diff mbox

[Xen-devel,2/2] tools: Use SeaBIOS's defconfig

Message ID 1400058604-1345-2-git-send-email-ian.campbell@citrix.com
State Accepted
Commit 79e0f772a9857ac101b4608e05951964d928a02c
Headers show

Commit Message

Ian Campbell May 14, 2014, 9:10 a.m. UTC 
Compared with our local config this enables CONFIG_BOOTSPLASH and disables
CONFIG_ATA_DMA and CONFIG_ATA_PIO32.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 tools/firmware/Makefile       |    2 +-
 tools/firmware/seabios-config |  103 -----------------------------------------
 2 files changed, 1 insertion(+), 104 deletions(-)
 delete mode 100644 tools/firmware/seabios-config

Comments

Ian Jackson June 2, 2014, 2:07 p.m. UTC | #1 
Ian Campbell writes ("[PATCH 2/2] tools: Use SeaBIOS's defconfig"):
> Compared with our local config this enables CONFIG_BOOTSPLASH and disables
> CONFIG_ATA_DMA and CONFIG_ATA_PIO32.

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
diff mbox

Patch

diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
index dcb56e5..9d1fdec 100644
--- a/tools/firmware/Makefile
+++ b/tools/firmware/Makefile
@@ -23,7 +23,7 @@  ovmf-dir:
 
 seabios-dir:
 	GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_TAG) seabios-dir
-	cp seabios-config seabios-dir/.config;
+	$(MAKE) -C seabios-dir defconfig
 
 .PHONY: all
 all: $(SUBDIRS-y)
diff --git a/tools/firmware/seabios-config b/tools/firmware/seabios-config
deleted file mode 100644
index f42d497..0000000
--- a/tools/firmware/seabios-config
+++ /dev/null
@@ -1,103 +0,0 @@ 
-#
-# Automatically generated file; DO NOT EDIT.
-# SeaBIOS Configuration
-#
-
-#
-# General Features
-#
-# CONFIG_COREBOOT is not set
-CONFIG_QEMU=y
-# CONFIG_CSM is not set
-CONFIG_QEMU_HARDWARE=y
-CONFIG_XEN=y
-CONFIG_THREADS=y
-# CONFIG_THREAD_OPTIONROMS is not set
-CONFIG_RELOCATE_INIT=y
-CONFIG_BOOTMENU=y
-# CONFIG_BOOTSPLASH is not set
-CONFIG_BOOTORDER=y
-CONFIG_ENTRY_EXTRASTACK=y
-CONFIG_MALLOC_UPPERMEMORY=y
-CONFIG_ROM_SIZE=0
-
-#
-# Hardware support
-#
-CONFIG_ATA=y
-CONFIG_ATA_DMA=y
-CONFIG_ATA_PIO32=y
-CONFIG_AHCI=y
-CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_SCSI=y
-CONFIG_PVSCSI=y
-CONFIG_ESP_SCSI=y
-CONFIG_LSI_SCSI=y
-CONFIG_MEGASAS=y
-CONFIG_FLOPPY=y
-CONFIG_PS2PORT=y
-CONFIG_USB=y
-CONFIG_USB_UHCI=y
-CONFIG_USB_OHCI=y
-CONFIG_USB_EHCI=y
-CONFIG_USB_XHCI=y
-CONFIG_USB_MSC=y
-CONFIG_USB_UAS=y
-CONFIG_USB_HUB=y
-CONFIG_USB_KEYBOARD=y
-CONFIG_USB_MOUSE=y
-CONFIG_SERIAL=y
-CONFIG_LPT=y
-CONFIG_USE_SMM=y
-CONFIG_MTRR_INIT=y
-CONFIG_PMTIMER=y
-
-#
-# BIOS interfaces
-#
-CONFIG_DRIVES=y
-CONFIG_CDROM_BOOT=y
-CONFIG_CDROM_EMU=y
-CONFIG_PCIBIOS=y
-CONFIG_APMBIOS=y
-CONFIG_PNPBIOS=y
-CONFIG_OPTIONROMS=y
-# CONFIG_OPTIONROMS_DEPLOYED is not set
-CONFIG_PMM=y
-CONFIG_BOOT=y
-CONFIG_KEYBOARD=y
-CONFIG_KBD_CALL_INT15_4F=y
-CONFIG_MOUSE=y
-CONFIG_S3_RESUME=y
-CONFIG_VGAHOOKS=y
-# CONFIG_DISABLE_A20 is not set
-# CONFIG_WRITABLE_UPPERMEMORY is not set
-
-#
-# BIOS Tables
-#
-CONFIG_PIRTABLE=y
-CONFIG_MPTABLE=y
-CONFIG_SMBIOS=y
-CONFIG_ACPI=y
-CONFIG_ACPI_DSDT=y
-CONFIG_FW_ROMFILE_LOAD=y
-
-#
-# VGA ROM
-#
-CONFIG_NO_VGABIOS=y
-# CONFIG_VGA_STANDARD_VGA is not set
-# CONFIG_VGA_CIRRUS is not set
-# CONFIG_VGA_BOCHS is not set
-# CONFIG_VGA_GEODEGX2 is not set
-# CONFIG_VGA_GEODELX is not set
-# CONFIG_BUILD_VGABIOS is not set
-CONFIG_VGA_EXTRA_STACK_SIZE=512
-
-#
-# Debugging
-#
-CONFIG_DEBUG_LEVEL=1
-# CONFIG_DEBUG_SERIAL is not set
-CONFIG_DEBUG_IO=y