@@ -53,18 +53,6 @@ config TARGET_SLT_AST2600
endchoice
-config ASPEED_SECBOOT_BL2
- bool "ASPEED secure boot BL2 support"
- depends on ASPEED_AST2600
- help
- Enable ASPEED's "secboot" secure boot support for verifying
- the SPL's playload ("BL2").
-
- Enable this is if you're using secure boot support in the AST2600 (or similar)
- to verify your u-boot proper.
-
- Disable this is if you are using u-boot's vboot to verify u-boot.
-
source "board/aspeed/evb_ast2600a0/Kconfig"
source "board/aspeed/evb_ast2600a1/Kconfig"
source "board/aspeed/ncsi_ast2600a0/Kconfig"
@@ -23,7 +23,7 @@ static int aspeed_spl_ram_load_image(struct spl_image_info *spl_image,
}
SPL_LOAD_IMAGE_METHOD("RAM", 0, ASPEED_BOOT_DEVICE_RAM, aspeed_spl_ram_load_image);
-#if IS_ENABLED(ASPEED_SECBOOT_BL2)
+#if IS_ENABLED(CONFIG_ASPEED_SECURE_BOOT)
static int aspeed_secboot_spl_ram_load_image(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev)
{
@@ -42,9 +42,8 @@ static int aspeed_secboot_spl_ram_load_image(struct spl_image_info *spl_image,
return 0;
}
SPL_LOAD_IMAGE_METHOD("RAM with Aspeed Secure Boot", 0, ASPEED_SECBOOT_DEVICE_RAM, aspeed_secboot_spl_ram_load_image);
-#endif /* ASPEED_SECBOOT_BL2 */
+#endif /* IS_ENABLED(CONFIG_ASPEED_SECURE_BOOT) */
-#if IS_ENABLED(CONFIG_SPL_MMC_SUPPORT)
static int aspeed_spl_mmc_load_image(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev)
{
@@ -104,7 +103,7 @@ static int aspeed_spl_mmc_load_image(struct spl_image_info *spl_image,
}
SPL_LOAD_IMAGE_METHOD("MMC", 0, ASPEED_BOOT_DEVICE_MMC, aspeed_spl_mmc_load_image);
-#if IS_ENABLED(ASPEED_SECBOOT_BL2)
+#if IS_ENABLED(CONFIG_ASPEED_SECURE_BOOT)
static int aspeed_secboot_spl_mmc_load_image(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev)
{
@@ -165,8 +164,7 @@ static int aspeed_secboot_spl_mmc_load_image(struct spl_image_info *spl_image,
return 0;
}
SPL_LOAD_IMAGE_METHOD("MMC with Aspeed Secure Boot", 0, ASPEED_SECBOOT_DEVICE_MMC, aspeed_secboot_spl_mmc_load_image);
-#endif /* ASPEED_SECBOOT_BL2 */
-#endif
+#endif /* IS_ENABLED(CONFIG_ASPEED_SECURE_BOOT) */
#if IS_ENABLED(CONFIG_SPL_YMODEM_SUPPORT)
static int getcymodem(void)
@@ -211,8 +209,7 @@ end_stream:
}
SPL_LOAD_IMAGE_METHOD("UART", 0, ASPEED_BOOT_DEVICE_UART, aspeed_spl_ymodem_load_image);
-
-#if IS_ENABLED(ASPEED_SECBOOT_BL2)
+#if IS_ENABLED(CONFIG_ASPEED_SECURE_BOOT)
static int aspeed_secboot_spl_ymodem_load_image(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev)
{
@@ -254,5 +251,5 @@ end_stream:
return ret;
}
SPL_LOAD_IMAGE_METHOD("UART with Aspeed Secure Boot", 0, ASPEED_SECBOOT_DEVICE_UART, aspeed_secboot_spl_ymodem_load_image);
-#endif /* ASPEED_SECBOOT_BL2 */
-#endif
+#endif /* IS_ENABLED(CONFIG_ASPEED_SECURE_BOOT) */
+#endif /* IS_ENABLED(CONFIG_SPL_YMODEM_SUPPORT) */
THis option was added in "ast2600: Allow selection of SPL boot devices" to allow disabling the secboot BL2 loaders. Instead of adding the new symbol the patch could have used the existing ASPEED_SECURE_BOOT option. Change to use the existing option. Signed-off-by: Joel Stanley <joel@jms.id.au> --- arch/arm/mach-aspeed/ast2600/Kconfig | 12 ------------ arch/arm/mach-aspeed/ast2600/spl_boot.c | 17 +++++++---------- 2 files changed, 7 insertions(+), 22 deletions(-)