ARM: Move AES from board file to Kconfig

And also enable it for RSA defconfigs.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/configs/zynq_afx_nand_RSA_defconfig b/configs/zynq_afx_nand_RSA_defconfig
index 7685e5d4577779644dd3296ab24849b2172bd500..9478b9730bad37c6ce5c777fd19e0acb3013c883 100644 (file)
--- a/configs/zynq_afx_nand_RSA_defconfig
+++ b/configs/zynq_afx_nand_RSA_defconfig
@@ -8,5 +8,6 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_EXTRA_OPTIONS="AFX_NAND"
 CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_IMLS is not set
+CONFIG_CMD_ZYNQ_AES=y
 CONFIG_CMD_ZYNQ_RSA=y
 CONFIG_OF_EMBED=y

diff --git a/configs/zynq_afx_nor_RSA_defconfig b/configs/zynq_afx_nor_RSA_defconfig
index 3a1316467cb5e59d6739286fd8ff8665cbf6bea2..e5825efeec46277ef1ea8d7e5a1b2b80c8955c66 100644 (file)
--- a/configs/zynq_afx_nor_RSA_defconfig
+++ b/configs/zynq_afx_nor_RSA_defconfig
@@ -7,5 +7,6 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_EXTRA_OPTIONS="AFX_NOR"
 CONFIG_SYS_PROMPT="Zynq> "
+CONFIG_CMD_ZYNQ_AES=y
 CONFIG_CMD_ZYNQ_RSA=y
 CONFIG_OF_EMBED=y

diff --git a/configs/zynq_afx_qspi_RSA_defconfig b/configs/zynq_afx_qspi_RSA_defconfig
index b31b76ff5b39c973cf8abee630fb35dbe28f4ba3..bb5a515d6d8f8dc33a3af5db5762bfa51fb7daa2 100644 (file)
--- a/configs/zynq_afx_qspi_RSA_defconfig
+++ b/configs/zynq_afx_qspi_RSA_defconfig
@@ -7,6 +7,7 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_IMLS is not set
+CONFIG_CMD_ZYNQ_AES=y
 CONFIG_CMD_ZYNQ_RSA=y
 CONFIG_OF_EMBED=y
 CONFIG_SPI_FLASH=y

diff --git a/configs/zynq_zc702_RSA_defconfig b/configs/zynq_zc702_RSA_defconfig
index ebbc35ca46b0bf44ce63ba9d60738a5009a6c50d..57e932278c9ed857239c4868e14718906e7c58b7 100644 (file)
--- a/configs/zynq_zc702_RSA_defconfig
+++ b/configs/zynq_zc702_RSA_defconfig
@@ -10,6 +10,7 @@ CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_ZYNQ_AES=y
 CONFIG_CMD_ZYNQ_RSA=y
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y

diff --git a/configs/zynq_zc706_RSA_defconfig b/configs/zynq_zc706_RSA_defconfig
index 40af947c973af020847257cff7060620bd5253c7..70d7a054249dd4cc1b7798f214b2f491e69dae3f 100644 (file)
--- a/configs/zynq_zc706_RSA_defconfig
+++ b/configs/zynq_zc706_RSA_defconfig
@@ -11,6 +11,7 @@ CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_ZYNQ_AES=y
 CONFIG_CMD_ZYNQ_RSA=y
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y

diff --git a/configs/zynq_zc770_xm010_RSA_defconfig b/configs/zynq_zc770_xm010_RSA_defconfig
index 04d8c387dbf5e68f4e227d9adcb8a26bcc0cc581..ac75f318169a2a9f71ece7902977a8786072585d 100644 (file)
--- a/configs/zynq_zc770_xm010_RSA_defconfig
+++ b/configs/zynq_zc770_xm010_RSA_defconfig
@@ -11,6 +11,7 @@ CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_ZYNQ_AES=y
 CONFIG_CMD_ZYNQ_RSA=y
 CONFIG_OF_EMBED=y
 CONFIG_SPI_FLASH=y

diff --git a/configs/zynq_zc770_xm011_RSA_defconfig b/configs/zynq_zc770_xm011_RSA_defconfig
index 0b28e0d8b0885135cfcdc7d2b748326e3b617e3d..e1222fcad187076f6592efd26d5b27c3e4197f2f 100644 (file)
--- a/configs/zynq_zc770_xm011_RSA_defconfig
+++ b/configs/zynq_zc770_xm011_RSA_defconfig
@@ -8,5 +8,6 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM011"
 CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_IMLS is not set
+CONFIG_CMD_ZYNQ_AES=y
 CONFIG_CMD_ZYNQ_RSA=y
 CONFIG_OF_EMBED=y

diff --git a/configs/zynq_zc770_xm012_RSA_defconfig b/configs/zynq_zc770_xm012_RSA_defconfig
index f209b1707ab65b7d2a08ae26dad606dd0f43d033..8d620d71a3e1dcfcd1fc252ef3806d7a995e5455 100644 (file)
--- a/configs/zynq_zc770_xm012_RSA_defconfig
+++ b/configs/zynq_zc770_xm012_RSA_defconfig
@@ -10,5 +10,6 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
 CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_ZYNQ_AES=y
 CONFIG_CMD_ZYNQ_RSA=y
 CONFIG_OF_EMBED=y

diff --git a/configs/zynq_zc770_xm013_RSA_defconfig b/configs/zynq_zc770_xm013_RSA_defconfig
index 0a1313fabc56b14ac763453463441649b974883f..81e313e7157a0b9590b9f78c79323306001fef9b 100644 (file)
--- a/configs/zynq_zc770_xm013_RSA_defconfig
+++ b/configs/zynq_zc770_xm013_RSA_defconfig
@@ -10,6 +10,7 @@ CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_ZYNQ_AES=y
 CONFIG_CMD_ZYNQ_RSA=y
 CONFIG_OF_EMBED=y
 CONFIG_SPI_FLASH=y

diff --git a/configs/zynq_zed_RSA_defconfig b/configs/zynq_zed_RSA_defconfig
index 700eeaec1594f794338b0799a84ba088af95c450..80c68ad14f3f8a771df3e431891b83c7ee7f75e4 100644 (file)
--- a/configs/zynq_zed_RSA_defconfig
+++ b/configs/zynq_zed_RSA_defconfig
@@ -10,6 +10,7 @@ CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_ZYNQ_AES=y
 CONFIG_CMD_ZYNQ_RSA=y
 CONFIG_OF_EMBED=y
 CONFIG_SPI_FLASH=y

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 5456323087d4e36543852349e5053acf37516298..c5d46a08a5a32101bacab1efb250f74393466c0c 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -428,7 +428,6 @@
 #  define CONFIG_RSA
 # endif
 #define CONFIG_SHA256
-#define CONFIG_CMD_ZYNQ_AES
 #endif
 
 #define CONFIG_CMD_BOOTZ