diff options
| author | Heiko Schocher <hs@denx.de> | 2015-06-29 09:10:46 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-12 20:47:13 -0400 |
| commit | 80402f34f8e1f46134a0272ff4d34be64ff7380b (patch) | |
| tree | 5fcf26d057c39f522fe4cf6ed77966dc322d72b8 /arch | |
| parent | acb5ff021eb65931d3e970da8ff0a00dda0cd088 (diff) | |
| download | talos-obmc-uboot-80402f34f8e1f46134a0272ff4d34be64ff7380b.tar.gz talos-obmc-uboot-80402f34f8e1f46134a0272ff4d34be64ff7380b.zip | |
spl, common, serial: build SPL without serial support
This patch enables building SPL without
CONFIG_SPL_SERIAL_SUPPORT support.
Signed-off-by: Heiko Schocher <hs@denx.de>
[trini: Ensure we build arch/arm/imx-common on mx28]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/lib/interrupts.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-at91/arm926ejs/cpu.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/spl_at91.c | 3 |
4 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 6f30098f0a..ab0e9ce673 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -78,7 +78,7 @@ libs-y += arch/arm/cpu/ libs-y += arch/arm/lib/ ifeq ($(CONFIG_SPL_BUILD),y) -ifneq (,$(CONFIG_MX23)$(CONFIG_MX35)$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35)) +ifneq (,$(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_MX35)$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35)) libs-y += arch/arm/imx-common/ endif else diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c index 06f46795c3..ec3fb77f85 100644 --- a/arch/arm/lib/interrupts.c +++ b/arch/arm/lib/interrupts.c @@ -123,8 +123,8 @@ void bad_mode (void) void show_regs (struct pt_regs *regs) { - unsigned long flags; - const char *processor_modes[] = { + unsigned long __maybe_unused flags; + const char __maybe_unused *processor_modes[] = { "USER_26", "FIQ_26", "IRQ_26", "SVC_26", "UK4_26", "UK5_26", "UK6_26", "UK7_26", "UK8_26", "UK9_26", "UK10_26", "UK11_26", diff --git a/arch/arm/mach-at91/arm926ejs/cpu.c b/arch/arm/mach-at91/arm926ejs/cpu.c index da1d35907e..990c689ad7 100644 --- a/arch/arm/mach-at91/arm926ejs/cpu.c +++ b/arch/arm/mach-at91/arm926ejs/cpu.c @@ -42,7 +42,7 @@ void arch_preboot_os(void) #if defined(CONFIG_DISPLAY_CPUINFO) int print_cpuinfo(void) { - char buf[32]; + char __maybe_unused buf[32]; printf("CPU: %s\n", ATMEL_CPU_NAME); printf("Crystal frequency: %8s MHz\n", diff --git a/arch/arm/mach-at91/spl_at91.c b/arch/arm/mach-at91/spl_at91.c index a79a9dce75..b19f95b0d0 100644 --- a/arch/arm/mach-at91/spl_at91.c +++ b/arch/arm/mach-at91/spl_at91.c @@ -123,9 +123,12 @@ void board_init_f(ulong dummy) at91_periph_clk_enable(ATMEL_ID_PIOB); at91_periph_clk_enable(ATMEL_ID_PIOC); #endif + +#if defined(CONFIG_SPL_SERIAL_SUPPORT) /* init console */ at91_seriald_hw_init(); preloader_console_init(); +#endif mem_init(); |
