From 4901bbb4c814ccfb74e0aeee9b2020e7c259a686 Mon Sep 17 00:00:00 2001 From: Sin Hui Kho Date: Wed, 19 May 2021 00:57:19 +0800 Subject: configs: socfpga: soc64: Disable CONFIG_SPL_RAW_IMAGE_SUPPORT Enable the SPL to support loading u-boot image with header or in FIT format only. SPL shall proceed to the next boot device in the boot order list when proper u-boot image is unavailable in current device. This requires disabling the raw image support in SPL. This change is common for all Intel SOC64 devices. Signed-off-by: Sin Hui Kho --- configs/socfpga_agilex_atf_defconfig | 1 + configs/socfpga_agilex_defconfig | 1 + configs/socfpga_agilex_nand_atf_defconfig | 1 + configs/socfpga_agilex_nand_defconfig | 1 + configs/socfpga_agilex_qspi_atf_defconfig | 1 + configs/socfpga_agilex_qspi_defconfig | 1 + configs/socfpga_agilex_vab_defconfig | 1 + configs/socfpga_n5x_atf_defconfig | 1 + configs/socfpga_n5x_defconfig | 1 + configs/socfpga_n5x_vab_defconfig | 1 + configs/socfpga_stratix10_atf_defconfig | 1 + configs/socfpga_stratix10_defconfig | 1 + configs/socfpga_stratix10_nand_atf_defconfig | 1 + configs/socfpga_stratix10_nand_defconfig | 1 + configs/socfpga_stratix10_qspi_atf_defconfig | 1 + configs/socfpga_stratix10_qspi_defconfig | 1 + 16 files changed, 16 insertions(+) diff --git a/configs/socfpga_agilex_atf_defconfig b/configs/socfpga_agilex_atf_defconfig index 3d2798e46a..dd35892ec8 100644 --- a/configs/socfpga_agilex_atf_defconfig +++ b/configs/socfpga_agilex_atf_defconfig @@ -75,3 +75,4 @@ CONFIG_DESIGNWARE_WATCHDOG=y CONFIG_WDT=y # CONFIG_SPL_USE_TINY_PRINTF is not set CONFIG_PANIC_HANG=y +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set diff --git a/configs/socfpga_agilex_defconfig b/configs/socfpga_agilex_defconfig index 329e276ca6..1a3c0467ef 100644 --- a/configs/socfpga_agilex_defconfig +++ b/configs/socfpga_agilex_defconfig @@ -73,3 +73,4 @@ CONFIG_DESIGNWARE_WATCHDOG=y CONFIG_WDT=y # CONFIG_SPL_USE_TINY_PRINTF is not set CONFIG_PANIC_HANG=y +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set diff --git a/configs/socfpga_agilex_nand_atf_defconfig b/configs/socfpga_agilex_nand_atf_defconfig index 777f2bfedc..ea2ade6024 100644 --- a/configs/socfpga_agilex_nand_atf_defconfig +++ b/configs/socfpga_agilex_nand_atf_defconfig @@ -90,3 +90,4 @@ CONFIG_USB_STORAGE=y CONFIG_DESIGNWARE_WATCHDOG=y CONFIG_WDT=y # CONFIG_SPL_USE_TINY_PRINTF is not set +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set diff --git a/configs/socfpga_agilex_nand_defconfig b/configs/socfpga_agilex_nand_defconfig index ecd041b7bc..83de640ddc 100644 --- a/configs/socfpga_agilex_nand_defconfig +++ b/configs/socfpga_agilex_nand_defconfig @@ -83,3 +83,4 @@ CONFIG_USB_STORAGE=y CONFIG_DESIGNWARE_WATCHDOG=y CONFIG_WDT=y # CONFIG_SPL_USE_TINY_PRINTF is not set +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set diff --git a/configs/socfpga_agilex_qspi_atf_defconfig b/configs/socfpga_agilex_qspi_atf_defconfig index a7c411b5f9..45b2afddd7 100644 --- a/configs/socfpga_agilex_qspi_atf_defconfig +++ b/configs/socfpga_agilex_qspi_atf_defconfig @@ -79,3 +79,4 @@ CONFIG_DESIGNWARE_WATCHDOG=y CONFIG_WDT=y # CONFIG_SPL_USE_TINY_PRINTF is not set CONFIG_PANIC_HANG=y +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set diff --git a/configs/socfpga_agilex_qspi_defconfig b/configs/socfpga_agilex_qspi_defconfig index 99d46291e2..2dc63bb9bb 100755 --- a/configs/socfpga_agilex_qspi_defconfig +++ b/configs/socfpga_agilex_qspi_defconfig @@ -73,3 +73,4 @@ CONFIG_DESIGNWARE_WATCHDOG=y CONFIG_WDT=y # CONFIG_SPL_USE_TINY_PRINTF is not set CONFIG_PANIC_HANG=y +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set diff --git a/configs/socfpga_agilex_vab_defconfig b/configs/socfpga_agilex_vab_defconfig index 73ef6ff82a..94681dd52f 100644 --- a/configs/socfpga_agilex_vab_defconfig +++ b/configs/socfpga_agilex_vab_defconfig @@ -74,3 +74,4 @@ CONFIG_DESIGNWARE_WATCHDOG=y CONFIG_WDT=y # CONFIG_SPL_USE_TINY_PRINTF is not set CONFIG_PANIC_HANG=y +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set diff --git a/configs/socfpga_n5x_atf_defconfig b/configs/socfpga_n5x_atf_defconfig index 45c0a14291..120ec750b0 100644 --- a/configs/socfpga_n5x_atf_defconfig +++ b/configs/socfpga_n5x_atf_defconfig @@ -82,3 +82,4 @@ CONFIG_SHA512_ALGO=y CONFIG_SHA384=y CONFIG_FS_LOADER=y CONFIG_SPL_ENV_SUPPORT=y +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set diff --git a/configs/socfpga_n5x_defconfig b/configs/socfpga_n5x_defconfig index 8a187aee05..d386d36459 100644 --- a/configs/socfpga_n5x_defconfig +++ b/configs/socfpga_n5x_defconfig @@ -75,3 +75,4 @@ CONFIG_SHA512_ALGO=y CONFIG_SHA384=y CONFIG_FS_LOADER=y CONFIG_SPL_ENV_SUPPORT=y +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set diff --git a/configs/socfpga_n5x_vab_defconfig b/configs/socfpga_n5x_vab_defconfig index 8cd0ead5a4..e96d32a86b 100644 --- a/configs/socfpga_n5x_vab_defconfig +++ b/configs/socfpga_n5x_vab_defconfig @@ -84,3 +84,4 @@ CONFIG_SHA512_ALGO=y CONFIG_SHA384=y CONFIG_FS_LOADER=y CONFIG_SPL_ENV_SUPPORT=y +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set diff --git a/configs/socfpga_stratix10_atf_defconfig b/configs/socfpga_stratix10_atf_defconfig index e74e59699f..5946e31045 100644 --- a/configs/socfpga_stratix10_atf_defconfig +++ b/configs/socfpga_stratix10_atf_defconfig @@ -74,3 +74,4 @@ CONFIG_DESIGNWARE_WATCHDOG=y CONFIG_WDT=y # CONFIG_SPL_USE_TINY_PRINTF is not set CONFIG_PANIC_HANG=y +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig index bd94e3c3a0..f4c68b04ce 100644 --- a/configs/socfpga_stratix10_defconfig +++ b/configs/socfpga_stratix10_defconfig @@ -74,3 +74,4 @@ CONFIG_DESIGNWARE_WATCHDOG=y CONFIG_WDT=y # CONFIG_SPL_USE_TINY_PRINTF is not set CONFIG_PANIC_HANG=y +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set diff --git a/configs/socfpga_stratix10_nand_atf_defconfig b/configs/socfpga_stratix10_nand_atf_defconfig index 1b16e2e28f..7b2543c42c 100644 --- a/configs/socfpga_stratix10_nand_atf_defconfig +++ b/configs/socfpga_stratix10_nand_atf_defconfig @@ -91,3 +91,4 @@ CONFIG_DESIGNWARE_WATCHDOG=y CONFIG_WDT=y # CONFIG_SPL_USE_TINY_PRINTF is not set CONFIG_PANIC_HANG=y +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set diff --git a/configs/socfpga_stratix10_nand_defconfig b/configs/socfpga_stratix10_nand_defconfig index f2d67b30b8..b5251fa3ad 100644 --- a/configs/socfpga_stratix10_nand_defconfig +++ b/configs/socfpga_stratix10_nand_defconfig @@ -84,3 +84,4 @@ CONFIG_DESIGNWARE_WATCHDOG=y CONFIG_WDT=y # CONFIG_SPL_USE_TINY_PRINTF is not set CONFIG_PANIC_HANG=y +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set diff --git a/configs/socfpga_stratix10_qspi_atf_defconfig b/configs/socfpga_stratix10_qspi_atf_defconfig index 33dc6e8e38..a62220c864 100644 --- a/configs/socfpga_stratix10_qspi_atf_defconfig +++ b/configs/socfpga_stratix10_qspi_atf_defconfig @@ -79,3 +79,4 @@ CONFIG_DESIGNWARE_WATCHDOG=y CONFIG_WDT=y # CONFIG_SPL_USE_TINY_PRINTF is not set CONFIG_PANIC_HANG=y +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set diff --git a/configs/socfpga_stratix10_qspi_defconfig b/configs/socfpga_stratix10_qspi_defconfig index 786b185087..d0f946544e 100644 --- a/configs/socfpga_stratix10_qspi_defconfig +++ b/configs/socfpga_stratix10_qspi_defconfig @@ -73,3 +73,4 @@ CONFIG_DESIGNWARE_WATCHDOG=y CONFIG_WDT=y # CONFIG_SPL_USE_TINY_PRINTF is not set CONFIG_PANIC_HANG=y +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set -- cgit v1.2.1