Patch for the jz-3.2, to enable vmlinuz. As advised by larsc.
>From c97b2231e78551855f40bdec2984357da739bcae Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen <[email protected]> Date: Fri, 25 Mar 2011 14:41:31 +0100 Subject: [PATCH] Enable the target vmlinuz for the nanonote.
Following the instructions given by larsc: Pick the first 3 changes in http://projects.qi-hardware.com/index.php/p/qi-kernel/source/commit/9a83f481a49cf9337a0aaed749c631572dddb950/ ... 23:25 < larsc> and the third one should use CONFIG_MACH_JZ4740 instead of CONFIG_MACH_JZ4760 23:26 < larsc> and 0xB0030000 instead of 0xB0031000 Conflicts: arch/mips/Kconfig arch/mips/boot/compressed/Makefile arch/mips/jz47xx/dma.c arch/mips/jz47xx/jz4760/board-lepus.c drivers/input/touchscreen/jz4740-ts.c drivers/mfd/Kconfig drivers/mfd/jz4740-adc.c drivers/mtd/nand/Kconfig drivers/mtd/nand/jz4750_nand.c drivers/video/jz4740_fb.c --- arch/mips/Kconfig | 1 + arch/mips/boot/compressed/Makefile | 9 +++------ arch/mips/boot/compressed/uart-16550.c | 5 +++++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 8128df7..5537054 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -210,6 +210,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 ed36a55..85500ce 100644 --- a/arch/mips/boot/compressed/Makefile +++ b/arch/mips/boot/compressed/Makefile @@ -58,12 +58,9 @@ $(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_JZ4740_A320),y) -VMLINUZ_LOAD_ADDRESS = 0x80600000 -else -VMLINUZ_LOAD_ADDRESS = $(shell $(obj)/calc_vmlinuz_load_addr \ - $(obj)/vmlinux.bin $(VMLINUX_LOAD_ADDRESS)) -endif +#VMLINUZ_LOAD_ADDRESS = $(shell $(obj)/calc_vmlinuz_load_addr \ +# $(obj)/vmlinux.bin $(VMLINUX_LOAD_ADDRESS)) +VMLINUZ_LOAD_ADDRESS:=0x80600000 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..078eac8 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 UART1_BASE 0xB0030000 +#define PORT(offset) (UART1_BASE + (4 * offset)) +#endif + #ifndef PORT #error please define the serial port address for your own machine #endif -- 1.7.8
_______________________________________________ Qi Hardware Discussion List Mail to list (members only): [email protected] Subscribe or Unsubscribe: http://lists.en.qi-hardware.com/mailman/listinfo/discussion
