From: Joe Hershberger Date: Tue, 5 Jun 2012 16:15:05 +0000 (-0500) Subject: Xilinx: ARM: Remove common elements in zynq_zed.h X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68e9f51f065872ccf24dd3a616ed8b239ee32d31;p=thirdparty%2Fu-boot.git Xilinx: ARM: Remove common elements in zynq_zed.h May of the defines that exist in zynq_common.h were still left in zynq_zed.h... clean those up Also explicitly #undef anything that we want to change from common Signed-off-by: Joe Hershberger --- diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h index 3e6f7f30462..b93ed2b1377 100644 --- a/include/configs/zynq_zed.h +++ b/include/configs/zynq_zed.h @@ -2,32 +2,22 @@ #define __CONFIG_H #define CONFIG_ARM1176 1 /* CPU */ -#define CONFIG_XDF 1 /* Board */ -#define CONFIG_DFE 1 /* Board sub-type ("flavor"?) */ #define CONFIG_PELE 1 /* SoC? */ #define CONFIG_ZED 1 /* Community Board */ -/* Select board: comment out all but one. */ - -//#define CONFIG_ZC770_XM010 -//#define CONFIG_ZC770_XM011 -//#define CONFIG_ZC770_XM010_XM011 - #include #define CONFIG_XGMAC_PHY_ADDR 0 #define CONFIG_NET_MULTI -/* - * Open Firmware flat tree - */ -#define CONFIG_OF_LIBFDT 1 - /* Default environment */ +#undef CONFIG_IPADDR #define CONFIG_IPADDR 192.168.1.10 #define CONFIG_ETHADDR 00:0a:35:00:01:22 +#undef CONFIG_SERVERIP #define CONFIG_SERVERIP 192.168.1.50 +#undef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS \ "kernel_size=0x140000\0" \ "ramdisk_size=0x200000\0" \ @@ -39,16 +29,6 @@ #undef CONFIG_PELE_XIL_LQSPI -/* default boot is according to the bootmode switch settings */ -#define CONFIG_BOOTCOMMAND "run modeboot" - -#define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 38400, 115200 } -#define CONFIG_BOOTDELAY 3 /* -1 to Disable autoboot */ - -#define CONFIG_PSS_SERIAL -#define CONFIG_RTC_XPSSRTC - #include #define CONFIG_CMD_DATE /* RTC? */ #define CONFIG_CMD_PING /* Might be useful for debugging */ @@ -66,6 +46,7 @@ #define CONFIG_AUTO_COMPLETE 1 #define CONFIG_CMDLINE_EDITING 1 +#undef CONFIG_SYS_PROMPT #define CONFIG_SYS_PROMPT "zed-boot> " #undef CONFIG_SKIP_RELOCATE_UBOOT @@ -73,10 +54,6 @@ /* Uncomment it if you don't want Flash */ /*#define CONFIG_SYS_NO_FLASH */ -#define CONFIG_SYS_SDRAM_BASE 0 - -#define CONFIG_L2_OFF - //#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. @@ -113,18 +90,6 @@ #endif -/* CONFIG_SYS_MONITOR_BASE? */ -/* CONFIG_SYS_MONITOR_LEN? */ - -#define CONFIG_SYS_CACHELINE_SIZE 32 /* Assuming bytes? */ - -/* CONFIG_SYS_INIT_RAM_ADDR? */ -/* CONFIG_SYS_GLOBAL_DATA_OFFSET? */ - -/* Because (at least at first) we're going to be loaded via JTAG_Tcl */ -/*#define CONFIG_SKIP_LOWLEVEL_INIT */ - - /* HW to use */ #define CONFIG_XDF_UART 1 #define CONFIG_XDF_ETH 1 @@ -133,26 +98,11 @@ #define CONFIG_TTC0 1 #define CONFIG_GEM0 1 -#define TIMER_INPUT_CLOCK XPAR_CPU_CORTEXA9_CORE_CLOCK_FREQ_HZ / 2 -#define CONFIG_TIMER_PRESCALE 255 -#define TIMER_TICK_HZ (TIMER_INPUT_CLOCK / CONFIG_TIMER_PRESCALE) -#define CONFIG_SYS_HZ 1000 - -/* And here... */ -#define CONFIG_SYS_LOAD_ADDR 0 /* default? */ -/* Semi-educated guess based on p.48 of DF Arch spec */ -#define PHYS_SDRAM_1 (256 * 1024) -#define PHYS_SDRAM_1_SIZE (256 * 1024 * 1024) /* Cameron guessed 256 or 512 MB */ - -#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM_1 -#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x10000) - /* * These were lifted straight from imx31_phycore, and may well be very wrong. */ //#define CONFIG_ENV_SIZE 4096 #define CONFIG_ENV_SIZE 0x10000 -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_MALLOC_LEN 0x400000 #define CONFIG_SYS_GBL_DATA_SIZE 128 #define CONFIG_SYS_MAXARGS 16 @@ -175,17 +125,6 @@ #endif #define CONFIG_SPI_FLASH_SPANSION -/* - * NAND Flash settings - */ -#if defined(CONFIG_ZC770_XM011) || defined(CONFIG_ZC770_XM010_XM011) -#define CONFIG_CMD_NAND -#define CONFIG_CMD_NAND_LOCK_UNLOCK -#define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_SYS_NAND_BASE XPSS_NAND_BASEADDR -#define CONFIG_MTD_DEVICE -#endif - /* Place a Xilinx Boot ROM header in u-boot image? */ #define CONFIG_PELE_XILINX_FLASH_HEADER