Date:2012-03-30 16:44:30 (8 years 6 months ago)
Author:Maarten ter Huurne
Commit:d1c6dd7ad214e361abd5afc136e68ef74edd7ccc
Message:Revert "MIPS: Enable vmlinuz for JZ4740"

This reverts commit 332b2f92349d462485f09e9ec9d43fdfbc19176f.
Cleaning up the patch to get it accepted upstream.
Files: arch/mips/Kconfig (1 diff)
arch/mips/boot/compressed/Makefile (1 diff)
arch/mips/boot/compressed/uart-16550.c (1 diff)

Change Details

arch/mips/Kconfig
213213    select HAVE_CLK
214214    select GENERIC_IRQ_CHIP
215215    select CPU_SUPPORTS_CPUFREQ
216    select SYS_SUPPORTS_ZBOOT_UART16550
217216
218217config LANTIQ
219218    bool "Lantiq based platforms"
arch/mips/boot/compressed/Makefile
5858# Calculate the load address of the compressed kernel image
5959hostprogs-y := calc_vmlinuz_load_addr
6060
61ifeq ($(CONFIG_MACH_JZ4740),y)
62VMLINUZ_LOAD_ADDRESS:=0x80600000
63else
6461VMLINUZ_LOAD_ADDRESS = $(shell $(obj)/calc_vmlinuz_load_addr \
6562        $(obj)/vmlinux.bin $(VMLINUX_LOAD_ADDRESS))
66endif
6763
6864vmlinuzobjs-y += $(obj)/piggy.o
6965
arch/mips/boot/compressed/uart-16550.c
1818#define PORT(offset) (CKSEG1ADDR(AR7_REGS_UART0) + (4 * offset))
1919#endif
2020
21#ifdef CONFIG_MACH_JZ4740
22#define UART0_BASE 0xB0030000
23#define PORT(offset) (UART0_BASE + (4 * offset))
24#endif
25
2621#ifndef PORT
2722#error please define the serial port address for your own machine
2823#endif

Archive Download the corresponding diff file



interactive