[PATCH V2] configs: drop CONFIG_SPL_ABORT_ON_RAW_IMAGE
Marcel Ziswiler
marcel.ziswiler at toradex.com
Mon May 16 23:39:58 CEST 2022
On Mon, 2022-05-02 at 20:46 +0800, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan at nxp.com>
>
> CONFIG_SPL_RAW_IMAGE_SUPPORT default y has been used to replace
> CONFIG_SPL_ABORT_ON_RAW_IMAGE for quite some time, so drop
> CONFIG_SPL_ABORT_ON_RAW_IMAGE.
>
> Signed-off-by: Peng Fan <peng.fan at nxp.com>
Tested-by: Marcel Ziswiler <marcel.ziswiler at toradex.com>
> ---
>
> V2:
> Drop comments
>
> include/configs/capricorn-common.h | 1 -
> include/configs/cgtqmx8.h | 1 -
> include/configs/imx8mm-cl-iot-gate.h | 1 -
> include/configs/imx8mm_beacon.h | 1 -
> include/configs/imx8mm_data_modul_edm_sbc.h | 1 -
> include/configs/imx8mm_evk.h | 1 -
> include/configs/imx8mm_icore_mx8mm.h | 1 -
> include/configs/imx8mm_venice.h | 1 -
> include/configs/imx8mn_beacon.h | 1 -
> include/configs/imx8mn_evk.h | 1 -
> include/configs/imx8mn_venice.h | 1 -
> include/configs/imx8mp_evk.h | 1 -
> include/configs/imx8mp_rsb3720.h | 1 -
> include/configs/imx8mp_venice.h | 1 -
> include/configs/imx8mq_cm.h | 1 -
> include/configs/imx8mq_evk.h | 1 -
> include/configs/imx8mq_phanbell.h | 1 -
> include/configs/imx8qm_mek.h | 1 -
> include/configs/imx8qxp_mek.h | 1 -
> include/configs/imx8ulp_evk.h | 1 -
> include/configs/kontron_pitx_imx8m.h | 1 -
> include/configs/phycore_imx8mm.h | 1 -
> include/configs/phycore_imx8mp.h | 1 -
> include/configs/pico-imx8mq.h | 1 -
> include/configs/verdin-imx8mm.h | 1 -
> include/configs/verdin-imx8mp.h | 1 -
> 26 files changed, 26 deletions(-)
>
> diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
> index 364bd50b591..aa4c9818638 100644
> --- a/include/configs/capricorn-common.h
> +++ b/include/configs/capricorn-common.h
> @@ -26,7 +26,6 @@
> #define CONFIG_MALLOC_F_ADDR 0x00120000
>
> #define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE
> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
>
> #endif /* CONFIG_SPL_BUILD */
>
> diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
> index 6da0483ef09..183170e833c 100644
> --- a/include/configs/cgtqmx8.h
> +++ b/include/configs/cgtqmx8.h
> @@ -25,7 +25,6 @@
>
> #define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE
>
> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
> #endif
>
> /* Flat Device Tree Definitions */
> diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
> index fcb46c16605..e6c220bf0a8 100644
> --- a/include/configs/imx8mm-cl-iot-gate.h
> +++ b/include/configs/imx8mm-cl-iot-gate.h
> @@ -27,7 +27,6 @@
> /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
> #define CONFIG_MALLOC_F_ADDR 0x912000
> /* For RAW image gives a error info not panic */
> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
>
> #endif
>
> diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h
> index 4c9b5491f78..a9ca13a9da4 100644
> --- a/include/configs/imx8mm_beacon.h
> +++ b/include/configs/imx8mm_beacon.h
> @@ -24,7 +24,6 @@
> /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
> #define CONFIG_MALLOC_F_ADDR 0x930000
> /* For RAW image gives a error info not panic */
> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
>
> #endif
>
> diff --git a/include/configs/imx8mm_data_modul_edm_sbc.h b/include/configs/imx8mm_data_modul_edm_sbc.h
> index ff98095d27d..b5c445df9ce 100644
> --- a/include/configs/imx8mm_data_modul_edm_sbc.h
> +++ b/include/configs/imx8mm_data_modul_edm_sbc.h
> @@ -25,7 +25,6 @@
> #define CONFIG_MALLOC_F_ADDR 0x930000
>
> /* For RAW image gives a error info not panic */
> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
>
> #endif
>
> diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
> index 7dd66527c3d..98be481fce7 100644
> --- a/include/configs/imx8mm_evk.h
> +++ b/include/configs/imx8mm_evk.h
> @@ -26,7 +26,6 @@
> /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
> #define CONFIG_MALLOC_F_ADDR 0x930000
> /* For RAW image gives a error info not panic */
> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
>
> #endif
>
> diff --git a/include/configs/imx8mm_icore_mx8mm.h b/include/configs/imx8mm_icore_mx8mm.h
> index 1a439370c09..34993cafdaf 100644
> --- a/include/configs/imx8mm_icore_mx8mm.h
> +++ b/include/configs/imx8mm_icore_mx8mm.h
> @@ -25,7 +25,6 @@
> /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
> # define CONFIG_MALLOC_F_ADDR 0x930000
> /* For RAW image gives a error info not panic */
> -# define CONFIG_SPL_ABORT_ON_RAW_IMAGE
> #endif /* CONFIG_SPL_BUILD */
>
> #ifndef CONFIG_SPL_BUILD
> diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h
> index c3e92b76141..ba8379db784 100644
> --- a/include/configs/imx8mm_venice.h
> +++ b/include/configs/imx8mm_venice.h
> @@ -24,7 +24,6 @@
> /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
> #define CONFIG_MALLOC_F_ADDR 0x930000
> /* For RAW image gives a error info not panic */
> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
>
> #endif
>
> diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h
> index c16dda5e22c..57b99d5a110 100644
> --- a/include/configs/imx8mn_beacon.h
> +++ b/include/configs/imx8mn_beacon.h
> @@ -25,7 +25,6 @@
> #define CONFIG_MALLOC_F_ADDR 0x184000
>
> /* For RAW image gives a error info not panic */
> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
>
> #endif /* CONFIG_SPL_BUILD */
>
> diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h
> index b20e0a5553d..c0e9b0e9872 100644
> --- a/include/configs/imx8mn_evk.h
> +++ b/include/configs/imx8mn_evk.h
> @@ -25,7 +25,6 @@
> #define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K /* 512 KB */
>
> /* For RAW image gives a error info not panic */
> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
>
> #endif
>
> diff --git a/include/configs/imx8mn_venice.h b/include/configs/imx8mn_venice.h
> index 41062b139f8..6f36440b4f2 100644
> --- a/include/configs/imx8mn_venice.h
> +++ b/include/configs/imx8mn_venice.h
> @@ -22,7 +22,6 @@
> #define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K /* 512 KB */
>
> /* For RAW image gives a error info not panic */
> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
> #endif
>
> #define MEM_LAYOUT_ENV_SETTINGS \
> diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
> index cbdd490a300..55691821f90 100644
> --- a/include/configs/imx8mp_evk.h
> +++ b/include/configs/imx8mp_evk.h
> @@ -24,7 +24,6 @@
> #define CONFIG_SYS_SPL_MALLOC_START 0x42200000
> #define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K /* 512 KB */
>
> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
>
> #define CONFIG_POWER_PCA9450
>
> diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h
> index f2d9fa8cbf9..7c2babbb0ae 100644
> --- a/include/configs/imx8mp_rsb3720.h
> +++ b/include/configs/imx8mp_rsb3720.h
> @@ -39,7 +39,6 @@
> * set \
> */
>
> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
>
> #if defined(CONFIG_NAND_BOOT)
> #define CONFIG_SPL_NAND_MXS
> diff --git a/include/configs/imx8mp_venice.h b/include/configs/imx8mp_venice.h
> index 5242b56ad8c..161f2e8d366 100644
> --- a/include/configs/imx8mp_venice.h
> +++ b/include/configs/imx8mp_venice.h
> @@ -22,7 +22,6 @@
> #define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K /* 512 KB */
>
> /* For RAW image gives a error info not panic */
> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
> #endif
>
> #define MEM_LAYOUT_ENV_SETTINGS \
> diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h
> index 989486aa6dc..34d64f7ae45 100644
> --- a/include/configs/imx8mq_cm.h
> +++ b/include/configs/imx8mq_cm.h
> @@ -26,7 +26,6 @@
> /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
> #define CONFIG_MALLOC_F_ADDR 0x182000
> /* For RAW image gives a error info not panic */
> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
>
> #endif
>
> diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
> index f7929e5867e..98257e8ba81 100644
> --- a/include/configs/imx8mq_evk.h
> +++ b/include/configs/imx8mq_evk.h
> @@ -27,7 +27,6 @@
> /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
> #define CONFIG_MALLOC_F_ADDR 0x182000
> /* For RAW image gives a error info not panic */
> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
>
> #define CONFIG_POWER_PFUZE100
> #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
> diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
> index f6410114b76..19381b6b778 100644
> --- a/include/configs/imx8mq_phanbell.h
> +++ b/include/configs/imx8mq_phanbell.h
> @@ -24,7 +24,6 @@
> /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
> #define CONFIG_MALLOC_F_ADDR 0x182000
> /* For RAW image gives a error info not panic */
> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
> #endif
>
> /* ENET Config */
> diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
> index 61d56e269ac..ddcd6cf2319 100644
> --- a/include/configs/imx8qm_mek.h
> +++ b/include/configs/imx8qm_mek.h
> @@ -26,7 +26,6 @@
>
> #define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE
>
> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
> #endif
>
> #ifdef CONFIG_AHAB_BOOT
> diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
> index 26dc4ded030..dee6852df4c 100644
> --- a/include/configs/imx8qxp_mek.h
> +++ b/include/configs/imx8qxp_mek.h
> @@ -24,7 +24,6 @@
>
> #define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE
>
> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
> #endif
>
> #ifdef CONFIG_AHAB_BOOT
> diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h
> index 05df43b39b4..190bbb8c13c 100644
> --- a/include/configs/imx8ulp_evk.h
> +++ b/include/configs/imx8ulp_evk.h
> @@ -23,7 +23,6 @@
>
> #define CONFIG_MALLOC_F_ADDR 0x22040000
>
> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE /* For RAW image gives a error info not panic */
>
> #endif
>
> diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h
> index e8e92920dcb..d519935b064 100644
> --- a/include/configs/kontron_pitx_imx8m.h
> +++ b/include/configs/kontron_pitx_imx8m.h
> @@ -28,7 +28,6 @@
> /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
> #define CONFIG_MALLOC_F_ADDR 0x182000
> /* For RAW image gives a error info not panic */
> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
>
>
> #define CONFIG_POWER_PFUZE100
> diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h
> index 564b8125ba3..b70c31ca633 100644
> --- a/include/configs/phycore_imx8mm.h
> +++ b/include/configs/phycore_imx8mm.h
> @@ -27,7 +27,6 @@
> /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
> #define CONFIG_MALLOC_F_ADDR 0x930000
> /* For RAW image gives a error info not panic */
> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
> #endif
>
> #define CONFIG_EXTRA_ENV_SETTINGS \
> diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h
> index 3e4315f2b81..95d70bb92d1 100644
> --- a/include/configs/phycore_imx8mp.h
> +++ b/include/configs/phycore_imx8mp.h
> @@ -24,7 +24,6 @@
> #define CONFIG_SYS_SPL_MALLOC_START 0x42200000
> #define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K
>
> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
>
> #define CONFIG_POWER_PCA9450
>
> diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
> index 95845276e7b..1de54e6431c 100644
> --- a/include/configs/pico-imx8mq.h
> +++ b/include/configs/pico-imx8mq.h
> @@ -24,7 +24,6 @@
> /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
> #define CONFIG_MALLOC_F_ADDR 0x182000
> /* For RAW image gives a error info not panic */
> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
> #endif
>
> /* ENET Config */
> diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
> index 3d7f5a3380e..a8fb5c63b7f 100644
> --- a/include/configs/verdin-imx8mm.h
> +++ b/include/configs/verdin-imx8mm.h
> @@ -26,7 +26,6 @@
> /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
> #define CONFIG_MALLOC_F_ADDR 0x930000
> /* For RAW image gives a error info not panic */
> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
> #endif
>
> #define MEM_LAYOUT_ENV_SETTINGS \
> diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h
> index b166e750c27..d6bb552e875 100644
> --- a/include/configs/verdin-imx8mp.h
> +++ b/include/configs/verdin-imx8mp.h
> @@ -25,7 +25,6 @@
> /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
> #define CONFIG_MALLOC_F_ADDR 0x184000
> /* For RAW image gives a error info not panic */
> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
>
> #define CONFIG_POWER_PCA9450
More information about the U-Boot
mailing list