enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SpacemiT: Update OpenSBI/U-Boot to k1-bl-v2.2.9-release

Browse Source 
Signed-off-by: Patrick Yavitz <pyavitz@gmail.com>
This commit is contained in:
Patrick Yavitz 2026-02-20 15:03:01 -05:00 committed by c0rnelius
parent a8977dcd7d
commit 0d8faf47da
9 changed files with 111 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/sources/families/spacemit.conf
View File

@ -14,12 +14,12 @@ declare -g GOVERNOR="performance"
# OpenSBI
declare -g ATFSOURCE="https://gitee.com/bianbu-linux/opensbi.git"
declare -g ATFDIR="opensbi"
declare -g ATFBRANCH="tag:k1-bl-v2.2.7-release"
declare -g ATFBRANCH="tag:k1-bl-v2.2.9-release"
declare -g ATF_TARGET_MAP="PLATFORM_DEFCONFIG=k1_defconfig PLATFORM=generic ;;build/platform/generic/firmware/fw_dynamic.itb"
# U-Boot
declare -g BOOTSOURCE="https://gitee.com/bianbu-linux/uboot-2022.10.git"
declare -g BOOTBRANCH="${BOOTBRANCH_BOARD:-"tag:k1-bl-v2.2.7-release"}"
declare -g BOOTBRANCH="${BOOTBRANCH_BOARD:-"tag:k1-bl-v2.2.9-release"}"
declare -g BOOTDIR='u-boot-spacemit'
declare -g BOOTPATCHDIR="${BOOTPATCHDIR:-"legacy/u-boot-spacemit-k1"}"
declare -g UBOOT_TARGET_MAP=";;bootinfo_emmc.bin bootinfo_spinor.bin FSBL.bin fw_dynamic.itb u-boot.itb u-boot-env-default.bin"

32
patch/u-boot/legacy/u-boot-spacemit-k1/001-MBR-support.patch
View File

@ -1,20 +1,19 @@
From dfd3005876dfb8a8d87c7d20ce250b6fd51074d3 Mon Sep 17 00:00:00 2001
From 9f5695b99ded1f35ab4807963a5f6002419d6e7d Mon Sep 17 00:00:00 2001
From: Banana Pi -BPI <lionwang@sinovoip.com.cn>
Date: Sun, 7 Dec 2025 08:02:50 -0500
Date: Mon, 16 Feb 2026 09:17:44 -0500
Subject: [PATCH] MBR support
Signed-off-by: Banana Pi -BPI <lionwang@sinovoip.com.cn>
---
board/spacemit/k1-x/k1x.c | 10 +++++++++-
common/spl/spl_mmc.c | 22 ++++++++++++++++++++--
configs/k1_defconfig | 4 +++-
3 files changed, 32 insertions(+), 4 deletions(-)
2 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/board/spacemit/k1-x/k1x.c b/board/spacemit/k1-x/k1x.c
index 8d0ee1b5..c48b4e74 100644
index 662d334a..309bbb09 100644
--- a/board/spacemit/k1-x/k1x.c
+++ b/board/spacemit/k1-x/k1x.c
@@ -511,6 +511,7 @@ void _load_env_from_blk(struct blk_desc *dev_desc, const char *dev_name, int dev
@@ -520,6 +520,7 @@ void _load_env_from_blk(struct blk_desc *dev_desc, const char *dev_name, int dev
char cmd[128];
struct disk_partition info;
@ -22,7 +21,7 @@ index 8d0ee1b5..c48b4e74 100644
for (part = 1; part <= MAX_SEARCH_PARTITIONS; part++) {
err = part_get_info(dev_desc, part, &info);
if (err)
@@ -520,8 +521,13 @@ void _load_env_from_blk(struct blk_desc *dev_desc, const char *dev_name, int dev
@@ -529,8 +530,13 @@ void _load_env_from_blk(struct blk_desc *dev_desc, const char *dev_name, int dev
break;
}
}
@ -37,7 +36,7 @@ index 8d0ee1b5..c48b4e74 100644
env_set("bootfs_part", simple_itoa(part));
env_set("bootfs_devname", dev_name);
@@ -531,12 +537,14 @@ void _load_env_from_blk(struct blk_desc *dev_desc, const char *dev_name, int dev
@@ -540,12 +546,14 @@ void _load_env_from_blk(struct blk_desc *dev_desc, const char *dev_name, int dev
sprintf(cmd, "load %s %d:%d 0x%x env_%s.txt", dev_name,
dev, part, CONFIG_SPL_LOAD_FIT_ADDRESS, CONFIG_SYS_CONFIG_NAME);
pr_debug("cmd:%s\n", cmd);
@ -102,21 +101,6 @@ index acf2b278..581958bb 100644
return mmc_load_image_raw_sector(spl_image, bootdev, mmc, info.start);
#endif
}
diff --git a/configs/k1_defconfig b/configs/k1_defconfig
index 29908a84..29aca4ce 100644
--- a/configs/k1_defconfig
+++ b/configs/k1_defconfig
@@ -23,7 +23,9 @@ CONFIG_K1_X_BOARD_ASIC=y
CONFIG_ARCH_RV64I=y
CONFIG_RISCV_SMODE=y
# CONFIG_SPL_SMP is not set
-CONFIG_LOCALVERSION="spacemit"
+CONFIG_LOCALVERSION=" Armbian"
+CONFIG_LOCALVERSION_AUTO=n
+CONFIG_DISTRO_DEFAULTS=y
CONFIG_ENV_VARS_UBOOT_CONFIG=y
CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x1000000
--
2.47.3
2.51.0

30
patch/u-boot/legacy/u-boot-spacemit-k1/003-SpacemiT-K1X-Fixups.patch → patch/u-boot/legacy/u-boot-spacemit-k1/002-SpacemiT-K1X-Fixups.patch
View File

@ -1,20 +1,19 @@
From 08b4f3a1e38621cdef2d5a41d048770057d9fa66 Mon Sep 17 00:00:00 2001
From dc7a3795f78e71c2ebe93939275c6c880e0a3aee Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@gmail.com>
Date: Sat, 27 Dec 2025 18:12:33 -0500
Date: Mon, 16 Feb 2026 09:18:25 -0500
Subject: [PATCH] SpacemiT K1X Fixups
Signed-off-by: Patrick Yavitz <pyavitz@gmail.com>
---
board/spacemit/k1-x/k1x.c | 28 ++++++++++------------------
configs/k1_defconfig | 1 +
include/configs/k1-x.h | 22 ++++++++++------------
3 files changed, 21 insertions(+), 30 deletions(-)
2 files changed, 20 insertions(+), 30 deletions(-)
diff --git a/board/spacemit/k1-x/k1x.c b/board/spacemit/k1-x/k1x.c
index c48b4e74..ab1d1264 100644
index 309bbb09..83c7d400 100644
--- a/board/spacemit/k1-x/k1x.c
+++ b/board/spacemit/k1-x/k1x.c
@@ -529,8 +529,8 @@ void _load_env_from_blk(struct blk_desc *dev_desc, const char *dev_name, int dev
@@ -538,8 +538,8 @@ void _load_env_from_blk(struct blk_desc *dev_desc, const char *dev_name, int dev
#endif
}
@ -25,7 +24,7 @@ index c48b4e74..ab1d1264 100644
/*load env.txt and import to uboot*/
memset((void *)CONFIG_SPL_LOAD_FIT_ADDRESS, 0, CONFIG_ENV_SIZE);
@@ -747,34 +747,26 @@ void setenv_boot_mode(void)
@@ -756,34 +756,26 @@ void setenv_boot_mode(void)
u32 boot_mode = get_boot_mode();
switch (boot_mode) {
case BOOT_MODE_NAND:
@ -68,20 +67,11 @@ index c48b4e74..ab1d1264 100644
break;
}
}
diff --git a/configs/k1_defconfig b/configs/k1_defconfig
index 29aca4ce..949ab18b 100644
--- a/configs/k1_defconfig
+++ b/configs/k1_defconfig
@@ -291,3 +291,4 @@ CONFIG_PRINT_TIMESTAMP=y
# CONFIG_SPL_SHA256 is not set
CONFIG_ZSTD=y
# CONFIG_HEXDUMP is not set
+CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/include/configs/k1-x.h b/include/configs/k1-x.h
index b15d2e0b..b7311ac0 100644
index 1af9debc..fcab226e 100644
--- a/include/configs/k1-x.h
+++ b/include/configs/k1-x.h
@@ -106,11 +106,6 @@
@@ -108,11 +108,6 @@
#define TLV_CODE_EEPROM_I2C_INDEX 0x81
#define TLV_CODE_EEPROM_PIN_GROUP 0x82
@ -93,7 +83,7 @@ index b15d2e0b..b7311ac0 100644
// for those has NOT been through test procedure(ATE)
#define SVT_DRO_DEFAULT_VALUE (120)
@@ -173,6 +168,11 @@ enum private_part_offset {
@@ -217,6 +212,11 @@ enum private_part_offset {
#define BOOT_TARGET_DEVICES(func) \
func(QEMU, qemu, na)
@ -105,7 +95,7 @@ index b15d2e0b..b7311ac0 100644
#include <config_distro_bootcmd.h>
#define BOOTENV_DEV_QEMU(devtypeu, devtypel, instance) \
@@ -200,15 +200,13 @@ enum private_part_offset {
@@ -244,15 +244,13 @@ enum private_part_offset {
"stdout_flash=serial,vidconsole\0" \
"kernel_comp_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"kernel_comp_size=" __stringify(CONFIG_FASTBOOT_BUF_SIZE) "\0" \

44
patch/u-boot/legacy/u-boot-spacemit-k1/002-Use-default-AUTOBOOT.patch
View File

@ -1,44 +0,0 @@
From c1bde89e63be8bc517f3514a9d352a28179d9cee Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@gmail.com>
Date: Sun, 21 Sep 2025 11:40:14 -0400
Subject: [PATCH] Use default AUTOBOOT
Signed-off-by: Patrick Yavitz <pyavitz@gmail.com>
---
configs/k1_defconfig | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/configs/k1_defconfig b/configs/k1_defconfig
index 29aca4ce..8861f32a 100644
--- a/configs/k1_defconfig
+++ b/configs/k1_defconfig
@@ -37,10 +37,6 @@ CONFIG_SPL_LOAD_FIT_ADDRESS=0x08000000
CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_OF_BOARD_SETUP=y
-CONFIG_BOOTDELAY=0
-CONFIG_AUTOBOOT_KEYED=y
-CONFIG_AUTOBOOT_STOP_STR="s"
-CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="bootm 0x08000000"
CONFIG_LOGLEVEL=7
CONFIG_SPL_LOGLEVEL=1
@@ -113,6 +109,7 @@ CONFIG_CMD_PXE=y
CONFIG_CMD_BMP=y
CONFIG_CMD_TIME=y
CONFIG_CMD_GETTIME=y
+CONFIG_CMD_KASLRSEED=y
CONFIG_CMD_TIMER=y
CONFIG_CMD_SYSBOOT=y
CONFIG_CMD_EXT4_WRITE=y
@@ -234,6 +231,7 @@ CONFIG_SPL_SPACEMIT_POWER=y
CONFIG_DM_PWM=y
CONFIG_PWM_PXA=y
CONFIG_RESET_SPACEMIT_K1X=y
+CONFIG_DM_RNG=y
# CONFIG_SCSI is not set
# CONFIG_DM_SCSI is not set
CONFIG_SYS_NS16550_IER=0x40
--
2.43.0

60
patch/u-boot/legacy/u-boot-spacemit-k1/003-SpacemiT-K1X-Defconfig-Fixups.patch Normal file
View File

@ -0,0 +1,60 @@
From e85b53e372eebc6f047ca28d6656e50a88d57388 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@gmail.com>
Date: Mon, 16 Feb 2026 09:13:43 -0500
Subject: [PATCH] SpacemiT K1X Defconfig Fixups
Signed-off-by: Patrick Yavitz <pyavitz@gmail.com>
---
configs/k1_defconfig | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/configs/k1_defconfig b/configs/k1_defconfig
index c3d8806e..4bf6ee31 100644
--- a/configs/k1_defconfig
+++ b/configs/k1_defconfig
@@ -24,7 +24,9 @@ CONFIG_K1_X_BOARD_ASIC=y
CONFIG_ARCH_RV64I=y
CONFIG_RISCV_SMODE=y
# CONFIG_SPL_SMP is not set
-CONFIG_LOCALVERSION="spacemit"
+CONFIG_LOCALVERSION=" Armbian"
+CONFIG_LOCALVERSION_AUTO=n
+CONFIG_DISTRO_DEFAULTS=y
CONFIG_ENV_VARS_UBOOT_CONFIG=y
CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x1000000
@@ -36,10 +38,6 @@ CONFIG_SPL_LOAD_FIT_ADDRESS=0x08000000
CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_OF_BOARD_SETUP=y
-CONFIG_BOOTDELAY=0
-CONFIG_AUTOBOOT_KEYED=y
-CONFIG_AUTOBOOT_STOP_STR="s"
-CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="bootm 0x08000000"
CONFIG_LOGLEVEL=7
CONFIG_SPL_LOGLEVEL=1
@@ -114,6 +112,7 @@ CONFIG_CMD_PXE=y
CONFIG_CMD_BMP=y
CONFIG_CMD_TIME=y
CONFIG_CMD_GETTIME=y
+CONFIG_CMD_KASLRSEED=y
CONFIG_CMD_TIMER=y
CONFIG_CMD_SYSBOOT=y
CONFIG_CMD_EXT4_WRITE=y
@@ -236,6 +235,7 @@ CONFIG_SPL_SPACEMIT_POWER=y
CONFIG_DM_PWM=y
CONFIG_PWM_PXA=y
CONFIG_RESET_SPACEMIT_K1X=y
+CONFIG_DM_RNG=y
# CONFIG_SCSI is not set
# CONFIG_DM_SCSI is not set
CONFIG_SYS_NS16550_IER=0x40
@@ -296,3 +296,4 @@ CONFIG_PRINT_TIMESTAMP=y
CONFIG_ZSTD=y
CONFIG_SPL_LZO=y
# CONFIG_HEXDUMP is not set
+CONFIG_OF_LIBFDT_OVERLAY=y
--
2.51.0

30
patch/u-boot/legacy/u-boot-spacemit-k1/005-Add-uefi-syslinux-and-script-support.patch → patch/u-boot/legacy/u-boot-spacemit-k1/004-Add-uefi-syslinux-and-script-support.patch
View File

@ -1,18 +1,18 @@
From 567294bbff02249adfb9c85d2079cb235f8d3994 Mon Sep 17 00:00:00 2001
From 12836b75b818985a2059921b6882418a2dd60908 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@gmail.com>
Date: Fri, 12 Dec 2025 07:11:44 -0500
Date: Fri, 20 Feb 2026 14:51:24 -0500
Subject: [PATCH] Add uefi syslinux and script support
Signed-off-by: Patrick Yavitz <pyavitz@gmail.com>
---
board/spacemit/k1-x/k1-x.env | 350 +++--------------------------------
1 file changed, 30 insertions(+), 320 deletions(-)
board/spacemit/k1-x/k1-x.env | 366 +++--------------------------------
1 file changed, 30 insertions(+), 336 deletions(-)
diff --git a/board/spacemit/k1-x/k1-x.env b/board/spacemit/k1-x/k1-x.env
index cd1ed726..fe0242cd 100644
index 3499aec7..fe0242cd 100644
--- a/board/spacemit/k1-x/k1-x.env
+++ b/board/spacemit/k1-x/k1-x.env
@@ -1,320 +1,30 @@
@@ -1,336 +1,30 @@
-// Common parameter
-earlycon=sbi
-init=/init
@ -119,6 +119,22 @@ index cd1ed726..fe0242cd 100644
-add_bootarg=run set_console; \
- run set_loglevel;
-
-set_bootargs_unified=run commonargs; \
- run add_bootarg; \
- if test "${boot_device}" = nand; then \
- run set_nand_args; \
- elif test "${boot_device}" = nor; then \
- run set_nor_args; \
- run set_root_arg; \
- elif test "${boot_device}" = mmc; then \
- run set_mmc_args; \
- run set_root_arg; \
- elif test "${boot_device}" = nfs; then \
- setenv bootargs "${bootargs}" root=/dev/nfs net.ifnames=0 nfsroot=${serverip}:${rootfs_path} bootfs=${serverip}:${bootfs_path} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}::${netdev}:off noipath; \
- else \
- echo "Unknown boot_device: ${boot_device}"; \
- fi;
-
-//detect product_name from env and select dtb file to load
-dtb_env=if test -n "${product_name}"; then \
- if test "${product_name}" = k1_evb; then \
@ -364,5 +380,5 @@ index cd1ed726..fe0242cd 100644
+ nvme scan; \
+ run autoboot
--
2.47.3
2.51.0

16
patch/u-boot/legacy/u-boot-spacemit-k1/006-orangepi-rv2-spi-flash.patch → patch/u-boot/legacy/u-boot-spacemit-k1/005-Orange-Pi-RV2-u-boot-support-for-XM25QU128C-flash.patch
View File

@ -1,6 +1,6 @@
From 94334b971eaabf18ad905f92b8f0e03763cbe974 Mon Sep 17 00:00:00 2001
From 11aa6bce044e68df020b843ea9c350a048bd5e9d Mon Sep 17 00:00:00 2001
From: Sven-Ola Tuecke <sven-ola@gmx.de>
Date: Tue, 3 Feb 2026 10:32:23 +0100
Date: Fri, 20 Feb 2026 14:55:43 -0500
Subject: [PATCH] Orange Pi RV2: u-boot support for XM25QU128C flash
NOR flash name from u-boot/master, ID from Xunlong Ky-Tree.
@ -12,11 +12,11 @@ Signed-off-by: Sven-Ola Tuecke <sven-ola@gmx.de>
2 files changed, 2 insertions(+)
diff --git a/configs/k1_defconfig b/configs/k1_defconfig
index a134f8df14b..d157bc42348 100644
index 4bf6ee31..653c89d0 100644
--- a/configs/k1_defconfig
+++ b/configs/k1_defconfig
@@ -204,6 +204,7 @@ CONFIG_DM_MTD=y
CONFIG_MTD_SPI_NAND=y
@@ -208,6 +208,7 @@ CONFIG_MTD_SPI_NAND=y
CONFIG_SPI_NAND_GIGADEVICE=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_FLASH_XMC=y
@ -24,10 +24,10 @@ index a134f8df14b..d157bc42348 100644
CONFIG_SPINOR_BLOCK_SUPPORT=y
# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
diff --git a/drivers/mtd/spi/spi-nor-ids.c b/drivers/mtd/spi/spi-nor-ids.c
index 14a797468eb..8eccad98ddf 100644
index 855b1bf6..d8e7a527 100644
--- a/drivers/mtd/spi/spi-nor-ids.c
+++ b/drivers/mtd/spi/spi-nor-ids.c
@@ -450,6 +450,7 @@ const struct flash_info spi_nor_ids[] = {
@@ -455,6 +455,7 @@ const struct flash_info spi_nor_ids[] = {
{ INFO("XM25QH64A", 0x207017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
{ INFO("XM25QH64C", 0x204017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
{ INFO("XM25QH128A", 0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
@ -36,5 +36,5 @@ index 14a797468eb..8eccad98ddf 100644
#ifdef CONFIG_SPI_FLASH_XTX
/* XTX Technology (Shenzhen) Limited */
--
2.34.1
2.51.0

0
patch/u-boot/legacy/u-boot-spacemit-k1/007-orangepi-rv2-r2s-fit.patch → patch/u-boot/legacy/u-boot-spacemit-k1/006-orangepi-rv2-r2s-fit.patch
View File

0
patch/u-boot/legacy/u-boot-spacemit-k1/004-efi_loader-suppress-error-print-message.patch → patch/u-boot/legacy/u-boot-spacemit-k1/007-efi_loader-suppress-error-print-message.patch
View File