From f4d75e9077feb1e59c023d23c8daddd376454e10 Mon Sep 17 00:00:00 2001 From: Joe Hershberger Date: Tue, 5 Jun 2012 15:22:32 -0500 Subject: [PATCH] Xilinx: ARM: Simple clean-up of Zynq configs For boolean options, stop defining them to 1 or 0... they are all checked for #ifdef. Eliminate dead code and irrelevant options. Signed-off-by: Joe Hershberger --- include/configs/zynq_common.h | 10 ++-- include/configs/zynq_cseflash.h | 62 +++++++------------ include/configs/zynq_ep107.h | 43 +++++++------ include/configs/zynq_zc702.h | 24 ++++---- include/configs/zynq_zc770.h | 51 ++++++++-------- include/configs/zynq_zed.h | 103 ++++++++++++++------------------ 6 files changed, 124 insertions(+), 169 deletions(-) diff --git a/include/configs/zynq_common.h b/include/configs/zynq_common.h index 277c3506a3b..1e5eac8f433 100644 --- a/include/configs/zynq_common.h +++ b/include/configs/zynq_common.h @@ -19,7 +19,8 @@ /* * Open Firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_LIBFDT + /* TODO: After upgrade to v2011.09, * remove this and set fdt_high env var instead * @@ -34,7 +35,6 @@ "ramdisk_size=0x200000\0" \ "nand_kernel_size=0x400000\0" \ "nand_ramdisk_size=0x400000\0" \ - "bootcmd=run modeboot\0" \ "norboot=echo Copying Linux from NOR flash to RAM...;" \ "cp 0xE2100000 0x8000 ${kernel_size};" \ "cp 0xE2600000 0x1000000 0x8000;" \ @@ -81,8 +81,8 @@ /* CONFIG_SYS_MONITOR_LEN? */ /* Keep L2 Cache Disabled */ -#define CONFIG_L2_OFF 1 -#define CONFIG_SYS_CACHELINE_SIZE 32 /* Assuming bytes? */ +#define CONFIG_L2_OFF +#define CONFIG_SYS_CACHELINE_SIZE 32 /* * Physical Memory map @@ -108,8 +108,6 @@ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) #undef CONFIG_SKIP_RELOCATE_UBOOT -/* Because (at least at first) we're going to be loaded via JTAG_Tcl */ -/* #define CONFIG_SKIP_LOWLEVEL_INIT */ /* HW to use */ #define TIMER_INPUT_CLOCK (XPAR_CPU_CORTEXA9_CORE_CLOCK_FREQ_HZ / 2) diff --git a/include/configs/zynq_cseflash.h b/include/configs/zynq_cseflash.h index f2065da6226..01e8a827842 100644 --- a/include/configs/zynq_cseflash.h +++ b/include/configs/zynq_cseflash.h @@ -7,6 +7,7 @@ /* * High Level Configuration Options */ +#define CONFIG_CSEFLASH /* Board */ #include @@ -26,6 +27,9 @@ #undef CONFIG_PSS_SERIAL #undef CONFIG_RTC_XPSSRTC +#undef CONFIG_SYS_NO_FLASH +#define CONFIG_ENV_IS_NOWHERE + #include #undef CONFIG_CMD_DATE /* RTC? */ #undef CONFIG_CMD_PING /* Might be useful for debugging */ @@ -64,19 +68,13 @@ //#define CONFIG_TIMESTAMP /* print image timestamp on bootm, etc */ -/* IPADDR, SERVERIP */ -/* Need I2C for RTC? */ - -#define CONFIG_PANIC_HANG 1 /* For development/debugging */ +#define CONFIG_PANIC_HANG /* For development/debugging */ -//#define CONFIG_AUTO_COMPLETE 1 -#define CONFIG_CMDLINE_EDITING 1 +//#define CONFIG_AUTO_COMPLETE +#define CONFIG_CMDLINE_EDITING #define CONFIG_SKIP_RELOCATE_UBOOT -/* Uncomment it if you don't want Flash */ -//#define CONFIG_SYS_NO_FLASH - /* this is to initialize GEM at uboot start */ /* #define CONFIG_ZYNQ_INIT_GEM */ /* this is to set ipaddr, ethaddr and serverip env variables. */ @@ -87,49 +85,44 @@ /* FLASH organization */ #define CONFIG_SYS_FLASH_BASE 0xE2000000 -#define CONFIG_SYS_FLASH_SIZE (16*1024*1024) /* i.e. 16MB */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ -#define CONFIG_SYS_MAX_FLASH_SECT 512 /* max number of sectors/blocks on one chip */ +#define CONFIG_SYS_FLASH_SIZE (16 * 1024 * 1024) +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +/* max number of sectors/blocks on one chip */ +#define CONFIG_SYS_MAX_FLASH_SECT 512 #define CONFIG_SYS_FLASH_ERASE_TOUT 1000 #define CONFIG_SYS_FLASH_WRITE_TOUT 5000 #define CONFIG_FLASH_SHOW_PROGRESS 10 -#define CONFIG_SYS_FLASH_CFI 1 -// #define CONFIG_SYS_FLASH_EMPTY_INFO 0 -#define CONFIG_FLASH_CFI_DRIVER 1 +#define CONFIG_SYS_FLASH_CFI +#undef CONFIG_SYS_FLASH_EMPTY_INFO +#define CONFIG_FLASH_CFI_DRIVER -#define CONFIG_SYS_FLASH_PROTECTION 0 /* use hardware protection */ -#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE /* use buffered writes (20x faster) */ -//#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x00000000) -#define CONFIG_ENV_OFFSET 0xC0000 /*768 KB*/ -#define CONFIG_ENV_SECT_SIZE 0x20000 /*128 KB*/ +#undef CONFIG_SYS_FLASH_PROTECTION /* don't use hardware protection */ +#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE /* use buffered writes (20x faster) */ #endif -#define CONFIG_ENV_IS_NOWHERE 1 - /* Because (at least at first) we're going to be loaded via JTAG_Tcl */ #define CONFIG_SKIP_LOWLEVEL_INIT /* HW to use */ -#define CONFIG_UART1 1 -#define CONFIG_TTC0 1 -//#define CONFIG_GEM0 1 +#define CONFIG_UART1 +#define CONFIG_TTC0 +//#define CONFIG_GEM0 /* * Physical Memory map */ #define PHYS_SDRAM_1_SIZE (256 * 1024 * 1024) -//#define CONFIG_ENV_SIZE 4096 -#define CONFIG_ENV_SIZE 896 -#define CONFIG_SYS_GBL_DATA_SIZE 128 +/* Why? */ +#undef CONFIG_ENV_SIZE +#define CONFIG_ENV_SIZE 896 /* * SPI Settings */ #define CONFIG_CMD_SPI -#define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 #define CONFIG_SPI_FLASH #define CONFIG_CMD_SF @@ -152,15 +145,4 @@ #endif #endif -/* Secure Digital */ -//#define CONFIG_MMC 1 - -#ifdef CONFIG_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_CMD_MMC -#define CONFIG_CMD_FAT -#define CONFIG_CMD_EXT2 -#define CONFIG_DOS_PARTITION -#endif - #endif /* __CONFIG_H */ diff --git a/include/configs/zynq_ep107.h b/include/configs/zynq_ep107.h index 73559abaa60..e4aa9b64b79 100644 --- a/include/configs/zynq_ep107.h +++ b/include/configs/zynq_ep107.h @@ -11,7 +11,7 @@ /* * High Level Configuration Options */ -#define CONFIG_EP107 1 /* Board */ +#define CONFIG_EP107 /* Board */ #include @@ -33,13 +33,10 @@ #define CONFIG_TIMESTAMP /* print image timestamp on bootm, etc */ -/* IPADDR, SERVERIP */ -/* Need I2C for RTC? */ +#define CONFIG_PANIC_HANG /* For development/debugging */ -#define CONFIG_PANIC_HANG 1 /* For development/debugging */ - -#define CONFIG_AUTO_COMPLETE 1 -#define CONFIG_CMDLINE_EDITING 1 +#define CONFIG_AUTO_COMPLETE +#define CONFIG_CMDLINE_EDITING /* this is to initialize GEM at uboot start */ /* #define CONFIG_ZYNQ_INIT_GEM */ @@ -50,31 +47,32 @@ * NOR Flash Settings */ #ifndef CONFIG_SYS_NO_FLASH + #define CONFIG_SYS_FLASH_BASE 0xE2000000 -#define CONFIG_SYS_FLASH_SIZE (16*1024*1024) /* i.e. 16MB */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ -#define CONFIG_SYS_MAX_FLASH_SECT 512 /* max number of sectors/blocks on one chip */ +#define CONFIG_SYS_FLASH_SIZE (16 * 1024 * 1024) +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +/* max number of sectors/blocks on one chip */ +#define CONFIG_SYS_MAX_FLASH_SECT 512 #define CONFIG_SYS_FLASH_ERASE_TOUT 1000 #define CONFIG_SYS_FLASH_WRITE_TOUT 5000 #define CONFIG_FLASH_SHOW_PROGRESS 10 -#define CONFIG_SYS_FLASH_CFI 1 -// #define CONFIG_SYS_FLASH_EMPTY_INFO 0 -#define CONFIG_FLASH_CFI_DRIVER 1 -#define CONFIG_SYS_FLASH_PROTECTION 0 /* use hardware protection */ -#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE /* use buffered writes (20x faster) */ -//#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x00000000) +#define CONFIG_SYS_FLASH_CFI +#undef CONFIG_SYS_FLASH_EMPTY_INFO +#define CONFIG_FLASH_CFI_DRIVER +#undef CONFIG_SYS_FLASH_PROTECTION /* don't use hardware protection */ +#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE /* use buffered writes (20x faster) */ #define CONFIG_ENV_OFFSET 0xC0000 /*768 KB*/ #define CONFIG_ENV_SECT_SIZE 0x20000 /*128 KB*/ -#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #else -#define CONFIG_ENV_IS_NOWHERE 1 +#define CONFIG_ENV_IS_NOWHERE #endif /* HW to use */ -# define CONFIG_UART0 1 -#define CONFIG_TTC0 1 -#define CONFIG_GEM0 1 +# define CONFIG_UART0 +#define CONFIG_TTC0 +#define CONFIG_GEM0 #define CONFIG_NET_MULTI #define CONFIG_XGMAC_PHY_ADDR 0x17 @@ -87,7 +85,6 @@ * SPI Settings */ #define CONFIG_CMD_SPI -#define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 #define CONFIG_SPI_FLASH #define CONFIG_CMD_SF @@ -118,7 +115,7 @@ #endif /* Secure Digital */ -#define CONFIG_MMC 1 +#define CONFIG_MMC #ifdef CONFIG_MMC #define CONFIG_GENERIC_MMC diff --git a/include/configs/zynq_zc702.h b/include/configs/zynq_zc702.h index 503126900f5..b75b7392241 100644 --- a/include/configs/zynq_zc702.h +++ b/include/configs/zynq_zc702.h @@ -11,7 +11,7 @@ /* * High Level Configuration Options */ -#define CONFIG_ZC702 1 /* Board */ +#define CONFIG_ZC702 /* Board */ #include @@ -23,7 +23,7 @@ /* no NOR on zc702 */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_ENV_IS_NOWHERE 1 +#define CONFIG_ENV_IS_NOWHERE #include #define CONFIG_CMD_DATE /* RTC? */ @@ -34,13 +34,10 @@ #define CONFIG_TIMESTAMP /* print image timestamp on bootm, etc */ -/* IPADDR, SERVERIP */ -/* Need I2C for RTC? */ +#define CONFIG_PANIC_HANG /* For development/debugging */ -#define CONFIG_PANIC_HANG 1 /* For development/debugging */ - -#define CONFIG_AUTO_COMPLETE 1 -#define CONFIG_CMDLINE_EDITING 1 +#define CONFIG_AUTO_COMPLETE +#define CONFIG_CMDLINE_EDITING /* this is to initialize GEM at uboot start */ /* #define CONFIG_ZYNQ_INIT_GEM */ @@ -48,11 +45,11 @@ #define CONFIG_ZYNQ_IP_ENV /* HW to use */ -#define CONFIG_UART1 1 -#define CONFIG_TTC0 1 -#define CONFIG_GEM0 1 +#define CONFIG_UART1 +#define CONFIG_TTC0 +#define CONFIG_GEM0 #define CONFIG_NET_MULTI -#define CONFIG_XGMAC_PHY_ADDR 0x7 +#define CONFIG_XGMAC_PHY_ADDR 0x7 /* * Physical Memory map @@ -63,7 +60,6 @@ * SPI Settings */ #define CONFIG_CMD_SPI -#define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 #define CONFIG_SPI_FLASH #define CONFIG_CMD_SF @@ -81,7 +77,7 @@ #endif /* Secure Digital */ -#define CONFIG_MMC 1 +#define CONFIG_MMC #ifdef CONFIG_MMC #define CONFIG_GENERIC_MMC diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h index cfbf8a918e0..997b8916e94 100644 --- a/include/configs/zynq_zc770.h +++ b/include/configs/zynq_zc770.h @@ -11,7 +11,7 @@ /* * High Level Configuration Options */ -#define CONFIG_ZC770 1 /* Board */ +#define CONFIG_ZC770 /* Board */ #include @@ -33,13 +33,10 @@ #define CONFIG_TIMESTAMP /* print image timestamp on bootm, etc */ -/* IPADDR, SERVERIP */ -/* Need I2C for RTC? */ +#define CONFIG_PANIC_HANG /* For development/debugging */ -#define CONFIG_PANIC_HANG 1 /* For development/debugging */ - -#define CONFIG_AUTO_COMPLETE 1 -#define CONFIG_CMDLINE_EDITING 1 +#define CONFIG_AUTO_COMPLETE +#define CONFIG_CMDLINE_EDITING /* this is to initialize GEM at uboot start */ /* #define CONFIG_ZYNQ_INIT_GEM */ @@ -55,28 +52,29 @@ * NOR Flash Settings */ #ifndef CONFIG_SYS_NO_FLASH + #define CONFIG_SYS_FLASH_BASE 0xE2000000 -#define CONFIG_SYS_FLASH_SIZE (16*1024*1024) /* i.e. 16MB */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ -#define CONFIG_SYS_MAX_FLASH_SECT 512 /* max number of sectors/blocks on one chip */ +#define CONFIG_SYS_FLASH_SIZE (16 * 1024 * 1024) +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +/* max number of sectors/blocks on one chip */ +#define CONFIG_SYS_MAX_FLASH_SECT 512 #define CONFIG_SYS_FLASH_ERASE_TOUT 1000 #define CONFIG_SYS_FLASH_WRITE_TOUT 5000 #define CONFIG_FLASH_SHOW_PROGRESS 10 -#define CONFIG_SYS_FLASH_CFI 1 -// #define CONFIG_SYS_FLASH_EMPTY_INFO 0 -#define CONFIG_FLASH_CFI_DRIVER 1 -#define CONFIG_SYS_FLASH_PROTECTION 0 /* use hardware protection */ -#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE /* use buffered writes (20x faster) */ -//#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x00000000) +#define CONFIG_SYS_FLASH_CFI +#undef CONFIG_SYS_FLASH_EMPTY_INFO +#define CONFIG_FLASH_CFI_DRIVER +#undef CONFIG_SYS_FLASH_PROTECTION /* don't use hardware protection */ +#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE /* use buffered writes (20x faster) */ #define CONFIG_ENV_OFFSET 0xC0000 /*768 KB*/ #define CONFIG_ENV_SECT_SIZE 0x20000 /*128 KB*/ -#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ZYNQ_XILINX_FLASH_HEADER #define CONFIG_ZYNQ_XIP_START CONFIG_SYS_FLASH_BASE #endif #else -#define CONFIG_ENV_IS_NOWHERE 1 +#define CONFIG_ENV_IS_NOWHERE #endif /* @@ -86,16 +84,16 @@ #if defined(CONFIG_ZC770_XM010) || defined(CONFIG_ZC770_XM011) \ || defined(CONFIG_ZC770_XM012) -#define CONFIG_UART1 1 +#define CONFIG_UART1 #else -#define CONFIG_UART0 1 +#define CONFIG_UART0 #endif /* * Ethernet Settings */ #if defined(CONFIG_ZC770_XM010) || defined(CONFIG_ZC770_XM013) -#define CONFIG_CMD_PING /* Might be useful for debugging */ +#define CONFIG_CMD_PING #define CONFIG_NET_MULTI #define CONFIG_XGMAC_PHY_ADDR 0x7 #else @@ -109,7 +107,6 @@ */ #if defined(CONFIG_ZC770_XM010) || defined(CONFIG_ZC770_XM013) #define CONFIG_CMD_SPI -#define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 #define CONFIG_SPI_FLASH #define CONFIG_CMD_SF @@ -121,15 +118,15 @@ #endif #if defined(CONFIG_ZC770_XM013) -#define CONFIG_GEM1 1 -#define CONFIG_TTC1 1 +#define CONFIG_GEM1 +#define CONFIG_TTC1 #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_XILINX_PSS_QSPI_USE_DUAL_FLASH #endif #if defined(CONFIG_ZC770_XM010) -#define CONFIG_GEM0 1 -#define CONFIG_TTC0 1 +#define CONFIG_GEM0 +#define CONFIG_TTC0 #define CONFIG_SPI_FLASH_STMICRO #endif @@ -146,7 +143,7 @@ #if defined(CONFIG_ZC770_XM010) /* Secure Digital */ -#define CONFIG_MMC 1 +#define CONFIG_MMC #ifdef CONFIG_MMC #define CONFIG_GENERIC_MMC diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h index 4cf330cb9f3..2fe050f946a 100644 --- a/include/configs/zynq_zed.h +++ b/include/configs/zynq_zed.h @@ -1,13 +1,13 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_ZED 1 /* Community Board */ +/* + * High Level Configuration Options + */ +#define CONFIG_ZED /* Community Board */ #include -#define CONFIG_XGMAC_PHY_ADDR 0 -#define CONFIG_NET_MULTI - /* Default environment */ #define CONFIG_IPADDR 192.168.1.10 /* ETHADDR should pretty much never be in the default env */ @@ -18,14 +18,28 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "kernel_size=0x140000\0" \ "ramdisk_size=0x200000\0" \ - "bootcmd=run modeboot\0" \ - "qspiboot=sf probe 0 0 0; sf read 0x8000 0x100000 0x2c0000; sf read 0x1000000 0x3c0000 0x40000; sf read 0x800000 0x400000 0x800000; go 0x8000\0" \ - "sdboot=echo Copying Linux from SD to RAM...; mmcinfo; fatload mmc 0 0x8000 zImage; fatload mmc 0 0x1000000 devicetree.dtb; fatload mmc 0 0x800000 ramdisk8M.image.gz;go 0x8000\0" \ - "jtagboot=echo TFTPing Linux to RAM...; tftp 0x8000 zImage; tftp 0x1000000 devicetree.dtb; tftp 0x800000 ramdisk8M.image.gz; go 0x8000\0" - + "qspiboot=sf probe 0 0 0;" \ + "sf read 0x8000 0x100000 0x2c0000; " \ + "sf read 0x1000000 0x3c0000 0x40000; " \ + "sf read 0x800000 0x400000 0x800000; " \ + "go 0x8000\0" \ + "sdboot=echo Copying Linux from SD to RAM...; " \ + "mmcinfo; " \ + "fatload mmc 0 0x8000 zImage; " \ + "fatload mmc 0 0x1000000 devicetree.dtb; " \ + "fatload mmc 0 0x800000 ramdisk8M.image.gz; " \ + "go 0x8000\0" \ + "jtagboot=echo TFTPing Linux to RAM...; " \ + "tftp 0x8000 zImage; " \ + "tftp 0x1000000 devicetree.dtb; " \ + "tftp 0x800000 ramdisk8M.image.gz; " \ + "go 0x8000\0" #undef CONFIG_PELE_XIL_LQSPI +#undef CONFIG_SYS_NO_FLASH +#define CONFIG_ENV_IS_NOWHERE + #include #define CONFIG_CMD_DATE /* RTC? */ #define CONFIG_CMD_PING /* Might be useful for debugging */ @@ -35,86 +49,57 @@ #define CONFIG_TIMESTAMP /* print image timestamp on bootm, etc */ -/* IPADDR, SERVERIP */ -/* Need I2C for RTC? */ - -#define CONFIG_PANIC_HANG 1 /* For development/debugging */ +#define CONFIG_PANIC_HANG /* For development/debugging */ -#define CONFIG_AUTO_COMPLETE 1 -#define CONFIG_CMDLINE_EDITING 1 +#define CONFIG_AUTO_COMPLETE +#define CONFIG_CMDLINE_EDITING #undef CONFIG_SYS_PROMPT #define CONFIG_SYS_PROMPT "zed-boot> " -#undef CONFIG_SKIP_RELOCATE_UBOOT - -/* Uncomment it if you don't want Flash */ -/*#define CONFIG_SYS_NO_FLASH */ - -//#define CONFIG_PELE_INIT_GEM //this is to initialize GEM at uboot start -#define CONFIG_PELE_IP_ENV //this is to set ipaddr, ethaddr and serverip env variables. - - #ifndef CONFIG_SYS_NO_FLASH /* FLASH organization */ #define CONFIG_SYS_FLASH_BASE 0xE2000000 -#define CONFIG_SYS_FLASH_SIZE (16*1024*1024) /* i.e. 16MB */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ -#define CONFIG_SYS_MAX_FLASH_SECT 512 /* max number of sectors/blocks on one chip */ +#define CONFIG_SYS_FLASH_SIZE (16 * 1024 * 1024) +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +/* max number of sectors/blocks on one chip */ +#define CONFIG_SYS_MAX_FLASH_SECT 512 #define CONFIG_SYS_FLASH_ERASE_TOUT 1000 #define CONFIG_SYS_FLASH_WRITE_TOUT 5000 #define CONFIG_FLASH_SHOW_PROGRESS 10 -#define CONFIG_SYS_FLASH_CFI 1 -// #define CONFIG_SYS_FLASH_EMPTY_INFO 0 -#define CONFIG_FLASH_CFI_DRIVER 1 - -#define CONFIG_SYS_FLASH_PROTECTION 0 /* use hardware protection */ -#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE /* use buffered writes (20x faster) */ -/*#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x00000000) */ -#define CONFIG_ENV_OFFSET 0xC0000 /*768 KB*/ -#define CONFIG_ENV_SECT_SIZE 0x20000 /*128 KB*/ -#ifdef CONFIG_EP107 -# define CONFIG_ENV_IS_IN_FLASH 1 -#else -# define CONFIG_ENV_IS_NOWHERE 1 -#endif -#else - -#define CONFIG_ENV_IS_NOWHERE 1 +#define CONFIG_SYS_FLASH_CFI +#undef CONFIG_SYS_FLASH_EMPTY_INFO +#define CONFIG_FLASH_CFI_DRIVER +#undef CONFIG_SYS_FLASH_PROTECTION /* don't use hardware protection */ +#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE /* use buffered writes (20x faster) */ #endif /* HW to use */ -#define CONFIG_XDF_UART 1 -#define CONFIG_XDF_ETH 1 -#define CONFIG_XDF_RTC 1 -# define CONFIG_UART1 1 -#define CONFIG_TTC0 1 -#define CONFIG_GEM0 1 +#define CONFIG_XDF_UART +#define CONFIG_XDF_ETH +#define CONFIG_XDF_RTC +# define CONFIG_UART1 +#define CONFIG_TTC0 +#define CONFIG_GEM0 +#define CONFIG_XGMAC_PHY_ADDR 0 +#define CONFIG_NET_MULTI /* * Physical Memory map */ #define PHYS_SDRAM_1_SIZE (256 * 1024 * 1024) -#define CONFIG_SYS_GBL_DATA_SIZE 128 /* * SPI Settings */ #define CONFIG_CMD_SPI -#define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 #define CONFIG_SPI_FLASH #define CONFIG_CMD_SF -/* #define CONFIG_XILINX_PSS_QSPI_USE_DUAL_FLASH */ -#ifdef NOTOW_BHILL -#define CONFIG_SPI_FLASH_ATMEL -#define CONFIG_SPI_FLASH_SPANSION -#define CONFIG_SPI_FLASH_WINBOND -#endif #define CONFIG_SPI_FLASH_SPANSION /* Place a Xilinx Boot ROM header in u-boot image? */ @@ -131,7 +116,7 @@ #endif /* Secure Digital */ -#define CONFIG_MMC 1 +#define CONFIG_MMC #ifdef CONFIG_MMC #define CONFIG_GENERIC_MMC -- 2.47.3