From: Tom Rini <trini@konsulko.com>
Date: Mon, 13 Dec 2021 03:12:33 +0000 (-0500)
Subject: warp7, pic32mzdask: Remove SYS_FDT_ADDR/SYS_ENV_ADDR from CONFIG namespace
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=6880b330a9f96403985bf70962934f9a7a2a1397;p=u-boot.git

warp7, pic32mzdask: Remove SYS_FDT_ADDR/SYS_ENV_ADDR from CONFIG namespace

In the case of CONFIG_SYS_FDT_ADDR this was being used to modify the
default value of fdt_addr / fdt_addr_r, which is not something to expose
in this manner and is not otherwise done.  The case of SYS_ENV_ADDR is
similar but only done on the pic32mzdask platform, for scriptaddr.

Signed-off-by: Tom Rini <trini@konsulko.com>
---

diff --git a/board/warp7/Kconfig b/board/warp7/Kconfig
index e5051cdda6..05b4420afc 100644
--- a/board/warp7/Kconfig
+++ b/board/warp7/Kconfig
@@ -14,12 +14,6 @@ config WARP7_ROOT_PART
 	  partition that is typically specified with root=/dev/sdaX or
 	  which gets converted into a root=PARTUUID=some_uuid.
 
-config SYS_FDT_ADDR
-	hex "FDT load address"
-	default 0x83000000
-	help
-	  The address the FDT file should be loaded to.
-
 config IMX_CONFIG
 	default "board/warp7/imximage.cfg"
 
diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h
index cc2e6a7ae8..3624c122fc 100644
--- a/include/configs/pic32mzdask.h
+++ b/include/configs/pic32mzdask.h
@@ -33,9 +33,6 @@
 #define CONFIG_SYS_MONITOR_BASE		CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_MONITOR_LEN		(192 << 10)
 
-#define CONFIG_SYS_ENV_ADDR		0x88300000
-#define CONFIG_SYS_FDT_ADDR		0x89d00000
-
 /* Memory Test */
 
 /*----------------------------------------------------------------------
@@ -74,8 +71,8 @@
 
 #define MEM_LAYOUT_ENV_SETTINGS					\
 	"kernel_addr_r="__stringify(CONFIG_SYS_LOAD_ADDR)"\0"	\
-	"fdt_addr_r="__stringify(CONFIG_SYS_FDT_ADDR)"\0"	\
-	"scriptaddr="__stringify(CONFIG_SYS_ENV_ADDR)"\0"
+	"fdt_addr_r=0x89d00000\0"				\
+	"scriptaddr=0x88300000\0"				\
 
 #define CONFIG_LEGACY_BOOTCMD_ENV					\
 	"legacy_bootcmd= "						\
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index da7c753ddd..83ee1784ce 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -39,7 +39,7 @@
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
 	"fdt_file=imx7s-warp.dtb\0" \
-	"fdt_addr=" __stringify(CONFIG_SYS_FDT_ADDR)"\0" \
+	"fdt_addr=0x83000000\0" \
 	"fdtovaddr=0x83100000\0" \
 	"boot_fdt=try\0" \
 	"ip_dyn=yes\0" \