Date: | 2012-03-30 16:44:30 (11 years 11 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 | ||
---|---|---|
213 | 213 | select HAVE_CLK |
214 | 214 | select GENERIC_IRQ_CHIP |
215 | 215 | select CPU_SUPPORTS_CPUFREQ |
216 | select SYS_SUPPORTS_ZBOOT_UART16550 | |
217 | 216 | |
218 | 217 | config LANTIQ |
219 | 218 | bool "Lantiq based platforms" |
arch/mips/boot/compressed/Makefile | ||
---|---|---|
58 | 58 | # Calculate the load address of the compressed kernel image |
59 | 59 | hostprogs-y := calc_vmlinuz_load_addr |
60 | 60 | |
61 | ifeq ($(CONFIG_MACH_JZ4740),y) | |
62 | VMLINUZ_LOAD_ADDRESS:=0x80600000 | |
63 | else | |
64 | 61 | VMLINUZ_LOAD_ADDRESS = $(shell $(obj)/calc_vmlinuz_load_addr \ |
65 | 62 | $(obj)/vmlinux.bin $(VMLINUX_LOAD_ADDRESS)) |
66 | endif | |
67 | 63 | |
68 | 64 | vmlinuzobjs-y += $(obj)/piggy.o |
69 | 65 |
arch/mips/boot/compressed/uart-16550.c | ||
---|---|---|
18 | 18 | #define PORT(offset) (CKSEG1ADDR(AR7_REGS_UART0) + (4 * offset)) |
19 | 19 | #endif |
20 | 20 | |
21 | #ifdef CONFIG_MACH_JZ4740 | |
22 | #define UART0_BASE 0xB0030000 | |
23 | #define PORT(offset) (UART0_BASE + (4 * offset)) | |
24 | #endif | |
25 | ||
26 | 21 | #ifndef PORT |
27 | 22 | #error please define the serial port address for your own machine |
28 | 23 | #endif |
Branches:
ben-wpan
ben-wpan-stefan
5396a9238205f20f811ea57898980d3ca82df0b6
jz-2.6.34
jz-2.6.34-rc5
jz-2.6.34-rc6
jz-2.6.34-rc7
jz-2.6.35
jz-2.6.36
jz-2.6.37
jz-2.6.38
jz-2.6.39
jz-3.0
jz-3.1
jz-3.11
jz-3.12
jz-3.13
jz-3.15
jz-3.16
jz-3.18-dt
jz-3.2
jz-3.3
jz-3.4
jz-3.5
jz-3.6
jz-3.6-rc2-pwm
jz-3.9
jz-3.9-clk
jz-3.9-rc8
jz47xx
jz47xx-2.6.38
master
Tags:
od-2011-09-04
od-2011-09-18
v2.6.34-rc5
v2.6.34-rc6
v2.6.34-rc7
v3.9