From: Lluís Batlle i Rossell <viric@xxxxxxxxxx> This patch adds support for building a compressed kernel for the JZ4740 architecture. Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx> Signed-off-by: Maarten ter Huurne <maarten@xxxxxxxxxxxxxx> --- arch/mips/Kconfig | 1 + arch/mips/boot/compressed/Makefile | 4 ++++ arch/mips/boot/compressed/uart-16550.c | 5 +++++ 3 files changed, 10 insertions(+), 0 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 9f78fbe..03dd163 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -213,6 +213,7 @@ config MACH_JZ4740 select HAVE_CLK select GENERIC_IRQ_CHIP select CPU_SUPPORTS_CPUFREQ + select SYS_SUPPORTS_ZBOOT_UART16550 config LANTIQ bool "Lantiq based platforms" diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile index 5042d51..71d89cb 100644 --- a/arch/mips/boot/compressed/Makefile +++ b/arch/mips/boot/compressed/Makefile @@ -58,8 +58,12 @@ $(obj)/piggy.o: $(obj)/dummy.o $(obj)/vmlinux.bin.z FORCE # Calculate the load address of the compressed kernel image hostprogs-y := calc_vmlinuz_load_addr +ifeq ($(CONFIG_MACH_JZ4740),y) +VMLINUZ_LOAD_ADDRESS:=0x80600000 +else VMLINUZ_LOAD_ADDRESS = $(shell $(obj)/calc_vmlinuz_load_addr \ $(obj)/vmlinux.bin $(VMLINUX_LOAD_ADDRESS)) +endif vmlinuzobjs-y += $(obj)/piggy.o diff --git a/arch/mips/boot/compressed/uart-16550.c b/arch/mips/boot/compressed/uart-16550.c index c9caaf4..1c7b739 100644 --- a/arch/mips/boot/compressed/uart-16550.c +++ b/arch/mips/boot/compressed/uart-16550.c @@ -18,6 +18,11 @@ #define PORT(offset) (CKSEG1ADDR(AR7_REGS_UART0) + (4 * offset)) #endif +#ifdef CONFIG_MACH_JZ4740 +#define UART0_BASE 0xB0030000 +#define PORT(offset) (UART0_BASE + (4 * offset)) +#endif + #ifndef PORT #error please define the serial port address for your own machine #endif -- 1.7.7
