Merge git://git.denx.de/u-boot-x86

[people/ms/u-boot.git] / include / environment.h

diff --git a/include/environment.h b/include/environment.h
index 584fd7216d2e05d25d29a391ac802b69cab9e0c4..a4060506fabb543ab291feb394c8059c8c1454aa 100644 (file)
--- a/include/environment.h
+++ b/include/environment.h
@@ -143,12 +143,7 @@ extern unsigned long nand_env_oob_offset;
 # define ENV_HEADER_SIZE       (sizeof(uint32_t))
 #endif
 
-#ifdef CONFIG_ENV_AES
-/* Make sure the payload is multiple of AES block size */
-#define ENV_SIZE ((CONFIG_ENV_SIZE - ENV_HEADER_SIZE) & ~(16 - 1))
-#else
 #define ENV_SIZE (CONFIG_ENV_SIZE - ENV_HEADER_SIZE)
-#endif
 
 typedef struct environment_s {
        uint32_t        crc;            /* CRC32 over data bytes        */
@@ -156,12 +151,7 @@ typedef struct environment_s {
        unsigned char   flags;          /* active/obsolete flags        */
 #endif
        unsigned char   data[ENV_SIZE]; /* Environment data             */
-} env_t
-#ifdef CONFIG_ENV_AES
-/* Make sure the env is aligned to block size. */
-__attribute__((aligned(16)))
-#endif
-;
+} env_t;
 
 #ifdef ENV_IS_EMBEDDED
 extern env_t environment;
@@ -170,9 +160,6 @@ extern env_t environment;
 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
@@ -201,7 +188,6 @@ enum env_valid {
 };
 
 enum env_location {
-       ENVL_DATAFLASH,
        ENVL_EEPROM,
        ENVL_EXT4,
        ENVL_FAT,
@@ -219,6 +205,14 @@ enum env_location {
        ENVL_UNKNOWN,
 };
 
+/* value for the various operations we want to perform on the env */
+enum env_operation {
+       ENVOP_GET_CHAR, /* we want to call the get_char function */
+       ENVOP_INIT,     /* we want to call the init function */
+       ENVOP_LOAD,     /* we want to call the load function */
+       ENVOP_SAVE,     /* we want to call the save function */
+};
+
 struct env_driver {
        const char *name;
        enum env_location location;
@@ -230,17 +224,19 @@ struct env_driver {
         * will read from gd->env_addr.
         *
         * @index: Index of character to read (0=first)
-        * @return character read
+        * @return character read, or -ve on error
         */
-       unsigned char (*get_char)(int index);
+       int (*get_char)(int index);
 
        /**
         * load() - Load the environment from storage
         *
         * This method is optional. If not provided, no environment will be
         * loaded.
+        *
+        * @return 0 if OK, -ve on error
         */
-       void (*load)(void);
+       int (*load)(void);
 
        /**
         * save() - Save the environment to storage
@@ -281,14 +277,11 @@ struct env_driver {
 
 extern struct hsearch_data env_htab;
 
-/* Function that returns a character from the environment */
-unsigned char env_get_char(int);
-
 /* Function that updates CRC of the enironment */
 void env_crc_update(void);
 
 /* Look up the variable from the default environment */
-char *getenv_default(const char *name);
+char *env_get_default(const char *name);
 
 /* [re]set to the default environment */
 void set_default_env(const char *s);
@@ -308,11 +301,28 @@ int env_import_redund(const char *buf1, const char *buf2);
 #endif
 
 /**
- * env_driver_lookup_default() - Look up the default environment driver
+ * env_get_char() - Get a character from the early environment
+ *
+ * This reads from the pre-relocation environemnt
+ *
+ * @index: Index of character to read (0 = first)
+ * @return character read, or -ve on error
+ */
+int env_get_char(int index);
+
+/**
+ * env_load() - Load the environment from storage
+ *
+ * @return 0 if OK, -ve on error
+ */
+int env_load(void);
+
+/**
+ * env_save() - Save the environment to storage
  *
- * @return pointer to driver, or NULL if none (which should not happen)
+ * @return 0 if OK, -ve on error
  */
-struct env_driver *env_driver_lookup_default(void);
+int env_save(void);
 
 #endif /* DO_DEPS_ONLY */