commit 10d4ada6586fcd4a7d34b35ebda9901502cc4ecd
Author: Jan Palus <[email protected]>
Date: Sun Jul 14 13:34:06 2024 +0200
up to 2024.07
hardkernel-uboot-gcc14.patch | 21 +++++
...using-the-DT-provided-by-the-Raspberry-Pi.patch | 96 ----------------------
uboot.spec | 10 +--
3 files changed, 25 insertions(+), 102 deletions(-)
---
diff --git a/uboot.spec b/uboot.spec
index 12e228e..ab11f17 100644
--- a/uboot.spec
+++ b/uboot.spec
@@ -1,15 +1,14 @@
Summary: Das U-Boot -- the Universal Boot Loader
Summary(pl.UTF-8): Das U-Boot - uniwersalny bootloader
Name: uboot
-Version: 2024.01
+Version: 2024.07
Release: 1
License: GPL v2
Group: Applications/System
Source0: https://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
-# Source0-md5: a020c6e24bfeb19a455c920a48ab9976
+# Source0-md5: e19c1180d996369d730918fc94f903c0
Source1:
https://github.com/hardkernel/u-boot/archive/travis/odroidc4-189/odroid-189.tar.gz
# Source1-md5: dd117b6180ad5c9abb3303b31e57e7b4
-Patch0:
rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
Patch2: odroid-n2-binutils-2.39.patch
Patch3: hardkernel-uboot-gcc5.patch
Patch4: hardkernel-uboot-werror.patch
@@ -18,6 +17,7 @@ Patch6: hardkernel-uboot-no_stdint.patch
Patch7: hardkernel-uboot-x86_64_bin.patch
Patch8: hardkernel-uboot-acs.patch
Patch9: hardkernel-uboot-uboot_payload.patch
+Patch10: hardkernel-uboot-gcc14.patch
URL: https://www.denx.de/wiki/U-Boot
BuildRequires: bison
BuildRequires: dtc
@@ -176,9 +176,6 @@ czasie utworzenia, sumach kontrolnych CRC32 itp.
%prep
%setup -q -n u-boot-%{version}
-%ifarch %{arm} aarch64
-%patch0 -p1
-%endif
%ifarch aarch64
install -d build/hardkernel-uboot-odroid
tar xf %{SOURCE1} -C build/hardkernel-uboot-odroid
@@ -192,6 +189,7 @@ cd build/hardkernel-uboot-odroid
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
cd ../..
%endif
diff --git a/hardkernel-uboot-gcc14.patch b/hardkernel-uboot-gcc14.patch
new file mode 100644
index 0000000..5e204ad
--- /dev/null
+++ b/hardkernel-uboot-gcc14.patch
@@ -0,0 +1,21 @@
+diff -ur hardkernel-uboot-odroid.orig/common/bootm.c
hardkernel-uboot-odroid/common/bootm.c
+--- hardkernel-uboot-odroid.orig/common/bootm.c 2024-07-14
13:02:16.210258070 +0200
++++ hardkernel-uboot-odroid/common/bootm.c 2024-07-14 13:05:23.621487933
+0200
+@@ -330,7 +330,7 @@
+ #ifdef CONFIG_OF_LIBFDT_OVERLAY
+ static int get_fdto_totalsize(u32 *tz)
+ {
+- unsigned long long dtbo_mem_addr = NULL;
++ unsigned long long dtbo_mem_addr;
+ int ret;
+
+ ret = read_fdto_partition();
+@@ -347,7 +347,7 @@
+ #ifdef CONFIG_OF_LIBFDT_OVERLAY
+ static int do_fdt_overlay(void)
+ {
+- unsigned long long dtbo_mem_addr = NULL;
++ unsigned long long dtbo_mem_addr;
+ int dtbo_num = 0;
+ int i;
+ char cmd[128];
diff --git a/rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
b/rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
deleted file mode 100644
index c156e4d..0000000
--- a/rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From f10f94831450671a77f61fe413b4a57459963860 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <[email protected]>
-Date: Mon, 10 Aug 2020 22:20:29 +0100
-Subject: [PATCH] rpi: Use firmware provided device tree
-
-Signed-off-by: Peter Robinson <[email protected]>
----
- configs/rpi_0_w_defconfig | 2 +-
- configs/rpi_2_defconfig | 2 +-
- configs/rpi_3_32b_defconfig | 2 +-
- configs/rpi_3_b_plus_defconfig | 2 +-
- configs/rpi_3_defconfig | 2 +-
- configs/rpi_defconfig | 2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
-index bba5e12b12..0241f4c6d3 100644
---- a/configs/rpi_0_w_defconfig
-+++ b/configs/rpi_0_w_defconfig
-@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_FS_UUID=y
--CONFIG_OF_EMBED=y
-+CONFIG_OF_BOARD=y
- CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
- CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
-index 1c2bbb29ce..9573e475f4 100644
---- a/configs/rpi_2_defconfig
-+++ b/configs/rpi_2_defconfig
-@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_FS_UUID=y
--CONFIG_OF_EMBED=y
-+CONFIG_OF_BOARD=y
- CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
- CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
-index b8a3d17f43..252df994e6 100644
---- a/configs/rpi_3_32b_defconfig
-+++ b/configs/rpi_3_32b_defconfig
-@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_FS_UUID=y
--CONFIG_OF_EMBED=y
-+CONFIG_OF_BOARD=y
- CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
- CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-diff --git a/configs/rpi_3_b_plus_defconfig b/configs/rpi_3_b_plus_defconfig
-index 4c361438fa..3b2996a2f9 100644
---- a/configs/rpi_3_b_plus_defconfig
-+++ b/configs/rpi_3_b_plus_defconfig
-@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_FS_UUID=y
--CONFIG_OF_EMBED=y
-+CONFIG_OF_BOARD=y
- CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
- CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
-index 9b281a4f15..1e9ee6122e 100644
---- a/configs/rpi_3_defconfig
-+++ b/configs/rpi_3_defconfig
-@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_FS_UUID=y
--CONFIG_OF_EMBED=y
-+CONFIG_OF_BOARD=y
- CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
- CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
-index b5ad53c37b..223fc03275 100644
---- a/configs/rpi_defconfig
-+++ b/configs/rpi_defconfig
-@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_FS_UUID=y
--CONFIG_OF_EMBED=y
-+CONFIG_OF_BOARD=y
- CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
- CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
---
-2.26.2
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/uboot.git/commitdiff/10d4ada6586fcd4a7d34b35ebda9901502cc4ecd
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
