diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/M54418TWR.h | 4 | ||||
| -rw-r--r-- | include/configs/MERGERBOX.h | 3 | ||||
| -rw-r--r-- | include/configs/P1023RDS.h | 3 | ||||
| -rw-r--r-- | include/configs/ac14xx.h | 3 | ||||
| -rw-r--r-- | include/configs/adp-ag101.h | 5 | ||||
| -rw-r--r-- | include/configs/adp-ag101p.h | 5 | ||||
| -rw-r--r-- | include/configs/adp-ag102.h | 5 | ||||
| -rw-r--r-- | include/configs/ap_sh4a_4a.h | 2 | ||||
| -rw-r--r-- | include/configs/armadillo-800eva.h | 1 | ||||
| -rw-r--r-- | include/configs/devkit3250.h | 1 | ||||
| -rw-r--r-- | include/configs/dlvision-10g.h | 3 | ||||
| -rw-r--r-- | include/configs/ecovec.h | 2 | ||||
| -rw-r--r-- | include/configs/io.h | 3 | ||||
| -rw-r--r-- | include/configs/iocon.h | 3 | ||||
| -rw-r--r-- | include/configs/km/km83xx-common.h | 1 | ||||
| -rw-r--r-- | include/configs/koelsch.h | 1 | ||||
| -rw-r--r-- | include/configs/kzm9g.h | 1 | ||||
| -rw-r--r-- | include/configs/lager.h | 1 | ||||
| -rw-r--r-- | include/configs/mxs.h | 1 | ||||
| -rw-r--r-- | include/configs/o2dnt-common.h | 4 | ||||
| -rw-r--r-- | include/configs/r0p7734.h | 2 | ||||
| -rw-r--r-- | include/configs/shmin.h | 1 | ||||
| -rw-r--r-- | include/configs/snowball.h | 2 | ||||
| -rw-r--r-- | include/configs/u8500_href.h | 1 | ||||
| -rw-r--r-- | include/configs/vl_ma2sc.h | 1 | 
25 files changed, 8 insertions, 51 deletions
| diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index de063b70d..031672eb3 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -268,10 +268,8 @@  /* End of used area in internal SRAM */  #define CONFIG_SYS_INIT_RAM_SIZE	0x10000  #define CONFIG_SYS_INIT_RAM_CTRL	0x221 -/* size in bytes reserved for initial data */ -#define CONFIG_SYS_GBL_DATA_SIZE	256  #define CONFIG_SYS_GBL_DATA_OFFSET	((CONFIG_SYS_INIT_RAM_SIZE - \ -					CONFIG_SYS_GBL_DATA_SIZE) - 32) +					GENERATED_GBL_DATA_SIZE) - 32)  #define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_GBL_DATA_OFFSET  #define CONFIG_SYS_SBFHDR_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_SIZE - 32) diff --git a/include/configs/MERGERBOX.h b/include/configs/MERGERBOX.h index 3dcea0b59..930699ba6 100644 --- a/include/configs/MERGERBOX.h +++ b/include/configs/MERGERBOX.h @@ -121,9 +121,8 @@  #define CONFIG_SYS_INIT_RAM_LOCK	1  #define CONFIG_SYS_INIT_RAM_ADDR	0xE6000000 /* Initial RAM address */  #define CONFIG_SYS_INIT_RAM_SIZE	0x1000 /* End of used area in RAM */ -#define CONFIG_SYS_GBL_DATA_SIZE	0x100 /* num bytes initial data */  #define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_SIZE -\ -					 CONFIG_SYS_GBL_DATA_SIZE) +					 GENERATED_GBL_DATA_SIZE)  /*   * Local Bus Configuration & Clock Setup diff --git a/include/configs/P1023RDS.h b/include/configs/P1023RDS.h index b51354525..ec72c7886 100644 --- a/include/configs/P1023RDS.h +++ b/include/configs/P1023RDS.h @@ -194,9 +194,8 @@ extern unsigned long get_clock_freq(void);  #define CONFIG_SYS_INIT_RAM_ADDR	0xffd00000	/* Initial L1 address */  #define CONFIG_SYS_INIT_RAM_END	0x00004000	/* End of used area in RAM */ -#define CONFIG_SYS_GBL_DATA_SIZE	128	/* num bytes initial data */  #define CONFIG_SYS_GBL_DATA_OFFSET	\ -	(CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) +	(CONFIG_SYS_INIT_RAM_END - GENERATED_GBL_DATA_SIZE)  #define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_GBL_DATA_OFFSET  #define CONFIG_SYS_MONITOR_LEN	(256 * 1024) /* Reserve 256 kB for Mon */ diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h index aa584b776..f57820d8f 100644 --- a/include/configs/ac14xx.h +++ b/include/configs/ac14xx.h @@ -289,9 +289,8 @@  #define CONFIG_SYS_INIT_RAM_ADDR	CONFIG_SYS_SRAM_BASE  #define CONFIG_SYS_INIT_RAM_END		CONFIG_SYS_SRAM_SIZE -#define CONFIG_SYS_GBL_DATA_SIZE	0x100  #define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_END - \ -					 CONFIG_SYS_GBL_DATA_SIZE) +					 GENERATED_GBL_DATA_SIZE)  #define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_GBL_DATA_OFFSET  #define CONFIG_SYS_MONITOR_BASE		CONFIG_SYS_TEXT_BASE diff --git a/include/configs/adp-ag101.h b/include/configs/adp-ag101.h index e31131f6e..e318c7543 100644 --- a/include/configs/adp-ag101.h +++ b/include/configs/adp-ag101.h @@ -139,11 +139,6 @@  #define CONFIG_SYS_MALLOC_LEN		(512 << 10)  /* - * size in bytes reserved for initial data - */ -#define CONFIG_SYS_GBL_DATA_SIZE	128 - -/*   * AHB Controller configuration   */  #define CONFIG_FTAHBC020S diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index ded3f331e..24904b0b7 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -139,11 +139,6 @@  #define CONFIG_SYS_MALLOC_LEN		(512 << 10)  /* - * size in bytes reserved for initial data - */ -#define CONFIG_SYS_GBL_DATA_SIZE	128 - -/*   * AHB Controller configuration   */  #define CONFIG_FTAHBC020S diff --git a/include/configs/adp-ag102.h b/include/configs/adp-ag102.h index 1e4ce2e7d..39f7a3cd4 100644 --- a/include/configs/adp-ag102.h +++ b/include/configs/adp-ag102.h @@ -204,11 +204,6 @@  #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 128 * 1024)  /* - * size in bytes reserved for initial data -*/ -#define CONFIG_SYS_GBL_DATA_SIZE	128 - -/*   * AHB Controller configuration   */  #define CONFIG_FTAHBC020S diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h index bb39491f8..4282d7026 100644 --- a/include/configs/ap_sh4a_4a.h +++ b/include/configs/ap_sh4a_4a.h @@ -134,8 +134,6 @@  #define CONFIG_SYS_MONITOR_LEN	(256 * 1024)  /* Size of DRAM reserved for malloc() use */  #define CONFIG_SYS_MALLOC_LEN	(256 * 1024) -/* size in bytes reserved for initial data */ -#define CONFIG_SYS_GBL_DATA_SIZE	(256)  #define CONFIG_SYS_BOOTMAPSZ	(8 * 1024 * 1024)  /* ENV setting */ diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index e5569c729..17a2da034 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -94,7 +94,6 @@  #define CONFIG_SYS_MONITOR_BASE		0x00000000  #define CONFIG_SYS_MONITOR_LEN		(256 * 1024)  #define CONFIG_SYS_MALLOC_LEN		(1 * 1024 * 1024) -#define CONFIG_SYS_GBL_DATA_SIZE	(256)  #define CONFIG_SYS_BOOTMAPSZ		(8 * 1024 * 1024)  #define CONFIG_SYS_TEXT_BASE	0xE80C0000 diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index bcb21fefe..3d39b1065 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -29,7 +29,6 @@   */  #define CONFIG_NR_DRAM_BANKS		1  #define CONFIG_SYS_MALLOC_LEN		SZ_1M -#define CONFIG_SYS_GBL_DATA_SIZE	128  #define CONFIG_SYS_SDRAM_BASE		EMC_DYCS0_BASE  #define CONFIG_SYS_SDRAM_SIZE		SZ_64M  #define CONFIG_SYS_TEXT_BASE		0x83FA0000 diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h index 31fc65d19..78778970f 100644 --- a/include/configs/dlvision-10g.h +++ b/include/configs/dlvision-10g.h @@ -217,9 +217,8 @@  #define CONFIG_SYS_INIT_RAM_ADDR	CONFIG_SYS_OCM_DATA_ADDR /* in SDRAM */  #define CONFIG_SYS_INIT_RAM_END	CONFIG_SYS_OCM_DATA_SIZE /* End of used area */ -#define CONFIG_SYS_GBL_DATA_SIZE	128  /* size/bytes res'd for init data*/  #define CONFIG_SYS_GBL_DATA_OFFSET \ -	(CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) +	(CONFIG_SYS_INIT_RAM_END - GENERATED_GBL_DATA_SIZE)  #define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_GBL_DATA_OFFSET  /* diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h index 3a5cc7482..e26591c14 100644 --- a/include/configs/ecovec.h +++ b/include/configs/ecovec.h @@ -158,8 +158,6 @@  #define CONFIG_SYS_MONITOR_LEN	(256 * 1024)  /* Size of DRAM reserved for malloc() use */  #define CONFIG_SYS_MALLOC_LEN	(256 * 1024) -/* size in bytes reserved for initial data */ -#define CONFIG_SYS_GBL_DATA_SIZE	(256)  #define CONFIG_SYS_BOOTMAPSZ	(8 * 1024 * 1024)  /* ENV setting */ diff --git a/include/configs/io.h b/include/configs/io.h index 7f86767e9..9da6cc685 100644 --- a/include/configs/io.h +++ b/include/configs/io.h @@ -198,9 +198,8 @@  #define CONFIG_SYS_INIT_RAM_ADDR	CONFIG_SYS_OCM_DATA_ADDR /* in SDRAM */  #define CONFIG_SYS_INIT_RAM_END	CONFIG_SYS_OCM_DATA_SIZE /* End of used area */ -#define CONFIG_SYS_GBL_DATA_SIZE	128  /* size/bytes res'd for init data*/  #define CONFIG_SYS_GBL_DATA_OFFSET \ -	(CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) +	(CONFIG_SYS_INIT_RAM_END - GENERATED_GBL_DATA_SIZE)  #define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_GBL_DATA_OFFSET  /* diff --git a/include/configs/iocon.h b/include/configs/iocon.h index d34b91dfd..f36c2a350 100644 --- a/include/configs/iocon.h +++ b/include/configs/iocon.h @@ -238,9 +238,8 @@ int fpga_gpio_get(unsigned int bus, int pin);  #define CONFIG_SYS_INIT_RAM_ADDR	CONFIG_SYS_OCM_DATA_ADDR /* in SDRAM */  #define CONFIG_SYS_INIT_RAM_END	CONFIG_SYS_OCM_DATA_SIZE /* End of used area */ -#define CONFIG_SYS_GBL_DATA_SIZE	128  /* size/bytes res'd for init data*/  #define CONFIG_SYS_GBL_DATA_OFFSET \ -	(CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) +	(CONFIG_SYS_INIT_RAM_END - GENERATED_GBL_DATA_SIZE)  #define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_GBL_DATA_OFFSET  /* diff --git a/include/configs/km/km83xx-common.h b/include/configs/km/km83xx-common.h index 5e075c8dd..ae6b6dcf2 100644 --- a/include/configs/km/km83xx-common.h +++ b/include/configs/km/km83xx-common.h @@ -84,7 +84,6 @@  #define CONFIG_SYS_INIT_RAM_LOCK  #define CONFIG_SYS_INIT_RAM_ADDR	0xE6000000 /* Initial RAM address */  #define CONFIG_SYS_INIT_RAM_SIZE	0x1000 /* End of used area in RAM */ -#define CONFIG_SYS_GBL_DATA_SIZE	0x100 /* num bytes initial data */  #define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_SIZE - \  						GENERATED_GBL_DATA_SIZE) diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index 964d0dcb4..90e2d7a03 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -106,7 +106,6 @@  #define CONFIG_SYS_MONITOR_BASE		0x00000000  #define CONFIG_SYS_MONITOR_LEN		(256 * 1024)  #define CONFIG_SYS_MALLOC_LEN		(1 * 1024 * 1024) -#define CONFIG_SYS_GBL_DATA_SIZE	(256)  #define CONFIG_SYS_BOOTMAPSZ		(8 * 1024 * 1024)  /* FLASH */ diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index f183279ba..4d11c7d08 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -88,7 +88,6 @@  #define CONFIG_SYS_MONITOR_BASE	(KZM_FLASH_BASE)  #define CONFIG_SYS_MALLOC_LEN	(CONFIG_ENV_SIZE + 128 * 1024) -#define CONFIG_SYS_GBL_DATA_SIZE	(256)  #define CONFIG_SYS_BOOTMAPSZ	(8 * 1024 * 1024)  #define CONFIG_SYS_TEXT_BASE		0x00000000 diff --git a/include/configs/lager.h b/include/configs/lager.h index 32a2655d7..b420e45e6 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -109,7 +109,6 @@  #define CONFIG_SYS_MONITOR_BASE		0x00000000  #define CONFIG_SYS_MONITOR_LEN		(256 * 1024)  #define CONFIG_SYS_MALLOC_LEN		(1 * 1024 * 1024) -#define CONFIG_SYS_GBL_DATA_SIZE	(256)  #define CONFIG_SYS_BOOTMAPSZ		(8 * 1024 * 1024)  #if defined(CONFIG_SYS_USE_BOOT_NORFLASH) diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 363b27763..55ecef92a 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -59,7 +59,6 @@  /* Memory sizes */  #define CONFIG_SYS_MALLOC_LEN		0x00400000	/* 4 MB for malloc */ -#define CONFIG_SYS_GBL_DATA_SIZE	128		/* Initial data */  #define CONFIG_SYS_MEMTEST_START	0x40000000	/* Memtest start adr */  #define CONFIG_SYS_MEMTEST_END		0x40400000	/* 4 MB RAM test */ diff --git a/include/configs/o2dnt-common.h b/include/configs/o2dnt-common.h index 18714eae1..133dc6f8c 100644 --- a/include/configs/o2dnt-common.h +++ b/include/configs/o2dnt-common.h @@ -275,10 +275,8 @@  #define CONFIG_SYS_INIT_RAM_END		MPC5XXX_SRAM_SIZE  #endif -/* size in bytes reserved for initial data */ -#define CONFIG_SYS_GBL_DATA_SIZE	128  #define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_END - \ -					 CONFIG_SYS_GBL_DATA_SIZE) +					 GENERATED_GBL_DATA_SIZE)  #define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_GBL_DATA_OFFSET  #define CONFIG_SYS_MONITOR_BASE		CONFIG_SYS_TEXT_BASE diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h index 53128ecc1..a71709bc7 100644 --- a/include/configs/r0p7734.h +++ b/include/configs/r0p7734.h @@ -140,8 +140,6 @@  #define CONFIG_SYS_MONITOR_LEN	(256 * 1024)  /* Size of DRAM reserved for malloc() use */  #define CONFIG_SYS_MALLOC_LEN	(256 * 1024) -/* size in bytes reserved for initial data */ -#define CONFIG_SYS_GBL_DATA_SIZE	(256)  #define CONFIG_SYS_BOOTMAPSZ	(8 * 1024 * 1024)  /* ENV setting */ diff --git a/include/configs/shmin.h b/include/configs/shmin.h index f8155efbc..4d38f6c55 100644 --- a/include/configs/shmin.h +++ b/include/configs/shmin.h @@ -62,7 +62,6 @@  #define CONFIG_SYS_MONITOR_BASE		(SHMIN_FLASH_BASE_1 + CONFIG_ENV_SECT_SIZE)  #define CONFIG_SYS_MONITOR_LEN		(128 * 1024)  #define CONFIG_SYS_MALLOC_LEN		(256 * 1024) -#define CONFIG_SYS_GBL_DATA_SIZE	256  #define CONFIG_SYS_BOOTMAPSZ		(8 * 1024 * 1024)  /* FLASH */ diff --git a/include/configs/snowball.h b/include/configs/snowball.h index 9a069f3cd..dacb5604c 100644 --- a/include/configs/snowball.h +++ b/include/configs/snowball.h @@ -41,8 +41,6 @@  #define CONFIG_ENV_SIZE		(8*1024)  #define CONFIG_SYS_MALLOC_LEN	(CONFIG_ENV_SIZE + 256*1024) -#define CONFIG_SYS_GBL_DATA_SIZE	128	/* for initial data */ -  #define CONFIG_ENV_IS_IN_MMC  #define CONFIG_CMD_ENV  #define CONFIG_CMD_SAVEENV diff --git a/include/configs/u8500_href.h b/include/configs/u8500_href.h index 629299d10..8d7970a37 100644 --- a/include/configs/u8500_href.h +++ b/include/configs/u8500_href.h @@ -29,7 +29,6 @@  #define CONFIG_ENV_SIZE		(128*1024)  #define CONFIG_SYS_MALLOC_LEN	(CONFIG_ENV_SIZE + 256*1024)  #endif -#define CONFIG_SYS_GBL_DATA_SIZE	128	/* for initial data */  /*   * PL011 Configuration diff --git a/include/configs/vl_ma2sc.h b/include/configs/vl_ma2sc.h index 88aaa95fb..2187f77c5 100644 --- a/include/configs/vl_ma2sc.h +++ b/include/configs/vl_ma2sc.h @@ -363,7 +363,6 @@   */  #define CONFIG_SYS_MALLOC_LEN		\  	ROUND(3 * CONFIG_ENV_SIZE + 128 * 1024, 0x1000) -#define CONFIG_SYS_GBL_DATA_SIZE	128	/* 128 bytes for initial data */  #ifndef CONFIG_RAMLOAD  #define CONFIG_BOOTCOMMAND		"run nfsboot" |