From 99b2937ed4573f94ac163451ad2e226a6d911365 Mon Sep 17 00:00:00 2001
From: Chris Patterson <cjp256@gmail.com>
Date: Fri, 1 Jan 2016 10:54:00 -0500
Subject: [PATCH] seabios: drop shipped defconfig and use defaults

Upstream Xen opted to simply use 'make defconfig' to get a
generic seabios config.  Follow suit and remove old config.

Signed-off-by: Chris Patterson <cjp256@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 recipes-extended/seabios/seabios/defconfig | 102 ---------------------
 recipes-extended/seabios/seabios_1.9.0.bb  |   4 +-
 2 files changed, 1 insertion(+), 105 deletions(-)
 delete mode 100644 recipes-extended/seabios/seabios/defconfig

diff --git a/recipes-extended/seabios/seabios/defconfig b/recipes-extended/seabios/seabios/defconfig
deleted file mode 100644
index d4474bab..00000000
--- a/recipes-extended/seabios/seabios/defconfig
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# SeaBIOS Configuration
-# Wed Sep 18 14:08:45 2013
-#
-
-#
-# 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 is not set
-
-#
-# Hardware support
-#
-CONFIG_ATA=y
-# CONFIG_ATA_DMA is not set
-# CONFIG_ATA_PIO32 is not set
-CONFIG_AHCI=y
-CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_SCSI=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_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 is not set
-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=y
-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
-
-#
-# BIOS Tables
-#
-# CONFIG_PIRTABLE is not set
-# CONFIG_MPTABLE is not set
-# CONFIG_SMBIOS is not set
-# CONFIG_ACPI is not set
-
-#
-# VGA ROM
-#
-# CONFIG_NO_VGABIOS is not set
-# 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_VGA_XENGFX is not set
-# CONFIG_BUILD_VGABIOS is not set
-# CONFIG_VGA_VBE is not set
-# CONFIG_VGA_PCI is not set
-# CONFIG_OVERRIDE_PCI_ID is not set
-# CONFIG_VGA_VID=0x5853
-# CONFIG_VGA_DID=0xC147
-
-#
-# Debugging
-#
-CONFIG_DEBUG_LEVEL=2
-# CONFIG_DEBUG_SERIAL is not set
-CONFIG_DEBUG_IO=y
diff --git a/recipes-extended/seabios/seabios_1.9.0.bb b/recipes-extended/seabios/seabios_1.9.0.bb
index fcdc0c5b..4808a18e 100644
--- a/recipes-extended/seabios/seabios_1.9.0.bb
+++ b/recipes-extended/seabios/seabios_1.9.0.bb
@@ -6,7 +6,6 @@ SECTION = "firmware"
 SRC_URI = " \
     http://code.coreboot.org/p/seabios/downloads/get/${PN}-${PV}.tar.gz \
     file://hostcc.patch \
-    file://defconfig \
     "
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504         \
@@ -25,8 +24,7 @@ EXTRA_OEMAKE += "HOSTCC='${BUILD_CC}'"
 EXTRA_OEMAKE += "CROSS_PREFIX=${TARGET_PREFIX}"
 
 do_configure() {
-    install -m 0644 "${WORKDIR}/defconfig" .config
-    oe_runmake oldconfig
+    oe_runmake defconfig
 }
 
 do_compile() {