From 217680ed596473d3f3effa49df8b8e352c9ca7d1 Mon Sep 17 00:00:00 2001
From: Troy Kisky <troy.kisky@boundarydevices.com>
Date: Mon, 26 Aug 2019 14:03:23 -0700
Subject: [PATCH] nitrogen8m_som: move CONFIG_NR_DRAM_BANKS to defconfig

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
---
 configs/nitrogen8m_som_2g_defconfig | 1 +
 configs/nitrogen8m_som_4g_defconfig | 1 +
 include/configs/nitrogen8m_som.h    | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/configs/nitrogen8m_som_2g_defconfig b/configs/nitrogen8m_som_2g_defconfig
index bff5666aa3e..67cee344199 100644
--- a/configs/nitrogen8m_som_2g_defconfig
+++ b/configs/nitrogen8m_som_2g_defconfig
@@ -15,6 +15,7 @@ CONFIG_DEBUG_UART_CLOCK=25000000
 CONFIG_DEFAULT_DEVICE_TREE="imx8mq-nitrogen8m_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,DDR_MB=2048,DEFCONFIG=\"nitrogen8m_som_2g\""
diff --git a/configs/nitrogen8m_som_4g_defconfig b/configs/nitrogen8m_som_4g_defconfig
index c43de4382bf..1c116a2ed71 100644
--- a/configs/nitrogen8m_som_4g_defconfig
+++ b/configs/nitrogen8m_som_4g_defconfig
@@ -15,6 +15,7 @@ CONFIG_DEBUG_UART_CLOCK=25000000
 CONFIG_DEFAULT_DEVICE_TREE="imx8mq-nitrogen8m_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,DDR_MB=4096,DEFCONFIG=\"nitrogen8m_som_4g\""
diff --git a/include/configs/nitrogen8m_som.h b/include/configs/nitrogen8m_som.h
index 31204a131de..fff64ceef78 100644
--- a/include/configs/nitrogen8m_som.h
+++ b/include/configs/nitrogen8m_som.h
@@ -101,7 +101,6 @@
 
 #define CONFIG_SYS_SDRAM_BASE           0x40000000
 #define PHYS_SDRAM                      0x40000000
-#define CONFIG_NR_DRAM_BANKS		1
 
 #define CONFIG_SYS_MEMTEST_START    PHYS_SDRAM
 #define CONFIG_SYS_MEMTEST_END      (CONFIG_SYS_MEMTEST_START + 0x40000000u)
-- 
GitLab