[PATCH 013/149] global: Migrate CONFIG_DFU_ALT et al to CFG

Tom Rini
2022-12-04T15:08:42Z

Perform simple renames of:
CONFIG_DFU_ALT to CFG_DFU_ALT
CONFIG_DFU_ALT_BOOT_EMMC to CFG_DFU_ALT_BOOT_EMMC
CONFIG_DFU_ALT_BOOT_SD to CFG_DFU_ALT_BOOT_SD
CONFIG_DFU_ALT_SYSTEM to CFG_DFU_ALT_SYSTEM
CONFIG_DFU_ENV_SETTINGS to CFG_DFU_ENV_SETTINGS

Signed-off-by: Tom Rini <trini@konsulko.com>
---
board/samsung/common/exynos5-dt.c | 4 ++--
board/samsung/odroid/odroid.c | 4 ++--
include/configs/mx7dsabresd.h | 4 ++--
include/configs/odroid.h | 8 ++++----
include/configs/odroid_xu3.h | 8 ++++----
include/configs/pico-imx6.h | 4 ++--
include/configs/pico-imx6ul.h | 4 ++--
include/configs/pico-imx7d.h | 4 ++--
include/configs/s5p_goni.h | 4 ++--
include/configs/trats.h | 4 ++--
include/configs/trats2.h | 4 ++--
include/configs/warp7.h | 4 ++--
12 files changed, 28 insertions(+), 28 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/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index bd70b62bd209..e56b6101af43 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -44,7 +44,7 @@
"initrd_high=0xffffffff\0" \
"bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \

-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
"dfu_alt_info=image raw 0 0x800000;"\
"u-boot raw 0 0x4000;"\
"bootimg part 0 1;"\
@@ -53,7 +53,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
UPDATE_M4_ENV \
CONFIG_MFG_ENV_SETTINGS \
- CONFIG_DFU_ENV_SETTINGS \
+ CFG_DFU_ENV_SETTINGS \
"script=boot.scr\0" \
"image=zImage\0" \
"console=ttymxc0\0" \
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 bf63a4de0765..e4a81499a726 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -20,7 +20,7 @@
#define DFU_DEFAULT_POLL_TIMEOUT 300
#define DFU_MANIFEST_POLL_TIMEOUT 25000

-#define CONFIG_DFU_ALT_SYSTEM \
+#define CFG_DFU_ALT_SYSTEM \
"uImage fat 0 1;" \
"zImage fat 0 1;" \
"Image.itb fat 0 1;" \
@@ -34,14 +34,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;" \
@@ -75,7 +75,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/pico-imx6.h b/include/configs/pico-imx6.h
index 6d7873daa0ad..719b70144051 100644
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -21,7 +21,7 @@

#define DFU_DEFAULT_POLL_TIMEOUT 300

-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
"dfu_alt_info=" \
"spl raw 0x2 0x400;" \
"u-boot raw 0x8a 0x1000;" \
@@ -47,7 +47,7 @@
"fdt_addr_r=0x18000000\0" \
"fdt_addr=0x18000000\0" \
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
- CONFIG_DFU_ENV_SETTINGS \
+ CFG_DFU_ENV_SETTINGS \
"finduuid=part uuid mmc 0:1 uuid\0" \
"findfdt="\
"if test $baseboard = hobbit && test $board_rev = MX6Q ; then " \
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index faf11d5a72ad..36f648f63400 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -28,7 +28,7 @@

#define DFU_DEFAULT_POLL_TIMEOUT 300

-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
"dfu_alt_info=" \
"spl raw 0x2 0x400;" \
"u-boot raw 0x8a 0x400;" \
@@ -63,7 +63,7 @@
"ramdiskaddr=0x83000000\0" \
"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"mmcautodetect=yes\0" \
- CONFIG_DFU_ENV_SETTINGS \
+ CFG_DFU_ENV_SETTINGS \
"findfdt=" \
"if test $fdtfile = ask ; then " \
"bootmenu -1; fi;" \
diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 83907b06ebb4..581921510426 100644
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -15,7 +15,7 @@
/* MMC Config */
#define CFG_SYS_FSL_ESDHC_ADDR 0

-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
"dfu_alt_info=" \
"spl raw 0x2 0x400;" \
"u-boot raw 0x8a 0x1000;" \
@@ -67,7 +67,7 @@
"ramdisk_addr_r=0x83000000\0" \
"ramdiskaddr=0x83000000\0" \
"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
- CONFIG_DFU_ENV_SETTINGS \
+ CFG_DFU_ENV_SETTINGS \
"findfdt=" \
"if test $fdtfile = ask ; then " \
"bootmenu -1; fi;" \
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index da83db1f68ab..555bedb93d65 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -35,7 +35,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;" \
@@ -102,7 +102,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 4d39b4005bd6..18fca09a3807 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/include/configs/warp7.h b/include/configs/warp7.h
index a985c6f28f30..188180da54eb 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -16,7 +16,7 @@
/* MMC Config*/
#define CFG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR

-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
"dfu_alt_info=boot raw 0x2 0x1000 mmcpart 1\0" \

/* When booting with FIT specify the node entry containing boot.scr */
@@ -27,7 +27,7 @@
#endif

#define CONFIG_EXTRA_ENV_SETTINGS \
- CONFIG_DFU_ENV_SETTINGS \
+ CFG_DFU_ENV_SETTINGS \
"script=boot.scr\0" \
"bootscr_fitimage_name=bootscr\0" \
"script_signed=boot.scr.imx-signed\0" \
--
2.25.1