diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /arch/mips/boot/compressed | |
parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) |
Patched in Tegra support.
Diffstat (limited to 'arch/mips/boot/compressed')
-rw-r--r-- | arch/mips/boot/compressed/Makefile | 4 | ||||
-rw-r--r-- | arch/mips/boot/compressed/uart-16550.c | 5 | ||||
-rw-r--r-- | arch/mips/boot/compressed/uart-alchemy.c | 1 |
3 files changed, 1 insertions, 9 deletions
diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile index c2a3fb0ffc8..5042d51b051 100644 --- a/arch/mips/boot/compressed/Makefile +++ b/arch/mips/boot/compressed/Makefile | |||
@@ -58,12 +58,8 @@ $(obj)/piggy.o: $(obj)/dummy.o $(obj)/vmlinux.bin.z FORCE | |||
58 | # Calculate the load address of the compressed kernel image | 58 | # Calculate the load address of the compressed kernel image |
59 | hostprogs-y := calc_vmlinuz_load_addr | 59 | hostprogs-y := calc_vmlinuz_load_addr |
60 | 60 | ||
61 | ifeq ($(CONFIG_MACH_JZ4740),y) | ||
62 | VMLINUZ_LOAD_ADDRESS := 0x80600000 | ||
63 | else | ||
64 | VMLINUZ_LOAD_ADDRESS = $(shell $(obj)/calc_vmlinuz_load_addr \ | 61 | VMLINUZ_LOAD_ADDRESS = $(shell $(obj)/calc_vmlinuz_load_addr \ |
65 | $(obj)/vmlinux.bin $(VMLINUX_LOAD_ADDRESS)) | 62 | $(obj)/vmlinux.bin $(VMLINUX_LOAD_ADDRESS)) |
66 | endif | ||
67 | 63 | ||
68 | vmlinuzobjs-y += $(obj)/piggy.o | 64 | vmlinuzobjs-y += $(obj)/piggy.o |
69 | 65 | ||
diff --git a/arch/mips/boot/compressed/uart-16550.c b/arch/mips/boot/compressed/uart-16550.c index 1c7b739b6a1..c9caaf4fbf6 100644 --- a/arch/mips/boot/compressed/uart-16550.c +++ b/arch/mips/boot/compressed/uart-16550.c | |||
@@ -18,11 +18,6 @@ | |||
18 | #define PORT(offset) (CKSEG1ADDR(AR7_REGS_UART0) + (4 * offset)) | 18 | #define PORT(offset) (CKSEG1ADDR(AR7_REGS_UART0) + (4 * offset)) |
19 | #endif | 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 | #ifndef PORT | 21 | #ifndef PORT |
27 | #error please define the serial port address for your own machine | 22 | #error please define the serial port address for your own machine |
28 | #endif | 23 | #endif |
diff --git a/arch/mips/boot/compressed/uart-alchemy.c b/arch/mips/boot/compressed/uart-alchemy.c index 4bee55b93f6..eb063e6dead 100644 --- a/arch/mips/boot/compressed/uart-alchemy.c +++ b/arch/mips/boot/compressed/uart-alchemy.c | |||
@@ -2,5 +2,6 @@ | |||
2 | 2 | ||
3 | void putc(char c) | 3 | void putc(char c) |
4 | { | 4 | { |
5 | /* all current (Jan. 2010) in-kernel boards */ | ||
5 | alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c); | 6 | alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c); |
6 | } | 7 | } |