These symbols do not exist in mainline, remove them.
Signed-off-by: Tom Rini <tr...@konsulko.com>
---
include/configs/capricorn-common.h | 3 ---
include/configs/cgtqmx8.h | 4 ----
include/configs/imx8mm-cl-iot-gate.h | 3 ---
include/configs/imx8mm_beacon.h | 3 ---
include/configs/imx8mm_data_modul_edm_sbc.h | 4 ----
include/configs/imx8mm_evk.h | 3 ---
include/configs/imx8mm_icore_mx8mm.h | 2 --
include/configs/imx8mm_venice.h | 3 ---
include/configs/imx8mn_beacon.h | 4 ----
include/configs/imx8mn_evk.h | 6 ------
include/configs/imx8mn_venice.h | 5 -----
include/configs/imx8mp_dhcom_pdk2.h | 6 ------
include/configs/imx8mp_evk.h | 2 --
include/configs/imx8mp_rsb3720.h | 2 --
include/configs/imx8mp_venice.h | 5 -----
include/configs/imx8mq_cm.h | 3 ---
include/configs/imx8mq_evk.h | 2 --
include/configs/imx8mq_phanbell.h | 2 --
include/configs/imx8qm_mek.h | 4 ----
include/configs/imx8qxp_mek.h | 4 ----
include/configs/imx8ulp_evk.h | 2 --
include/configs/kontron_pitx_imx8m.h | 3 ---
include/configs/phycore_imx8mm.h | 2 --
include/configs/phycore_imx8mp.h | 2 --
include/configs/pico-imx8mq.h | 2 --
include/configs/verdin-imx8mm.h | 2 --
include/configs/verdin-imx8mp.h | 2 --
27 files changed, 85 deletions(-)
diff --git a/include/configs/capricorn-common.h
b/include/configs/capricorn-common.h
index 4ca9e13ecf7a..456d1828d629 100644
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -19,9 +19,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 */
/* ENET1 connects to base board and MUX with ESAI */
diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
index 0266d6988ce1..f53c49db3899 100644
--- a/include/configs/cgtqmx8.h
+++ b/include/configs/cgtqmx8.h
@@ -16,10 +16,6 @@
#define CONFIG_SERIAL_LPUART_BASE 0x5a060000
#define CONFIG_MALLOC_F_ADDR 0x00120000
-
-#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 c559778c1d32..8303c68e369e 100644
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -19,9 +19,6 @@
#ifdef CONFIG_SPL_BUILD
/* 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
/* GUIDs for capsule updatable firmware images */
diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h
index 897eac66b148..131eedac6c5e 100644
--- a/include/configs/imx8mm_beacon.h
+++ b/include/configs/imx8mm_beacon.h
@@ -16,9 +16,6 @@
#ifdef CONFIG_SPL_BUILD
/* 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
/* Initial environment variables */
diff --git a/include/configs/imx8mm_data_modul_edm_sbc.h
b/include/configs/imx8mm_data_modul_edm_sbc.h
index bb19aa292b81..f8af3baef6f4 100644
--- a/include/configs/imx8mm_data_modul_edm_sbc.h
+++ b/include/configs/imx8mm_data_modul_edm_sbc.h
@@ -16,10 +16,6 @@
#ifdef CONFIG_SPL_BUILD
#define CONFIG_MALLOC_F_ADDR 0x930000
-
-/* For RAW image gives a error info not panic */
-#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
-
#endif
/* Link Definitions */
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index 983743b50936..d239c926ad5c 100644
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -18,9 +18,6 @@
#ifdef CONFIG_SPL_BUILD
/* 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
#ifndef CONFIG_SPL_BUILD
diff --git a/include/configs/imx8mm_icore_mx8mm.h
b/include/configs/imx8mm_icore_mx8mm.h
index e6642936cba0..f02d6d58c4ad 100644
--- a/include/configs/imx8mm_icore_mx8mm.h
+++ b/include/configs/imx8mm_icore_mx8mm.h
@@ -17,8 +17,6 @@
#ifdef CONFIG_SPL_BUILD
/* 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 595c10749668..573af3b7e286 100644
--- a/include/configs/imx8mm_venice.h
+++ b/include/configs/imx8mm_venice.h
@@ -16,9 +16,6 @@
#ifdef CONFIG_SPL_BUILD
/* 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/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h
index 99cbc1d07c8f..bfee1e29705e 100644
--- a/include/configs/imx8mn_beacon.h
+++ b/include/configs/imx8mn_beacon.h
@@ -16,10 +16,6 @@
#ifdef CONFIG_SPL_BUILD
/* 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
-
#endif /* CONFIG_SPL_BUILD */
/* Initial environment variables */
diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h
index 73ba49b0d8fb..1b8caba3321c 100644
--- a/include/configs/imx8mn_evk.h
+++ b/include/configs/imx8mn_evk.h
@@ -16,12 +16,6 @@
#define CONFIG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
-#ifdef CONFIG_SPL_BUILD
-/* For RAW image gives a error info not panic */
-#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
-
-#endif
-
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \
diff --git a/include/configs/imx8mn_venice.h b/include/configs/imx8mn_venice.h
index 8565ba7fdb15..a3ba520eb0b5 100644
--- a/include/configs/imx8mn_venice.h
+++ b/include/configs/imx8mn_venice.h
@@ -13,11 +13,6 @@
#define CONFIG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
-#ifdef CONFIG_SPL_BUILD
-/* For RAW image gives a error info not panic */
-#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
-#endif
-
#define MEM_LAYOUT_ENV_SETTINGS \
"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"fdt_addr_r=0x50200000\0" \
diff --git a/include/configs/imx8mp_dhcom_pdk2.h
b/include/configs/imx8mp_dhcom_pdk2.h
index 1ad90e5bdbd9..79db625d0373 100644
--- a/include/configs/imx8mp_dhcom_pdk2.h
+++ b/include/configs/imx8mp_dhcom_pdk2.h
@@ -14,12 +14,6 @@
#define CONFIG_SYS_MONITOR_LEN SZ_1M
-#ifdef CONFIG_SPL_BUILD
-/* For RAW image gives a error info not panic */
-#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
-
-#endif
-
/* Link Definitions */
#define CONFIG_SYS_INIT_RAM_ADDR 0x40000000
#define CONFIG_SYS_INIT_RAM_SIZE 0x200000
diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
index 65c1616bca72..6464d2ff28b3 100644
--- a/include/configs/imx8mp_evk.h
+++ b/include/configs/imx8mp_evk.h
@@ -18,8 +18,6 @@
#ifdef CONFIG_SPL_BUILD
/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
-#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
-
#define CONFIG_POWER_PCA9450
#endif
diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h
index efff6b955534..e4ec63c7050d 100644
--- a/include/configs/imx8mp_rsb3720.h
+++ b/include/configs/imx8mp_rsb3720.h
@@ -32,8 +32,6 @@
* set \
*/
-#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
-
#if defined(CONFIG_NAND_BOOT)
#define CONFIG_SPL_NAND_MXS
#endif
diff --git a/include/configs/imx8mp_venice.h b/include/configs/imx8mp_venice.h
index e1d335539568..7b30a3a21d7b 100644
--- a/include/configs/imx8mp_venice.h
+++ b/include/configs/imx8mp_venice.h
@@ -13,11 +13,6 @@
#define CONFIG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
-#ifdef CONFIG_SPL_BUILD
-/* For RAW image gives a error info not panic */
-#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
-#endif
-
#define MEM_LAYOUT_ENV_SETTINGS \
"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"fdt_addr_r=0x50200000\0" \
diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h
index a242d5e3e8ee..28f61b9fa13e 100644
--- a/include/configs/imx8mq_cm.h
+++ b/include/configs/imx8mq_cm.h
@@ -19,9 +19,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/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index 98ddb06fe337..63bd1955f453 100644
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -20,8 +20,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 1b3c0493ebd1..66b3c2091ed3 100644
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -17,8 +17,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 f4d19f87312f..8c4402dab5ff 100644
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -17,10 +17,6 @@
#define CONFIG_SERIAL_LPUART_BASE 0x5a060000
#define CONFIG_MALLOC_F_ADDR 0x00120000
-
-#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 a6aabc7add70..375079584586 100644
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -15,10 +15,6 @@
#define CONFIG_SERIAL_LPUART_BASE 0x5a060000
#define CONFIG_MALLOC_F_ADDR 0x00120000
-
-#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 987069447d53..8c911c925409 100644
--- a/include/configs/imx8ulp_evk.h
+++ b/include/configs/imx8ulp_evk.h
@@ -16,8 +16,6 @@
#ifdef CONFIG_SPL_BUILD
#define CONFIG_MALLOC_F_ADDR 0x22040000
-#define CONFIG_SPL_ABORT_ON_RAW_IMAGE /* For RAW image gives a error info not
panic */
-
#endif
/* ENET Config */
diff --git a/include/configs/kontron_pitx_imx8m.h
b/include/configs/kontron_pitx_imx8m.h
index 88aaa55bef53..40b1be7058ae 100644
--- a/include/configs/kontron_pitx_imx8m.h
+++ b/include/configs/kontron_pitx_imx8m.h
@@ -21,9 +21,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/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h
index 1d01104cfe83..36f3adebf423 100644
--- a/include/configs/phycore_imx8mm.h
+++ b/include/configs/phycore_imx8mm.h
@@ -19,8 +19,6 @@
#ifdef CONFIG_SPL_BUILD
/* 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 75ddcf465f9e..467216bf54c7 100644
--- a/include/configs/phycore_imx8mp.h
+++ b/include/configs/phycore_imx8mp.h
@@ -17,8 +17,6 @@
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR *
512)
#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
-
#define CONFIG_POWER_PCA9450
#endif
diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index 25ad936a06bb..1a43ef2fe2c3 100644
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -17,8 +17,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 a93d94dafe4e..846d6566a55a 100644
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -18,8 +18,6 @@
#ifdef CONFIG_SPL_BUILD
/* 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 906a20fd8402..2bbe2b72e0a7 100644
--- a/include/configs/verdin-imx8mp.h
+++ b/include/configs/verdin-imx8mp.h
@@ -18,8 +18,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
--
2.25.1
