Browse Source

at91: Minor tweaks to SPL logic for space savings on smartweb

- spl_board_init is empty on smartweb so drop that function
- When CONFIG_AT91SAM9_WATCHDOG is set we do not disable the watchdog in
  SPL and instead let full U-Boot handle it.  Instead of an empty
  function just do not call a function.

Signed-off-by: Tom Rini <trini@konsulko.com>
Tom Rini 6 years ago
parent
commit
f58e94602e
4 changed files with 6 additions and 4 deletions
  1. 1 1
      arch/arm/Kconfig
  2. 1 3
      arch/arm/mach-at91/spl.c
  3. 2 0
      arch/arm/mach-at91/spl_at91.c
  4. 2 0
      arch/arm/mach-at91/spl_atmel.c

+ 1 - 1
arch/arm/Kconfig

@@ -393,7 +393,7 @@ choice
 
 config ARCH_AT91
 	bool "Atmel AT91"
-	select SPL_BOARD_INIT if SPL
+	select SPL_BOARD_INIT if SPL && !TARGET_SMARTWEB
 
 config TARGET_EDB93XX
 	bool "Support edb93xx"

+ 1 - 3
arch/arm/mach-at91/spl.c

@@ -11,9 +11,7 @@
 #include <asm/arch/clk.h>
 #include <spl.h>
 
-#if defined(CONFIG_AT91SAM9_WATCHDOG)
-void at91_disable_wdt(void) { }
-#else
+#if !defined(CONFIG_AT91SAM9_WATCHDOG)
 void at91_disable_wdt(void)
 {
 	struct at91_wdt *wdt = (struct at91_wdt *)ATMEL_BASE_WDT;

+ 2 - 0
arch/arm/mach-at91/spl_at91.c

@@ -76,7 +76,9 @@ void __weak spl_board_init(void)
 void board_init_f(ulong dummy)
 {
 	lowlevel_clock_init();
+#if !defined(CONFIG_AT91SAM9_WATCHDOG)
 	at91_disable_wdt();
+#endif
 
 	/*
 	 * At this stage the main oscillator is supposed to be enabled

+ 2 - 0
arch/arm/mach-at91/spl_atmel.c

@@ -98,8 +98,10 @@ void board_init_f(ulong dummy)
 	configure_2nd_sram_as_l2_cache();
 #endif
 
+#if !defined(CONFIG_AT91SAM9_WATCHDOG)
 	/* disable watchdog */
 	at91_disable_wdt();
+#endif
 
 	/* PMC configuration */
 	at91_pmc_init();