From: BALATON Zoltan <balaton@eik.bme.hu>
Date: Tue, 28 Oct 2025 15:19:23 +0000 (+0100)
Subject: hw/ppc/sam460ex: Update u-boot-sam460ex
X-Git-Tag: v10.2.0-rc1~31^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a62bbf4ed49bcd8c4f2003e265ea554589da9f4;p=thirdparty%2Fqemu.git

hw/ppc/sam460ex: Update u-boot-sam460ex

Update the sam460ex firmware to match 2015.c version from the machine
vendor which fixes USB devices and some other bugs. Also cherry pick
some commits from upstream U-Boot that moves licenses in a subdir and
allows gitlab to correctly detect and show license information. Drop
version number from the binary name to avoid needing to change it in
case of future updates.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Message-Id: <20251028151923.10DBB5972E5@zero.eik.bme.hu>
Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
---

diff --git a/MAINTAINERS b/MAINTAINERS
index 64491c800c2..0a620ba87c8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1643,7 +1643,7 @@ F: hw/display/sm501*
 F: hw/ide/sii3112.c
 F: hw/rtc/m41t80.c
 F: pc-bios/dtb/canyonlands.dt[sb]
-F: pc-bios/u-boot-sam460ex-20100605.bin
+F: pc-bios/u-boot-sam460ex.bin
 F: roms/u-boot-sam460ex
 F: docs/system/ppc/amigang.rst
 F: tests/functional/ppc/test_sam460ex.py
diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
index 258d43f8d2d..038b98d0b81 100644
--- a/hw/ppc/sam460ex.c
+++ b/hw/ppc/sam460ex.c
@@ -43,10 +43,7 @@
 #include <libfdt.h>
 
 #define BINARY_DEVICE_TREE_FILE "canyonlands.dtb"
-#define UBOOT_FILENAME "u-boot-sam460-20100605.bin"
-/* to extract the official U-Boot bin from the updater: */
-/* dd bs=1 skip=$(($(stat -c '%s' updater/updater-460) - 0x80000)) \
-     if=updater/updater-460 of=u-boot-sam460-20100605.bin */
+#define UBOOT_FILENAME "u-boot-sam460.bin"
 
 #define PCIE0_DCRN_BASE 0x100
 #define PCIE1_DCRN_BASE 0x120
@@ -97,7 +94,7 @@ static int sam460ex_load_uboot(void)
      *
      * Else, it's initialized to zero.  And then 512KiB of ROM get
      * mapped on top of its second half (0xFFF80000..0xFFFFFFFF),
-     * initialized from u-boot-sam460-20100605.bin.
+     * initialized from UBOOT_FILENAME.
      *
      * This doesn't smell right.
      *
diff --git a/pc-bios/meson.build b/pc-bios/meson.build
index 3c41620044a..9260aaad78e 100644
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -74,7 +74,7 @@ blobs = [
   'pnv-pnor.bin',
   'palcode-clipper',
   'u-boot.e500',
-  'u-boot-sam460-20100605.bin',
+  'u-boot-sam460.bin',
   'qemu_vga.ndrv',
   'edk2-licenses.txt',
   'hppa-firmware.img',
diff --git a/pc-bios/u-boot-sam460-20100605.bin b/pc-bios/u-boot-sam460-20100605.bin
deleted file mode 100644
index e17de77c197..00000000000
Binary files a/pc-bios/u-boot-sam460-20100605.bin and /dev/null differ
diff --git a/pc-bios/u-boot-sam460.bin b/pc-bios/u-boot-sam460.bin
new file mode 100644
index 00000000000..6663683ef1a
Binary files /dev/null and b/pc-bios/u-boot-sam460.bin differ
diff --git a/roms/Makefile b/roms/Makefile
index 4c8793c5bd4..f15189a5409 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -144,9 +144,10 @@ u-boot.e500:
 		../pc-bios/u-boot.e500
 
 u-boot.sam460:
-	$(MAKE) -C u-boot-sam460ex Sam460ex_config
+	$(MAKE) -C u-boot-sam460ex Sam460_50_config
 	$(MAKE) -C u-boot-sam460ex CROSS_COMPILE=$(powerpc_cross_prefix)
-	cp u-boot-sam460ex/u-boot.bin ../pc-bios/u-boot-sam460-20100605.bin
+	cp u-boot-sam460ex/u-boot.bin ../pc-bios/u-boot-sam460.bin
+	chmod -x ../pc-bios/u-boot-sam460.bin
 
 skiboot:
 	$(MAKE) -C skiboot CROSS=$(powerpc64_cross_prefix)
diff --git a/roms/u-boot-sam460ex b/roms/u-boot-sam460ex
index 60b3916f33e..1e5f4a1607c 160000
--- a/roms/u-boot-sam460ex
+++ b/roms/u-boot-sam460ex
@@ -1 +1 @@
-Subproject commit 60b3916f33e617a815973c5a6df77055b2e3a588
+Subproject commit 1e5f4a1607cc6713d27ffe48dd9de84e69cfc1c2