| Message ID | 1587304717-13322-11-git-send-email-amittomer25@gmail.com |
|---|---|
| State | Accepted |
| Commit | d5c819b885c217f545f9d86bc7f18f6adc739e47 |
| Headers | show |
| Series | Actions S700 SoC support | expand |
On Sun, Apr 19, 2020 at 07:28:34PM +0530, Amit Singh Tomar wrote: > This patch moves some of the config options from bubblegum_96_defconfig > to respective Kconfig files. > > Signed-off-by: Amit Singh Tomar <amittomer25 at gmail.com> Applied to u-boot/master, thanks!
diff --git a/Kconfig b/Kconfig index 8bae87e..663ca15 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 84499b3..dd1649c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -879,6 +879,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 e76e9a2..2228faf 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
This patch moves some of the config options from bubblegum_96_defconfig to respective Kconfig files. Signed-off-by: Amit Singh Tomar <amittomer25 at gmail.com> --- Changes since v10: * Moved out some of config options from mach-owl/Kconfig to appropriate config files. Changes since v9: * Added Reviewed-by tag from Mani. Changes since v8: * No changes. Changes since v7: * No changes. Changes since v6: * remove unnecessary string from SYS_PROMPT. Changes since v5: * Newly added patch, was not there in earlier versions. --- Kconfig | 2 +- arch/arm/Kconfig | 1 + configs/bubblegum_96_defconfig | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-)