@@ -108,6 +108,11 @@ config TARGET_OMAP3_LOGIC
config TARGET_NOKIA_RX51
bool "Nokia RX51"
select POSITION_INDEPENDENT
+ select SKIP_LOWLEVEL_INIT
+ select SUPPORT_PASSING_ATAGS
+ select CMDLINE_TAG
+ select INITRD_TAG
+ select REVISION_TAG
config TARGET_TAO3530
bool "TAO3530"
@@ -1,5 +1,8 @@
if TARGET_NOKIA_RX51
+config NR_DRAM_BANKS
+ default 2
+
config SYS_BOARD
default "rx51"
@@ -9,4 +12,7 @@ config SYS_VENDOR
config SYS_CONFIG_NAME
default "nokia_rx51"
+config SYS_PROMPT
+ default "Nokia RX-51 # "
+
endif
@@ -1,16 +1,10 @@
CONFIG_ARM=y
-CONFIG_SKIP_LOWLEVEL_INIT=y
# CONFIG_SYS_THUMB_BUILD is not set
CONFIG_SYS_L2CACHE_OFF=y
CONFIG_ARCH_OMAP2PLUS=y
-CONFIG_SUPPORT_PASSING_ATAGS=y
-CONFIG_CMDLINE_TAG=y
-CONFIG_INITRD_TAG=y
-CONFIG_REVISION_TAG=y
CONFIG_STATIC_MACH_TYPE=y
CONFIG_MACH_TYPE=1955
CONFIG_SYS_MALLOC_LEN=0xc0000
-CONFIG_NR_DRAM_BANKS=2
CONFIG_TARGET_NOKIA_RX51=y
CONFIG_SYS_LOAD_ADDR=0x80000000
CONFIG_OPTIMIZE_INLINING=y
@@ -26,7 +20,6 @@ CONFIG_USE_PREBOOT=y
CONFIG_PREBOOT="run preboot"
# CONFIG_SYS_DEVICE_NULLDEV is not set
CONFIG_HUSH_PARSER=y
-CONFIG_SYS_PROMPT="Nokia RX-51 # "
# CONFIG_CMD_BDI is not set
CONFIG_CMD_BOOTZ=y
# CONFIG_BOOTM_NETBSD is not set
Some of config options are board specific and should be set in into their default values automatically. So move them from defconfig file to Kconfig definitions to ensure that possible user custom defconfig files would have these required options also enabled. Signed-off-by: Pali Rohár <pali@kernel.org> --- arch/arm/mach-omap2/omap3/Kconfig | 5 +++++ board/nokia/rx51/Kconfig | 6 ++++++ configs/nokia_rx51_defconfig | 7 ------- 3 files changed, 11 insertions(+), 7 deletions(-)