Convert CONFIG_SPLASH_SCREEN et al to Kconfig

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

diff --git a/include/configs/x600.h b/include/configs/x600.h
index f677921..0dd5722 100644 (file)
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -27,7 +27,6 @@
 #define CONFIG_SYS_SPL_LEN                     CONFIG_SPL_PAD_TO
 #define CONFIG_SYS_UBOOT_BASE                  (CONFIG_SYS_FLASH_BASE + \
                                                 CONFIG_SYS_SPL_LEN)
-#define CONFIG_SYS_UBOOT_START                 CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_MONITOR_BASE                        CONFIG_SYS_FLASH_BASE
 #define CONFIG_SYS_MONITOR_LEN                 0x60000
 
@@ -87,20 +86,12 @@
 /*
  * U-Boot Environment placing definitions.
  */
-#define CONFIG_ENV_SECT_SIZE                   0x00010000
-#define CONFIG_ENV_ADDR                                (CONFIG_SYS_MONITOR_BASE + \
-                                                CONFIG_SYS_MONITOR_LEN)
-#define CONFIG_ENV_SIZE                                0x02000
-#define CONFIG_ENV_ADDR_REDUND                 (CONFIG_ENV_ADDR + \
-                                                CONFIG_ENV_SECT_SIZE)
 
 /* Miscellaneous configurable options */
 #define CONFIG_BOOT_PARAMS_ADDR                        0x00000100
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 
-#define CONFIG_SYS_MEMTEST_START               0x00800000
-#define CONFIG_SYS_MEMTEST_END                 0x04000000
 #define CONFIG_SYS_MALLOC_LEN                  (8 << 20)
 #define CONFIG_SYS_LOAD_ADDR                   0x00800000