Blackfin: tweak embedded LDR env config option
Use the common config option for extracting the environment for embedding into LDR files and clarify the LDR-specific option. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
/*
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
/*
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
/*
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
/*
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
/*
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
/*
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
/*
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user