From 9728b95e00e52c888999b5bc0c42a5113f50253c Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 18 May 2016 13:45:55 +0200 Subject: [PATCH] ARM: Move AES from board file to Kconfig And also enable it for RSA defconfigs. Signed-off-by: Michal Simek --- configs/zynq_afx_nand_RSA_defconfig | 1 + configs/zynq_afx_nor_RSA_defconfig | 1 + configs/zynq_afx_qspi_RSA_defconfig | 1 + configs/zynq_zc702_RSA_defconfig | 1 + configs/zynq_zc706_RSA_defconfig | 1 + configs/zynq_zc770_xm010_RSA_defconfig | 1 + configs/zynq_zc770_xm011_RSA_defconfig | 1 + configs/zynq_zc770_xm012_RSA_defconfig | 1 + configs/zynq_zc770_xm013_RSA_defconfig | 1 + configs/zynq_zed_RSA_defconfig | 1 + include/configs/zynq-common.h | 1 - 11 files changed, 10 insertions(+), 1 deletion(-) diff --git a/configs/zynq_afx_nand_RSA_defconfig b/configs/zynq_afx_nand_RSA_defconfig index 7685e5d4577..9478b9730ba 100644 --- 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 3a1316467cb..e5825efeec4 100644 --- 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 b31b76ff5b3..bb5a515d6d8 100644 --- 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 ebbc35ca46b..57e932278c9 100644 --- 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 40af947c973..70d7a054249 100644 --- 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 04d8c387dbf..ac75f318169 100644 --- 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 0b28e0d8b08..e1222fcad18 100644 --- 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 f209b1707ab..8d620d71a3e 100644 --- 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 0a1313fabc5..81e313e7157 100644 --- 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 700eeaec159..80c68ad14f3 100644 --- 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 5456323087d..c5d46a08a5a 100644 --- 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 -- 2.47.3