[PoC 003/241] global: Migrate CONFIG_DFU_ALT to CFG

Tom Rini
2022-11-20T13:34:40Z

board/samsung/common/exynos5-dt.c | 4 ++--
board/samsung/odroid/odroid.c | 4 ++--
include/configs/odroid.h | 8 ++++----
include/configs/odroid_xu3.h | 8 ++++----
include/configs/s5p_goni.h | 4 ++--
include/configs/trats.h | 4 ++--
include/configs/trats2.h | 4 ++--
scripts/config_whitelist.txt | 8 ++++----
8 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c
index 0d77a57f8082..cde77d79a0f6 100644
--- a/board/samsung/common/exynos5-dt.c
+++ b/board/samsung/common/exynos5-dt.c
@@ -179,9 +179,9 @@ char *get_dfu_alt_boot(char *interface, char *devstr)
return NULL;

if (IS_SD(mmc))
- alt_boot = CONFIG_DFU_ALT_BOOT_SD;
+ alt_boot = CFG_DFU_ALT_BOOT_SD;
else
- alt_boot = CONFIG_DFU_ALT_BOOT_EMMC;
+ alt_boot = CFG_DFU_ALT_BOOT_EMMC;

return alt_boot;
}
diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c
index 35e4cee74f44..39a60e4ad295 100644
--- a/board/samsung/odroid/odroid.c
+++ b/board/samsung/odroid/odroid.c
@@ -94,8 +94,8 @@ char *get_dfu_alt_boot(char *interface, char *devstr)
if (mmc_init(mmc))
return NULL;

- alt_boot = IS_SD(mmc) ? CONFIG_DFU_ALT_BOOT_SD :
- CONFIG_DFU_ALT_BOOT_EMMC;
+ alt_boot = IS_SD(mmc) ? CFG_DFU_ALT_BOOT_SD :
+ CFG_DFU_ALT_BOOT_EMMC;

return alt_boot;
}
diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index f252b349437c..e2331e45cdfe 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -27,7 +27,7 @@
#define PARTS_BOOT "boot"
#define PARTS_ROOT "platform"

-#define CONFIG_DFU_ALT \
+#define CFG_DFU_ALT \
"uImage fat 0 1;" \
"zImage fat 0 1;" \
"Image.itb fat 0 1;" \
@@ -39,13 +39,13 @@

#define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K)

-#define CONFIG_DFU_ALT_BOOT_EMMC \
+#define CFG_DFU_ALT_BOOT_EMMC \
"u-boot raw 0x3e 0x800 mmcpart 1;" \
"bl1 raw 0x0 0x1e mmcpart 1;" \
"bl2 raw 0x1e 0x1d mmcpart 1;" \
"tzsw raw 0x83e 0x138 mmcpart 1\0"

-#define CONFIG_DFU_ALT_BOOT_SD \
+#define CFG_DFU_ALT_BOOT_SD \
"u-boot raw 0x3f 0x800;" \
"bl1 raw 0x1 0x1e;" \
"bl2 raw 0x1f 0x1d;" \
@@ -132,7 +132,7 @@
"mmcbootpart=1\0" \
"mmcrootdev=0\0" \
"mmcrootpart=2\0" \
- "dfu_alt_system="CONFIG_DFU_ALT \
+ "dfu_alt_system="CFG_DFU_ALT \
"dfu_alt_info=Please reset the board\0" \
"consoleon=set console console=ttySAC1,115200n8; save; reset\0" \
"consoleoff=set console console=ram; save; reset\0" \
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index 5bbe7aadcb25..7a81585494a9 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -28,7 +28,7 @@
#define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5

-#define CONFIG_DFU_ALT_SYSTEM \
+#define CFG_DFU_ALT_SYSTEM \
"uImage fat 0 1;" \
"zImage fat 0 1;" \
"Image.itb fat 0 1;" \
@@ -42,14 +42,14 @@
"boot part 0 1;" \
"root part 0 2\0"

-#define CONFIG_DFU_ALT_BOOT_EMMC \
+#define CFG_DFU_ALT_BOOT_EMMC \
"u-boot raw 0x3e 0x800 mmcpart 1;" \
"bl1 raw 0x0 0x1e mmcpart 1;" \
"bl2 raw 0x1e 0x1d mmcpart 1;" \
"tzsw raw 0x83e 0x200 mmcpart 1;" \
"params.bin raw 0x1880 0x20\0"

-#define CONFIG_DFU_ALT_BOOT_SD \
+#define CFG_DFU_ALT_BOOT_SD \
"u-boot raw 0x3f 0x800;" \
"bl1 raw 0x1 0x1e;" \
"bl2 raw 0x1f 0x1d;" \
@@ -83,7 +83,7 @@
"mmcrootdev=0\0" \
"mmcbootpart=1\0" \
"mmcrootpart=2\0" \
- "dfu_alt_system="CONFIG_DFU_ALT_SYSTEM \
+ "dfu_alt_system="CFG_DFU_ALT_SYSTEM \
"dfu_alt_info=Autoset by THOR/DFU command run.\0"

#endif /* __CONFIG_H */
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index fdade1ee66fa..b7a91af008c7 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -42,7 +42,7 @@
#define PARTS_CSC "csc"
#define PARTS_UMS "ums"

-#define CONFIG_DFU_ALT \
+#define CFG_DFU_ALT \
"u-boot raw 0x80 0x400;" \
"uImage ext4 0 2;" \
"exynos3-goni.dtb ext4 0 2;" \
@@ -109,7 +109,7 @@
"ubiblock=8\0" \
"ubi=enabled\0" \
"opts=always_resume=1\0" \
- "dfu_alt_info=" CONFIG_DFU_ALT "\0"
+ "dfu_alt_info=" CFG_DFU_ALT "\0"

/* Goni has 3 banks of DRAM, but swap the bank */
#define PHYS_SDRAM_1 CFG_SYS_SDRAM_BASE /* OneDRAM Bank #0 */
diff --git a/include/configs/trats.h b/include/configs/trats.h
index ec18842bbe8c..3eac66539dfe 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -39,7 +39,7 @@
"name="PARTS_DATA",size=3000MiB,uuid=${uuid_gpt_"PARTS_DATA"};" \
"name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \

-#define CONFIG_DFU_ALT \
+#define CFG_DFU_ALT \
"u-boot raw 0x80 0x400;" \
"/uImage ext4 0 2;" \
"/modem.bin ext4 0 2;" \
@@ -98,7 +98,7 @@
"mmcrootpart=5\0" \
"opts=always_resume=1\0" \
"partitions=" PARTS_DEFAULT \
- "dfu_alt_info=" CONFIG_DFU_ALT \
+ "dfu_alt_info=" CFG_DFU_ALT \
"spladdr=0x40000100\0" \
"splsize=0x200\0" \
"splfile=falcon.bin\0" \
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 0aa331e39359..125d3e776a3f 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -40,7 +40,7 @@
"name="PARTS_DATA",size=3000MiB,uuid=${uuid_gpt_"PARTS_DATA"};" \
"name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \

-#define CONFIG_DFU_ALT \
+#define CFG_DFU_ALT \
"u-boot raw 0x80 0x800;" \
"/uImage ext4 0 2;" \
"/modem.bin ext4 0 2;" \
@@ -86,7 +86,7 @@
"mmcrootpart=5\0" \
"opts=always_resume=1\0" \
"partitions=" PARTS_DEFAULT \
- "dfu_alt_info=" CONFIG_DFU_ALT \
+ "dfu_alt_info=" CFG_DFU_ALT \
"uartpath=ap\0" \
"usbpath=ap\0" \
"consoleon=set console console=ttySAC2,115200n8; save; reset\0" \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 14863642e4d3..880e963e1d0f 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1,9 +1,9 @@
CFG_ARM_GIC_BASE_ADDRESS
CFG_BOARDDIR
-CONFIG_DFU_ALT
-CONFIG_DFU_ALT_BOOT_EMMC
-CONFIG_DFU_ALT_BOOT_SD
-CONFIG_DFU_ALT_SYSTEM
+CFG_DFU_ALT
+CFG_DFU_ALT_BOOT_EMMC
+CFG_DFU_ALT_BOOT_SD
+CFG_DFU_ALT_SYSTEM
CONFIG_DFU_ENV_SETTINGS
CONFIG_DM9000_BASE
CONFIG_DM9000_BYTE_SWAPPED
--
2.25.1