From: Joe Hershberger Date: Wed, 21 Mar 2012 20:13:25 +0000 (-0500) Subject: Xilinx: ARM: Move CONFIG_SYS_NO_FLASH in zynq configs X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a30ad9b4bb5707a810504b45337f047128ad7c41;p=thirdparty%2Fu-boot.git Xilinx: ARM: Move CONFIG_SYS_NO_FLASH in zynq configs CONFIG_SYS_NO_FLASH must be defined before you include config_cmd_default.h so that CMD_IMLS will not be defined Signed-off-by: Joe Hershberger --- diff --git a/include/configs/xpele.h b/include/configs/xpele.h index bb70405c574..2e9314aace0 100644 --- a/include/configs/xpele.h +++ b/include/configs/xpele.h @@ -89,6 +89,9 @@ #define CONFIG_PSS_SERIAL #define CONFIG_RTC_XPSSRTC +/* Uncomment it if you don't want Flash */ +//#define CONFIG_SYS_NO_FLASH + #include #define CONFIG_CMD_DATE /* RTC? */ #define CONFIG_CMD_PING /* Might be useful for debugging */ @@ -111,9 +114,6 @@ #undef CONFIG_SKIP_RELOCATE_UBOOT -/* Uncomment it if you don't want Flash */ -//#define CONFIG_SYS_NO_FLASH - #define CONFIG_SYS_SDRAM_BASE 0 #define CONFIG_L2_OFF diff --git a/include/configs/zynq_zc702.h b/include/configs/zynq_zc702.h index c7cc018b31d..a2cd976b60f 100644 --- a/include/configs/zynq_zc702.h +++ b/include/configs/zynq_zc702.h @@ -84,6 +84,9 @@ #define CONFIG_PSS_SERIAL #define CONFIG_RTC_XPSSRTC +/* Uncomment it if you don't want Flash */ +//#define CONFIG_SYS_NO_FLASH + #include #define CONFIG_CMD_DATE /* RTC? */ #define CONFIG_CMD_PING /* Might be useful for debugging */ @@ -106,9 +109,6 @@ #undef CONFIG_SKIP_RELOCATE_UBOOT -/* Uncomment it if you don't want Flash */ -//#define CONFIG_SYS_NO_FLASH - #define CONFIG_SYS_SDRAM_BASE 0 #define CONFIG_L2_OFF diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h index c7cc018b31d..a2cd976b60f 100644 --- a/include/configs/zynq_zc770.h +++ b/include/configs/zynq_zc770.h @@ -84,6 +84,9 @@ #define CONFIG_PSS_SERIAL #define CONFIG_RTC_XPSSRTC +/* Uncomment it if you don't want Flash */ +//#define CONFIG_SYS_NO_FLASH + #include #define CONFIG_CMD_DATE /* RTC? */ #define CONFIG_CMD_PING /* Might be useful for debugging */ @@ -106,9 +109,6 @@ #undef CONFIG_SKIP_RELOCATE_UBOOT -/* Uncomment it if you don't want Flash */ -//#define CONFIG_SYS_NO_FLASH - #define CONFIG_SYS_SDRAM_BASE 0 #define CONFIG_L2_OFF