flash: complete CONFIG_SYS_NO_FLASH move with renaming

[people/ms/u-boot.git] / arch / arm / mach-uniphier / micro-support-card.c

diff --git a/arch/arm/mach-uniphier/micro-support-card.c b/arch/arm/mach-uniphier/micro-support-card.c
index e53bcdf8e3c2024515dafd27f8a577cebbf4a8c8..2b231ac1870368f171bff81f6e5121a4123a63e2 100644 (file)
--- a/arch/arm/mach-uniphier/micro-support-card.c
+++ b/arch/arm/mach-uniphier/micro-support-card.c
@@ -25,12 +25,12 @@
  * bit[0]: LAN, I2C, LED
  * bit[1]: UART
  */
-void support_card_reset_deassert(void)
+static void support_card_reset_deassert(void)
 {
        writel(0x00010000, MICRO_SUPPORT_CARD_RESET);
 }
 
-void support_card_reset(void)
+static void support_card_reset(void)
 {
        writel(0x00020003, MICRO_SUPPORT_CARD_RESET);
 }
@@ -57,6 +57,7 @@ int checkboard(void)
 
 void support_card_init(void)
 {
+       support_card_reset();
        /*
         * After power on, we need to keep the LAN controller in reset state
         * for a while. (200 usec)
@@ -74,7 +75,7 @@ int board_eth_init(bd_t *bis)
 }
 #endif
 
-#if !defined(CONFIG_SYS_NO_FLASH)
+#if defined(CONFIG_MTD_NOR_FLASH)
 
 #include <mtd/cfi_flash.h>
 
@@ -156,11 +157,11 @@ static void detect_num_flash_banks(void)
 
        debug("number of flash banks: %d\n", cfi_flash_num_flash_banks);
 }
-#else /* CONFIG_SYS_NO_FLASH */
-void detect_num_flash_banks(void)
+#else /* CONFIG_MTD_NOR_FLASH */
+static void detect_num_flash_banks(void)
 {
 };
-#endif /* CONFIG_SYS_NO_FLASH */
+#endif /* CONFIG_MTD_NOR_FLASH */
 
 void support_card_late_init(void)
 {