diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-blackfin/config.h | 5 | ||||
| -rw-r--r-- | include/configs/bf518f-ezbrd.h | 2 | ||||
| -rw-r--r-- | include/configs/bf526-ezbrd.h | 2 | ||||
| -rw-r--r-- | include/configs/bf527-ezkit.h | 2 | ||||
| -rw-r--r-- | include/configs/bf533-stamp.h | 2 | ||||
| -rw-r--r-- | include/configs/bf537-minotaur.h | 2 | ||||
| -rw-r--r-- | include/configs/bf537-pnav.h | 2 | ||||
| -rw-r--r-- | include/configs/bf537-srv1.h | 2 | ||||
| -rw-r--r-- | include/configs/bf537-stamp.h | 2 | ||||
| -rw-r--r-- | include/configs/bf538f-ezkit.h | 2 | ||||
| -rw-r--r-- | include/configs/bf548-ezkit.h | 4 | ||||
| -rw-r--r-- | include/configs/bf561-ezkit.h | 2 | ||||
| -rw-r--r-- | include/configs/cm-bf527.h | 2 | ||||
| -rw-r--r-- | include/configs/cm-bf537e.h | 2 | ||||
| -rw-r--r-- | include/configs/cm-bf537u.h | 2 | ||||
| -rw-r--r-- | include/configs/cm-bf548.h | 2 | ||||
| -rw-r--r-- | include/configs/ibf-dsp561.h | 2 | ||||
| -rw-r--r-- | include/configs/tcm-bf537.h | 2 | 
18 files changed, 23 insertions, 18 deletions
| diff --git a/include/asm-blackfin/config.h b/include/asm-blackfin/config.h index 327843d0b..fbfd59882 100644 --- a/include/asm-blackfin/config.h +++ b/include/asm-blackfin/config.h @@ -79,6 +79,11 @@  # define CONFIG_ENV_SPI_CS BFIN_BOOT_SPI_SSEL  #endif +/* We need envcrc to embed the env into LDRs */ +#ifdef CONFIG_ENV_IS_EMBEDDED_IN_LDR +# define CONFIG_BUILD_ENVCRC +#endif +  /* Default/common Blackfin memory layout */  #ifndef CONFIG_SYS_SDRAM_BASE  # define CONFIG_SYS_SDRAM_BASE 0 diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h index 3db8171fb..492840327 100644 --- a/include/configs/bf518f-ezbrd.h +++ b/include/configs/bf518f-ezbrd.h @@ -109,7 +109,7 @@  #define CONFIG_ENV_SIZE		0x2000  #define CONFIG_ENV_SECT_SIZE	0x2000  #endif -#define ENV_IS_EMBEDDED_CUSTOM +#define CONFIG_ENV_IS_EMBEDDED_IN_LDR  /* diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h index 97853af2d..711fa27b4 100644 --- a/include/configs/bf526-ezbrd.h +++ b/include/configs/bf526-ezbrd.h @@ -126,7 +126,7 @@  #define CONFIG_ENV_SIZE		0x2000  #define CONFIG_ENV_SECT_SIZE	0x2000  #endif -#define ENV_IS_EMBEDDED_CUSTOM +#define CONFIG_ENV_IS_EMBEDDED_IN_LDR  /* diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h index 0d0235478..5f3cb8362 100644 --- a/include/configs/bf527-ezkit.h +++ b/include/configs/bf527-ezkit.h @@ -125,7 +125,7 @@  #define CONFIG_ENV_SIZE		0x2000  #define CONFIG_ENV_SECT_SIZE	0x2000  #endif -#define ENV_IS_EMBEDDED_CUSTOM +#define CONFIG_ENV_IS_EMBEDDED_IN_LDR  /* diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h index 0006b029e..083c03017 100644 --- a/include/configs/bf533-stamp.h +++ b/include/configs/bf533-stamp.h @@ -117,7 +117,7 @@  #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS)  #define ENV_IS_EMBEDDED  #else -#define ENV_IS_EMBEDDED_CUSTOM +#define CONFIG_ENV_IS_EMBEDDED_IN_LDR  #endif  #ifdef ENV_IS_EMBEDDED  /* WARNING - the following is hand-optimized to fit within diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h index 463b7d08c..86aa1f61e 100644 --- a/include/configs/bf537-minotaur.h +++ b/include/configs/bf537-minotaur.h @@ -115,7 +115,7 @@  #define CONFIG_ENV_OFFSET	0x10000  #define CONFIG_ENV_SIZE		0x10000  #define CONFIG_ENV_SECT_SIZE	0x10000 -#define ENV_IS_EMBEDDED_CUSTOM +#define CONFIG_ENV_IS_EMBEDDED_IN_LDR  /* diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h index 0f908efff..6627a04f5 100644 --- a/include/configs/bf537-pnav.h +++ b/include/configs/bf537-pnav.h @@ -94,7 +94,7 @@   * Env Storage Settings   */  #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER) -#define ENV_IS_EMBEDDED_CUSTOM +#define CONFIG_ENV_IS_EMBEDDED_IN_LDR  #define CONFIG_ENV_IS_IN_SPI_FLASH  #define CONFIG_ENV_OFFSET	0x4000  #else diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h index 736862998..7e9dd36bc 100644 --- a/include/configs/bf537-srv1.h +++ b/include/configs/bf537-srv1.h @@ -115,7 +115,7 @@  #define CONFIG_ENV_OFFSET	0x10000  #define CONFIG_ENV_SIZE		0x10000  #define CONFIG_ENV_SECT_SIZE	0x10000 -#define ENV_IS_EMBEDDED_CUSTOM +#define CONFIG_ENV_IS_EMBEDDED_IN_LDR  /* diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h index 74b9ecd0b..017fb45c1 100644 --- a/include/configs/bf537-stamp.h +++ b/include/configs/bf537-stamp.h @@ -113,7 +113,7 @@  #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS)  #define ENV_IS_EMBEDDED  #else -#define ENV_IS_EMBEDDED_CUSTOM +#define CONFIG_ENV_IS_EMBEDDED_IN_LDR  #endif  #ifdef ENV_IS_EMBEDDED  /* WARNING - the following is hand-optimized to fit within diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h index c4d899dca..4ea2300f4 100644 --- a/include/configs/bf538f-ezkit.h +++ b/include/configs/bf538f-ezkit.h @@ -110,7 +110,7 @@  #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS)  #define ENV_IS_EMBEDDED  #else -#define ENV_IS_EMBEDDED_CUSTOM +#define CONFIG_ENV_IS_EMBEDDED_IN_LDR  #endif  #ifdef ENV_IS_EMBEDDED  /* WARNING - the following is hand-optimized to fit within diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h index 5b9de1695..d0a9e491f 100644 --- a/include/configs/bf548-ezkit.h +++ b/include/configs/bf548-ezkit.h @@ -107,7 +107,7 @@  #define CONFIG_ENV_OFFSET	0x10000  #define CONFIG_ENV_SIZE		0x2000  #define CONFIG_ENV_SECT_SIZE	0x10000 -#define ENV_IS_EMBEDDED_CUSTOM +#define CONFIG_ENV_IS_EMBEDDED_IN_LDR  #elif (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_NAND)  #define CONFIG_ENV_IS_IN_NAND  #define CONFIG_ENV_OFFSET	0x40000 @@ -118,7 +118,7 @@  #define CONFIG_ENV_OFFSET	0x2000  #define CONFIG_ENV_SIZE		0x2000  #define CONFIG_ENV_SECT_SIZE	(128 * 1024) -#define ENV_IS_EMBEDDED_CUSTOM +#define CONFIG_ENV_IS_EMBEDDED_IN_LDR  #endif diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h index a1fa80bb8..8ab38bbac 100644 --- a/include/configs/bf561-ezkit.h +++ b/include/configs/bf561-ezkit.h @@ -87,7 +87,7 @@  #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS)  #define ENV_IS_EMBEDDED  #else -#define ENV_IS_EMBEDDED_CUSTOM +#define CONFIG_ENV_IS_EMBEDDED_IN_LDR  #endif  #ifdef ENV_IS_EMBEDDED  /* WARNING - the following is hand-optimized to fit within diff --git a/include/configs/cm-bf527.h b/include/configs/cm-bf527.h index 159271996..3d41bd1b5 100644 --- a/include/configs/cm-bf527.h +++ b/include/configs/cm-bf527.h @@ -106,7 +106,7 @@  #define CONFIG_ENV_OFFSET	0x8000  #define CONFIG_ENV_SIZE		0x8000  #define CONFIG_ENV_SECT_SIZE	0x20000 -#define ENV_IS_EMBEDDED_CUSTOM +#define CONFIG_ENV_IS_EMBEDDED_IN_LDR  /* diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h index 34d429935..b243e1a52 100644 --- a/include/configs/cm-bf537e.h +++ b/include/configs/cm-bf537e.h @@ -92,7 +92,7 @@  #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS)  #define ENV_IS_EMBEDDED  #else -#define ENV_IS_EMBEDDED_CUSTOM +#define CONFIG_ENV_IS_EMBEDDED_IN_LDR  #endif  #ifdef ENV_IS_EMBEDDED  /* WARNING - the following is hand-optimized to fit within diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h index d1870a896..0ed596085 100644 --- a/include/configs/cm-bf537u.h +++ b/include/configs/cm-bf537u.h @@ -96,7 +96,7 @@  #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS)  #define ENV_IS_EMBEDDED  #else -#define ENV_IS_EMBEDDED_CUSTOM +#define CONFIG_ENV_IS_EMBEDDED_IN_LDR  #endif  #ifdef ENV_IS_EMBEDDED  /* WARNING - the following is hand-optimized to fit within diff --git a/include/configs/cm-bf548.h b/include/configs/cm-bf548.h index b5cfc2199..9630f7de5 100644 --- a/include/configs/cm-bf548.h +++ b/include/configs/cm-bf548.h @@ -96,7 +96,7 @@  #define CONFIG_ENV_ADDR		0x20008000  #define CONFIG_ENV_OFFSET	0x8000  #define CONFIG_ENV_SIZE		0x8000 -#define ENV_IS_EMBEDDED_CUSTOM +#define CONFIG_ENV_IS_EMBEDDED_IN_LDR  /* diff --git a/include/configs/ibf-dsp561.h b/include/configs/ibf-dsp561.h index 066859f8e..7c9f71e88 100644 --- a/include/configs/ibf-dsp561.h +++ b/include/configs/ibf-dsp561.h @@ -75,7 +75,7 @@  #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS)  #define ENV_IS_EMBEDDED  #else -#define ENV_IS_EMBEDDED_CUSTOM +#define CONFIG_ENV_IS_EMBEDDED_IN_LDR  #endif  #ifdef ENV_IS_EMBEDDED  /* WARNING - the following is hand-optimized to fit within diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h index 9794e1b90..9615ced6c 100644 --- a/include/configs/tcm-bf537.h +++ b/include/configs/tcm-bf537.h @@ -93,7 +93,7 @@  #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS)  #define ENV_IS_EMBEDDED  #else -#define ENV_IS_EMBEDDED_CUSTOM +#define CONFIG_ENV_IS_EMBEDDED_IN_LDR  #endif  #ifdef ENV_IS_EMBEDDED  /* WARNING - the following is hand-optimized to fit within |