Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq

[platform/kernel/u-boot.git] / include / configs / mx6memcal.h

diff --git a/include/configs/mx6memcal.h b/include/configs/mx6memcal.h
index f5238a5..6fd87c2 100644 (file)
--- a/include/configs/mx6memcal.h
+++ b/include/configs/mx6memcal.h
@@ -1,10 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright (C) 2010-2011 Freescale Semiconductor, Inc.
+ * Copyright (C) 2010-2018 Freescale Semiconductor, Inc.
  *
- * Configuration settings for the Boundary Devices Nitrogen6X
- * and Freescale i.MX6Q Sabre Lite boards.
- *
- * SPDX-License-Identifier:    GPL-2.0+
+ * Configuration settings for the virtual mx6memcal board.
  */
 
 #ifndef __CONFIG_H
@@ -15,7 +13,6 @@
 #include "mx6_common.h"
 #include "imx6_spl.h"
 
-#undef CONFIG_FSL_ESDHC
 #undef CONFIG_MMC
 #undef CONFIG_SPL_MMC_SUPPORT
 #undef CONFIG_GENERIC_MMC
@@ -42,7 +39,6 @@
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + 16)
 
 /* Physical Memory Map */
-#define CONFIG_NR_DRAM_BANKS          1
 #define PHYS_SDRAM                    MMDC0_ARB_BASE_ADDR
 
 #define CONFIG_SYS_SDRAM_BASE         PHYS_SDRAM
@@ -54,6 +50,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-#define CONFIG_ENV_SIZE                        (8 * 1024)
+#define CONFIG_MXC_USB_PORTSC  PORT_PTS_UTMI
 
 #endif        /* __CONFIG_H */