From patchwork Wed May 14 09:10:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 30159 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f70.google.com (mail-yh0-f70.google.com [209.85.213.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9DC442055D for ; Wed, 14 May 2014 09:11:59 +0000 (UTC) Received: by mail-yh0-f70.google.com with SMTP id z6sf5681363yhz.5 for ; Wed, 14 May 2014 02:11:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=8jSF29SkdMeqFTeqDQTzWCJFAVJ2PWxFo02+piuBfOE=; b=DBUfD+FQJNgvtWwi5kjDxdkNisMHVBehqDnBOTeDlhin9mkUkHPRU6Xg91iRnRn0gp mT8fSnbIiLWdjfQcOf1xuFsfCobPEqfyBGUeORcp6zUlJeLTWR9j00ITGi+WVUV7y1qA VqOorEl5NMNl4BUfgFEiD77g7+Jb4wqu7JNIdibZPmbfZxLX9xTBA4oHmIEXm75SPyYk e1hNXLcYrqymoa7eSu4PoIrXJ4Ice1XdJ6Sks4kwwjYOxwe7TM+rZnRfv0Co12zZGM+N yhlI00+y2cQMEoESOo5CaMVEE7ASol3g9XHLTDPiDaUvr65Z+i7KM1R3Fm5kTYw7IWDQ p6pw== X-Gm-Message-State: ALoCoQmxoSTn3uMWPS/jdMuvH5vULUvUdAIicfcIE+2v7piuVP0kl1gAlNNn8yWXnlyfDrEGFzkk X-Received: by 10.236.199.108 with SMTP id w72mr1007251yhn.10.1400058719474; Wed, 14 May 2014 02:11:59 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.101.4 with SMTP id t4ls2373451qge.1.gmail; Wed, 14 May 2014 02:11:59 -0700 (PDT) X-Received: by 10.220.167.2 with SMTP id o2mr2167112vcy.8.1400058719413; Wed, 14 May 2014 02:11:59 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id o6si226397vcz.76.2014.05.14.02.11.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 14 May 2014 02:11:59 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id im17so2028945vcb.24 for ; Wed, 14 May 2014 02:11:59 -0700 (PDT) X-Received: by 10.52.95.171 with SMTP id dl11mr1806443vdb.36.1400058719332; Wed, 14 May 2014 02:11:59 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp223739vcb; Wed, 14 May 2014 02:11:59 -0700 (PDT) X-Received: by 10.58.195.231 with SMTP id ih7mr2090564vec.32.1400058718940; Wed, 14 May 2014 02:11:58 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id tx4si220023vdc.184.2014.05.14.02.11.58 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 14 May 2014 02:11:58 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WkVCW-0004Aw-VG; Wed, 14 May 2014 09:10:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WkVCV-0004AO-V5 for xen-devel@lists.xen.org; Wed, 14 May 2014 09:10:12 +0000 Received: from [85.158.137.68:51245] by server-14.bemta-3.messagelabs.com id F8/35-30903-2F233735; Wed, 14 May 2014 09:10:10 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1400058608!3800285!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4970 invoked from network); 14 May 2014 09:10:10 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-3.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 14 May 2014 09:10:10 -0000 X-IronPort-AV: E=Sophos; i="4.97,1050,1389744000"; d="scan'208"; a="130201318" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 14 May 2014 09:10:10 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Wed, 14 May 2014 05:10:08 -0400 Received: from cosworth.uk.xensource.com ([10.80.16.52] helo=localhost.localdomain ident=ianc) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1WkVCQ-0005fp-I1; Wed, 14 May 2014 10:10:07 +0100 Received: by localhost.localdomain (sSMTP sendmail emulation); Wed, 14 May 2014 10:10:06 +0100 From: Ian Campbell To: , Date: Wed, 14 May 2014 10:10:04 +0100 Message-ID: <1400058604-1345-2-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1400058556.29366.4.camel@kazak.uk.xensource.com> References: <1400058556.29366.4.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell , roger.pau@citrix.com Subject: [Xen-devel] [PATCH 2/2] tools: Use SeaBIOS's defconfig X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: Compared with our local config this enables CONFIG_BOOTSPLASH and disables CONFIG_ATA_DMA and CONFIG_ATA_PIO32. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- tools/firmware/Makefile | 2 +- tools/firmware/seabios-config | 103 ----------------------------------------- 2 files changed, 1 insertion(+), 104 deletions(-) delete mode 100644 tools/firmware/seabios-config 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