starred/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-07-08 17:46:10 +00:00
Code Issues 380 Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
BALATON Zoltan
2025-10-28 16:19:23 +01:00
committed by Harsh Prateek Bora
parent f551663d02
commit 2a62bbf4ed
7 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@@ -1643,7 +1643,7 @@ F: hw/display/sm501*
F: hw/ide/sii3112.c F: hw/ide/sii3112.c
F: hw/rtc/m41t80.c F: hw/rtc/m41t80.c
F: pc-bios/dtb/canyonlands.dt[sb] 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: roms/u-boot-sam460ex
F: docs/system/ppc/amigang.rst F: docs/system/ppc/amigang.rst
F: tests/functional/ppc/test_sam460ex.py F: tests/functional/ppc/test_sam460ex.py

7
hw/ppc/sam460ex.c
View File

@@ -43,10 +43,7 @@
#include <libfdt.h> #include <libfdt.h>
#define BINARY_DEVICE_TREE_FILE "canyonlands.dtb" #define BINARY_DEVICE_TREE_FILE "canyonlands.dtb"
#define UBOOT_FILENAME "u-boot-sam460-20100605.bin" #define UBOOT_FILENAME "u-boot-sam460.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 PCIE0_DCRN_BASE 0x100 #define PCIE0_DCRN_BASE 0x100
#define PCIE1_DCRN_BASE 0x120 #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 * Else, it's initialized to zero. And then 512KiB of ROM get
* mapped on top of its second half (0xFFF80000..0xFFFFFFFF), * 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. * This doesn't smell right.
* *

2
pc-bios/meson.build
View File

@@ -74,7 +74,7 @@ blobs = [
'pnv-pnor.bin', 'pnv-pnor.bin',
'palcode-clipper', 'palcode-clipper',
'u-boot.e500', 'u-boot.e500',
'u-boot-sam460-20100605.bin', 'u-boot-sam460.bin',
'qemu_vga.ndrv', 'qemu_vga.ndrv',
'edk2-licenses.txt', 'edk2-licenses.txt',
'hppa-firmware.img', 'hppa-firmware.img',

BIN
pc-bios/u-boot-sam460-20100605.bin
View File

Binary file not shown.

BIN
pc-bios/u-boot-sam460.bin Normal file
View File

Binary file not shown.

5
roms/Makefile
View File

@@ -144,9 +144,10 @@ u-boot.e500:
../pc-bios/u-boot.e500 ../pc-bios/u-boot.e500
u-boot.sam460: 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) $(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: skiboot:
$(MAKE) -C skiboot CROSS=$(powerpc64_cross_prefix) $(MAKE) -C skiboot CROSS=$(powerpc64_cross_prefix)

2
roms/u-boot-sam460ex

Submodule roms/u-boot-sam460ex updated: 60b3916f33...1e5f4a1607