From patchwork Wed Jul 8 19:02:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Franz X-Patchwork-Id: 50910 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 469D0213FD for ; Wed, 8 Jul 2015 19:03:44 +0000 (UTC) Received: by wifm2 with SMTP id m2sf32872049wif.1 for ; Wed, 08 Jul 2015 12:03:43 -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:subject:precedence:reply-to:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=oSHpmgUBwu48EnQBrUeVXiTbNayjM7QaA2kvewkez4M=; b=aYC4/TCW8Gmh7p2PSc2JurHJSEsoa5W6vuglTQ4gPDda9VPe6LAI0geWfyVea+OfeI BpqMKUOGh4sKQX/BC2jORUxoTFab6Tm7mwbcKCtWzrbbhtLNf2DsZU6bFSQGBbXteJVQ BjyoyGR2QPbn/wlUCyElh77loTGMhceJIz7C+mQzbnzFeMt1LevNwoN9yJhG2T0jiY96 LOzTy867XDznFrU8ZATDOVa0E2RevP1ZMgyKMJG0r+iuAIVK/UfLI0wlBQvSW9pagW40 qjeYXpUXZo/zj8h6gb/JFMaMoEwpkc9ZMKFbUq+95ERLoJ6D1wP5QAwp6zu2TtyfU0of rkJA== X-Gm-Message-State: ALoCoQlaim2xtPCfoKc3FzahCfYR9/wt9RFFR+7OdCNt+PGJzOtsra6uH3lrRIU4vBvuE5jwN5LJ X-Received: by 10.112.189.131 with SMTP id gi3mr5546286lbc.6.1436382223619; Wed, 08 Jul 2015 12:03:43 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.4.227 with SMTP id n3ls1049401lan.0.gmail; Wed, 08 Jul 2015 12:03:43 -0700 (PDT) X-Received: by 10.112.56.139 with SMTP id a11mr11052811lbq.90.1436382223466; Wed, 08 Jul 2015 12:03:43 -0700 (PDT) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com. [209.85.215.53]) by mx.google.com with ESMTPS id p6si2691870lbm.170.2015.07.08.12.03.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jul 2015 12:03:43 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by lagc2 with SMTP id c2so228836041lag.3 for ; Wed, 08 Jul 2015 12:03:43 -0700 (PDT) X-Received: by 10.112.166.2 with SMTP id zc2mr10921434lbb.29.1436382223355; Wed, 08 Jul 2015 12:03:43 -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.112.108.230 with SMTP id hn6csp153220lbb; Wed, 8 Jul 2015 12:03:42 -0700 (PDT) X-Received: by 10.107.9.41 with SMTP id j41mr20355506ioi.37.1436382212108; Wed, 08 Jul 2015 12:03:32 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id w2si20848342igl.34.2015.07.08.12.03.31 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 08 Jul 2015 12:03:32 -0700 (PDT) Received-SPF: pass (google.com: domain of edk2-devel-bounces@lists.sourceforge.net designates 216.34.181.88 as permitted sender) client-ip=216.34.181.88; Received: from localhost ([127.0.0.1] helo=sfs-ml-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1ZCucs-0000R8-33; Wed, 08 Jul 2015 19:03:22 +0000 Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1ZCucq-0000Qs-HR for edk2-devel@lists.sourceforge.net; Wed, 08 Jul 2015 19:03:20 +0000 Received-SPF: pass (sog-mx-1.v43.ch3.sourceforge.com: domain of linaro.org designates 209.85.192.175 as permitted sender) client-ip=209.85.192.175; envelope-from=roy.franz@linaro.org; helo=mail-pd0-f175.google.com; Received: from mail-pd0-f175.google.com ([209.85.192.175]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1ZCucp-0006o8-Ja for edk2-devel@lists.sourceforge.net; Wed, 08 Jul 2015 19:03:20 +0000 Received: by pdbqm3 with SMTP id qm3so6924471pdb.0 for ; Wed, 08 Jul 2015 12:03:14 -0700 (PDT) X-Received: by 10.68.179.228 with SMTP id dj4mr22939581pbc.141.1436382193996; Wed, 08 Jul 2015 12:03:13 -0700 (PDT) Received: from localhost.localdomain (c-73-41-93-56.hsd1.ca.comcast.net. [73.41.93.56]) by smtp.gmail.com with ESMTPSA id nk1sm3322254pdb.36.2015.07.08.12.03.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Jul 2015 12:03:13 -0700 (PDT) From: Roy Franz To: edk2-devel@lists.sourceforge.net, feng.tian@intel.com, lersek@redhat.com, ard.biesheuvel@linaro.org Date: Wed, 8 Jul 2015 12:02:52 -0700 Message-Id: <1436382172-27491-6-git-send-email-roy.franz@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436382172-27491-1-git-send-email-roy.franz@linaro.org> References: <1436382172-27491-1-git-send-email-roy.franz@linaro.org> X-Spam-Score: -1.5 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1ZCucp-0006o8-Ja Subject: [edk2] [PATCH V4 5/5] add TTY_TERMINAL build option for ARM BDS X-BeenThere: edk2-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list Reply-To: edk2-devel@lists.sourceforge.net List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.sourceforge.net X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: roy.franz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 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 Enable selecting the TtyTerminal type for the ARM BDS build of QEMU using the TTY_TERMINAL define. Convert INTEL_BDS define to check for value (!if) rather than just definition (!ifdef) to allow setting of either value on command line. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Roy Franz --- ArmVirtPkg/ArmVirtQemu.dsc | 11 ++++++++--- ArmVirtPkg/ArmVirtQemu.fdf | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 0671469..fbc2b12 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -57,7 +57,7 @@ TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf NorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf -!ifdef INTEL_BDS +!if $(INTEL_BDS) == TRUE CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf PlatformBdsLib|ArmVirtPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf @@ -138,8 +138,13 @@ # # Settings for ARM BDS -- use the serial console (ConIn & ConOut). # +!if $(TTY_TERMINAL) == TRUE + gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenMsg(7D916D80-5BB1-458C-A48F-E25FDD51EF94)" + gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenMsg(7D916D80-5BB1-458C-A48F-E25FDD51EF94)" +!else gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenVt100()" gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenVt100()" +!endif gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3 # @@ -163,7 +168,7 @@ # initial location of the device tree blob passed by QEMU -- base of DRAM gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x40000000 -!ifdef INTEL_BDS +!if $(INTEL_BDS) == TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } !endif @@ -313,7 +318,7 @@ # Bds # MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf -!ifdef INTEL_BDS +!if $(INTEL_BDS) == TRUE MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf index e822fdf..30556f5 100644 --- a/ArmVirtPkg/ArmVirtQemu.fdf +++ b/ArmVirtPkg/ArmVirtQemu.fdf @@ -169,7 +169,7 @@ READ_LOCK_STATUS = TRUE # Bds # INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf -!ifdef INTEL_BDS +!if $(INTEL_BDS) == TRUE INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf @@ -227,7 +227,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf -!ifdef INTEL_BDS +!if $(INTEL_BDS) == TRUE # # TianoCore logo (splash screen) #