X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=include%2Fenvironment.h;h=00e59ba789c0965f420ed072ffdbeeda03d90a73;hb=2598090b7e17f8bdca95b22e7f27217054730e02;hp=c4f7c33be6b868c2daff5a44ea51dfb1ecad7c8e;hpb=926662762e5d280f6a9caed8dd9f49be2ebcaf2f;p=people%2Fms%2Fu-boot.git diff --git a/include/environment.h b/include/environment.h index c4f7c33be6..00e59ba789 100644 --- a/include/environment.h +++ b/include/environment.h @@ -22,7 +22,7 @@ */ #ifndef _ENVIRONMENT_H_ -#define _ENVIRONMENT_H_ 1 +#define _ENVIRONMENT_H_ /************************************************************************** * @@ -37,74 +37,159 @@ ************************************************************************** */ -#if defined(CFG_ENV_IS_IN_FLASH) -# ifndef CFG_ENV_ADDR -# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) +#if defined(CONFIG_ENV_IS_IN_FLASH) +# ifndef CONFIG_ENV_ADDR +# define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET) # endif -# ifndef CFG_ENV_OFFSET -# define CFG_ENV_OFFSET (CFG_ENV_ADDR - CFG_FLASH_BASE) +# ifndef CONFIG_ENV_OFFSET +# define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR - CONFIG_SYS_FLASH_BASE) # endif -# if !defined(CFG_ENV_ADDR_REDUND) && defined(CFG_ENV_OFFSET_REDUND) -# define CFG_ENV_ADDR_REDUND (CFG_FLASH_BASE + CFG_ENV_OFFSET_REDUND) +# if !defined(CONFIG_ENV_ADDR_REDUND) && defined(CONFIG_ENV_OFFSET_REDUND) +# define CONFIG_ENV_ADDR_REDUND \ + (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET_REDUND) # endif -# if defined(CFG_ENV_SECT_SIZE) || defined(CFG_ENV_SIZE) -# ifndef CFG_ENV_SECT_SIZE -# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE +# if defined(CONFIG_ENV_SECT_SIZE) || defined(CONFIG_ENV_SIZE) +# ifndef CONFIG_ENV_SECT_SIZE +# define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE # endif -# ifndef CFG_ENV_SIZE -# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE +# ifndef CONFIG_ENV_SIZE +# define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE # endif # else -# error "Both CFG_ENV_SECT_SIZE and CFG_ENV_SIZE undefined" +# error "Both CONFIG_ENV_SECT_SIZE and CONFIG_ENV_SIZE undefined" # endif -# if defined(CFG_ENV_ADDR_REDUND) && !defined(CFG_ENV_SIZE_REDUND) -# define CFG_ENV_SIZE_REDUND CFG_ENV_SIZE +# if defined(CONFIG_ENV_ADDR_REDUND) && !defined(CONFIG_ENV_SIZE_REDUND) +# define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE # endif -# if (CFG_ENV_ADDR >= CFG_MONITOR_BASE) && \ - (CFG_ENV_ADDR+CFG_ENV_SIZE) <= (CFG_MONITOR_BASE + CFG_MONITOR_LEN) -# define ENV_IS_EMBEDDED 1 +# if (CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE) && \ + (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) <= \ + (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) +# define ENV_IS_EMBEDDED # endif -# if defined(CFG_ENV_ADDR_REDUND) || defined(CFG_ENV_OFFSET_REDUND) -# define CFG_REDUNDAND_ENVIRONMENT 1 +# if defined(CONFIG_ENV_ADDR_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND) +# define CONFIG_SYS_REDUNDAND_ENVIRONMENT # endif -#endif /* CFG_ENV_IS_IN_FLASH */ - -#if defined(CFG_ENV_IS_IN_NAND) -# ifndef CFG_ENV_OFFSET -# error "Need to define CFG_ENV_OFFSET when using CFG_ENV_IS_IN_NAND" -# endif -# ifndef CFG_ENV_SIZE -# error "Need to define CFG_ENV_SIZE when using CFG_ENV_IS_IN_NAND" +# 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 -# ifdef CFG_ENV_OFFSET_REDUND -# define CFG_REDUNDAND_ENVIRONMENT +#endif /* CONFIG_ENV_IS_IN_FLASH */ + +#if defined(CONFIG_ENV_IS_IN_NAND) +# if defined(CONFIG_ENV_OFFSET_OOB) +# ifdef CONFIG_ENV_OFFSET_REDUND +# error "CONFIG_ENV_OFFSET_REDUND is not supported when CONFIG_ENV_OFFSET_OOB" +# error "is set" +# endif +extern unsigned long nand_env_oob_offset; +# define CONFIG_ENV_OFFSET nand_env_oob_offset +# else +# ifndef CONFIG_ENV_OFFSET +# error "Need to define CONFIG_ENV_OFFSET when using CONFIG_ENV_IS_IN_NAND" +# endif +# ifdef CONFIG_ENV_OFFSET_REDUND +# define CONFIG_SYS_REDUNDAND_ENVIRONMENT +# endif +# endif /* CONFIG_ENV_OFFSET_OOB */ +# ifndef CONFIG_ENV_SIZE +# error "Need to define CONFIG_ENV_SIZE when using CONFIG_ENV_IS_IN_NAND" # endif -# ifdef CFG_ENV_IS_EMBEDDED -# define ENV_IS_EMBEDDED 1 +#endif /* CONFIG_ENV_IS_IN_NAND */ + +/* 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) && \ + !defined(CONFIG_ENV_IS_IN_SPI_FLASH) +# error "CONFIG_ENV_IS_EMBEDDED not supported for your flash type" # endif -#endif /* CFG_ENV_IS_IN_NAND */ +#endif -#ifdef USE_HOSTCC -# include -#else -# include +/* + * 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 +#endif + +/* The build system likes to know if the env is embedded */ +#ifdef DO_DEPS_ONLY +# ifdef ENV_IS_EMBEDDED +# ifndef CONFIG_ENV_IS_EMBEDDED +# define CONFIG_ENV_IS_EMBEDDED +# endif +# endif #endif -#ifdef CFG_REDUNDAND_ENVIRONMENT +#include "compiler.h" + +#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT # define ENV_HEADER_SIZE (sizeof(uint32_t) + 1) + +# define ACTIVE_FLAG 1 +# define OBSOLETE_FLAG 0 #else # define ENV_HEADER_SIZE (sizeof(uint32_t)) #endif +#if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE) +extern char *env_name_spec; +#endif -#define ENV_SIZE (CFG_ENV_SIZE - ENV_HEADER_SIZE) +#define ENV_SIZE (CONFIG_ENV_SIZE - ENV_HEADER_SIZE) -typedef struct environment_s { +typedef struct environment_s { uint32_t crc; /* CRC32 over data bytes */ -#ifdef CFG_REDUNDAND_ENVIRONMENT +#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT unsigned char flags; /* active/obsolete flags */ #endif unsigned char data[ENV_SIZE]; /* Environment data */ } env_t; -#endif /* _ENVIRONMENT_H_ */ +#ifdef ENV_IS_EMBEDDED +extern env_t environment; +#endif /* ENV_IS_EMBEDDED */ + +extern const unsigned char default_environment[]; +extern env_t *env_ptr; + +extern void env_relocate_spec(void); +extern unsigned char env_get_char_spec(int); + +#if defined(CONFIG_NEEDS_MANUAL_RELOC) +extern void env_reloc(void); +#endif + +#ifndef DO_DEPS_ONLY + +#include +#include +#include +#include + +extern struct hsearch_data env_htab; + +/* Function that returns a character from the environment */ +unsigned char env_get_char(int); + +/* Function that returns a pointer to a value from the environment */ +const unsigned char *env_get_addr(int); +unsigned char env_get_char_memory(int index); + +/* Function that updates CRC of the enironment */ +void env_crc_update(void); + +/* [re]set to the default environment */ +void set_default_env(const char *s); + +/* [re]set individual variables to their value in the default environment */ +int set_default_vars(int nvars, char * const vars[]); + +/* Import from binary representation into hash table */ +int env_import(const char *buf, int check); + +#endif /* DO_DEPS_ONLY */ + +#endif /* _ENVIRONMENT_H_ */