Update to 2024.04 RC3
Enable a number of new upstream devices Upstream now builds Rockchip SPI artifacts Various cleanups Fix ESP partition detection to enable EFI vars
This commit is contained in:
parent
6d54ac747c
commit
9dc8c9ae3c
|
@ -1,41 +0,0 @@
|
||||||
From ed5ffb3b53690a47333b931301a3765b9588b5dc Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
Date: Sun, 11 Jun 2023 21:22:41 +0100
|
|
||||||
Subject: [PATCH] Revert "rockchip: rockpro64: Build u-boot-rockchip-spi.bin"
|
|
||||||
|
|
||||||
This reverts commit 5713135ecc75660684ff3eb6cfba7bc11eb6433c.
|
|
||||||
---
|
|
||||||
configs/rockpro64-rk3399_defconfig | 3 ---
|
|
||||||
1 file changed, 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig
|
|
||||||
index f41c0306790..0ca2cecade2 100644
|
|
||||||
--- a/configs/rockpro64-rk3399_defconfig
|
|
||||||
+++ b/configs/rockpro64-rk3399_defconfig
|
|
||||||
@@ -11,7 +11,6 @@
|
|
||||||
CONFIG_DEFAULT_DEVICE_TREE="rk3399-rockpro64"
|
|
||||||
CONFIG_DM_RESET=y
|
|
||||||
CONFIG_ROCKCHIP_RK3399=y
|
|
||||||
-CONFIG_ROCKCHIP_SPI_IMAGE=y
|
|
||||||
CONFIG_TARGET_ROCKPRO64_RK3399=y
|
|
||||||
CONFIG_SPL_STACK=0x400000
|
|
||||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
|
||||||
@@ -21,7 +20,6 @@
|
|
||||||
CONFIG_SYS_LOAD_ADDR=0x800800
|
|
||||||
CONFIG_PCI=y
|
|
||||||
CONFIG_DEBUG_UART=y
|
|
||||||
-CONFIG_LTO=y
|
|
||||||
CONFIG_SPL_FIT_SIGNATURE=y
|
|
||||||
CONFIG_LEGACY_IMAGE_FORMAT=y
|
|
||||||
CONFIG_BOOTSTAGE=y
|
|
||||||
@@ -40,7 +38,6 @@
|
|
||||||
CONFIG_SPL_STACK_R=y
|
|
||||||
CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
|
|
||||||
CONFIG_SPL_SPI_LOAD=y
|
|
||||||
-CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000
|
|
||||||
CONFIG_TPL=y
|
|
||||||
CONFIG_CMD_BOOTZ=y
|
|
||||||
CONFIG_CMD_GPT=y
|
|
||||||
--
|
|
||||||
2.41.0
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
a64-olinuxino
|
a64-olinuxino
|
||||||
|
a64-olinuxino-emmc
|
||||||
amarula_a64_relic
|
amarula_a64_relic
|
||||||
apple_m1
|
apple_m1
|
||||||
bananapi_m2_plus_h5
|
bananapi_m2_plus_h5
|
||||||
|
@ -8,6 +9,8 @@ dragonboard410c
|
||||||
dragonboard820c
|
dragonboard820c
|
||||||
dragonboard845c
|
dragonboard845c
|
||||||
eaidk-610-rk3399
|
eaidk-610-rk3399
|
||||||
|
emlid_neutis_n5_devboard
|
||||||
|
evb-px5
|
||||||
evb-rk3328
|
evb-rk3328
|
||||||
evb-rk3399
|
evb-rk3399
|
||||||
ficus-rk3399
|
ficus-rk3399
|
||||||
|
@ -39,17 +42,23 @@ nanopi_neo2
|
||||||
nanopi-neo4-rk3399
|
nanopi-neo4-rk3399
|
||||||
nanopi_neo_plus2
|
nanopi_neo_plus2
|
||||||
nanopi_r1s_h5
|
nanopi_r1s_h5
|
||||||
|
nanopi-r2c-plus-rk3328
|
||||||
|
nanopi-r2c-rk3328
|
||||||
nanopi-r2s-rk3328
|
nanopi-r2s-rk3328
|
||||||
nanopi-r4s-rk3399
|
nanopi-r4s-rk3399
|
||||||
|
oceanic_5205_5inmfd
|
||||||
odroid-c2
|
odroid-c2
|
||||||
orangepi_3
|
orangepi_3
|
||||||
orangepi_lite2
|
orangepi_lite2
|
||||||
orangepi_one_plus
|
orangepi_one_plus
|
||||||
orangepi_pc2
|
orangepi_pc2
|
||||||
orangepi_prime
|
orangepi_prime
|
||||||
|
orangepi-r1-plus-lts-rk3328
|
||||||
|
orangepi-r1-plus-rk3328
|
||||||
orangepi-rk3399
|
orangepi-rk3399
|
||||||
orangepi_win
|
orangepi_win
|
||||||
orangepi_zero2
|
orangepi_zero2
|
||||||
|
orangepi_zero3
|
||||||
orangepi_zero_plus
|
orangepi_zero_plus
|
||||||
orangepi_zero_plus2
|
orangepi_zero_plus2
|
||||||
p212
|
p212
|
||||||
|
@ -68,6 +77,8 @@ poplar
|
||||||
puma-rk3399
|
puma-rk3399
|
||||||
qemu_arm64
|
qemu_arm64
|
||||||
roc-cc-rk3328
|
roc-cc-rk3328
|
||||||
|
rock-4c-plus-rk3399
|
||||||
|
rock-4se-rk3399
|
||||||
rock64-rk3328
|
rock64-rk3328
|
||||||
rock960-rk3399
|
rock960-rk3399
|
||||||
rock-pi-4c-rk3399
|
rock-pi-4c-rk3399
|
||||||
|
@ -82,6 +93,8 @@ sopine_baseboard
|
||||||
starqltechn
|
starqltechn
|
||||||
tanix_tx6
|
tanix_tx6
|
||||||
teres_i
|
teres_i
|
||||||
|
transpeed-8k618-t
|
||||||
turris_mox
|
turris_mox
|
||||||
vexpress_aemv8a_juno
|
vexpress_aemv8a_juno
|
||||||
|
x96_mate
|
||||||
xilinx_zynqmp_virt
|
xilinx_zynqmp_virt
|
||||||
|
|
|
@ -1,43 +0,0 @@
|
||||||
From 1af5e42f170d2c4b944beeb875b80ec7f061038a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ondrej Jirman <megi@xff.cz>
|
|
||||||
Date: Thu, 25 May 2023 15:27:08 +0200
|
|
||||||
Subject: [PATCH] pinephone-pro: Fix I/O port voltage (GPIO3D4A is 1.8V)
|
|
||||||
|
|
||||||
This fixes access to camera sensor over I2C during probe time in
|
|
||||||
the kernel. (Kernel will fix I/0 port voltage by itself, but the
|
|
||||||
timing depends on probe order of the drivers, so the fix can
|
|
||||||
come after the camera sensor driver already failed to probe.)
|
|
||||||
|
|
||||||
Signed-off-by: Ondrej Jirman <megi@xff.cz>
|
|
||||||
Cc: Kever Yang <kever.yang@rock-chips.com>
|
|
||||||
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
|
|
||||||
---
|
|
||||||
board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c | 6 ++++--
|
|
||||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c b/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c
|
|
||||||
index eb639cd0d07..b6ccbb9c1c4 100644
|
|
||||||
--- a/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c
|
|
||||||
+++ b/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c
|
|
||||||
@@ -15,7 +15,8 @@
|
|
||||||
#include <asm/arch-rockchip/misc.h>
|
|
||||||
#include <power/regulator.h>
|
|
||||||
|
|
||||||
-#define GRF_IO_VSEL_BT565_SHIFT 0
|
|
||||||
+#define GRF_IO_VSEL_BT565_GPIO2AB 1
|
|
||||||
+#define GRF_IO_VSEL_AUDIO_GPIO3D4A 2
|
|
||||||
#define PMUGRF_CON0_VSEL_SHIFT 8
|
|
||||||
|
|
||||||
#ifndef CONFIG_SPL_BUILD
|
|
||||||
@@ -48,7 +49,8 @@ static void setup_iodomain(void)
|
|
||||||
syscon_get_first_range(ROCKCHIP_SYSCON_PMUGRF);
|
|
||||||
|
|
||||||
/* BT565 is in 1.8v domain */
|
|
||||||
- rk_setreg(&grf->io_vsel, 1 << GRF_IO_VSEL_BT565_SHIFT);
|
|
||||||
+ rk_setreg(&grf->io_vsel,
|
|
||||||
+ GRF_IO_VSEL_BT565_GPIO2AB | GRF_IO_VSEL_AUDIO_GPIO3D4A);
|
|
||||||
|
|
||||||
/* Set GPIO1 1.8v/3.0v source select to PMU1830_VOL */
|
|
||||||
rk_setreg(&pmugrf->soc_con0, 1 << PMUGRF_CON0_VSEL_SHIFT);
|
|
||||||
--
|
|
||||||
2.41.0
|
|
|
@ -1,136 +0,0 @@
|
||||||
From 2d9350c50a9659cc2a247cdea07f0eacffa3cb32 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
Date: Sun, 12 Jun 2022 14:44:44 +0100
|
|
||||||
Subject: [PATCH] rockchip: pinebook-pro: minor SPI flash fixes
|
|
||||||
|
|
||||||
Set a default offset for environment so it doesn't write it to
|
|
||||||
unexpected locations, drop unneeded mtd config option.
|
|
||||||
|
|
||||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
---
|
|
||||||
configs/pinebook-pro-rk3399_defconfig | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/configs/pinebook-pro-rk3399_defconfig b/configs/pinebook-pro-rk3399_defconfig
|
|
||||||
index 8ca1d0708f9..aaa52c6ea70 100644
|
|
||||||
--- a/configs/pinebook-pro-rk3399_defconfig
|
|
||||||
+++ b/configs/pinebook-pro-rk3399_defconfig
|
|
||||||
@@ -5,6 +5,7 @@ CONFIG_ARCH_ROCKCHIP=y
|
|
||||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
|
||||||
CONFIG_NR_DRAM_BANKS=1
|
|
||||||
CONFIG_ENV_SIZE=0x8000
|
|
||||||
+CONFIG_ENV_OFFSET=0x3F8000
|
|
||||||
CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro"
|
|
||||||
CONFIG_ROCKCHIP_RK3399=y
|
|
||||||
CONFIG_TARGET_PINEBOOK_PRO_RK3399=y
|
|
||||||
@@ -22,7 +23,6 @@ CONFIG_MISC_INIT_R=y
|
|
||||||
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
|
|
||||||
CONFIG_SPL_STACK_R=y
|
|
||||||
CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
|
|
||||||
-CONFIG_SPL_MTD_SUPPORT=y
|
|
||||||
CONFIG_SPL_SPI_LOAD=y
|
|
||||||
CONFIG_TPL=y
|
|
||||||
CONFIG_CMD_BOOTZ=y
|
|
||||||
--
|
|
||||||
2.36.1
|
|
||||||
|
|
||||||
From 27ba8e2f904063aec5196f86dd0332bf58a60259 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
Date: Sun, 12 Jun 2022 14:50:42 +0100
|
|
||||||
Subject: [PATCH] rockchip: rockpro64: enable leds
|
|
||||||
|
|
||||||
The Rockpro64 has some GPIO leds so let's enable them so the
|
|
||||||
user gets some output in early boot.
|
|
||||||
|
|
||||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
---
|
|
||||||
configs/rockpro64-rk3399_defconfig | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig
|
|
||||||
index e6f7a8469a3..b0c3527fab0 100644
|
|
||||||
--- a/configs/rockpro64-rk3399_defconfig
|
|
||||||
+++ b/configs/rockpro64-rk3399_defconfig
|
|
||||||
@@ -42,6 +42,8 @@ CONFIG_AHCI_PCI=y
|
|
||||||
CONFIG_SATA_SIL=y
|
|
||||||
CONFIG_ROCKCHIP_GPIO=y
|
|
||||||
CONFIG_SYS_I2C_ROCKCHIP=y
|
|
||||||
+CONFIG_LED=y
|
|
||||||
+CONFIG_LED_GPIO=y
|
|
||||||
CONFIG_MISC=y
|
|
||||||
CONFIG_ROCKCHIP_EFUSE=y
|
|
||||||
CONFIG_MMC_DW=y
|
|
||||||
--
|
|
||||||
2.36.1
|
|
||||||
|
|
||||||
From 8bca90472e0d71e5344711b6f5fe8dc95e19af5a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
Date: Sun, 12 Jun 2022 15:12:47 +0100
|
|
||||||
Subject: [PATCH] rockchip: pinebook-pro: sync PBP dtb to 5.18
|
|
||||||
|
|
||||||
Sync the pinebook pro to upstream 5.18, in particular this brings
|
|
||||||
brings in a fix so the DP is disabled so Linux will actually boot.
|
|
||||||
|
|
||||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
---
|
|
||||||
arch/arm/dts/rk3399-pinebook-pro.dts | 11 +++--------
|
|
||||||
1 file changed, 3 insertions(+), 8 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/dts/rk3399-pinebook-pro.dts b/arch/arm/dts/rk3399-pinebook-pro.dts
|
|
||||||
index 2b5f001ff4a..d6b68d77d63 100644
|
|
||||||
--- a/arch/arm/dts/rk3399-pinebook-pro.dts
|
|
||||||
+++ b/arch/arm/dts/rk3399-pinebook-pro.dts
|
|
||||||
@@ -17,6 +17,7 @@
|
|
||||||
/ {
|
|
||||||
model = "Pine64 Pinebook Pro";
|
|
||||||
compatible = "pine64,pinebook-pro", "rockchip,rk3399";
|
|
||||||
+ chassis-type = "laptop";
|
|
||||||
|
|
||||||
aliases {
|
|
||||||
mmc0 = &sdio0;
|
|
||||||
@@ -242,12 +243,12 @@
|
|
||||||
vdd_log: vdd-log {
|
|
||||||
compatible = "pwm-regulator";
|
|
||||||
pwms = <&pwm2 0 25000 1>;
|
|
||||||
+ pwm-supply = <&vcc_sysin>;
|
|
||||||
regulator-name = "vdd_log";
|
|
||||||
regulator-always-on;
|
|
||||||
regulator-boot-on;
|
|
||||||
regulator-min-microvolt = <800000>;
|
|
||||||
regulator-max-microvolt = <1400000>;
|
|
||||||
- vin-supply = <&vcc_sysin>;
|
|
||||||
|
|
||||||
regulator-state-mem {
|
|
||||||
regulator-on-in-suspend;
|
|
||||||
@@ -385,10 +386,6 @@
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
-&cdn_dp {
|
|
||||||
- status = "okay";
|
|
||||||
-};
|
|
||||||
-
|
|
||||||
&cpu_b0 {
|
|
||||||
cpu-supply = <&vdd_cpu_b>;
|
|
||||||
};
|
|
||||||
@@ -475,8 +472,6 @@
|
|
||||||
vcc10-supply = <&vcc_sysin>;
|
|
||||||
vcc11-supply = <&vcc_sysin>;
|
|
||||||
vcc12-supply = <&vcc3v3_sys>;
|
|
||||||
- vcc13-supply = <&vcc_sysin>;
|
|
||||||
- vcc14-supply = <&vcc_sysin>;
|
|
||||||
|
|
||||||
regulators {
|
|
||||||
/* rk3399 center logic supply */
|
|
||||||
@@ -711,7 +706,7 @@
|
|
||||||
|
|
||||||
connector {
|
|
||||||
compatible = "usb-c-connector";
|
|
||||||
- data-role = "host";
|
|
||||||
+ data-role = "dual";
|
|
||||||
label = "USB-C";
|
|
||||||
op-sink-microwatt = <1000000>;
|
|
||||||
power-role = "dual";
|
|
||||||
--
|
|
||||||
2.36.1
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
2
sources
2
sources
|
@ -1 +1 @@
|
||||||
SHA512 (u-boot-2024.04-rc2.tar.bz2) = f5c6d6a37ce6b34bd1ab2cddd5d0cacddfd19b5345934731df3a7ed454a3895ad2d14acbdb2e1b922b9571778e50b54cb7612b1798a04dfb991365d3344cd865
|
SHA512 (u-boot-2024.04-rc3.tar.bz2) = 75f36d57330e771dd3757c49d576b3a7f1c933dad9a102f22d2438286a763f0ec7deae863a97559cac48be8fc736b68a5292b4383d45178b111bd08134352e38
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
%global candidate rc2
|
%global candidate rc3
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
%bcond_with toolsonly
|
%bcond_with toolsonly
|
||||||
%else
|
%else
|
||||||
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
Name: uboot-tools
|
Name: uboot-tools
|
||||||
Version: 2024.04
|
Version: 2024.04
|
||||||
Release: 0.2%{?candidate:.%{candidate}}%{?dist}
|
Release: 0.3%{?candidate:.%{candidate}}%{?dist}
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Summary: U-Boot utilities
|
Summary: U-Boot utilities
|
||||||
License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
|
License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
|
||||||
|
@ -17,17 +17,23 @@ ExcludeArch: s390x
|
||||||
Source0: https://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2
|
Source0: https://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2
|
||||||
Source1: aarch64-boards
|
Source1: aarch64-boards
|
||||||
|
|
||||||
|
# This is now legacy, most devices use bootflow, we keep this for the laggards
|
||||||
Patch1: uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
|
Patch1: uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
|
||||||
Patch2: disable-VBE-by-default.patch
|
# Identify VFAT partitions as ESP, allows EFI setvar on our images
|
||||||
|
Patch2: uefi-Add-all-options-for-EFI-System-Partitions.patch
|
||||||
|
# New function to find fdt for loading from disk
|
||||||
|
#Patch3:
|
||||||
|
# Fedora patches to enable/disable features
|
||||||
|
Patch4: disable-VBE-by-default.patch
|
||||||
Patch5: enable-bootmenu-by-default.patch
|
Patch5: enable-bootmenu-by-default.patch
|
||||||
Patch7: Add-video-damage-tracking.patch
|
# Should be upstream but it's taking time
|
||||||
|
Patch6: Add-video-damage-tracking.patch
|
||||||
|
|
||||||
# Board fixes and enablement
|
# Board fixes and enablement
|
||||||
# RPi - uses RPI firmware device tree for HAT support
|
# RPi - uses RPI firmware device tree for HAT support
|
||||||
Patch10: rpi-Switch-to-OF_HAS_PRIOR_STAGE-by-default.patch
|
Patch10: rpi-Switch-to-OF_HAS_PRIOR_STAGE-by-default.patch
|
||||||
# Rockchips improvements
|
# Rockchips improvements
|
||||||
Patch11: rockchip-Add-initial-support-for-the-PinePhone-Pro.patch
|
Patch11: rockchip-Add-initial-support-for-the-PinePhone-Pro.patch
|
||||||
#Patch12: 0001-Revert-rockchip-rockpro64-Build-u-boot-rockchip-spi..patch
|
|
||||||
|
|
||||||
BuildRequires: bc
|
BuildRequires: bc
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
|
@ -87,22 +93,27 @@ do
|
||||||
mkdir builds/$(echo $board)/
|
mkdir builds/$(echo $board)/
|
||||||
|
|
||||||
# ATF selection, needs improving, suggestions of ATF SoC to Board matrix welcome
|
# ATF selection, needs improving, suggestions of ATF SoC to Board matrix welcome
|
||||||
sun50i=(a64-olinuxino amarula_a64_relic bananapi_m2_plus_h5 bananapi_m64 libretech_all_h3_cc_h5 nanopi_a64 nanopi_neo2 nanopi_neo_plus2 orangepi_pc2 orangepi_prime orangepi_win orangepi_zero_plus orangepi_zero_plus2 pine64-lts pine64_plus pinebook pinephone pinetab sopine_baseboard teres_i)
|
sun50i=(a64-olinuxino a64-olinuxino-emmc amarula_a64_relic bananapi_m2_plus_h5 bananapi_m64 libretech_all_h3_cc_h5 nanopi_a64 nanopi_neo2 nanopi_neo_plus2 oceanic_5205_5inmfd orangepi_pc2 orangepi_prime orangepi_win orangepi_zero_plus orangepi_zero_plus2 pine64-lts pine64_plus pinebook pinephone pinetab sopine_baseboard teres_i)
|
||||||
if [[ " ${sun50i[*]} " == *" $board "* ]]; then
|
if [[ " ${sun50i[*]} " == *" $board "* ]]; then
|
||||||
echo "Board: $board using sun50i_a64"
|
echo "Board: $board using sun50i_a64"
|
||||||
cp /usr/share/arm-trusted-firmware/sun50i_a64/* builds/$(echo $board)/
|
cp /usr/share/arm-trusted-firmware/sun50i_a64/bl31.bin builds/$(echo $board)/atf-bl31
|
||||||
fi
|
fi
|
||||||
sun50h6=(beelink_gs1 orangepi_3 orangepi_lite2 orangepi_one_plus orangepi_zero2 pine_h64 tanix_tx6)
|
sun50h6=(beelink_gs1 emlid_neutis_n5_devboard orangepi_3 orangepi_lite2 orangepi_one_plus pine_h64 tanix_tx6)
|
||||||
if [[ " ${sun50h6[*]} " == *" $board "* ]]; then
|
if [[ " ${sun50h6[*]} " == *" $board "* ]]; then
|
||||||
echo "Board: $board using sun50i_h6"
|
echo "Board: $board using sun50i_h6"
|
||||||
cp /usr/share/arm-trusted-firmware/sun50i_h6/* builds/$(echo $board)/
|
cp /usr/share/arm-trusted-firmware/sun50i_h6/bl31.bin builds/$(echo $board)/atf-bl31
|
||||||
fi
|
fi
|
||||||
rk3328=(evb-rk3328 nanopi-r2s-rk3328 rock64-rk3328 rock-pi-e-rk3328 roc-cc-rk3328)
|
sun50i_h616=(orangepi_zero2 orangepi_zero3 transpeed-8k618-t x96_mate)
|
||||||
|
if [[ " ${sun50i_h616[*]} " == *" $board "* ]]; then
|
||||||
|
echo "Board: $board using sun50i_h616"
|
||||||
|
cp /usr/share/arm-trusted-firmware/sun50i_h616/bl31.bin builds/$(echo $board)/atf-bl31
|
||||||
|
fi
|
||||||
|
rk3328=(evb-rk3328 nanopi-r2c-plus-rk3328 nanopi-r2c-rk3328 nanopi-r2s-rk3328 orangepi-r1-plus-lts-rk3328 orangepi-r1-plus-rk3328 roc-cc-rk3328 rock64-rk3328 rock-pi-e-rk3328)
|
||||||
if [[ " ${rk3328[*]} " == *" $board "* ]]; then
|
if [[ " ${rk3328[*]} " == *" $board "* ]]; then
|
||||||
echo "Board: $board using rk3328"
|
echo "Board: $board using rk3328"
|
||||||
cp /usr/share/arm-trusted-firmware/rk3328/bl31.elf builds/$(echo $board)/atf-bl31
|
cp /usr/share/arm-trusted-firmware/rk3328/bl31.elf builds/$(echo $board)/atf-bl31
|
||||||
fi
|
fi
|
||||||
rk3399=(evb-rk3399 ficus-rk3399 firefly-rk3399 khadas-edge-captain-rk3399 khadas-edge-rk3399 khadas-edge-v-rk3399 leez-rk3399 nanopc-t4-rk3399 nanopi-m4-2gb-rk3399 nanopi-m4b-rk3399 nanopi-m4-rk3399 nanopi-neo4-rk3399 nanopi-r4s-rk3399 orangepi-rk3399 pinebook-pro-rk3399 pinephone-pro-rk3399 puma-rk3399 rock960-rk3399 rock-pi-4c-rk3399 rock-pi-4-rk3399 rock-pi-n10-rk3399pro rockpro64-rk3399 roc-pc-mezzanine-rk3399 roc-pc-rk3399 eaidk-610-rk3399)
|
rk3399=(eaidk-610-rk3399 evb-rk3399 ficus-rk3399 firefly-rk3399 khadas-edge-captain-rk3399 khadas-edge-rk3399 khadas-edge-v-rk3399 leez-rk3399 nanopc-t4-rk3399 nanopi-m4-2gb-rk3399 nanopi-m4b-rk3399 nanopi-m4-rk3399 nanopi-neo4-rk3399 nanopi-r4s-rk3399 orangepi-rk3399 pinebook-pro-rk3399 pinephone-pro-rk3399 puma-rk3399 rock960-rk3399 rock-pi-4c-rk3399 rock-pi-4-rk3399 rock-pi-n10-rk3399pro rockpro64-rk3399 roc-pc-mezzanine-rk3399 roc-pc-rk3399)
|
||||||
if [[ " ${rk3399[*]} " == *" $board "* ]]; then
|
if [[ " ${rk3399[*]} " == *" $board "* ]]; then
|
||||||
echo "Board: $board using rk3399"
|
echo "Board: $board using rk3399"
|
||||||
cp /usr/share/arm-trusted-firmware/rk3399/* builds/$(echo $board)/
|
cp /usr/share/arm-trusted-firmware/rk3399/* builds/$(echo $board)/
|
||||||
|
@ -113,17 +124,6 @@ do
|
||||||
BINMAN_ALLOW_MISSING=1 make $(echo $board)_defconfig O=builds/$(echo $board)/
|
BINMAN_ALLOW_MISSING=1 make $(echo $board)_defconfig O=builds/$(echo $board)/
|
||||||
BINMAN_ALLOW_MISSING=1 %make_build HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" O=builds/$(echo $board)/
|
BINMAN_ALLOW_MISSING=1 %make_build HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" O=builds/$(echo $board)/
|
||||||
|
|
||||||
# build spi images for rockchip boards with SPI flash
|
|
||||||
rkspi=(rock64-rk3328)
|
|
||||||
if [[ " ${rkspi[*]} " == *" $board "* ]]; then
|
|
||||||
echo "Board: $board with SPI flash"
|
|
||||||
builds/$(echo $board)/tools/mkimage -n rk3328 -T rkspi -d builds/$(echo $board)/tpl/u-boot-tpl.bin:builds/$(echo $board)/spl/u-boot-spl.bin builds/$(echo $board)/idbloader.spi
|
|
||||||
fi
|
|
||||||
rkspi=(evb-rk3399 khadas-edge-captain-rk3399 khadas-edge-rk3399 khadas-edge-v-rk3399 nanopc-t4-rk3399 pinebook-pro-rk3399 pinephone-pro-rk3399 rockpro64-rk3399 roc-pc-mezzanine-rk3399 roc-pc-rk3399)
|
|
||||||
if [[ " ${rkspi[*]} " == *" $board "* ]]; then
|
|
||||||
echo "Board: $board with SPI flash"
|
|
||||||
builds/$(echo $board)/tools/mkimage -n rk3399 -T rkspi -d builds/$(echo $board)/tpl/u-boot-tpl.bin:builds/$(echo $board)/spl/u-boot-spl.bin builds/$(echo $board)/idbloader.spi
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
@ -138,39 +138,24 @@ mkdir -p %{buildroot}%{_datadir}/uboot/
|
||||||
%ifarch aarch64
|
%ifarch aarch64
|
||||||
for board in $(ls builds)
|
for board in $(ls builds)
|
||||||
do
|
do
|
||||||
mkdir -p %{buildroot}%{_datadir}/uboot/$(echo $board)/
|
for file in u-boot.bin u-boot.img u-boot-dtb.img u-boot.itb u-boot-sunxi-with-spl.bin u-boot-rockchip.bin idbloader.img idbloader-spi.img spl/boot.bin
|
||||||
for file in u-boot.bin u-boot.dtb u-boot.img u-boot-dtb.img u-boot.itb u-boot-sunxi-with-spl.bin u-boot-rockchip.bin idbloader.img idbloader.spi spl/boot.bin spl/sunxi-spl.bin
|
|
||||||
do
|
do
|
||||||
if [ -f builds/$(echo $board)/$(echo $file) ]; then
|
if [ -f builds/$(echo $board)/$(echo $file) ]; then
|
||||||
install -p -m 0644 builds/$(echo $board)/$(echo $file) %{buildroot}%{_datadir}/uboot/$(echo $board)/
|
install -pD -m 0644 builds/$(echo $board)/$(echo $file) %{buildroot}%{_datadir}/uboot/$(echo $board)/$(echo $file)
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
||||||
# For Apple M1 we also need the nodtb variant
|
# For Apple M-series we also need the nodtb variant
|
||||||
install -p -m 0644 builds/apple_m1/u-boot-nodtb.bin %{buildroot}%{_datadir}/uboot/apple_m1/u-boot-nodtb.bin
|
install -pD -m 0644 builds/apple_m1/u-boot-nodtb.bin %{buildroot}%{_datadir}/uboot/apple_m1/u-boot-nodtb.bin
|
||||||
%endif
|
|
||||||
|
|
||||||
# Bit of a hack to remove binaries we don't use as they're large
|
# Bit of a hack to remove binaries we don't use as they're large
|
||||||
%ifarch aarch64
|
|
||||||
for board in $(ls builds)
|
for board in $(ls builds)
|
||||||
do
|
do
|
||||||
rm -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot.dtb
|
rm -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot.dtb
|
||||||
if [ -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot-sunxi-with-spl.bin ]; then
|
if [ -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot-sunxi-with-spl.bin ]; then
|
||||||
rm -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot{,-dtb}.*
|
rm -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot{,-dtb}.*
|
||||||
fi
|
rm -f %{buildroot}%{_datadir}/uboot/$(echo $board)/sunxi-spl.bin
|
||||||
if [ -f %{buildroot}%{_datadir}/uboot/$(echo $board)/MLO ]; then
|
|
||||||
rm -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot.bin
|
|
||||||
fi
|
|
||||||
if [ -f %{buildroot}%{_datadir}/uboot/$(echo $board)/SPL ]; then
|
|
||||||
rm -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot.bin
|
|
||||||
fi
|
|
||||||
if [ -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot.imx ]; then
|
|
||||||
rm -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot.bin
|
|
||||||
fi
|
|
||||||
if [ -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot-spl.kwb ]; then
|
|
||||||
rm -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot.*
|
|
||||||
rm -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot-spl.bin
|
|
||||||
fi
|
fi
|
||||||
if [ -f %{buildroot}%{_datadir}/uboot/$(echo $board)/idbloader.img ]; then
|
if [ -f %{buildroot}%{_datadir}/uboot/$(echo $board)/idbloader.img ]; then
|
||||||
rm -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot.bin
|
rm -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot.bin
|
||||||
|
@ -194,16 +179,23 @@ install -p -m 0755 builds/tools/env/fw_printenv %{buildroot}%{_bindir}
|
||||||
%doc doc/develop/uefi doc/usage doc/arch/arm64.rst
|
%doc doc/develop/uefi doc/usage doc/arch/arm64.rst
|
||||||
%{_bindir}/*
|
%{_bindir}/*
|
||||||
%{_mandir}/man1/mkimage.1*
|
%{_mandir}/man1/mkimage.1*
|
||||||
%dir %{_datadir}/uboot/
|
|
||||||
|
|
||||||
%if %{with toolsonly}
|
%if %{with toolsonly}
|
||||||
%ifarch aarch64
|
%ifarch aarch64
|
||||||
%files -n uboot-images-armv8
|
%files -n uboot-images-armv8
|
||||||
|
%dir %{_datadir}/uboot/
|
||||||
%{_datadir}/uboot/*
|
%{_datadir}/uboot/*
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Feb 29 2024 Peter Robinson <pbrobinson@fedoraproject.org> - 1:2024.04-0.3.rc3
|
||||||
|
- Update to 2024.04 RC3
|
||||||
|
- Enable a number of new upstream devices
|
||||||
|
- Upstream now builds Rockchip SPI artifacts
|
||||||
|
- Various cleanups
|
||||||
|
- Fix ESP partition detection to enable EFI vars
|
||||||
|
|
||||||
* Wed Feb 14 2024 Peter Robinson <pbrobinson@fedoraproject.org> - 1:2024.04-0.2.rc2
|
* Wed Feb 14 2024 Peter Robinson <pbrobinson@fedoraproject.org> - 1:2024.04-0.2.rc2
|
||||||
- Update to 2024.04 RC2
|
- Update to 2024.04 RC2
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,36 @@
|
||||||
|
From 7ce45304053f31afaea6b80305aaee164c2e260a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
Date: Wed, 21 Feb 2024 14:43:16 +0000
|
||||||
|
Subject: [PATCH] disk: dos: Add all options for EFI System Partitions
|
||||||
|
|
||||||
|
The EFI spec states that the ESP can be any of FAT12/16/32 but for
|
||||||
|
compatibility doesn't necssarily require the partition to be the
|
||||||
|
EFI partition table ID of 0xef. A number of arm devices will not
|
||||||
|
find their firmware on a FAT partition with an ID of 0xef so also
|
||||||
|
allow the original FAT12/16/32 partition IDs as they are also
|
||||||
|
permissable for an ESP.
|
||||||
|
|
||||||
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
---
|
||||||
|
disk/part_dos.c | 6 ++++++
|
||||||
|
1 file changed, 6 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/disk/part_dos.c b/disk/part_dos.c
|
||||||
|
index 567ead7511d..303eb1d13ee 100644
|
||||||
|
--- a/disk/part_dos.c
|
||||||
|
+++ b/disk/part_dos.c
|
||||||
|
@@ -40,6 +40,12 @@ static int get_bootable(dos_partition_t *p)
|
||||||
|
{
|
||||||
|
int ret = 0;
|
||||||
|
|
||||||
|
+ if (p->sys_ind == 0x1)
|
||||||
|
+ ret |= PART_EFI_SYSTEM_PARTITION;
|
||||||
|
+ if (p->sys_ind == 0x6)
|
||||||
|
+ ret |= PART_EFI_SYSTEM_PARTITION;
|
||||||
|
+ if (p->sys_ind == 0x0b)
|
||||||
|
+ ret |= PART_EFI_SYSTEM_PARTITION;
|
||||||
|
if (p->sys_ind == 0xef)
|
||||||
|
ret |= PART_EFI_SYSTEM_PARTITION;
|
||||||
|
if (p->boot_ind == 0x80)
|
||||||
|
--
|
||||||
|
2.43.1
|
Loading…
Reference in New Issue