From: Fabio Estevam <festevam@gmail.com>
Date: Thu, 18 Jul 2019 18:04:24 +0000 (-0300)
Subject: imx: mmdc_size: Allow building it for i.MX7ULP
X-Git-Tag: v2020.01-rc1~23^2~4
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d9fba73a88afa4b8e2fdcc81778116bba8fbb243;p=oweals%2Fu-boot.git

imx: mmdc_size: Allow building it for i.MX7ULP

i.MX7ULP uses the same MMDC controller IP as found on i.MX53
and i.MX6, so build mmdc_size.c for i.MX7ULP as well.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
---

diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index cb6ef533de..9dfe883ead 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -51,7 +51,7 @@ obj-$(CONFIG_IMX_HAB)    += hab.o
 obj-$(CONFIG_SYSCOUNTER_TIMER) += syscounter.o
 endif
 ifeq ($(SOC),$(filter $(SOC),mx7ulp))
-obj-y  += cache.o
+obj-y  += cache.o mmdc_size.o
 obj-$(CONFIG_IMX_HAB) += hab.o
 endif
 ifeq ($(SOC),$(filter $(SOC),vf610))
diff --git a/arch/arm/mach-imx/mmdc_size.c b/arch/arm/mach-imx/mmdc_size.c
index 13f587c38a..1a094726aa 100644
--- a/arch/arm/mach-imx/mmdc_size.c
+++ b/arch/arm/mach-imx/mmdc_size.c
@@ -5,8 +5,10 @@
 
 #if defined(CONFIG_MX53)
 #define MEMCTL_BASE	ESDCTL_BASE_ADDR
-#else
+#elif defined(CONFIG_MX6)
 #define MEMCTL_BASE	MMDC_P0_BASE_ADDR
+#elif defined(CONFIG_MX7ULP)
+#define MEMCTL_BASE	MMDC0_RBASE
 #endif
 static const unsigned char col_lookup[] = {9, 10, 11, 8, 12, 9, 9, 9};
 static const unsigned char bank_lookup[] = {3, 2};