From: Joe Hershberger Date: Tue, 5 Jun 2012 20:19:16 +0000 (-0500) Subject: Xilinx: ARM: Move things out of zynq_common.h X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8bb4840d68f26f3baae7e5e6cdfdef6f701afaa5;p=thirdparty%2Fu-boot.git Xilinx: ARM: Move things out of zynq_common.h Some things really are not generic settings... move them to each board's config. Signed-off-by: Joe Hershberger --- diff --git a/include/configs/zynq_common.h b/include/configs/zynq_common.h index 63e1036c83b..277c3506a3b 100644 --- a/include/configs/zynq_common.h +++ b/include/configs/zynq_common.h @@ -28,9 +28,6 @@ #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Default environment */ -#define CONFIG_IPADDR 10.10.70.102 -#define CONFIG_SERVERIP 10.10.70.101 - #define CONFIG_EXTRA_ENV_SETTINGS \ "ethaddr=00:0a:35:00:01:22\0" \ "kernel_size=0x140000\0" \ @@ -91,13 +88,11 @@ * Physical Memory map */ #define CONFIG_NR_DRAM_BANKS 1 -/* Semi-educated guess based on p.48 of DF Arch spec */ -#define PHYS_SDRAM_1 (256 * 1024) -/* Cameron guessed 256 or 512 MB */ -#define PHYS_SDRAM_1_SIZE (256 * 1024 * 1024) +#define PHYS_SDRAM_1 0 -#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM_1 -#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x10000) +#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM_1 +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \ + PHYS_SDRAM_1_SIZE - (16 * 1024 * 1024)) #define CONFIG_SYS_SDRAM_BASE 0 #define CONFIG_SYS_INIT_RAM_ADDR 0xFFFF0000 diff --git a/include/configs/zynq_cseflash.h b/include/configs/zynq_cseflash.h index 36e10c8e444..f2065da6226 100644 --- a/include/configs/zynq_cseflash.h +++ b/include/configs/zynq_cseflash.h @@ -10,6 +10,10 @@ #include +/* Default environment */ +#define CONFIG_IPADDR 10.10.70.102 +#define CONFIG_SERVERIP 10.10.70.101 + #define CONFIG_ARM_DCC #define CONFIG_CPU_V6 /* Required by CONFIG_ARM_DCC */ @@ -113,8 +117,10 @@ //#define CONFIG_GEM0 1 /* - * These were lifted straight from imx31_phycore, and may well be very wrong. + * 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 diff --git a/include/configs/zynq_ep107.h b/include/configs/zynq_ep107.h index 3e6c40454bd..73559abaa60 100644 --- a/include/configs/zynq_ep107.h +++ b/include/configs/zynq_ep107.h @@ -15,6 +15,10 @@ #include +/* Default environment */ +#define CONFIG_IPADDR 10.10.70.102 +#define CONFIG_SERVERIP 10.10.70.101 + #undef CONFIG_ZYNQ_XIL_LQSPI /* Uncomment it if you don't want Flash */ @@ -75,9 +79,9 @@ #define CONFIG_XGMAC_PHY_ADDR 0x17 /* - * These were lifted straight from imx31_phycore, and may well be very wrong. + * Physical Memory map */ -#define CONFIG_NR_DRAM_BANKS 1 +#define PHYS_SDRAM_1_SIZE (256 * 1024 * 1024) /* * SPI Settings diff --git a/include/configs/zynq_zc702.h b/include/configs/zynq_zc702.h index 248e3475ea2..503126900f5 100644 --- a/include/configs/zynq_zc702.h +++ b/include/configs/zynq_zc702.h @@ -15,6 +15,10 @@ #include +/* Default environment */ +#define CONFIG_IPADDR 10.10.70.102 +#define CONFIG_SERVERIP 10.10.70.101 + #undef CONFIG_ZYNQ_XIL_LQSPI /* no NOR on zc702 */ @@ -51,8 +55,9 @@ #define CONFIG_XGMAC_PHY_ADDR 0x7 /* - * These were lifted straight from imx31_phycore, and may well be very wrong. + * Physical Memory map */ +#define PHYS_SDRAM_1_SIZE (256 * 1024 * 1024) /* * SPI Settings diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h index 746ea5ea0c0..cfbf8a918e0 100644 --- a/include/configs/zynq_zc770.h +++ b/include/configs/zynq_zc770.h @@ -15,6 +15,10 @@ #include +/* Default environment */ +#define CONFIG_IPADDR 10.10.70.102 +#define CONFIG_SERVERIP 10.10.70.101 + #if defined(CONFIG_ZC770_XM012) #undef CONFIG_SYS_NO_FLASH #else @@ -76,8 +80,9 @@ #endif /* - * These were lifted straight from imx31_phycore, and may well be very wrong. + * Physical Memory map */ +#define PHYS_SDRAM_1_SIZE (256 * 1024 * 1024) #if defined(CONFIG_ZC770_XM010) || defined(CONFIG_ZC770_XM011) \ || defined(CONFIG_ZC770_XM012) diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h index d297be15e58..4cf330cb9f3 100644 --- a/include/configs/zynq_zed.h +++ b/include/configs/zynq_zed.h @@ -9,10 +9,9 @@ #define CONFIG_NET_MULTI /* Default environment */ -#undef CONFIG_IPADDR #define CONFIG_IPADDR 192.168.1.10 +/* ETHADDR should pretty much never be in the default env */ #define CONFIG_ETHADDR 00:0a:35:00:01:22 -#undef CONFIG_SERVERIP #define CONFIG_SERVERIP 192.168.1.50 #undef CONFIG_EXTRA_ENV_SETTINGS @@ -97,8 +96,9 @@ #define CONFIG_GEM0 1 /* - * These were lifted straight from imx31_phycore, and may well be very wrong. + * Physical Memory map */ +#define PHYS_SDRAM_1_SIZE (256 * 1024 * 1024) #define CONFIG_SYS_GBL_DATA_SIZE 128 /*