[PoC 197/241] global: Migrate CONFIG_STANDALONE_LOAD_ADDR to CFG

Tom Rini
2022-11-20T14:22:28Z

README | 2 +-
arch/arc/config.mk | 2 +-
arch/arm/config.mk | 6 +++---
arch/arm/include/asm/arch-fsl-layerscape/config.h | 2 +-
arch/m68k/config.mk | 2 +-
arch/microblaze/config.mk | 2 +-
arch/mips/config.mk | 4 ++--
arch/nios2/config.mk | 2 +-
arch/powerpc/config.mk | 2 +-
arch/riscv/config.mk | 2 +-
arch/sh/config.mk | 2 +-
arch/x86/config.mk | 2 +-
config.mk | 2 +-
examples/standalone/Makefile | 2 +-
include/configs/display5.h | 2 +-
include/configs/microchip_mpfs_icicle.h | 2 +-
include/configs/opos6uldev.h | 2 +-
include/configs/qemu-riscv.h | 2 +-
include/configs/sifive-unleashed.h | 2 +-
include/configs/sifive-unmatched.h | 2 +-
include/configs/sunxi-common.h | 2 +-
include/configs/xtfpga.h | 6 +++---
scripts/config_whitelist.txt | 2 +-
tools/patman/test_checkpatch.py | 2 +-
24 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/README b/README
index 3eb882c6a248..57ca5733dd64 100644
--- a/README
+++ b/README
@@ -1224,7 +1224,7 @@ The following options need to be configured:
this is instead controlled by the value of
/config/load-environment.

- CONFIG_STANDALONE_LOAD_ADDR
+ CFG_STANDALONE_LOAD_ADDR

This option defines a board specific value for the
address where standalone program gets loaded, thus
diff --git a/arch/arc/config.mk b/arch/arc/config.mk
index 2b70945ac342..05e0eb7c9e4b 100644
--- a/arch/arc/config.mk
+++ b/arch/arc/config.mk
@@ -23,4 +23,4 @@ PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections -fno-common
LDFLAGS_FINAL += -pie --gc-sections

# Load address for standalone apps
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x82000000
+CFG_STANDALONE_LOAD_ADDR ?= 0x82000000
diff --git a/arch/arm/config.mk b/arch/arm/config.mk
index 2065438d0530..9f9d5964dccd 100644
--- a/arch/arm/config.mk
+++ b/arch/arm/config.mk
@@ -3,11 +3,11 @@
# (C) Copyright 2000-2002
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.

-ifndef CONFIG_STANDALONE_LOAD_ADDR
+ifndef CFG_STANDALONE_LOAD_ADDR
ifneq ($(CONFIG_ARCH_OMAP2PLUS),)
-CONFIG_STANDALONE_LOAD_ADDR = 0x80300000
+CFG_STANDALONE_LOAD_ADDR = 0x80300000
else
-CONFIG_STANDALONE_LOAD_ADDR = 0xc100000
+CFG_STANDALONE_LOAD_ADDR = 0xc100000
endif
endif

diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h b/arch/arm/include/asm/arch-fsl-layerscape/config.h
index b82aac9126d0..c3af74f1d83f 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/config.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h
@@ -14,7 +14,7 @@
#include <linux/bitops.h>
#endif

-#define CONFIG_STANDALONE_LOAD_ADDR 0x80300000
+#define CFG_STANDALONE_LOAD_ADDR 0x80300000

/*
* Reserve secure memory
diff --git a/arch/m68k/config.mk b/arch/m68k/config.mk
index ed592334af2e..9b54b0b8f9ff 100644
--- a/arch/m68k/config.mk
+++ b/arch/m68k/config.mk
@@ -3,7 +3,7 @@
# (C) Copyright 2000-2002
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.

-CONFIG_STANDALONE_LOAD_ADDR ?= 0x20000
+CFG_STANDALONE_LOAD_ADDR ?= 0x20000

PLATFORM_CPPFLAGS += -D__M68K__
KBUILD_LDFLAGS += -n
diff --git a/arch/microblaze/config.mk b/arch/microblaze/config.mk
index d35b4f6db7a1..83e51fee649f 100644
--- a/arch/microblaze/config.mk
+++ b/arch/microblaze/config.mk
@@ -6,7 +6,7 @@
# (C) Copyright 2004 Atmark Techno, Inc.
# Yasushi SHOJI <yashi@atmark-techno.com>

-CONFIG_STANDALONE_LOAD_ADDR ?= 0x80F00000
+CFG_STANDALONE_LOAD_ADDR ?= 0x80F00000

PLATFORM_CPPFLAGS += -ffixed-r31 -D__microblaze__
PLATFORM_CPPFLAGS += -fdata-sections -ffunction-sections
diff --git a/arch/mips/config.mk b/arch/mips/config.mk
index 04f362780580..5434507a958b 100644
--- a/arch/mips/config.mk
+++ b/arch/mips/config.mk
@@ -25,14 +25,14 @@ ifdef CONFIG_32BIT
PLATFORM_CPPFLAGS += -mabi=32
KBUILD_LDFLAGS += -m $(32bit-emul)
OBJCOPYFLAGS += -O $(32bit-bfd)
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x80200000
+CFG_STANDALONE_LOAD_ADDR ?= 0x80200000
endif

ifdef CONFIG_64BIT
PLATFORM_CPPFLAGS += -mabi=64
KBUILD_LDFLAGS += -m$(64bit-emul)
OBJCOPYFLAGS += -O $(64bit-bfd)
-CONFIG_STANDALONE_LOAD_ADDR ?= 0xffffffff80200000
+CFG_STANDALONE_LOAD_ADDR ?= 0xffffffff80200000
endif

PLATFORM_CPPFLAGS += -D__MIPS__
diff --git a/arch/nios2/config.mk b/arch/nios2/config.mk
index 44260b1431cb..ddf73e3ac2a3 100644
--- a/arch/nios2/config.mk
+++ b/arch/nios2/config.mk
@@ -4,7 +4,7 @@
# Psyent Corporation <www.psyent.com>
# Scott McNutt <smcnutt@psyent.com>

-CONFIG_STANDALONE_LOAD_ADDR ?= 0x02000000
+CFG_STANDALONE_LOAD_ADDR ?= 0x02000000

PLATFORM_CPPFLAGS += -D__NIOS2__
PLATFORM_CPPFLAGS += -G0
diff --git a/arch/powerpc/config.mk b/arch/powerpc/config.mk
index 307ca65745c8..5c3e71984ca9 100644
--- a/arch/powerpc/config.mk
+++ b/arch/powerpc/config.mk
@@ -3,7 +3,7 @@
# (C) Copyright 2000-2010
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.

-CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000
+CFG_STANDALONE_LOAD_ADDR ?= 0x40000
LDFLAGS_FINAL += --gc-sections
LDFLAGS_FINAL += --bss-plt
PLATFORM_RELFLAGS += -fpic -mrelocatable -ffunction-sections \
diff --git a/arch/riscv/config.mk b/arch/riscv/config.mk
index 1ebce5bd6748..3e81e34d41c2 100644
--- a/arch/riscv/config.mk
+++ b/arch/riscv/config.mk
@@ -23,7 +23,7 @@ KBUILD_LDFLAGS += -m $(64bit-emul)
EFI_LDS := elf_riscv64_efi.lds
endif

-CONFIG_STANDALONE_LOAD_ADDR ?= 0x00000000
+CFG_STANDALONE_LOAD_ADDR ?= 0x00000000

PLATFORM_CPPFLAGS += -ffixed-gp -fpic
PLATFORM_RELFLAGS += -fno-common -gdwarf-2 -ffunction-sections \
diff --git a/arch/sh/config.mk b/arch/sh/config.mk
index 78bb2660e1e3..14a81613d05b 100644
--- a/arch/sh/config.mk
+++ b/arch/sh/config.mk
@@ -3,7 +3,7 @@
# (C) Copyright 2000-2002
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.

-CONFIG_STANDALONE_LOAD_ADDR ?= 0x8C000000
+CFG_STANDALONE_LOAD_ADDR ?= 0x8C000000
ifeq ($(CPU),sh2)
LDFLAGS_STANDALONE += -EB
endif
diff --git a/arch/x86/config.mk b/arch/x86/config.mk
index 889497b6bd75..b808d560c444 100644
--- a/arch/x86/config.mk
+++ b/arch/x86/config.mk
@@ -3,7 +3,7 @@
# (C) Copyright 2000-2002
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.

-CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000
+CFG_STANDALONE_LOAD_ADDR ?= 0x40000

PLATFORM_CPPFLAGS += -fomit-frame-pointer
PF_CPPFLAGS_X86 := $(call cc-option, -fno-toplevel-reorder, \
diff --git a/config.mk b/config.mk
index b915c29b3f3e..db1c4aa74889 100644
--- a/config.mk
+++ b/config.mk
@@ -76,4 +76,4 @@ export PLATFORM_CPPFLAGS
export RELFLAGS
export LDFLAGS_FINAL
export LDFLAGS_STANDALONE
-export CONFIG_STANDALONE_LOAD_ADDR
+export CFG_STANDALONE_LOAD_ADDR
diff --git a/examples/standalone/Makefile b/examples/standalone/Makefile
index 5b48a9d43c62..4f6693f5348d 100644
--- a/examples/standalone/Makefile
+++ b/examples/standalone/Makefile
@@ -42,7 +42,7 @@ endif
# source file.
ccflags-y += $(call cc-option,-fno-toplevel-reorder)

-LDFLAGS_STANDALONE += -Ttext $(CONFIG_STANDALONE_LOAD_ADDR)
+LDFLAGS_STANDALONE += -Ttext $(CFG_STANDALONE_LOAD_ADDR)

#########################################################################

diff --git a/include/configs/display5.h b/include/configs/display5.h
index 6900baa84545..3d63e3528127 100644
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -279,7 +279,7 @@

/* Miscellaneous configurable options */

-#define CONFIG_STANDALONE_LOAD_ADDR 0x10001000
+#define CFG_STANDALONE_LOAD_ADDR 0x10001000

/* Physical Memory Map */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/microchip_mpfs_icicle.h b/include/configs/microchip_mpfs_icicle.h
index 0350f7a62da7..ead07ca2dd6a 100644
--- a/include/configs/microchip_mpfs_icicle.h
+++ b/include/configs/microchip_mpfs_icicle.h
@@ -11,7 +11,7 @@

#define CFG_SYS_SDRAM_BASE 0x80000000

-#define CONFIG_STANDALONE_LOAD_ADDR 0x80200000
+#define CFG_STANDALONE_LOAD_ADDR 0x80200000

/* Environment options */

diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index 1adfa5b668ae..833b2ffe129a 100644
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -11,7 +11,7 @@
#include "mx6_common.h"

/* Miscellaneous configurable options */
-#define CONFIG_STANDALONE_LOAD_ADDR CONFIG_SYS_LOAD_ADDR
+#define CFG_STANDALONE_LOAD_ADDR CONFIG_SYS_LOAD_ADDR

/* Physical Memory Map */
#define CFG_SYS_SDRAM_BASE MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h
index 11c795787887..8247c434e06d 100644
--- a/include/configs/qemu-riscv.h
+++ b/include/configs/qemu-riscv.h
@@ -10,7 +10,7 @@

#define CFG_SYS_SDRAM_BASE 0x80000000

-#define CONFIG_STANDALONE_LOAD_ADDR 0x80200000
+#define CFG_STANDALONE_LOAD_ADDR 0x80200000

#define RISCV_MMODE_TIMERBASE 0x2000000
#define RISCV_MMODE_TIMER_FREQ 1000000
diff --git a/include/configs/sifive-unleashed.h b/include/configs/sifive-unleashed.h
index 59e40710de48..72c042a9040e 100644
--- a/include/configs/sifive-unleashed.h
+++ b/include/configs/sifive-unleashed.h
@@ -13,7 +13,7 @@

#define CFG_SYS_SDRAM_BASE 0x80000000

-#define CONFIG_STANDALONE_LOAD_ADDR 0x80200000
+#define CFG_STANDALONE_LOAD_ADDR 0x80200000

#define RISCV_MMODE_TIMERBASE 0x2000000
#define RISCV_MMODE_TIMER_FREQ 1000000
diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h
index 3cf300a2e459..80df15d67d3e 100644
--- a/include/configs/sifive-unmatched.h
+++ b/include/configs/sifive-unmatched.h
@@ -13,7 +13,7 @@

#define CFG_SYS_SDRAM_BASE 0x80000000

-#define CONFIG_STANDALONE_LOAD_ADDR 0x80200000
+#define CFG_STANDALONE_LOAD_ADDR 0x80200000

/* Environment options */

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 1be4cde2b70e..dec836a2fecc 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -77,7 +77,7 @@
*/

/* standalone support */
-#define CONFIG_STANDALONE_LOAD_ADDR CONFIG_SYS_LOAD_ADDR
+#define CFG_STANDALONE_LOAD_ADDR CONFIG_SYS_LOAD_ADDR

/* FLASH and environment organization */

diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h
index 105ce7c0c726..714b21afc6b0 100644
--- a/include/configs/xtfpga.h
+++ b/include/configs/xtfpga.h
@@ -61,12 +61,12 @@
*/
#if XCHAL_HAVE_PTP_MMU
#if XCHAL_VECBASE_RESET_VADDR == XCHAL_VECBASE_RESET_PADDR
-#define CONFIG_STANDALONE_LOAD_ADDR 0x00800000
+#define CFG_STANDALONE_LOAD_ADDR 0x00800000
#else
-#define CONFIG_STANDALONE_LOAD_ADDR 0xd0800000
+#define CFG_STANDALONE_LOAD_ADDR 0xd0800000
#endif
#else
-#define CONFIG_STANDALONE_LOAD_ADDR 0x60800000
+#define CFG_STANDALONE_LOAD_ADDR 0x60800000
#endif

#if defined(CFG_MAX_MEM_MAPPED) && \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index f271ba83faca..e5598eb4159d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -206,7 +206,7 @@ CFG_SPI_FLASH_SIZE
CFG_SPI_HALF_DUPLEX
CFG_SPI_N25Q256A_RESET
CFG_STACKBASE
-CONFIG_STANDALONE_LOAD_ADDR
+CFG_STANDALONE_LOAD_ADDR
CONFIG_STD_DEVICES_SETTINGS
CONFIG_TEGRA_BOARD_STRING
CONFIG_TEGRA_ENABLE_UARTA
diff --git a/tools/patman/test_checkpatch.py b/tools/patman/test_checkpatch.py
index 8960cd505f82..a9faf6ab979f 100644
--- a/tools/patman/test_checkpatch.py
+++ b/tools/patman/test_checkpatch.py
@@ -205,7 +205,7 @@ index 6f3748d..f9e4e65 100644
+ You can add calls to bootstage_mark() to set time markers.
+
- Standalone program support:
- CONFIG_STANDALONE_LOAD_ADDR
+ CFG_STANDALONE_LOAD_ADDR

diff --git a/MAINTAINERS b/MAINTAINERS
index b167b028ec..beb7dc634f 100644
--
2.25.1