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 835eca7726dd70848aa2fa4d5daf18a85b2fd83b..f0248e646462445f33daa185e42dfc0a6ce3dca6 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 44518cdf6412c9f3185268f27ed256366def9e8a..cb79d6362fcbcd0c269ca997484d9dca22b85ff6 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 16ce89233fbb3a9a84e2c1422ded1614292221ec..a1d23b64630dbe6b94fe85f22e9abaef90d82d1d 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 e7a0294644cca6d9ceef659f762947a6d498a3e6..b5992366cf42c3e0972657da72808197b94f5497 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 2490ba3212a844a2f5c8905ce7b28dd21ffed6ca..c57b598d70de73741889da5ee5fe704089c8fcb9 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 546c4fcdb95c12d78c83befcffb749b008a08ecd..09168a28e7d549f7749e38c06461c3a762055dec 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 b4383d4bbdb704f363cb2d2174c1d52670921c44..b36c8dccf172f35f9c179a61fd73311175e3a938 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 b9c05943ec243343bf08588997ef03debd887f00..35363ccda1aa60965e60e43719d50fccc1d0c220 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 15ac1f565e4bf589fd2d53571394b05f9ea7a3c6..91223789b83974403f69faffd530a9ffd4cf2f28 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 61c6d4567649555cb89b760b39b74afec6997410..26db8ffe7e28b1e0bdc3cd4a2e0db498b5dc4ebb 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 f9279e4ab461ad7075b2139df8f9351d30c0d771..fb2011aa559243668b8bfade9b2b19b8b3074d4e 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 693a2f64b6cc81bd5be65fb857ba86eb95871212..c69003018bfcb377b86a10d20a12a090523f5b58 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 de269f4c7ed2c367bcb60537eef1df248d9e33ad..52a48bd4b891c5a47cb9de79ea5b27a7a6284d78 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 d56901481958b4d4b0376ef42870c9b24f595a43..aaba8fc26d9cd30f34db846290f619b57e838e1b 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"               \