diff options
author | Jayachandran C <jchandra@broadcom.com> | 2013-06-10 02:33:26 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-06-13 11:46:41 -0400 |
commit | 8f0b043045d0b19d7eb8b510bfe279c9bb05d952 (patch) | |
tree | 628c65b873e62ee7c9c5b15cf0cf898725bb7b49 /arch | |
parent | d6a5078459d95137d8d620787d1099a3016932a9 (diff) |
MIPS: Netlogic: Support compressed kernel
Add SYS_SUPPORTS_ZBOOT and SYS_SUPPORTS_ZBOOT_UART16550 config options
for XLR and XLP.
Update boot/compressed/uart-16550.c to add UART port for XLR and XLP.
Signed-off-by: Jayachandran C <jchandra@broadcom.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5417/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/Kconfig | 4 | ||||
-rw-r--r-- | arch/mips/boot/compressed/uart-16550.c | 12 |
2 files changed, 16 insertions, 0 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index a46b0a2f8f0f..69bf31062ca4 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -788,6 +788,8 @@ config NLM_XLR_BOARD | |||
788 | select SYS_HAS_EARLY_PRINTK | 788 | select SYS_HAS_EARLY_PRINTK |
789 | select USB_ARCH_HAS_OHCI if USB_SUPPORT | 789 | select USB_ARCH_HAS_OHCI if USB_SUPPORT |
790 | select USB_ARCH_HAS_EHCI if USB_SUPPORT | 790 | select USB_ARCH_HAS_EHCI if USB_SUPPORT |
791 | select SYS_SUPPORTS_ZBOOT | ||
792 | select SYS_SUPPORTS_ZBOOT_UART16550 | ||
791 | help | 793 | help |
792 | Support for systems based on Netlogic XLR and XLS processors. | 794 | Support for systems based on Netlogic XLR and XLS processors. |
793 | Say Y here if you have a XLR or XLS based board. | 795 | Say Y here if you have a XLR or XLS based board. |
@@ -814,6 +816,8 @@ config NLM_XLP_BOARD | |||
814 | select SYNC_R4K | 816 | select SYNC_R4K |
815 | select SYS_HAS_EARLY_PRINTK | 817 | select SYS_HAS_EARLY_PRINTK |
816 | select USE_OF | 818 | select USE_OF |
819 | select SYS_SUPPORTS_ZBOOT | ||
820 | select SYS_SUPPORTS_ZBOOT_UART16550 | ||
817 | help | 821 | help |
818 | This board is based on Netlogic XLP Processor. | 822 | This board is based on Netlogic XLP Processor. |
819 | Say Y here if you have a XLP based board. | 823 | Say Y here if you have a XLP based board. |
diff --git a/arch/mips/boot/compressed/uart-16550.c b/arch/mips/boot/compressed/uart-16550.c index 90ae4400c40c..c01d343ce6ad 100644 --- a/arch/mips/boot/compressed/uart-16550.c +++ b/arch/mips/boot/compressed/uart-16550.c | |||
@@ -23,6 +23,18 @@ | |||
23 | #define PORT(offset) (UART0_BASE + (4 * offset)) | 23 | #define PORT(offset) (UART0_BASE + (4 * offset)) |
24 | #endif | 24 | #endif |
25 | 25 | ||
26 | #ifdef CONFIG_CPU_XLR | ||
27 | #define UART0_BASE 0x1EF14000 | ||
28 | #define PORT(offset) (CKSEG1ADDR(UART0_BASE) + (4 * offset)) | ||
29 | #define IOTYPE unsigned int | ||
30 | #endif | ||
31 | |||
32 | #ifdef CONFIG_CPU_XLP | ||
33 | #define UART0_BASE 0x18030100 | ||
34 | #define PORT(offset) (CKSEG1ADDR(UART0_BASE) + (4 * offset)) | ||
35 | #define IOTYPE unsigned int | ||
36 | #endif | ||
37 | |||
26 | #ifndef IOTYPE | 38 | #ifndef IOTYPE |
27 | #define IOTYPE char | 39 | #define IOTYPE char |
28 | #endif | 40 | #endif |