imx6: centralise common boot options in mx6_common.h

[karo-tx-uboot.git] / include / configs / nitrogen6x.h

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 6c35e167dc4bf6a95fa550f9abfddb13cfff74a4..1304687c3ed2ad714f0b0438c5e2dbdf0af91b88 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -145,13 +145,8 @@
 
 /* Command definition */
 
-#define CONFIG_BOOTDELAY              1
-
 #define CONFIG_PREBOOT                 ""
 
-#define CONFIG_LOADADDR                               0x12000000
-#define CONFIG_SYS_TEXT_BASE          0x17800000
-
 #ifdef CONFIG_CMD_SATA
 #define CONFIG_DRIVE_SATA "sata "
 #else
@@ -318,8 +313,6 @@
 #define CONFIG_SYS_MEMTEST_END        0x10010000
 #define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000
 
-#define CONFIG_SYS_LOAD_ADDR          CONFIG_LOADADDR
-
 #define CONFIG_CMDLINE_EDITING
 
 /* Physical Memory Map */