Merge branch 'next'

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

diff --git a/include/configs/platinum.h b/include/configs/platinum.h
index 58e590a..5e81c45 100644 (file)
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -74,16 +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))
 
 #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 */
@@ -94,10 +88,6 @@
 
 /* Board startup config */
 
-#define CONFIG_SYS_MEMTEST_START               PHYS_SDRAM
-#define CONFIG_SYS_MEMTEST_END                 (CONFIG_SYS_MEMTEST_START + \
-                                                PHYS_SDRAM_SIZE - (12 << 20))
-
 #define CONFIG_BOOTCOMMAND                     "run bootubi_scr"
 
 /* Miscellaneous configurable options */