fit: Verify all configuration signatures

[u-boot] / include / environment.h

diff --git a/include/environment.h b/include/environment.h
index 03b41e0c51160d295b17f4764abfb4cb6dff312e..70b7eda428b660ca0ed72e7c81b152b80e876b3e 100644 (file)
--- a/include/environment.h
+++ b/include/environment.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2002
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _ENVIRONMENT_H_
@@ -143,12 +142,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 +150,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 +187,7 @@ enum env_valid {
 };
 
 enum env_location {
-       ENVL_DATAFLASH,
+       ENVL_UNKNOWN,
        ENVL_EEPROM,
        ENVL_EXT4,
        ENVL_FAT,
@@ -213,24 +202,20 @@ enum env_location {
        ENVL_NOWHERE,
 
        ENVL_COUNT,
-       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;
 
-       /**
-        * get_char() - Read a character from the environment
-        *
-        * This method is optional. If not provided, a default implementation
-        * will read from gd->env_addr.
-        *
-        * @index: Index of character to read (0=first)
-        * @return character read, or -ve on error
-        */
-       int (*get_char)(int index);
-
        /**
         * load() - Load the environment from storage
         *
@@ -300,20 +285,14 @@ int env_export(env_t *env_out);
 
 #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
 /* Select and import one of two redundant environments */
-int env_import_redund(const char *buf1, const char *buf2);
+int env_import_redund(const char *buf1, int buf1_status,
+                     const char *buf2, int buf2_status);
 #endif
 
-/**
- * env_driver_lookup_default() - Look up the default environment driver
- *
- * @return pointer to driver, or NULL if none (which should not happen)
- */
-struct env_driver *env_driver_lookup_default(void);
-
 /**
  * env_get_char() - Get a character from the early environment
  *
- * This reads from the pre-relocation environemnt
+ * This reads from the pre-relocation environment
  *
  * @index: Index of character to read (0 = first)
  * @return character read, or -ve on error
@@ -334,6 +313,15 @@ int env_load(void);
  */
 int env_save(void);
 
+/**
+ * env_fix_drivers() - Updates envdriver as per relocation
+ */
+void env_fix_drivers(void);
+
+void eth_parse_enetaddr(const char *addr, uint8_t *enetaddr);
+int eth_env_get_enetaddr(const char *name, uint8_t *enetaddr);
+int eth_env_set_enetaddr(const char *name, const uint8_t *enetaddr);
+
 #endif /* DO_DEPS_ONLY */
 
 #endif /* _ENVIRONMENT_H_ */