env: remove references to deprecated ENV_AES config

This config option was removed in
c6831c7.

Signed-off-by: Hector Palacios <[email protected]>

Author: hpalacio

Kconfig

@@ -66,14 +66,8 @@ config DEPRECATED
 	  code that relies on deprecated features that will be removed and
 	  the conversion deadline has passed.
 
-config ENV_AES
-	bool "Encrypt U-Boot environment"
-	select AES
-	help
-	  Define to encrypt the whole environment block with AES-128-CBC.
-
 config ENV_AES_CAAM_KEY
-	bool "Use CAAM internal key"
+	bool "Encrypt U-Boot environment with CAAM internal key"
 	depends on HAS_CAAM
 	help
 	  Use the internal CAAM secure key for environment encryption which

env/common.c

@@ -116,8 +116,6 @@ int env_set_default_vars(int nvars, char * const vars[], int flags)
 				flags, 0, nvars, vars);
 }
 
-#ifdef CONFIG_ENV_AES
-
 #ifdef CONFIG_ENV_AES_CAAM_KEY
 #include <fuse.h>
 #include <fsl_caam.h>
@@ -160,14 +158,12 @@ static int env_aes_cbc_crypt(env_t *env, const int enc)
 	free(buffer);
 	return ret;
 }
-#endif /* CONFIG_ENV_AES_CAAM_KEY */
-
 #else
 static inline int env_aes_cbc_crypt(env_t *env, const int enc)
 {
 	return 0;
 }
-#endif
+#endif /* CONFIG_ENV_AES_CAAM_KEY */
 
 /*
  * Check if CRC is valid and (if yes) import the environment.

include/env_internal.h

@@ -83,12 +83,7 @@ extern unsigned long nand_env_oob_offset;
 # define ENV_HEADER_SIZE	(sizeof(uint32_t))
 #endif
 
-#if defined(CONFIG_ENV_AES) && !defined(CONFIG_ENV_AES_CAAM_KEY)
-/* 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
 
 /*
  * If the environment is in RAM, allocate extra space for it in the malloc
@@ -111,7 +106,7 @@ typedef struct environment_s {
 #endif
 	unsigned char	data[ENV_SIZE]; /* Environment data		*/
 } env_t
-#ifdef CONFIG_ENV_AES
+#ifdef CONFIG_ENV_AES_CAAM_KEY
 /* Make sure the env is aligned to block size. */
 __attribute__((aligned(16)))
 #endif