Convert CONFIG_USB_MUSB_HCD et al to Kconfig

[u-boot] / include / environment.h

diff --git a/include/environment.h b/include/environment.h
index 9a4421523555db78d0f86495e0cbeb2b720242dc..d29f82cb5d6faf148f126df5aa2207928a1628ef 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;
@@ -198,7 +188,6 @@ enum env_valid {
 };
 
 enum env_location {
-       ENVL_DATAFLASH,
        ENVL_EEPROM,
        ENVL_EXT4,
        ENVL_FAT,
@@ -227,17 +216,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