mirror of
https://github.com/openwrt/openwrt.git
synced 2025-02-20 17:32:57 +00:00
layerscape: fix u-boot bootcmd
Current latest LSDK-19.03 u-boot had a bug that bootcmd environment was always been reset when u-boot started up. This was found on boards with spi NOR boot. Before the proper fix-up is applied, we have to use a workaround to hard code the bootcmd for OpenWrt booting for now. Signed-off-by: Biwen Li <biwen.li@nxp.com> Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
This commit is contained in:
parent
8468bf04d0
commit
639d127b83
@ -0,0 +1,28 @@
|
|||||||
|
From 51f860f8293d834497c6f7f810fa4650cd82f9ac Mon Sep 17 00:00:00 2001
|
||||||
|
From: Biwen Li <biwen.li@nxp.com>
|
||||||
|
Date: Sat, 13 Apr 2019 14:21:47 +0800
|
||||||
|
Subject: [PATCH] modify macro QSPI_NOR_BOOTCOMMAND of ls1046ardb for openwrt
|
||||||
|
|
||||||
|
Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
||||||
|
---
|
||||||
|
include/configs/ls1046ardb.h | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
|
||||||
|
index cc1f5f5f55..925e717e4b 100644
|
||||||
|
--- a/include/configs/ls1046ardb.h
|
||||||
|
+++ b/include/configs/ls1046ardb.h
|
||||||
|
@@ -217,8 +217,8 @@
|
||||||
|
#ifndef SPL_NO_MISC
|
||||||
|
#undef CONFIG_BOOTCOMMAND
|
||||||
|
#ifdef CONFIG_TFABOOT
|
||||||
|
-#define QSPI_NOR_BOOTCOMMAND "run distro_bootcmd; run qspi_bootcmd; " \
|
||||||
|
- "env exists secureboot && esbc_halt;;"
|
||||||
|
+#define QSPI_NOR_BOOTCOMMAND "echo (from QSPI_NOR_BOOTCOMMAND) starting openwrt; " \
|
||||||
|
+ "run qspi_boot;"
|
||||||
|
#define SD_BOOTCOMMAND "run distro_bootcmd;run sd_bootcmd; " \
|
||||||
|
"env exists secureboot && esbc_halt;"
|
||||||
|
#else
|
||||||
|
--
|
||||||
|
2.17.1
|
||||||
|
|
@ -0,0 +1,28 @@
|
|||||||
|
From 2999d128bef554da5ca7a553dfe1c31061df9c5c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Biwen Li <biwen.li@nxp.com>
|
||||||
|
Date: Sun, 14 Apr 2019 13:36:52 +0800
|
||||||
|
Subject: [PATCH] modify macro QSPI_NOR_BOOTCOMMAND of ls1012afrwy for openwrt
|
||||||
|
|
||||||
|
Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
||||||
|
---
|
||||||
|
include/configs/ls1012afrwy.h | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/include/configs/ls1012afrwy.h b/include/configs/ls1012afrwy.h
|
||||||
|
index 12e6437a05..900752970e 100644
|
||||||
|
--- a/include/configs/ls1012afrwy.h
|
||||||
|
+++ b/include/configs/ls1012afrwy.h
|
||||||
|
@@ -122,8 +122,8 @@
|
||||||
|
#undef CONFIG_BOOTCOMMAND
|
||||||
|
#ifdef CONFIG_TFABOOT
|
||||||
|
#undef QSPI_NOR_BOOTCOMMAND
|
||||||
|
-#define QSPI_NOR_BOOTCOMMAND "pfe stop; run distro_bootcmd; run sd_bootcmd; "\
|
||||||
|
- "env exists secureboot && esbc_halt;"
|
||||||
|
+#define QSPI_NOR_BOOTCOMMAND "echo (from QSPI_NOR_BOOTCOMMAND) starting openwrt ...; "\
|
||||||
|
+ "pfe stop; run sd_boot;"
|
||||||
|
#else
|
||||||
|
#define CONFIG_BOOTCOMMAND "pfe stop; run distro_bootcmd; run sd_bootcmd; "\
|
||||||
|
"env exists secureboot && esbc_halt;"
|
||||||
|
--
|
||||||
|
2.17.1
|
||||||
|
|
@ -0,0 +1,28 @@
|
|||||||
|
From 805c60e930a946560b52dfa83dd8e5fbdf2da15b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Biwen Li <biwen.li@nxp.com>
|
||||||
|
Date: Sun, 14 Apr 2019 13:39:13 +0800
|
||||||
|
Subject: [PATCH] modify macro QSPI_NOR_BOOTCOMMAND of ls1012ardb for openwrt
|
||||||
|
|
||||||
|
Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
||||||
|
---
|
||||||
|
include/configs/ls1012ardb.h | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h
|
||||||
|
index f6640fa499..51a2192c56 100644
|
||||||
|
--- a/include/configs/ls1012ardb.h
|
||||||
|
+++ b/include/configs/ls1012ardb.h
|
||||||
|
@@ -115,8 +115,8 @@
|
||||||
|
#undef CONFIG_BOOTCOMMAND
|
||||||
|
#ifdef CONFIG_TFABOOT
|
||||||
|
#undef QSPI_NOR_BOOTCOMMAND
|
||||||
|
-#define QSPI_NOR_BOOTCOMMAND "pfe stop; run distro_bootcmd; run qspi_bootcmd; "\
|
||||||
|
- "env exists secureboot && esbc_halt;"
|
||||||
|
+#define QSPI_NOR_BOOTCOMMAND "echo (from QSPI_NOR_BOOTCOMMAND) starting openwrt ...; "\
|
||||||
|
+ "pfe stop; run qspi_boot;"
|
||||||
|
#else
|
||||||
|
#define CONFIG_BOOTCOMMAND "pfe stop; run distro_bootcmd; run qspi_bootcmd; "\
|
||||||
|
"env exists secureboot && esbc_halt;"
|
||||||
|
--
|
||||||
|
2.17.1
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user