From: Michal Simek Date: Mon, 24 Sep 2012 09:41:12 +0000 (+0200) Subject: zynq: Remove unused board name variable X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a0723255878fc6e00cc7f18258883de1ecae9529;p=thirdparty%2Fu-boot.git zynq: Remove unused board name variable Signed-off-by: Michal Simek --- diff --git a/include/configs/zynq_afx.h b/include/configs/zynq_afx.h index cc143dbb405..5a766b9091a 100644 --- a/include/configs/zynq_afx.h +++ b/include/configs/zynq_afx.h @@ -18,11 +18,6 @@ #ifndef __CONFIG_ZYNQ_AFX_H #define __CONFIG_ZYNQ_AFX_H -/* - * High Level Configuration Options - */ -#define CONFIG_AFX /* Board */ - #include #if defined(CONFIG_AFX_NOR) diff --git a/include/configs/zynq_cseflash.h b/include/configs/zynq_cseflash.h index 6ed98696f09..0476c2e1a49 100644 --- a/include/configs/zynq_cseflash.h +++ b/include/configs/zynq_cseflash.h @@ -4,11 +4,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* - * High Level Configuration Options - */ -#define CONFIG_CSEFLASH /* Board */ - #include /* Default environment */ diff --git a/include/configs/zynq_ep107.h b/include/configs/zynq_ep107.h index b466b0a1fef..eb90d43ee43 100644 --- a/include/configs/zynq_ep107.h +++ b/include/configs/zynq_ep107.h @@ -18,9 +18,6 @@ #ifndef __CONFIG_ZYNQ_EP107_H #define __CONFIG_ZYNQ_EP107_H -/* - * High Level Configuration Options - */ #define CONFIG_EP107 /* Board */ #include @@ -69,9 +66,9 @@ "go 0x8000\0" /* Uncomment it if you don't want Flash */ -//#define CONFIG_SYS_NO_FLASH +//#define CONFIG_SYS_NO_FLASH -#include +#include #define CONFIG_CMD_DATE /* RTC? */ #define CONFIG_CMD_PING /* Might be useful for debugging */ #define CONFIG_CMD_SAVEENV /* Command to save ENV to Flash */ @@ -98,7 +95,7 @@ */ #ifndef CONFIG_SYS_NO_FLASH -#define CONFIG_SYS_FLASH_BASE 0xE2000000 +#define CONFIG_SYS_FLASH_BASE 0xE2000000 #define CONFIG_SYS_FLASH_SIZE (16 * 1024 * 1024) #define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of sectors/blocks on one chip */ diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h index 660ff369102..c9238bb3f01 100644 --- a/include/configs/zynq_zc70x.h +++ b/include/configs/zynq_zc70x.h @@ -18,12 +18,6 @@ #ifndef __CONFIG_ZYNQ_ZC70X_H #define __CONFIG_ZYNQ_ZC70X_H -/* - * High Level Configuration Options - */ -#define CONFIG_ZC702 /* Board */ -#define CONFIG_ZC706 /* Board */ - #include /* Default environment */ @@ -36,7 +30,7 @@ #define CONFIG_SYS_NO_FLASH #define CONFIG_ENV_IS_NOWHERE -#include +#include #define CONFIG_CMD_DATE /* RTC? */ #define CONFIG_CMD_PING /* Might be useful for debugging */ #define CONFIG_CMD_SAVEENV /* Command to save ENV to Flash */ diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h index 07ffffb6820..dcd5a3cf549 100644 --- a/include/configs/zynq_zc770.h +++ b/include/configs/zynq_zc770.h @@ -18,11 +18,6 @@ #ifndef __CONFIG_ZYNQ_ZC770_H #define __CONFIG_ZYNQ_ZC770_H -/* - * High Level Configuration Options - */ -#define CONFIG_ZC770 /* Board */ - #include /* Default environment */ @@ -35,7 +30,7 @@ #define CONFIG_SYS_NO_FLASH #endif -#include +#include #define CONFIG_CMD_DATE /* RTC? */ #define CONFIG_CMD_SAVEENV /* Command to save ENV to Flash */ #define CONFIG_REGINFO /* Again, debugging */ @@ -63,7 +58,7 @@ */ #ifndef CONFIG_SYS_NO_FLASH -#define CONFIG_SYS_FLASH_BASE 0xE2000000 +#define CONFIG_SYS_FLASH_BASE 0xE2000000 #define CONFIG_SYS_FLASH_SIZE (16 * 1024 * 1024) #define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of sectors/blocks on one chip */ diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h index a6e2f661ba3..554759fde95 100644 --- a/include/configs/zynq_zed.h +++ b/include/configs/zynq_zed.h @@ -20,11 +20,6 @@ #include -/* - * High Level Configuration Options - */ -#define CONFIG_ZED /* Community Board */ - /* Default environment */ #define CONFIG_IPADDR 192.168.1.10 #define CONFIG_SERVERIP 192.168.1.50