From aa216f35bdacbc3678c53284ab96b34aae78da78 Mon Sep 17 00:00:00 2001 From: Troy Kisky <troy.kisky@boundarydevices.com> Date: Mon, 26 Aug 2019 14:05:09 -0700 Subject: [PATCH] nitrogen8mm_som: move CONFIG_NR_DRAM_BANKS to defconfig Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> --- configs/nitrogen8mm_som_2g_defconfig | 1 + configs/nitrogen8mm_som_4g_defconfig | 1 + include/configs/nitrogen8mm_som.h | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/nitrogen8mm_som_2g_defconfig b/configs/nitrogen8mm_som_2g_defconfig index 25b6b42831b..d8decef4313 100644 --- a/configs/nitrogen8mm_som_2g_defconfig +++ b/configs/nitrogen8mm_som_2g_defconfig @@ -15,6 +15,7 @@ CONFIG_DEBUG_UART_CLOCK=25000000 CONFIG_DEFAULT_DEVICE_TREE="imx8mm-nitrogen8mm_som" CONFIG_DEBUG_UART=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_NR_DRAM_BANKS=1 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SPL_TEXT_BASE=0x7E1000,DDR_MB=2048,DEFCONFIG=\"nitrogen8mm_som_2g\"" diff --git a/configs/nitrogen8mm_som_4g_defconfig b/configs/nitrogen8mm_som_4g_defconfig index 71800f5de36..2465f215116 100644 --- a/configs/nitrogen8mm_som_4g_defconfig +++ b/configs/nitrogen8mm_som_4g_defconfig @@ -15,6 +15,7 @@ CONFIG_DEBUG_UART_CLOCK=25000000 CONFIG_DEFAULT_DEVICE_TREE="imx8mm-nitrogen8mm_som" CONFIG_DEBUG_UART=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_NR_DRAM_BANKS=1 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SPL_TEXT_BASE=0x7E1000,DDR_MB=4096,DEFCONFIG=\"nitrogen8mm_som_4g\"" diff --git a/include/configs/nitrogen8mm_som.h b/include/configs/nitrogen8mm_som.h index 763d947ce2e..4bd4f21cf78 100644 --- a/include/configs/nitrogen8mm_som.h +++ b/include/configs/nitrogen8mm_som.h @@ -114,7 +114,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x80000000 /* 2GB DDR */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_MEMTEST_START PHYS_SDRAM #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (PHYS_SDRAM_SIZE >> 1)) -- GitLab