summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPali Rohár <pali@kernel.org>2022-08-11 22:27:25 +0200
committerTom Rini <trini@konsulko.com>2022-08-20 16:18:40 -0400
commit9ca6c91732533c4d8e809dac9f602c28ae4923cc (patch)
tree875fcda7189d874ce598b82f9d01eb925de4e4fd
parent0ba6ce4b7889dc74a646cf54ea97a9d48428bcfe (diff)
downloadu-boot-9ca6c91732533c4d8e809dac9f602c28ae4923cc.tar.gz
u-boot-9ca6c91732533c4d8e809dac9f602c28ae4923cc.tar.bz2
u-boot-9ca6c91732533c4d8e809dac9f602c28ae4923cc.zip
Nokia RX-51: Move board required options from defconfig to Kconfig
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>
-rw-r--r--arch/arm/mach-omap2/omap3/Kconfig5
-rw-r--r--board/nokia/rx51/Kconfig6
-rw-r--r--configs/nokia_rx51_defconfig7
3 files changed, 11 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/omap3/Kconfig b/arch/arm/mach-omap2/omap3/Kconfig
index 18574ab2b2..3e97ec2629 100644
--- a/arch/arm/mach-omap2/omap3/Kconfig
+++ b/arch/arm/mach-omap2/omap3/Kconfig
@@ -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"
diff --git a/board/nokia/rx51/Kconfig b/board/nokia/rx51/Kconfig
index ec6a571a22..7cf05077da 100644
--- a/board/nokia/rx51/Kconfig
+++ b/board/nokia/rx51/Kconfig
@@ -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
diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
index 1306c1fc26..b25e33ea87 100644
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@@ -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
@@ -25,7 +19,6 @@ CONFIG_BOOTCOMMAND="run sdboot;run emmcboot;run attachboot;echo"
CONFIG_USE_PREBOOT=y
# CONFIG_SYS_DEVICE_NULLDEV is not set
CONFIG_HUSH_PARSER=y
-CONFIG_SYS_PROMPT="Nokia RX-51 # "
CONFIG_SYS_CBSIZE=256
CONFIG_SYS_PBSIZE=287
# CONFIG_CMD_BDI is not set