JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

BananaPi BPI-F3: Update u-boot k1-x.env file

Browse Source 
Signed-off-by: Patrick Yavitz <pyavitz@gmail.com>
This commit is contained in:
Patrick Yavitz
2025-02-15 11:18:20 -05:00
committed by c0rnelius
parent 62f72f4566
commit f6256b8715
1 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
patch/u-boot/legacy/u-boot-spacemit-k1/003-add-syslinux-and-script-support.patch
View File

@@ -1,28 +1,29 @@
From 888cb8a8729eaf8b19f64ca8c44c20f7fa1844e8 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@armbian.com>
Date: Mon, 3 Feb 2025 08:48:30 -0500
From 913408ef316997f97828cf050ade9f9d3f0e4733 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@gmail.com>
Date: Sat, 15 Feb 2025 11:13:36 -0500
Subject: [PATCH] Add syslinux and script support
Signed-off-by: Patrick Yavitz <pyavitz@armbian.com>
Signed-off-by: Patrick Yavitz <pyavitz@gmail.com>
---
board/spacemit/k1-x/k1-x.env | 265 +++--------------------------------
board/spacemit/k1-x/k1-x.env | 280 ++++-------------------------------
board/spacemit/k1-x/k1x.c | 20 +--
configs/k1_defconfig | 3 +
configs/k1_defconfig | 1 +
include/configs/k1-x.h | 23 ++-
4 files changed, 44 insertions(+), 267 deletions(-)
4 files changed, 48 insertions(+), 276 deletions(-)
diff --git a/board/spacemit/k1-x/k1-x.env b/board/spacemit/k1-x/k1-x.env
index f4dadc9a..3b5b8e20 100644
index f4dadc9a..8eb9c525 100644
--- a/board/spacemit/k1-x/k1-x.env
+++ b/board/spacemit/k1-x/k1-x.env
@@ -3,251 +3,28 @@ earlycon=sbi
init=/init
bootdelay=0
baudrate=115200
+loglevel=8
stderr=serial
stdin=serial,usbkbd,usbkbd1
stdout=serial
@@ -1,253 +1,27 @@
-// Common parameter
-earlycon=sbi
-init=/init
-bootdelay=0
-baudrate=115200
-stderr=serial
-stdin=serial,usbkbd,usbkbd1
-stdout=serial
-workqueue.default_affinity_scope=system
-
-//partitions/mtdparts/mtdids would set while flashing env.bin
@@ -267,7 +268,7 @@ index f4dadc9a..3b5b8e20 100644
-bootmenu_7="recovery from usb"=run flash_from_usb
-bootmenu_8="recovery from mmc"=run flash_from_mmc
-bootmenu_9="recovery from net"=run flash_from_net
-
+// SYSLINUX and SCRIPT Support
+autoboot=if test -e ${devtype} ${devnum}:${distro_bootpart} /extlinux/extlinux.conf; then \
+ sysboot ${devtype} ${devnum}:${distro_bootpart} any 0x2000000 /extlinux/extlinux.conf; \
@@ -277,7 +278,9 @@ index f4dadc9a..3b5b8e20 100644
+ load ${devtype} ${devnum}:${distro_bootpart} 0x2000000 /boot.scr; source 0x2000000; \
+ elif test -e ${devtype} ${devnum}:${distro_bootpart} /boot/boot.scr; then \
+ load ${devtype} ${devnum}:${distro_bootpart} 0x2000000 /boot/boot.scr; source 0x2000000; \
+ elif test -e nvme 0:1 /extlinux/extlinux.conf; then \
+ fi;
+ nvme part; \
+ if test -e nvme 0:1 /extlinux/extlinux.conf; then \
+ sysboot nvme 0:1 any 0x2000000 /extlinux/extlinux.conf; \
+ elif test -e nvme 0:1 /boot/extlinux/extlinux.conf; then \
+ sysboot nvme 0:1 any 0x2000000 /boot/extlinux/extlinux.conf; \
@@ -287,7 +290,12 @@ index f4dadc9a..3b5b8e20 100644
+ load nvme 0:1 0x2000000 /boot/boot.scr; source 0x2000000; \
+ fi;
+
+bootcmd=echo "Loading ..."; run autoboot
+bootcmd=echo "Loading K1-X Environment ..."; \
+ usb start; \
+ echo ""; \
+ echo "Running NVMe Scan ..."; \
+ nvme scan; \
+ run autoboot
diff --git a/board/spacemit/k1-x/k1x.c b/board/spacemit/k1-x/k1x.c
index 9210e121..f6c9a5c7 100644
--- a/board/spacemit/k1-x/k1x.c
@@ -344,19 +352,10 @@ index 9210e121..f6c9a5c7 100644
}
}
diff --git a/configs/k1_defconfig b/configs/k1_defconfig
index 18ac1e3a..a54d4fcf 100644
index 18ac1e3a..fd33afde 100644
--- a/configs/k1_defconfig
+++ b/configs/k1_defconfig
@@ -43,6 +43,8 @@ CONFIG_AUTOBOOT_STOP_STR=" "
CONFIG_AUTOBOOT_KEYED_CTRLC=y
CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="bootm 0x11000000"
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="usb start; nvme scan; nvme part"
CONFIG_LOGLEVEL=7
CONFIG_SPL_LOGLEVEL=1
# CONFIG_SYS_DEVICE_NULLDEV is not set
@@ -294,3 +296,4 @@ CONFIG_PRINT_TIMESTAMP=y
@@ -294,3 +294,4 @@ CONFIG_PRINT_TIMESTAMP=y
# CONFIG_SPL_SHA256 is not set
CONFIG_ZSTD=y
# CONFIG_HEXDUMP is not set