diff options
| author | Tom Rini <trini@konsulko.com> | 2021-12-12 22:12:33 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-12-27 16:20:18 -0500 |
| commit | 6880b330a9f96403985bf70962934f9a7a2a1397 (patch) | |
| tree | 4b0863bc2c896036bf0e381e61c6e6193cbd2e8c | |
| parent | 7856cd5a6dd66c2085d7162b4e9f89f0750834db (diff) | |
| download | u-boot-6880b330a9f96403985bf70962934f9a7a2a1397.zip u-boot-6880b330a9f96403985bf70962934f9a7a2a1397.tar.gz u-boot-6880b330a9f96403985bf70962934f9a7a2a1397.tar.bz2 | |
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>
| -rw-r--r-- | board/warp7/Kconfig | 6 | ||||
| -rw-r--r-- | include/configs/pic32mzdask.h | 7 | ||||
| -rw-r--r-- | include/configs/warp7.h | 2 |
3 files changed, 3 insertions, 12 deletions
diff --git a/board/warp7/Kconfig b/board/warp7/Kconfig index e5051cd..05b4420 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 cc2e6a7..3624c12 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 da7c753..83ee178 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" \ |