diff options
Diffstat (limited to 'roms')
-rw-r--r-- | roms/Makefile | 7 | ||||
m--------- | roms/SLOF | 0 | ||||
-rw-r--r-- | roms/config.seabios-128k | 2 | ||||
m--------- | roms/openbios | 0 | ||||
m--------- | roms/seabios | 0 |
5 files changed, 5 insertions, 4 deletions
diff --git a/roms/Makefile b/roms/Makefile index 09e33b59e5..7bd1252737 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -35,7 +35,7 @@ powerpc_cross_prefix := $(call find-cross-prefix,powerpc) x86_64_cross_prefix := $(call find-cross-prefix,x86_64) # tag our seabios builds -SEABIOS_VERSION="$(shell cd seabios; git describe --tags --long) by qemu-project.org" +SEABIOS_EXTRAVERSION="-prebuilt.qemu-project.org" # # EfiRom utility is shipped with edk2 / tianocore, in BaseTools/ @@ -64,7 +64,6 @@ default: bios: build-seabios-config-seabios-128k build-seabios-config-seabios-256k cp seabios/builds/seabios-128k/bios.bin ../pc-bios/bios.bin cp seabios/builds/seabios-256k/bios.bin ../pc-bios/bios-256k.bin - cp seabios/builds/seabios-256k/src/fw/*dsdt.aml ../pc-bios/ seavgabios: $(patsubst %,seavgabios-%,$(vgabios_variants)) @@ -78,12 +77,12 @@ build-seabios-config-%: config.% mkdir -p seabios/builds/$* cp $< seabios/builds/$*/.config $(MAKE) -C seabios \ - VERSION=$(SEABIOS_VERSION) \ + EXTRAVERSION=$(SEABIOS_EXTRAVERSION) \ CROSS_COMPILE=$(x86_64_cross_prefix) \ KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \ OUT=$(CURDIR)/seabios/builds/$*/ oldnoconfig $(MAKE) -C seabios \ - VERSION=$(SEABIOS_VERSION) \ + EXTRAVERSION=$(SEABIOS_EXTRAVERSION) \ CROSS_COMPILE=$(x86_64_cross_prefix) \ KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \ OUT=$(CURDIR)/seabios/builds/$*/ all diff --git a/roms/SLOF b/roms/SLOF -Subproject b4c93802a5b2c72f096649c497ec9ff5708e445 +Subproject e3d05727a074619fc12d0a67f05cf2c42c875cc diff --git a/roms/config.seabios-128k b/roms/config.seabios-128k index c719ba6892..0a9da77a5e 100644 --- a/roms/config.seabios-128k +++ b/roms/config.seabios-128k @@ -3,6 +3,8 @@ CONFIG_QEMU=y CONFIG_ROM_SIZE=128 CONFIG_XEN=n +CONFIG_USB_OHCI=n CONFIG_USB_XHCI=n CONFIG_USB_UAS=n CONFIG_SDCARD=n +CONFIG_TCGBIOS=n diff --git a/roms/openbios b/roms/openbios -Subproject 3caee1794ac3f742315823d8447d21f33ce019e +Subproject 422b916649aa0db8c5edadccb22387b3e807e3b diff --git a/roms/seabios b/roms/seabios -Subproject 33fbe13a3e2a01e0ba1087a8feed801a0451db2 +Subproject b3ef39f532db52bf17457ba931da758eeb38d6b |