Commit 0a9e4e77 authored by Mike Frysinger's avatar Mike Frysinger Committed by Wolfgang Denk
Browse files

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: default avatarMike Frysinger <vapier@gentoo.org>
Signed-off-by: default avatarAlbin Tonnerre <albin.tonnerre@free-electrons.com>
Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
parent 02c9aa1d
...@@ -255,7 +255,6 @@ ...@@ -255,7 +255,6 @@
# define CONFIG_ENV_IS_IN_FLASH 1 # define CONFIG_ENV_IS_IN_FLASH 1
#endif #endif
#define CONFIG_ENV_OVERWRITE 1 #define CONFIG_ENV_OVERWRITE 1
#undef CONFIG_ENV_IS_EMBEDDED
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* FLASH organization * FLASH organization
......
...@@ -222,7 +222,6 @@ ...@@ -222,7 +222,6 @@
* Environment is embedded in u-boot in the second sector of the flash * Environment is embedded in u-boot in the second sector of the flash
*/ */
#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_EMBEDDED 1
#ifdef NORFLASH_PS32BIT #ifdef NORFLASH_PS32BIT
# define CONFIG_ENV_OFFSET (0x8000) # define CONFIG_ENV_OFFSET (0x8000)
# define CONFIG_ENV_SIZE 0x4000 # define CONFIG_ENV_SIZE 0x4000
......
...@@ -55,7 +55,6 @@ ...@@ -55,7 +55,6 @@
#define CONFIG_ENV_OFFSET 0x4000 #define CONFIG_ENV_OFFSET 0x4000
#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x2000
#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_EMBEDDED 1
#else #else
#define CONFIG_ENV_ADDR 0xffe04000 #define CONFIG_ENV_ADDR 0xffe04000
#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x2000
......
...@@ -55,7 +55,6 @@ ...@@ -55,7 +55,6 @@
#define CONFIG_ENV_OFFSET 0x4000 #define CONFIG_ENV_OFFSET 0x4000
#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x2000
#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_EMBEDDED 1
#else #else
#define CONFIG_ENV_ADDR 0xffe04000 #define CONFIG_ENV_ADDR 0xffe04000
#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x2000
......
...@@ -231,7 +231,6 @@ ...@@ -231,7 +231,6 @@
#define CONFIG_ENV_OFFSET 0x4000 #define CONFIG_ENV_OFFSET 0x4000
#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x2000
#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_EMBEDDED 1
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* Cache Configuration * Cache Configuration
......
...@@ -231,7 +231,6 @@ ...@@ -231,7 +231,6 @@
#define CONFIG_ENV_OFFSET 0x4000 #define CONFIG_ENV_OFFSET 0x4000
#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x2000
#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_EMBEDDED 1
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* Cache Configuration * Cache Configuration
......
...@@ -277,7 +277,6 @@ ...@@ -277,7 +277,6 @@
# define CONFIG_ENV_SECT_SIZE 0x8000 # define CONFIG_ENV_SECT_SIZE 0x8000
#endif #endif
#undef CONFIG_ENV_OVERWRITE #undef CONFIG_ENV_OVERWRITE
#undef CONFIG_ENV_IS_EMBEDDED
/* FLASH organization */ /* FLASH organization */
#define CONFIG_SYS_FLASH_BASE CONFIG_SYS_CS0_BASE #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_CS0_BASE
......
...@@ -332,7 +332,6 @@ ...@@ -332,7 +332,6 @@
# define CONFIG_ENV_IS_IN_FLASH 1 # define CONFIG_ENV_IS_IN_FLASH 1
#endif #endif
#undef CONFIG_ENV_OVERWRITE #undef CONFIG_ENV_OVERWRITE
#undef CONFIG_ENV_IS_EMBEDDED
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* FLASH organization * FLASH organization
......
...@@ -280,7 +280,6 @@ ...@@ -280,7 +280,6 @@
#define CONFIG_ENV_OFFSET 0x2000 #define CONFIG_ENV_OFFSET 0x2000
#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x2000
#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_EMBEDDED 1
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* Cache Configuration * Cache Configuration
......
...@@ -266,7 +266,6 @@ ...@@ -266,7 +266,6 @@
#define CONFIG_ENV_OFFSET 0x2000 #define CONFIG_ENV_OFFSET 0x2000
#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x2000
#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_EMBEDDED 1
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* Cache Configuration * Cache Configuration
......
...@@ -196,7 +196,6 @@ ...@@ -196,7 +196,6 @@
#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR 0xFFF30000 /* Offset of Environment Sector */ #define CONFIG_ENV_ADDR 0xFFF30000 /* Offset of Environment Sector */
#define CONFIG_ENV_SIZE 0x00010000 /* Total Size 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 */ #define CONFIG_ENV_OVERWRITE 1 /* Allow modifying the environment */
/* /*
......
...@@ -127,7 +127,6 @@ ...@@ -127,7 +127,6 @@
#define CONFIG_ENV_OFFSET 0x4000 #define CONFIG_ENV_OFFSET 0x4000
#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x2000
#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_EMBEDDED 1
#else #else
#define CONFIG_ENV_ADDR 0xffe04000 #define CONFIG_ENV_ADDR 0xffe04000
#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x2000
......
...@@ -231,7 +231,6 @@ ...@@ -231,7 +231,6 @@
#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment */ #define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment */
#define CONFIG_ENV_ADDR 0xFFFFE000 /* Address of Environment Sector */ #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_SECT_SIZE 0x2000 /* use the top-most 8k boot sector */
#define CONFIG_ENV_IS_EMBEDDED 1 /* short-cut compile-time test */
#else #else
/* Final version: environment in EEPROM */ /* Final version: environment in EEPROM */
#define CONFIG_ENV_IS_IN_EEPROM 1 #define CONFIG_ENV_IS_IN_EEPROM 1
......
...@@ -67,6 +67,10 @@ ...@@ -67,6 +67,10 @@
# if defined(CONFIG_ENV_ADDR_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND) # if defined(CONFIG_ENV_ADDR_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND)
# define CONFIG_SYS_REDUNDAND_ENVIRONMENT 1 # define CONFIG_SYS_REDUNDAND_ENVIRONMENT 1
# endif # endif
# ifdef CONFIG_ENV_IS_EMBEDDED
# error "do not define CONFIG_ENV_IS_EMBEDDED in your board config"
# error "it is calculated automatically for you"
# endif
#endif /* CONFIG_ENV_IS_IN_FLASH */ #endif /* CONFIG_ENV_IS_IN_FLASH */
#if defined(CONFIG_ENV_IS_IN_NAND) #if defined(CONFIG_ENV_IS_IN_NAND)
...@@ -79,9 +83,6 @@ ...@@ -79,9 +83,6 @@
# ifdef CONFIG_ENV_OFFSET_REDUND # ifdef CONFIG_ENV_OFFSET_REDUND
# define CONFIG_SYS_REDUNDAND_ENVIRONMENT # define CONFIG_SYS_REDUNDAND_ENVIRONMENT
# endif # endif
# ifdef CONFIG_ENV_IS_EMBEDDED
# define ENV_IS_EMBEDDED 1
# endif
#endif /* CONFIG_ENV_IS_IN_NAND */ #endif /* CONFIG_ENV_IS_IN_NAND */
#if defined(CONFIG_ENV_IS_IN_MG_DISK) #if defined(CONFIG_ENV_IS_IN_MG_DISK)
...@@ -91,11 +92,32 @@ ...@@ -91,11 +92,32 @@
# ifndef CONFIG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# error "Need to define CONFIG_ENV_SIZE when using CONFIG_ENV_IS_IN_MG_DISK" # error "Need to define CONFIG_ENV_SIZE when using CONFIG_ENV_IS_IN_MG_DISK"
# endif # endif
# ifdef CONFIG_ENV_IS_EMBEDDED
# error "CONFIG_ENV_IS_EMBEDDED not supported when using CONFIG_ENV_IS_IN_MG_DISK"
# endif
#endif /* CONFIG_ENV_IS_IN_MG_DISK */ #endif /* CONFIG_ENV_IS_IN_MG_DISK */
/* Embedded env is only supported for some flash types */
#ifdef CONFIG_ENV_IS_EMBEDDED
# if !defined(CONFIG_ENV_IS_IN_FLASH) && \
!defined(CONFIG_ENV_IS_IN_NAND) && \
!defined(CONFIG_ENV_IS_IN_ONENAND)
# error "CONFIG_ENV_IS_EMBEDDED not supported for your flash type"
# endif
#endif
/*
* For the flash types where embedded env is supported, but it cannot be
* calculated automatically (i.e. NAND), take the board opt-in.
*/
#if defined(CONFIG_ENV_IS_EMBEDDED) && !defined(ENV_IS_EMBEDDED)
# define ENV_IS_EMBEDDED 1
#endif
/* The build system likes to know if the env is embedded */
#ifdef DO_DEPS_ONLY
# ifdef ENV_IS_EMBEDDED
# define CONFIG_ENV_IS_EMBEDDED
# endif
#endif
#include "compiler.h" #include "compiler.h"
#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment