imx6: centralise common boot options in mx6_common.h

[people/ms/u-boot.git] / include / configs / warp.h

diff --git a/include/configs/warp.h b/include/configs/warp.h
index 1c8b71f1585b85808dc5ac5d4444888984688c49..c9e510f913f5b9c03fd8cbbd73bbe85ff242d5a1 100644 (file)
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -50,11 +50,6 @@
 #undef CONFIG_CMD_NET
 #undef CONFIG_CMD_NFS
 
-#define CONFIG_BOOTDELAY               3
-
-#define CONFIG_LOADADDR                        0x82000000
-#define CONFIG_SYS_TEXT_BASE           0x87800000
-
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_HUSH_PARSER
@@ -71,8 +66,6 @@
 #define CONFIG_SYS_MEMTEST_START       0x80000000
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + SZ_256M)
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_STACKSIZE               SZ_128K