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>

diff --git a/Kconfig b/Kconfig
index 83b5b053923ef194d1c1e6e6724c23e403a7a12a..9a5e60075389a5dc9ee2d53a72ede1b6b17c056b 100644 (file)
--- 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 2f831a9a2cd2d1949e203bd4d46ca9eab8370d1b..1bcf3450288c54a117fc6e91dffb6ea64c08f3ec 100644 (file)
--- 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 e76e9a2e5a3e815fd93cd033dfd3858f18232986..2228fafac6c5c4e577b458f1eed8e6ca58438716 100644 (file)
--- 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