common: Move hang() to the same header as panic()

[oweals/u-boot.git] / board / gateworks / gw_ventana / gw_ventana_spl.c

diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c
index 27f3774140e538fb55108dba49cbe63ee339c5b3..80fec5f9cf3ef22b9aaf4df85c04b1233a4ac21e 100644 (file)
--- a/board/gateworks/gw_ventana/gw_ventana_spl.c
+++ b/board/gateworks/gw_ventana/gw_ventana_spl.c
@@ -5,6 +5,8 @@
  */
 
 #include <common.h>
+#include <env.h>
+#include <hang.h>
 #include <asm/io.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/mx6-ddr.h>
@@ -13,7 +15,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
-#include <environment.h>
+#include <env.h>
 #include <i2c.h>
 #include <spl.h>
 
@@ -540,6 +542,11 @@ static void spl_dram_init(int width, int size_mb, int board_model)
                else
                        calib = &mx6sdl_256x16_mmdc_calib;
                debug("4gB density\n");
+       } else if (width == 16 && size_mb == 1024) {
+               mem = &mt41k512m16ha_125;
+               if (is_cpu_type(MXC_CPU_MX6Q))
+                       calib = &mx6dq_512x32_mmdc_calib;
+               debug("8gB density\n");
        } else if (width == 32 && size_mb == 256) {
                /* Same calib as width==16, size==128 */
                mem = &mt41k64m16jt_125;