configs: drop CONFIG_SPL_ABORT_ON_RAW_IMAGE
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@nxp.com>
This commit is contained in:
parent
0a16da8079
commit
ca3369df71
@ -20,7 +20,6 @@
|
|||||||
#define CONFIG_MALLOC_F_ADDR 0x00120000
|
#define CONFIG_MALLOC_F_ADDR 0x00120000
|
||||||
|
|
||||||
#define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE
|
#define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE
|
||||||
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
|
|
||||||
|
|
||||||
#endif /* CONFIG_SPL_BUILD */
|
#endif /* CONFIG_SPL_BUILD */
|
||||||
|
|
||||||
|
@ -19,7 +19,6 @@
|
|||||||
|
|
||||||
#define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE
|
#define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE
|
||||||
|
|
||||||
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Flat Device Tree Definitions */
|
/* Flat Device Tree Definitions */
|
||||||
|
@ -20,7 +20,6 @@
|
|||||||
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
||||||
#define CONFIG_MALLOC_F_ADDR 0x912000
|
#define CONFIG_MALLOC_F_ADDR 0x912000
|
||||||
/* For RAW image gives a error info not panic */
|
/* For RAW image gives a error info not panic */
|
||||||
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
||||||
#define CONFIG_MALLOC_F_ADDR 0x930000
|
#define CONFIG_MALLOC_F_ADDR 0x930000
|
||||||
/* For RAW image gives a error info not panic */
|
/* For RAW image gives a error info not panic */
|
||||||
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
#define CONFIG_MALLOC_F_ADDR 0x930000
|
#define CONFIG_MALLOC_F_ADDR 0x930000
|
||||||
|
|
||||||
/* For RAW image gives a error info not panic */
|
/* For RAW image gives a error info not panic */
|
||||||
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -19,7 +19,6 @@
|
|||||||
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
||||||
#define CONFIG_MALLOC_F_ADDR 0x930000
|
#define CONFIG_MALLOC_F_ADDR 0x930000
|
||||||
/* For RAW image gives a error info not panic */
|
/* For RAW image gives a error info not panic */
|
||||||
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
||||||
# define CONFIG_MALLOC_F_ADDR 0x930000
|
# define CONFIG_MALLOC_F_ADDR 0x930000
|
||||||
/* For RAW image gives a error info not panic */
|
/* For RAW image gives a error info not panic */
|
||||||
# define CONFIG_SPL_ABORT_ON_RAW_IMAGE
|
|
||||||
#endif /* CONFIG_SPL_BUILD */
|
#endif /* CONFIG_SPL_BUILD */
|
||||||
|
|
||||||
#ifndef CONFIG_SPL_BUILD
|
#ifndef CONFIG_SPL_BUILD
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
||||||
#define CONFIG_MALLOC_F_ADDR 0x930000
|
#define CONFIG_MALLOC_F_ADDR 0x930000
|
||||||
/* For RAW image gives a error info not panic */
|
/* For RAW image gives a error info not panic */
|
||||||
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
#define CONFIG_MALLOC_F_ADDR 0x184000
|
#define CONFIG_MALLOC_F_ADDR 0x184000
|
||||||
|
|
||||||
/* For RAW image gives a error info not panic */
|
/* For RAW image gives a error info not panic */
|
||||||
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
|
|
||||||
|
|
||||||
#endif /* CONFIG_SPL_BUILD */
|
#endif /* CONFIG_SPL_BUILD */
|
||||||
|
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
|
|
||||||
#ifdef CONFIG_SPL_BUILD
|
#ifdef CONFIG_SPL_BUILD
|
||||||
/* For RAW image gives a error info not panic */
|
/* For RAW image gives a error info not panic */
|
||||||
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -15,7 +15,6 @@
|
|||||||
|
|
||||||
#ifdef CONFIG_SPL_BUILD
|
#ifdef CONFIG_SPL_BUILD
|
||||||
/* For RAW image gives a error info not panic */
|
/* For RAW image gives a error info not panic */
|
||||||
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define MEM_LAYOUT_ENV_SETTINGS \
|
#define MEM_LAYOUT_ENV_SETTINGS \
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
#ifdef CONFIG_SPL_BUILD
|
#ifdef CONFIG_SPL_BUILD
|
||||||
/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
|
/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
|
||||||
|
|
||||||
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
|
|
||||||
|
|
||||||
#define CONFIG_POWER_PCA9450
|
#define CONFIG_POWER_PCA9450
|
||||||
|
|
||||||
|
@ -32,7 +32,6 @@
|
|||||||
* set \
|
* set \
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
|
|
||||||
|
|
||||||
#if defined(CONFIG_NAND_BOOT)
|
#if defined(CONFIG_NAND_BOOT)
|
||||||
#define CONFIG_SPL_NAND_MXS
|
#define CONFIG_SPL_NAND_MXS
|
||||||
|
@ -15,7 +15,6 @@
|
|||||||
|
|
||||||
#ifdef CONFIG_SPL_BUILD
|
#ifdef CONFIG_SPL_BUILD
|
||||||
/* For RAW image gives a error info not panic */
|
/* For RAW image gives a error info not panic */
|
||||||
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define MEM_LAYOUT_ENV_SETTINGS \
|
#define MEM_LAYOUT_ENV_SETTINGS \
|
||||||
|
@ -20,7 +20,6 @@
|
|||||||
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
||||||
#define CONFIG_MALLOC_F_ADDR 0x182000
|
#define CONFIG_MALLOC_F_ADDR 0x182000
|
||||||
/* For RAW image gives a error info not panic */
|
/* For RAW image gives a error info not panic */
|
||||||
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -21,7 +21,6 @@
|
|||||||
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
||||||
#define CONFIG_MALLOC_F_ADDR 0x182000
|
#define CONFIG_MALLOC_F_ADDR 0x182000
|
||||||
/* For RAW image gives a error info not panic */
|
/* For RAW image gives a error info not panic */
|
||||||
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
|
|
||||||
|
|
||||||
#define CONFIG_POWER_PFUZE100
|
#define CONFIG_POWER_PFUZE100
|
||||||
#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
|
#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
||||||
#define CONFIG_MALLOC_F_ADDR 0x182000
|
#define CONFIG_MALLOC_F_ADDR 0x182000
|
||||||
/* For RAW image gives a error info not panic */
|
/* For RAW image gives a error info not panic */
|
||||||
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* ENET Config */
|
/* ENET Config */
|
||||||
|
@ -20,7 +20,6 @@
|
|||||||
|
|
||||||
#define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE
|
#define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE
|
||||||
|
|
||||||
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_AHAB_BOOT
|
#ifdef CONFIG_AHAB_BOOT
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
|
|
||||||
#define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE
|
#define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE
|
||||||
|
|
||||||
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_AHAB_BOOT
|
#ifdef CONFIG_AHAB_BOOT
|
||||||
|
@ -16,7 +16,6 @@
|
|||||||
#ifdef CONFIG_SPL_BUILD
|
#ifdef CONFIG_SPL_BUILD
|
||||||
#define CONFIG_MALLOC_F_ADDR 0x22040000
|
#define CONFIG_MALLOC_F_ADDR 0x22040000
|
||||||
|
|
||||||
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE /* For RAW image gives a error info not panic */
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -22,7 +22,6 @@
|
|||||||
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
||||||
#define CONFIG_MALLOC_F_ADDR 0x182000
|
#define CONFIG_MALLOC_F_ADDR 0x182000
|
||||||
/* For RAW image gives a error info not panic */
|
/* For RAW image gives a error info not panic */
|
||||||
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
|
|
||||||
|
|
||||||
|
|
||||||
#define CONFIG_POWER_PFUZE100
|
#define CONFIG_POWER_PFUZE100
|
||||||
|
@ -20,7 +20,6 @@
|
|||||||
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
||||||
#define CONFIG_MALLOC_F_ADDR 0x930000
|
#define CONFIG_MALLOC_F_ADDR 0x930000
|
||||||
/* For RAW image gives a error info not panic */
|
/* For RAW image gives a error info not panic */
|
||||||
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
|
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
|
||||||
|
|
||||||
#ifdef CONFIG_SPL_BUILD
|
#ifdef CONFIG_SPL_BUILD
|
||||||
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
|
|
||||||
|
|
||||||
#define CONFIG_POWER_PCA9450
|
#define CONFIG_POWER_PCA9450
|
||||||
|
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
||||||
#define CONFIG_MALLOC_F_ADDR 0x182000
|
#define CONFIG_MALLOC_F_ADDR 0x182000
|
||||||
/* For RAW image gives a error info not panic */
|
/* For RAW image gives a error info not panic */
|
||||||
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* ENET Config */
|
/* ENET Config */
|
||||||
|
@ -19,7 +19,6 @@
|
|||||||
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
||||||
#define CONFIG_MALLOC_F_ADDR 0x930000
|
#define CONFIG_MALLOC_F_ADDR 0x930000
|
||||||
/* For RAW image gives a error info not panic */
|
/* For RAW image gives a error info not panic */
|
||||||
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define MEM_LAYOUT_ENV_SETTINGS \
|
#define MEM_LAYOUT_ENV_SETTINGS \
|
||||||
|
@ -19,7 +19,6 @@
|
|||||||
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
|
||||||
#define CONFIG_MALLOC_F_ADDR 0x184000
|
#define CONFIG_MALLOC_F_ADDR 0x184000
|
||||||
/* For RAW image gives a error info not panic */
|
/* For RAW image gives a error info not panic */
|
||||||
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
|
|
||||||
|
|
||||||
#define CONFIG_POWER_PCA9450
|
#define CONFIG_POWER_PCA9450
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user