From 30a1080a5d1530743dbbbbed33f9526f81e206a2 Mon Sep 17 00:00:00 2001
From: Troy Kisky <troy.kisky@boundarydevices.com>
Date: Mon, 26 Aug 2019 14:01:28 -0700
Subject: [PATCH] nitrogen8m: move CONFIG_NR_DRAM_BANKS to defconfig

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
---
 configs/nitrogen8m_3g_defconfig | 1 +
 configs/nitrogen8m_4g_defconfig | 1 +
 configs/nitrogen8m_defconfig    | 1 +
 include/configs/nitrogen8m.h    | 1 -
 4 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/configs/nitrogen8m_3g_defconfig b/configs/nitrogen8m_3g_defconfig
index a7dfe403bdd..1a7100b48d1 100644
--- a/configs/nitrogen8m_3g_defconfig
+++ b/configs/nitrogen8m_3g_defconfig
@@ -15,6 +15,7 @@ CONFIG_DEBUG_UART_CLOCK=25000000
 CONFIG_DEFAULT_DEVICE_TREE="imx8mq-nitrogen8m"
 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=3072,DEFCONFIG=\"nitrogen8m_3g\""
diff --git a/configs/nitrogen8m_4g_defconfig b/configs/nitrogen8m_4g_defconfig
index 74a3bbd3f54..fd638671f24 100644
--- a/configs/nitrogen8m_4g_defconfig
+++ b/configs/nitrogen8m_4g_defconfig
@@ -15,6 +15,7 @@ CONFIG_DEBUG_UART_CLOCK=25000000
 CONFIG_DEFAULT_DEVICE_TREE="imx8mq-nitrogen8m"
 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_4g\""
diff --git a/configs/nitrogen8m_defconfig b/configs/nitrogen8m_defconfig
index 18363b086f5..89fa4bbe8e3 100644
--- a/configs/nitrogen8m_defconfig
+++ b/configs/nitrogen8m_defconfig
@@ -15,6 +15,7 @@ CONFIG_DEBUG_UART_CLOCK=25000000
 CONFIG_DEFAULT_DEVICE_TREE="imx8mq-nitrogen8m"
 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\""
diff --git a/include/configs/nitrogen8m.h b/include/configs/nitrogen8m.h
index ea0881f6081..0c473cb24d9 100644
--- a/include/configs/nitrogen8m.h
+++ b/include/configs/nitrogen8m.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