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

[oweals/u-boot.git] / include / configs / platinum.h

diff --git a/include/configs/platinum.h b/include/configs/platinum.h
index 734918a2bb577a58715a060c23896d3d8f52b4a6..210927f4de005d2876680f403efbd64f4f2dae2a 100644 (file)
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -36,7 +36,6 @@
 
 /* Ethernet config */
 #define CONFIG_FEC_MXC
-#define CONFIG_MII
 #define IMX_FEC_BASE                           ENET_BASE_ADDR
 
 /* USB config */
@@ -45,7 +44,6 @@
 #define CONFIG_MXC_USB_FLAGS                   0
 
 /* Memory config */
-#define CONFIG_NR_DRAM_BANKS                   1
 #define PHYS_SDRAM                             MMDC0_ARB_BASE_ADDR
 #ifndef PHYS_SDRAM_SIZE
 #define PHYS_SDRAM_SIZE                                (1024 << 20)
@@ -76,17 +74,10 @@
 /* DMA config, needed for GPMI/MXS NAND support */
 
 /* Environment in NAND */
-#define CONFIG_ENV_OFFSET              (16 << 20)
-#define CONFIG_ENV_SECT_SIZE           (128 << 10)
-#define CONFIG_ENV_SIZE                        CONFIG_ENV_SECT_SIZE
-#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + (512 << 10))
-#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 
 #else /* CONFIG_CMD_NAND */
 
 /* Environment in MMC */
-#define CONFIG_ENV_SIZE                        (8 << 10)
-#define CONFIG_ENV_OFFSET              (6 * 64 * 1024)
 #define CONFIG_SYS_MMC_ENV_DEV         0
 
 #endif /* CONFIG_CMD_NAND */
@@ -96,7 +87,6 @@
  */
 
 /* Board startup config */
-#define CONFIG_MISC_INIT_R
 
 #define CONFIG_SYS_MEMTEST_START               PHYS_SDRAM
 #define CONFIG_SYS_MEMTEST_END                 (CONFIG_SYS_MEMTEST_START + \
@@ -105,11 +95,8 @@
 #define CONFIG_BOOTCOMMAND                     "run bootubi_scr"
 
 /* Miscellaneous configurable options */
-#define CONFIG_PREBOOT
 
 /* MTD/UBI/UBIFS config */
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
 
 /*
  * Environment configuration