configs: Layerscape: Remove the 'fdt_addr' env

On Layerscape platforms, the DTB is loaded from boot filesystem,
per the fdt_addr description in doc/README.distro, it must be
removed.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
[Rebased]
Signed-off-by: Priyanka Jain <priyanka.jain@nxp.com>

diff --git a/include/configs/ls1012a2g5rdb.h b/include/configs/ls1012a2g5rdb.h
index 835eca7..f0248e6 100644 (file)
--- a/include/configs/ls1012a2g5rdb.h
+++ b/include/configs/ls1012a2g5rdb.h
@@ -19,7 +19,6 @@
 #define CONFIG_EXTRA_ENV_SETTINGS              \
        "verify=no\0"                           \
        "initrd_high=0xffffffffffffffff\0"      \
-       "fdt_addr=0x00f00000\0"                 \
        "kernel_addr=0x01000000\0"              \
        "kernelheader_addr=0x800000\0"          \
        "scriptaddr=0x80000000\0"               \

diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h
index 44518cd..cb79d63 100644 (file)
--- a/include/configs/ls1012afrdm.h
+++ b/include/configs/ls1012afrdm.h
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright 2016 Freescale Semiconductor, Inc.
+ * Copyright 2021 NXP
  */
 
 #ifndef __LS1012ARDB_H__
@@ -21,7 +22,6 @@
 #define CONFIG_EXTRA_ENV_SETTINGS              \
        "verify=no\0"                           \
        "fdt_high=0xffffffffffffffff\0"         \
-       "fdt_addr=0x00f00000\0"                 \
        "kernel_addr=0x01000000\0"              \
        "scriptaddr=0x80000000\0"               \
        "fdtheader_addr_r=0x80100000\0"         \

diff --git a/include/configs/ls1012afrwy.h b/include/configs/ls1012afrwy.h
index 16ce892..a1d23b6 100644 (file)
--- a/include/configs/ls1012afrwy.h
+++ b/include/configs/ls1012afrwy.h
@@ -35,7 +35,6 @@
 #define CONFIG_EXTRA_ENV_SETTINGS              \
        "verify=no\0"                           \
        "initrd_high=0xffffffffffffffff\0"      \
-       "fdt_addr=0x00f00000\0"                 \
        "kernel_addr=0x01000000\0"              \
        "kernel_size_sd=0x16000\0"              \
        "kernelhdr_size_sd=0x10\0"              \

diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h
index e7a0294..b599236 100644 (file)
--- a/include/configs/ls1012aqds.h
+++ b/include/configs/ls1012aqds.h
@@ -89,7 +89,6 @@
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS              \
        "verify=no\0"                           \
-       "fdt_addr=0x00f00000\0"                 \
        "kernel_addr=0x01000000\0"              \
        "kernelheader_addr=0x600000\0"          \
        "scriptaddr=0x80000000\0"               \

diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h
index 2490ba3..c57b598 100644 (file)
--- a/include/configs/ls1012ardb.h
+++ b/include/configs/ls1012ardb.h
@@ -44,7 +44,6 @@
 #define CONFIG_EXTRA_ENV_SETTINGS              \
        "verify=no\0"                           \
        "initrd_high=0xffffffffffffffff\0"      \
-       "fdt_addr=0x00f00000\0"                 \
        "kernel_addr=0x01000000\0"              \
        "kernelheader_addr=0x600000\0"          \
        "scriptaddr=0x80000000\0"               \

diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h
index 546c4fc..09168a2 100644 (file)
--- a/include/configs/ls1021atsn.h
+++ b/include/configs/ls1021atsn.h
@@ -114,7 +114,6 @@
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "bootargs=root=/dev/ram0 rw console=ttyS0,115200\0"             \
        "initrd_high=0xffffffff\0"                                      \
-       "fdt_addr=0x64f00000\0"                                         \
        "kernel_addr=0x61000000\0"                                      \
        "kernelheader_addr=0x60800000\0"                                \
        "scriptaddr=0x80000000\0"                                       \

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index b4383d4..b36c8dc 100644 (file)
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright 2014 Freescale Semiconductor, Inc.
- * Copyright 2019 NXP
+ * Copyright 2019, 2021 NXP
  */
 
 #ifndef __CONFIG_H
@@ -209,7 +209,6 @@
        "bootargs=root=/dev/ram0 rw console=ttyLP0,115200 "     \
                "cma=64M@0x0-0xb0000000\0" \
        "initrd_high=0xffffffff\0"      \
-       "fdt_addr=0x64f00000\0"         \
        "kernel_addr=0x65000000\0"      \
        "scriptaddr=0x80000000\0"       \
        "scripthdraddr=0x80080000\0"    \
@@ -266,7 +265,6 @@
        "bootargs=root=/dev/ram0 rw console=ttyS0,115200 "      \
                "cma=64M@0x0-0xb0000000\0" \
        "initrd_high=0xffffffff\0"      \
-       "fdt_addr=0x64f00000\0"         \
        "kernel_addr=0x61000000\0"      \
        "kernelheader_addr=0x60800000\0"        \
        "scriptaddr=0x80000000\0"       \

diff --git a/include/configs/ls1028aqds.h b/include/configs/ls1028aqds.h
index b9c0594..35363cc 100644 (file)
--- a/include/configs/ls1028aqds.h
+++ b/include/configs/ls1028aqds.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright 2019-2020 NXP
+ * Copyright 2019-2021 NXP
  */
 
 #ifndef __LS1028A_QDS_H
@@ -68,7 +68,6 @@
        "hwconfig=fsl_ddr:bank_intlv=auto\0" \
        "ramdisk_addr=0x800000\0" \
        "ramdisk_size=0x2000000\0" \
-       "fdt_addr=0x00f00000\0" \
        "kernel_addr=0x01000000\0" \
        "scriptaddr=0x80000000\0" \
        "scripthdraddr=0x80080000\0" \

diff --git a/include/configs/ls1028ardb.h b/include/configs/ls1028ardb.h
index 15ac1f5..9122378 100644 (file)
--- a/include/configs/ls1028ardb.h
+++ b/include/configs/ls1028ardb.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright 2019 NXP
+ * Copyright 2019, 2021 NXP
  */
 
 #ifndef __LS1028A_RDB_H
@@ -64,7 +64,6 @@
        "ramdisk_addr=0x800000\0"               \
        "ramdisk_size=0x2000000\0"              \
        "bootm_size=0x10000000\0"               \
-       "fdt_addr=0x00f00000\0"                 \
        "kernel_addr=0x01000000\0"              \
        "scriptaddr=0x80000000\0"               \
        "scripthdraddr=0x80080000\0"            \

diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 61c6d45..26db8ff 100644 (file)
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -173,7 +173,6 @@
        "hwconfig=fsl_ddr:bank_intlv=auto\0"    \
        "fdt_high=0xffffffffffffffff\0"         \
        "initrd_high=0xffffffffffffffff\0"      \
-       "fdt_addr=0x64f00000\0"                 \
        "kernel_addr=0x61000000\0"              \
        "scriptaddr=0x80000000\0"               \
        "scripthdraddr=0x80080000\0"            \

diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index f9279e4..fb2011a 100644 (file)
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -165,7 +165,6 @@
        "ramdisk_addr=0x800000\0"               \
        "ramdisk_size=0x2000000\0"              \
        "bootm_size=0x10000000\0"               \
-       "fdt_addr=0x64f00000\0"                 \
        "kernel_addr=0x61000000\0"              \
        "scriptaddr=0x80000000\0"               \
        "scripthdraddr=0x80080000\0"            \

diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index 693a2f6..c690030 100644 (file)
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -271,7 +271,6 @@
        "ramdisk_size=0x2000000\0"              \
        "fdt_high=0xa0000000\0"                 \
        "initrd_high=0xffffffffffffffff\0"      \
-       "fdt_addr=0x64f00000\0"                 \
        "kernel_addr=0x1000000\0"               \
        "kernel_addr_sd=0x8000\0"               \
        "kernelhdr_addr_sd=0x3000\0"            \
@@ -340,7 +339,6 @@
        "ramdisk_size=0x2000000\0"              \
        "fdt_high=0xa0000000\0"                 \
        "initrd_high=0xffffffffffffffff\0"      \
-       "fdt_addr=0x64f00000\0"                 \
        "kernel_addr=0x1000000\0"               \
        "kernel_addr_sd=0x8000\0"               \
        "kernelhdr_addr_sd=0x3000\0"            \

diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index de269f4..52a48bd 100644 (file)
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -323,7 +323,6 @@
        "ramdisk_size=0x2000000\0"              \
        "fdt_high=0xa0000000\0"                 \
        "initrd_high=0xffffffffffffffff\0"      \
-       "fdt_addr=0x64f00000\0"                 \
        "kernel_addr=0x581000000\0"             \
        "kernel_start=0x1000000\0"              \
        "kernelheader_start=0x800000\0"         \
@@ -386,7 +385,6 @@
        "ramdisk_size=0x2000000\0"              \
        "fdt_high=0xa0000000\0"                 \
        "initrd_high=0xffffffffffffffff\0"      \
-       "fdt_addr=0x64f00000\0"                 \
        "kernel_addr=0x581000000\0"             \
        "kernel_start=0x1000000\0"              \
        "kernelheader_start=0x600000\0"         \

diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index d569014..aaba8fc 100644 (file)
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -164,7 +164,6 @@
        "ramdisk_size=0x2000000\0"              \
        "fdt_high=0xa0000000\0"                 \
        "initrd_high=0xffffffffffffffff\0"      \
-       "fdt_addr=0x64f00000\0"                 \
        "kernel_start=0x1000000\0"              \
        "kernelheader_start=0x600000\0"         \
        "scriptaddr=0x80000000\0"               \