summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-12-06 00:03:26 +0900
committerMasahiro Yamada <yamada.m@jp.panasonic.com>2014-12-09 00:08:33 +0900
commit7a3620b24649663857d99e8ab73ec0b3bd60e50e (patch)
tree550362162350c26d1a7c853fa846632dd26a62e6 /include/configs
parentdc7246e725cda125382df548115e73e7e000728c (diff)
downloadu-boot-imx-7a3620b24649663857d99e8ab73ec0b3bd60e50e.zip
u-boot-imx-7a3620b24649663857d99e8ab73ec0b3bd60e50e.tar.gz
u-boot-imx-7a3620b24649663857d99e8ab73ec0b3bd60e50e.tar.bz2
ARM: UniPhier: detect the number of flash banks at run-time
Some UniPhier boards are equipped with an expansion slot that some optional SRAM/NOR-flash cards can be attached to. So, run-time detection of the number of flash banks would be more user-friendly. Until this commit, UniPhier boards have achieved this by (ab)using board_flash_wp_on() because the boot failed if flash_size got zero. Fortunately, this problem was solved by commit 70879a92561a (flash: do not fail even if flash_size is zero). Now it is possible to throw away such a tricky workaround. This commit also enables CONFIG_SYS_MAX_FLASH_BANKS_DETECT for further refactoring. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/uniphier.h13
1 files changed, 2 insertions, 11 deletions
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 733e6fa..dd022fb 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -92,6 +92,7 @@
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_BOARD_LATE_INIT
#define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024)
@@ -121,17 +122,7 @@
#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */
-#if defined(CONFIG_PFC_MICRO_SUPPORT_CARD)
-# define CONFIG_SYS_MAX_FLASH_BANKS 1
-# define CONFIG_SYS_FLASH_BANKS_LIST {0x00000000}
-# define CONFIG_SYS_FLASH_BANKS_SIZES {0x02000000}
-#endif
-
-#if defined(CONFIG_DCC_MICRO_SUPPORT_CARD)
-# define CONFIG_SYS_MAX_FLASH_BANKS 1
-# define CONFIG_SYS_FLASH_BANKS_LIST {0x04000000}
-# define CONFIG_SYS_FLASH_BANKS_SIZES {0x04000000}
-#endif
+#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 2
/* serial console configuration */
#define CONFIG_BAUDRATE 115200