From: Mario Six <mario.six@gdsys.cc>
Date: Fri, 29 Mar 2019 09:18:09 +0000 (+0100)
Subject: gdsys: mpc8308: Don't use manual RAM config if RAM driver is active
X-Git-Tag: v2019.07-rc3~13^2~10
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=edba2b29f57efdff0ee087a0686ef11efbd6f9b8;p=oweals%2Fu-boot.git

gdsys: mpc8308: Don't use manual RAM config if RAM driver is active

The "manual" RAM configuration should not be used if the DM RAM driver
is active, hence, disable the code if the CONFIG_MPC83XX_SDRAM config
variable is defined.

Signed-off-by: Mario Six <mario.six@gdsys.cc>
---

diff --git a/board/gdsys/mpc8308/sdram.c b/board/gdsys/mpc8308/sdram.c
index 3eb0e37b7b..2a77fed270 100644
--- a/board/gdsys/mpc8308/sdram.c
+++ b/board/gdsys/mpc8308/sdram.c
@@ -11,6 +11,8 @@
  * board\freescale\mpc8315erdb\sdram.c
  */
 
+#ifndef CONFIG_MPC83XX_SDRAM
+
 #include <common.h>
 #include <mpc83xx.h>
 #include <spd_sdram.h>
@@ -81,3 +83,5 @@ int dram_init(void)
 
 	return 0;
 }
+
+#endif /* !CONFIG_MPC83XX_SDRAM */