unify {CONFIG_,}ENV_IS_EMBEDDED
Some boards have fallen out of sync by defining CONFIG_ENV_IS_EMBEDDED manually. While it is useful to have this available to the build system, let's do it automatically rather than forcing people to opt into it. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
committed by
Wolfgang Denk
parent
02c9aa1d41
commit
0a9e4e7721
@@ -255,7 +255,6 @@
|
||||
# define CONFIG_ENV_IS_IN_FLASH 1
|
||||
#endif
|
||||
#define CONFIG_ENV_OVERWRITE 1
|
||||
#undef CONFIG_ENV_IS_EMBEDDED
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
* FLASH organization
|
||||
|
||||
@@ -222,7 +222,6 @@
|
||||
* Environment is embedded in u-boot in the second sector of the flash
|
||||
*/
|
||||
#define CONFIG_ENV_IS_IN_FLASH 1
|
||||
#define CONFIG_ENV_IS_EMBEDDED 1
|
||||
#ifdef NORFLASH_PS32BIT
|
||||
# define CONFIG_ENV_OFFSET (0x8000)
|
||||
# define CONFIG_ENV_SIZE 0x4000
|
||||
|
||||
@@ -55,7 +55,6 @@
|
||||
#define CONFIG_ENV_OFFSET 0x4000
|
||||
#define CONFIG_ENV_SECT_SIZE 0x2000
|
||||
#define CONFIG_ENV_IS_IN_FLASH 1
|
||||
#define CONFIG_ENV_IS_EMBEDDED 1
|
||||
#else
|
||||
#define CONFIG_ENV_ADDR 0xffe04000
|
||||
#define CONFIG_ENV_SECT_SIZE 0x2000
|
||||
|
||||
@@ -55,7 +55,6 @@
|
||||
#define CONFIG_ENV_OFFSET 0x4000
|
||||
#define CONFIG_ENV_SECT_SIZE 0x2000
|
||||
#define CONFIG_ENV_IS_IN_FLASH 1
|
||||
#define CONFIG_ENV_IS_EMBEDDED 1
|
||||
#else
|
||||
#define CONFIG_ENV_ADDR 0xffe04000
|
||||
#define CONFIG_ENV_SECT_SIZE 0x2000
|
||||
|
||||
@@ -231,7 +231,6 @@
|
||||
#define CONFIG_ENV_OFFSET 0x4000
|
||||
#define CONFIG_ENV_SECT_SIZE 0x2000
|
||||
#define CONFIG_ENV_IS_IN_FLASH 1
|
||||
#define CONFIG_ENV_IS_EMBEDDED 1
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
* Cache Configuration
|
||||
|
||||
@@ -231,7 +231,6 @@
|
||||
#define CONFIG_ENV_OFFSET 0x4000
|
||||
#define CONFIG_ENV_SECT_SIZE 0x2000
|
||||
#define CONFIG_ENV_IS_IN_FLASH 1
|
||||
#define CONFIG_ENV_IS_EMBEDDED 1
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
* Cache Configuration
|
||||
|
||||
@@ -277,7 +277,6 @@
|
||||
# define CONFIG_ENV_SECT_SIZE 0x8000
|
||||
#endif
|
||||
#undef CONFIG_ENV_OVERWRITE
|
||||
#undef CONFIG_ENV_IS_EMBEDDED
|
||||
|
||||
/* FLASH organization */
|
||||
#define CONFIG_SYS_FLASH_BASE CONFIG_SYS_CS0_BASE
|
||||
|
||||
@@ -332,7 +332,6 @@
|
||||
# define CONFIG_ENV_IS_IN_FLASH 1
|
||||
#endif
|
||||
#undef CONFIG_ENV_OVERWRITE
|
||||
#undef CONFIG_ENV_IS_EMBEDDED
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
* FLASH organization
|
||||
|
||||
@@ -280,7 +280,6 @@
|
||||
#define CONFIG_ENV_OFFSET 0x2000
|
||||
#define CONFIG_ENV_SECT_SIZE 0x2000
|
||||
#define CONFIG_ENV_IS_IN_FLASH 1
|
||||
#define CONFIG_ENV_IS_EMBEDDED 1
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
* Cache Configuration
|
||||
|
||||
@@ -266,7 +266,6 @@
|
||||
#define CONFIG_ENV_OFFSET 0x2000
|
||||
#define CONFIG_ENV_SECT_SIZE 0x2000
|
||||
#define CONFIG_ENV_IS_IN_FLASH 1
|
||||
#define CONFIG_ENV_IS_EMBEDDED 1
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
* Cache Configuration
|
||||
|
||||
@@ -196,7 +196,6 @@
|
||||
#define CONFIG_ENV_IS_IN_FLASH 1
|
||||
#define CONFIG_ENV_ADDR 0xFFF30000 /* Offset of Environment Sector */
|
||||
#define CONFIG_ENV_SIZE 0x00010000 /* Total Size of Environment Sector */
|
||||
#define CONFIG_ENV_IS_EMBEDDED 1 /* short-cut compile-time test */
|
||||
#define CONFIG_ENV_OVERWRITE 1 /* Allow modifying the environment */
|
||||
|
||||
/*
|
||||
|
||||
@@ -127,7 +127,6 @@
|
||||
#define CONFIG_ENV_OFFSET 0x4000
|
||||
#define CONFIG_ENV_SECT_SIZE 0x2000
|
||||
#define CONFIG_ENV_IS_IN_FLASH 1
|
||||
#define CONFIG_ENV_IS_EMBEDDED 1
|
||||
#else
|
||||
#define CONFIG_ENV_ADDR 0xffe04000
|
||||
#define CONFIG_ENV_SECT_SIZE 0x2000
|
||||
|
||||
@@ -231,7 +231,6 @@
|
||||
#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment */
|
||||
#define CONFIG_ENV_ADDR 0xFFFFE000 /* Address of Environment Sector */
|
||||
#define CONFIG_ENV_SECT_SIZE 0x2000 /* use the top-most 8k boot sector */
|
||||
#define CONFIG_ENV_IS_EMBEDDED 1 /* short-cut compile-time test */
|
||||
#else
|
||||
/* Final version: environment in EEPROM */
|
||||
#define CONFIG_ENV_IS_IN_EEPROM 1
|
||||
|
||||
Reference in New Issue
Block a user