aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Singh Tomar2020-04-19 19:28:34 +0530
committerTom Rini2020-04-24 16:40:09 -0400
commitd5c819b885c217f545f9d86bc7f18f6adc739e47 (patch)
tree947843a91901baa75df4af5c8aab3613c01d5f91
parent78e4f4594de0c0ab873a038379d958f7fa669069 (diff)
actions: Move defconfig options to Kconfig
This patch moves some of the config options from bubblegum_96_defconfig to respective Kconfig files. Signed-off-by: Amit Singh Tomar <amittomer25@gmail.com>
-rw-r--r--Kconfig2
-rw-r--r--arch/arm/Kconfig1
-rw-r--r--configs/bubblegum_96_defconfig2
3 files changed, 2 insertions, 3 deletions
diff --git a/Kconfig b/Kconfig
index 83b5b053923..9a5e6007538 100644
--- a/Kconfig
+++ b/Kconfig
@@ -111,7 +111,7 @@ config ENV_VARS_UBOOT_CONFIG
config NR_DRAM_BANKS
int "Number of DRAM banks"
- default 1 if ARCH_SUNXI
+ default 1 if ARCH_SUNXI || ARCH_OWL
default 4
help
This defines the number of DRAM banks.
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2f831a9a2cd..1bcf3450288 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -880,6 +880,7 @@ config ARCH_OWL
select CLK
select CLK_OWL
select OF_CONTROL
+ select CONFIG_SYS_RELOC_GD_ENV_ADDR
imply CMD_DM
config ARCH_QEMU
diff --git a/configs/bubblegum_96_defconfig b/configs/bubblegum_96_defconfig
index e76e9a2e5a3..2228fafac6c 100644
--- a/configs/bubblegum_96_defconfig
+++ b/configs/bubblegum_96_defconfig
@@ -1,7 +1,6 @@
CONFIG_ARM=y
CONFIG_ARCH_OWL=y
CONFIG_ENV_SIZE=0x2000
-CONFIG_NR_DRAM_BANKS=1
CONFIG_MACH_S900=y
CONFIG_IDENT_STRING="\nBubblegum-96"
CONFIG_DISTRO_DEFAULTS=y
@@ -16,4 +15,3 @@ CONFIG_CMD_MEMINFO=y
CONFIG_CMD_CACHE=y
CONFIG_CMD_TIMER=y
CONFIG_DEFAULT_DEVICE_TREE="bubblegum_96"
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y