Dropped uboot-layerscape patches which were environemnt patches.
We will make u-boot environment binaries with a txt file for all
devices.
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
+++ /dev/null
-From d1b42455f62baefe7fb782d0d7100715b0fdb41f Mon Sep 17 00:00:00 2001
-From: Yangbo Lu <yangbo.lu@nxp.com>
-Date: Fri, 19 Jan 2018 10:16:57 +0800
-Subject: [PATCH] armv8: ls1043a: add LEDE boot support in environment
-
-Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
----
- include/configs/ls1043a_common.h | 20 +++++++++++++++++++-
- 1 files changed, 19 insertions(+), 1 deletions(-)
-
-diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
-index c437ce5..48ecff5 100644
---- a/include/configs/ls1043a_common.h
-+++ b/include/configs/ls1043a_common.h
-@@ -341,7 +341,19 @@
- "env exists secureboot && mmc read $kernelheader_addr_r " \
- "$kernelhdr_addr_sd $kernelhdr_size_sd " \
- " && esbc_validate ${kernelheader_addr_r};" \
-- " bootm $load_addr#$board\0"
-+ " bootm $load_addr#$board\0" \
-+ "lede_setenv=setenv loadaddr 82000000 && " \
-+ "setenv fdtaddr 8f000000 && " \
-+ "setenv bootargs root=/dev/mtdblock8 " \
-+ "rootfstype=squashfs,jffs2 noinitrd " \
-+ "earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 " \
-+ "mtdparts=60000000.nor:1M(rcw),2M(u-boot),1M(u-boot-env)," \
-+ "5M(reserved-1),256k(fman),5888k(reserved-2),1M(dtb)," \
-+ "16M(kernel),32M(rootfs),64M(otherbank)\0" \
-+ "lede_run=cp.b 60f00000 $fdtaddr 100000 && " \
-+ "cp.b 61000000 $loadaddr 1000000 && " \
-+ "bootm $loadaddr - $fdtaddr\0" \
-+ "lede_boot=run lede_setenv;run lede_run\0"
-
-
- #undef CONFIG_BOOTCOMMAND
-@@ -356,6 +368,12 @@
- "env exists secureboot && esbc_halt;"
- #endif
-
-+#undef CONFIG_BOOTCOMMAND
-+#define CONFIG_BOOTCOMMAND "run lede_boot"
-+
-+#undef CONFIG_BOOTDELAY
-+#define CONFIG_BOOTDELAY 3
-+
- #define CONFIG_BOOTARGS "console=ttyS0,115200 root=/dev/ram0 " \
- "earlycon=uart8250,mmio,0x21c0500 " \
- MTDPARTS_DEFAULT
---
-1.7.1
-
+++ /dev/null
-From a5293c6d5fdacf84fdd4772d0532aa5478df4d3c Mon Sep 17 00:00:00 2001
-From: Yangbo Lu <yangbo.lu@nxp.com>
-Date: Fri, 19 Jan 2018 10:18:47 +0800
-Subject: [PATCH] armv8: ls1046ardb: add LEDE boot support in environment
-
-Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
----
- include/configs/ls1046a_common.h | 15 ++++++++++++++-
- include/configs/ls1046ardb.h | 6 ++++++
- 2 files changed, 20 insertions(+), 1 deletions(-)
-
-diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
-index d163347..d26147b 100644
---- a/include/configs/ls1046a_common.h
-+++ b/include/configs/ls1046a_common.h
-@@ -281,7 +281,20 @@
- "env exists secureboot && mmc read $kernelheader_addr_r " \
- "$kernelhdr_addr_sd $kernelhdr_size_sd " \
- " && esbc_validate ${kernelheader_addr_r};" \
-- " bootm $load_addr#$board\0"
-+ " bootm $load_addr#$board\0" \
-+ "lede_setenv=setenv loadaddr 82000000 && " \
-+ "setenv fdtaddr 8f000000 && " \
-+ "setenv bootargs ubi.mtd=9 root=ubi0:rootfs rw " \
-+ "rootfstype=ubifs noinitrd " \
-+ "earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 " \
-+ "mtdparts=1550000.quadspi:1M(rcw),2M(u-boot),1M(u-boot-env)," \
-+ "5M(reserved-1),256k(fman),5888k(reserved-2),1M(dtb)," \
-+ "16M(kernel),32M(ubifs)\0" \
-+ "lede_run=sf probe 0:0 && " \
-+ "sf read $fdtaddr f00000 100000 && " \
-+ "sf read $loadaddr 1000000 1000000 && " \
-+ "bootm $loadaddr - $fdtaddr\0" \
-+ "lede_boot=run lede_setenv;run lede_run\0"
-
-
- #define CONFIG_BOOTARGS "console=ttyS0,115200 root=/dev/ram0 " \
-diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
-index 4475ac7..15e7858 100644
---- a/include/configs/ls1046ardb.h
-+++ b/include/configs/ls1046ardb.h
-@@ -253,6 +253,12 @@
- "env exists secureboot && esbc_halt;"
- #endif
-
-+#undef CONFIG_BOOTCOMMAND
-+#define CONFIG_BOOTCOMMAND "run lede_boot"
-+
-+#undef CONFIG_BOOTDELAY
-+#define CONFIG_BOOTDELAY 3
-+
- #define MTDPARTS_DEFAULT "mtdparts=1550000.quadspi:1m(rcw)," \
- "15m(u-boot),48m(kernel.itb);" \
- "7e800000.flash:16m(nand_uboot)," \
---
-1.7.1
-
+++ /dev/null
-From 8d6efca7eb2de012b98493206c87f31ee9b9e967 Mon Sep 17 00:00:00 2001
-From: Yangbo Lu <yangbo.lu@nxp.com>
-Date: Thu, 28 Sep 2017 11:25:58 +0800
-Subject: [PATCH 3/3] armv8: ls1012ardb: add LEDE boot support in environment
-
-Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
----
- include/configs/ls1012ardb.h | 21 ++++++++++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h
-index 5fe3218..242cdf0 100644
---- a/include/configs/ls1012ardb.h
-+++ b/include/configs/ls1012ardb.h
-@@ -127,13 +127,32 @@
- "$kernel_addr $kernel_size; env exists secureboot " \
- "&& sf read $kernelheader_addr_r $kernelheader_addr " \
- "$kernelheader_size && esbc_validate ${kernelheader_addr_r}; " \
-- "bootm $load_addr#$board\0"
-+ "bootm $load_addr#$board\0" \
-+ "lede_setenv=setenv loadaddr 82000000 && " \
-+ "setenv fdtaddr 8f000000 && " \
-+ "setenv bootargs ubi.mtd=8 root=ubi0:rootfs rw " \
-+ "rootfstype=ubifs noinitrd " \
-+ "earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 " \
-+ "mtdparts=1550000.quadspi:1M(rcw),2M(u-boot),1M(u-boot-env)," \
-+ "5M(reserved-1),256k(fman),5888k(reserved-2),1M(dtb)," \
-+ "16M(kernel),32M(ubifs)\0" \
-+ "lede_run=pfe stop && sf probe 0:0 && " \
-+ "sf read $fdtaddr f00000 100000 && " \
-+ "sf read $loadaddr 1000000 1000000 && " \
-+ "bootm $loadaddr - $fdtaddr\0" \
-+ "lede_boot=run lede_setenv;run lede_run\0"
-
- #undef CONFIG_BOOTCOMMAND
- #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
- #define CONFIG_BOOTCOMMAND "run distro_bootcmd; run qspi_bootcmd; " \
- "env exists secureboot && esbc_halt;"
- #endif
-+#undef CONFIG_BOOTCOMMAND
-+#define CONFIG_BOOTCOMMAND "run lede_boot"
-+
-+#undef CONFIG_BOOTDELAY
-+#define CONFIG_BOOTDELAY 3
-+
-
- #include <asm/fsl_secure_boot.h>
-
---
-2.7.4
-
+++ /dev/null
-From 479bf0c0bec2e99442214facf0f414c2c737ac7b Mon Sep 17 00:00:00 2001
-From: Yangbo Lu <yangbo.lu@nxp.com>
-Date: Mon, 16 Oct 2017 11:57:36 +0800
-Subject: [PATCH] armv8: ls1088ardb: add LEDE boot support in environment
-
-Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
----
- include/configs/ls1088ardb.h | 27 ++++++++++++++++++++++++++-
- 1 file changed, 26 insertions(+), 1 deletion(-)
-
-diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
-index 7bd152d..4cefa40 100644
---- a/include/configs/ls1088ardb.h
-+++ b/include/configs/ls1088ardb.h
-@@ -404,7 +404,20 @@
- "env exists secureboot && mmc read $kernelheader_addr_r " \
- "$kernelhdr_addr_sd $kernelhdr_size_sd " \
- " && esbc_validate ${kernelheader_addr_r};" \
-- "bootm $load_addr#$BOARD\0"
-+ "bootm $load_addr#$BOARD\0" \
-+ "lede_setenv=setenv loadaddr 82000000 && " \
-+ "setenv fdtaddr 8f000000 && " \
-+ "setenv bootargs ubi.mtd=10 root=ubi0:rootfs rw " \
-+ "rootfstype=ubifs noinitrd " \
-+ "earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 " \
-+ "mtdparts=20c0000.quadspi:1M(rcw),2M(u-boot),1M(u-boot-env)," \
-+ "6M(reserved-1),3M(mc),1M(dpl),1M(dpc),1M(dtb)," \
-+ "16M(kernel),32M(ubifs)\0" \
-+ "lede_run=sf probe 0:0 && " \
-+ "sf read $fdtaddr f00000 100000 && " \
-+ "sf read $loadaddr 1000000 1000000 && " \
-+ "bootm $loadaddr - $fdtaddr\0" \
-+ "lede_boot=run lede_setenv;run lede_run\0"
-
- #undef CONFIG_BOOTCOMMAND
- #if defined(CONFIG_QSPI_BOOT)
-@@ -429,6 +442,18 @@
- "run distro_bootcmd;run sd_bootcmd;" \
- "env exists secureboot && esbc_halt;"
- #endif
-+
-+#undef CONFIG_BOOTCOMMAND
-+#define CONFIG_BOOTCOMMAND \
-+ "sf probe 0:0;sf read 0x80000000 0xA00000 0x300000;" \
-+ "sf read 0x80300000 0xE00000 0x100000;" \
-+ "fsl_mc start mc 0x80000000 0x80300000;" \
-+ "sf read 0x80400000 0xd00000 0x100000;" \
-+ "fsl_mc apply dpl 0x80400000;" \
-+ "run lede_boot;"
-+#undef CONFIG_BOOTDELAY
-+#define CONFIG_BOOTDELAY 3
-+
- /* MAC/PHY configuration */
- #ifdef CONFIG_FSL_MC_ENET
- #define CONFIG_PHYLIB_10G
---
-2.7.4
-
+++ /dev/null
-From 20f270670d1d5e14f3fd128f359535300a955ac8 Mon Sep 17 00:00:00 2001
-From: Yangbo Lu <yangbo.lu@nxp.com>
-Date: Mon, 16 Oct 2017 12:37:05 +0800
-Subject: [PATCH] armv8: ls2088ardb: add LEDE boot support in environment
-
-Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
----
- include/configs/ls2080ardb.h | 23 ++++++++++++++++++++++-
- 1 file changed, 22 insertions(+), 1 deletion(-)
-
-diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
-index 8a34990..8ae3944 100644
---- a/include/configs/ls2080ardb.h
-+++ b/include/configs/ls2080ardb.h
-@@ -432,7 +432,19 @@ unsigned long get_board_sys_clk(void);
- "env exists secureboot && mmc read $kernelheader_addr_r " \
- "$kernelhdr_addr_sd $kernelhdr_size_sd " \
- " && esbc_validate ${kernelheader_addr_r};" \
-- "bootm $load_addr#$board\0"
-+ "bootm $load_addr#$board\0" \
-+ "lede_setenv=setenv loadaddr 82000000 && " \
-+ "setenv fdtaddr 8f000000 && " \
-+ "setenv bootargs root=/dev/mtdblock9 " \
-+ "rootfstype=squashfs,jffs2 noinitrd " \
-+ "earlycon=uart8250,mmio,0x21c0500 console=ttyS1,115200 " \
-+ "mtdparts=580000000.nor:1M(rcw),2M(u-boot),1M(u-boot-env)," \
-+ "6M(reserved-1),3M(mc),1M(dpl),1M(dpc),1M(dtb)," \
-+ "16M(kernel),32M(rootfs),64M(otherbank)\0" \
-+ "lede_run=cp.b 580f00000 $fdtaddr 100000 && " \
-+ "cp.b 581000000 $loadaddr 1000000 && " \
-+ "bootm $loadaddr - $fdtaddr\0" \
-+ "lede_boot=run lede_setenv;run lede_run\0"
-
- #undef CONFIG_BOOTCOMMAND
- #ifdef CONFIG_QSPI_BOOT
-@@ -463,6 +475,15 @@ unsigned long get_board_sys_clk(void);
- "env exists secureboot && esbc_halt;"
- #endif
-
-+#undef CONFIG_BOOTCOMMAND
-+#define CONFIG_BOOTCOMMAND \
-+ "fsl_mc start mc 0x580a00000 0x580e00000;" \
-+ "fsl_mc apply dpl 0x580d00000;" \
-+ "run lede_boot;"
-+
-+#undef CONFIG_BOOTDELAY
-+#define CONFIG_BOOTDELAY 3
-+
- #undef CONFIG_BOOTARGS
- #define CONFIG_BOOTARGS "console=ttyS1,115200 root=/dev/ram0 " \
- "earlycon=uart8250,mmio,0x21c0600 " \
---
-2.7.4
-
+++ /dev/null
-From a5e454a3bb33a456655f08592606e4df34e40110 Mon Sep 17 00:00:00 2001
-From: Yangbo Lu <yangbo.lu@nxp.com>
-Date: Tue, 24 Oct 2017 17:48:08 +0800
-Subject: [PATCH] armv8: ls1012afrdm: add LEDE boot support in environment
-
-Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
----
- include/configs/ls1012afrdm.h | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h
-index a3f8824d27..36dff19bdd 100644
---- a/include/configs/ls1012afrdm.h
-+++ b/include/configs/ls1012afrdm.h
-@@ -73,12 +73,31 @@
- "qspi_bootcmd=echo Trying load from qspi..;" \
- "sf probe && sf read $load_addr " \
- "$kernel_addr $kernel_size && bootm $load_addr#$board\0" \
-+ "lede_setenv=setenv loadaddr 82000000 && " \
-+ "setenv fdtaddr 8f000000 && " \
-+ "setenv bootargs ubi.mtd=8 root=ubi0:rootfs rw " \
-+ "rootfstype=ubifs noinitrd " \
-+ "earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 " \
-+ "mtdparts=1550000.quadspi:1M(rcw),2M(u-boot),1M(u-boot-env)," \
-+ "5M(reserved-1),256k(fman),5888k(reserved-2),1M(dtb)," \
-+ "16M(kernel),32M(ubifs)\0" \
-+ "lede_run=pfe stop && sf probe 0:0 && " \
-+ "sf read $fdtaddr f00000 100000 && " \
-+ "sf read $loadaddr 1000000 1000000 && " \
-+ "bootm $loadaddr - $fdtaddr\0" \
-+ "lede_boot=run lede_setenv;run lede_run\0"
-
- #undef CONFIG_BOOTCOMMAND
- #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
- #define CONFIG_BOOTCOMMAND "run distro_bootcmd;run qspi_bootcmd"
- #endif
-
-+#undef CONFIG_BOOTCOMMAND
-+#define CONFIG_BOOTCOMMAND "run lede_boot"
-+
-+#undef CONFIG_BOOTDELAY
-+#define CONFIG_BOOTDELAY 3
-+
- /*
- * USB
- */
---
-2.14.1
-
projects / openwrt / staging / mkresin.git / commitdiff