From patchwork Fri Apr 26 03:59:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1091213 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="kA06pcaN"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44r0vb2CF7z9s3l for ; Fri, 26 Apr 2019 14:10:19 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id C63B4C21E1B; Fri, 26 Apr 2019 04:08:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 37607C21EA6; Fri, 26 Apr 2019 04:01:59 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3E584C21DD3; Fri, 26 Apr 2019 04:00:30 +0000 (UTC) Received: from mail-io1-f68.google.com (mail-io1-f68.google.com [209.85.166.68]) by lists.denx.de (Postfix) with ESMTPS id 3C859C21DFA for ; Fri, 26 Apr 2019 04:00:26 +0000 (UTC) Received: by mail-io1-f68.google.com with SMTP id p23so1819282iol.13 for ; Thu, 25 Apr 2019 21:00:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XPzwqV8k3O+EzNARLX0BaTD0aHFt0hYkoejb2bPuYeQ=; b=kA06pcaNhM1chFhJO7Y9Itt+6j7wQeBx8ME2zLq9Ct1HdWSL0YAsirFqIycpIrMZk1 0wz9LmkyO6Gw+BoDhZ5RdCMdGB1Y06FG7hoqd9DcWN+HY2r/Cp74pu0vE1LeyUBQTISx e6CHpErE7YxD8z1Gwdb9N6HE67niJJrC5PpOQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XPzwqV8k3O+EzNARLX0BaTD0aHFt0hYkoejb2bPuYeQ=; b=YBjBuxzYZPe4WMe+QjlKVXFTOpjPGLjfCaUq8aDOSosy41SES9SoWEyyGbAxkaekE9 LxE2n6/AdlB+9RmsmNG3VIU/Hbr/hGh5XAa+tI4mKX6+xp2ee1/KeseLV4Fr6Mc3efFr DJcildMEhtNTwr6Lb4axWsYOsQRabhu3hANYIx95SyGoaO7JQrJ0i5xvtdJMQPIj+ZOz J7PYaDUIMB0sVwnNNxMb4guwk96Lf/Fgnqn8JVWkY0UNoKX8k/W12Xh8k3/MH5NkBnd7 Ga5u8UZem4IOXQFeN32lElGuIEt2ZN1z0nWfo2dC3AB0ejUQyBTU3ckNPmmYUVlJHcaX lEzQ== X-Gm-Message-State: APjAAAUzGQginy15B3kKWRBqXaRcujS53Hjm6HdnS1djsO9nq+eryBtQ 8JsqNb2bgxFsYmFVBRnRv5x6kyfrjwo= X-Google-Smtp-Source: APXvYqx6h6Ef6qJxi9IUH+wTfpX7V4iIpitCP5dPZm6urkxzkvzcTQUVMDwn35kQcgkbFWMzxPKBug== X-Received: by 2002:a5d:8717:: with SMTP id u23mr29168784iom.93.1556251225128; Thu, 25 Apr 2019 21:00:25 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id m142sm5006180itb.31.2019.04.25.21.00.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Apr 2019 21:00:24 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Thu, 25 Apr 2019 21:59:08 -0600 Message-Id: <20190426035922.20596-37-sjg@chromium.org> X-Mailer: git-send-email 2.21.0.593.g511ec345e18-goog In-Reply-To: <20190426035922.20596-1-sjg@chromium.org> References: <20190426035922.20596-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v2 36/50] x86: Support PCI VGA ROM when TPL is used X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" When TPL is in use, U-Boot proper should support initing the VGA ROM even though the 32-bit init portion is in SPL. Update the condition to handle this. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- Changes in v2: None drivers/pci/pci_rom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c index 7d9b75c2c45..2cede1211bb 100644 --- a/drivers/pci/pci_rom.c +++ b/drivers/pci/pci_rom.c @@ -306,7 +306,7 @@ int dm_pci_run_vga_bios(struct udevice *dev, int (*int15_handler)(void), goto err; #endif } else { -#if defined(CONFIG_X86) && CONFIG_IS_ENABLED(X86_32BIT_INIT) +#if defined(CONFIG_X86) && (CONFIG_IS_ENABLED(X86_32BIT_INIT) || CONFIG_TPL) bios_set_interrupt_handler(0x15, int15_handler); bios_run_on_x86(dev, (unsigned long)ram, vesa_mode,