[PoC 227/241] global: Migrate CONFIG_USB_BOOTING to CFG

Tom Rini
2022-11-20T14:29:09Z

arch/arm/mach-exynos/spl_boot.c | 6 +++---
include/configs/exynos5-common.h | 2 +-
scripts/config_whitelist.txt | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-exynos/spl_boot.c b/arch/arm/mach-exynos/spl_boot.c
index 83bdee9f8579..d3eabef0e801 100644
--- a/arch/arm/mach-exynos/spl_boot.c
+++ b/arch/arm/mach-exynos/spl_boot.c
@@ -78,7 +78,7 @@ void *get_irom_func(int index)
return (void *)*(u32 *)irom_ptr_table[index];
}

-#ifdef CONFIG_USB_BOOTING
+#ifdef CFG_USB_BOOTING
/*
* Set/clear program flow prediction and return the previous state.
*/
@@ -227,7 +227,7 @@ void copy_uboot_to_ram(void)
u32 (*copy_bl2_from_emmc)(u32 nblock, u32 dst);
void (*end_bootop_from_emmc)(void);
#endif
-#ifdef CONFIG_USB_BOOTING
+#ifdef CFG_USB_BOOTING
int is_cr_z_set;
unsigned int sec_boot_check;

@@ -271,7 +271,7 @@ void copy_uboot_to_ram(void)
end_bootop_from_emmc();
break;
#endif
-#ifdef CONFIG_USB_BOOTING
+#ifdef CFG_USB_BOOTING
case BOOT_MODE_USB:
/*
* iROM needs program flow prediction to be disabled
diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index e8236a9ec418..b91e2614e8d5 100644
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -58,7 +58,7 @@
/* USB */

/* USB boot mode */
-#define CONFIG_USB_BOOTING
+#define CFG_USB_BOOTING
#define EXYNOS_COPY_USB_FNPTR_ADDR 0x02020070
#define EXYNOS_USB_SECONDARY_BOOT 0xfeed0002
#define EXYNOS_IRAM_SECONDARY_BASE 0x02020018
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2c7beda9248d..16d64d1cd3c3 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -241,7 +241,7 @@ CFG_UEC_ETH
CFG_USART_BASE
CFG_USART_ID
CFG_USBD_HS
-CONFIG_USB_BOOTING
+CFG_USB_BOOTING
CONFIG_USB_EXT2_BOOT
CONFIG_USB_FAT_BOOT
CONFIG_USB_ISP1301_I2C_ADDR
--
2.25.1