From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AA438C43219 for ; Sun, 20 Nov 2022 14:28:27 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CEED385517; Sun, 20 Nov 2022 15:18:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="cOWkmfEn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B28DE854E5; Sun, 20 Nov 2022 15:18:19 +0100 (CET) Received: from mail-qt1-x832.google.com (mail-qt1-x832.google.com [IPv6:2607:f8b0:4864:20::832]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 414E6854B8 for ; Sun, 20 Nov 2022 15:18:09 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qt1-x832.google.com with SMTP id l15so5946034qtv.4 for ; Sun, 20 Nov 2022 06:18:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=BCtBuMEj/Iv95rA9EKo5r3A1hFwa48JUb7TeGUZXPmU=; b=cOWkmfEn9ULgbBZ7vWecG2Lawm7wwYeQlXEqumA2BYpP6JJhWnTp4ggacmDti2Cxz4 CcZ31iWrwjLxXGJ+gQb++W1KQZrcWRhp4oJ+VbLVFGhnZrrhJvgHhK7WfFmHgVcs/LRm MkNrXnS2tIn6QuetRZPkUflaP34pM7jqHgCQo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BCtBuMEj/Iv95rA9EKo5r3A1hFwa48JUb7TeGUZXPmU=; b=sxvPmw5zuXkUkfSKkImTECFNQMAb5P0oG+7aEsetvZPWv+JzGJ9aZ+jVksWEgek6T0 cz+c058pUUocxqoEiCEEUO2WoOCwFztRGIlUFGrozRqCWHAxG3qMpJDDcMatSC3G2flM DF7PQuDpHkNOchFHGtNJen65wJnz5ASfrUck3GnvCD4Z+2x/gkCLlwgNa1wnPvzlU+h4 XOCRro2NK9GMRnac/aN/yEiYiIOkBN05clWI53/NEBT1sjbuss0Eqpj6X8f4FOoLBlvP fJUWvmFlItyrKDixTi2qtaHJu5eU8gSVcYLtO3wDw2jNNzGmreODKPfd1qQ6yx171o5Y IP7w== X-Gm-Message-State: ANoB5pnif9iu3YJknPbzy8F6ZycwJweWYAgr6SyaJP4hQnVKuotXjHkv WYWerljMWhM0hF9ss+xHq7SnANMmy/w+jg== X-Google-Smtp-Source: AA0mqf7ujMysUPWU1XxUCCetSglfBeUM3RIWHNU+CZdRXRSrYP71+g7dXDcy0A70Name6WcOqvElbg== X-Received: by 2002:ac8:7c96:0:b0:3a5:15dd:c912 with SMTP id y22-20020ac87c96000000b003a515ddc912mr14117855qtv.553.1668953888644; Sun, 20 Nov 2022 06:18:08 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-29a0-035f-b06a-235e.res6.spectrum.com. [2603:6081:7b00:6400:29a0:35f:b06a:235e]) by smtp.gmail.com with ESMTPSA id bk23-20020a05620a1a1700b006ce580c2663sm6400114qkb.35.2022.11.20.06.18.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:18:08 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 237/241] global: Migrate CONFIG_X86EMU_RAW_IO to CFG Date: Sun, 20 Nov 2022 09:17:39 -0500 Message-Id: <20221120141743.3059310-38-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120141743.3059310-1-trini@konsulko.com> References: <20221120140829.3057894-90-trini@konsulko.com> <20221120141743.3059310-1-trini@konsulko.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- drivers/bios_emulator/besys.c | 18 +++++++++--------- include/configs/conga-qeval20-qa3-e3845.h | 2 +- include/configs/dfi-bt700.h | 2 +- include/configs/minnowmax.h | 2 +- include/configs/som-db5800-som-6867.h | 2 +- include/configs/theadorable-x86-common.h | 2 +- include/configs/x86-chromebook.h | 2 +- scripts/config_whitelist.txt | 2 -- 8 files changed, 15 insertions(+), 17 deletions(-) diff --git a/drivers/bios_emulator/besys.c b/drivers/bios_emulator/besys.c index 02c4286a854c..28c41e70a226 100644 --- a/drivers/bios_emulator/besys.c +++ b/drivers/bios_emulator/besys.c @@ -54,7 +54,7 @@ /*------------------------- Global Variables ------------------------------*/ -#ifndef CONFIG_X86EMU_RAW_IO +#ifndef CFG_X86EMU_RAW_IO static char *BE_biosDate = "08/14/99"; static u8 BE_model = 0xFC; static u8 BE_submodel = 0x00; @@ -94,7 +94,7 @@ static u8 *BE_memaddr(u32 addr) } else if (addr >= 0xA0000 && addr <= 0xBFFFF) { return (u8*)(_BE_env.busmem_base + addr - 0xA0000); } -#ifdef CONFIG_X86EMU_RAW_IO +#ifdef CFG_X86EMU_RAW_IO else if (addr >= 0xD0000 && addr <= 0xFFFFF) { /* We map the real System BIOS directly on real PC's */ DB(printf("BE_memaddr: System BIOS address %#lx\n", @@ -240,7 +240,7 @@ void X86API BE_wrl(u32 addr, u32 val) } } -#if !defined(CONFIG_X86EMU_RAW_IO) +#if !defined(CFG_X86EMU_RAW_IO) /* For Non-Intel machines we may need to emulate some I/O port accesses that * the BIOS may try to access, such as the PCI config registers. @@ -571,7 +571,7 @@ u8 X86API BE_inb(X86EMU_pioAddr port) { u8 val = 0; -#if !defined(CONFIG_X86EMU_RAW_IO) +#if !defined(CFG_X86EMU_RAW_IO) if (IS_VGA_PORT(port)){ /*seems reading port 0x3c3 return the high 16 bit of io port*/ if(port == 0x3c3) @@ -617,7 +617,7 @@ u16 X86API BE_inw(X86EMU_pioAddr port) { u16 val = 0; -#if !defined(CONFIG_X86EMU_RAW_IO) +#if !defined(CFG_X86EMU_RAW_IO) if (IS_PCI_PORT(port)) val = PCI_inp(port, REG_READ_WORD); else if (port < 0x100) { @@ -650,7 +650,7 @@ u32 X86API BE_inl(X86EMU_pioAddr port) { u32 val = 0; -#if !defined(CONFIG_X86EMU_RAW_IO) +#if !defined(CFG_X86EMU_RAW_IO) if (IS_PCI_PORT(port)) val = PCI_inp(port, REG_READ_DWORD); else if (port < 0x100) { @@ -678,7 +678,7 @@ through to the real hardware if we don't need to special case it. ****************************************************************************/ void X86API BE_outb(X86EMU_pioAddr port, u8 val) { -#if !defined(CONFIG_X86EMU_RAW_IO) +#if !defined(CFG_X86EMU_RAW_IO) if (IS_VGA_PORT(port)) VGA_outpb(port, val); else if (IS_TIMER_PORT(port)) @@ -713,7 +713,7 @@ through to the real hardware if we don't need to special case it. ****************************************************************************/ void X86API BE_outw(X86EMU_pioAddr port, u16 val) { -#if !defined(CONFIG_X86EMU_RAW_IO) +#if !defined(CFG_X86EMU_RAW_IO) if (IS_VGA_PORT(port)) { VGA_outpb(port, val); VGA_outpb(port + 1, val >> 8); @@ -744,7 +744,7 @@ through to the real hardware if we don't need to special case it. ****************************************************************************/ void X86API BE_outl(X86EMU_pioAddr port, u32 val) { -#if !defined(CONFIG_X86EMU_RAW_IO) +#if !defined(CFG_X86EMU_RAW_IO) if (IS_PCI_PORT(port)) { PCI_outp(port, val, REG_WRITE_DWORD); } else if (port < 0x100) { diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h index 1066da3f8326..5cc6e06ddc2d 100644 --- a/include/configs/conga-qeval20-qa3-e3845.h +++ b/include/configs/conga-qeval20-qa3-e3845.h @@ -17,7 +17,7 @@ "stderr=serial\0" #define VIDEO_IO_OFFSET 0 -#define CONFIG_X86EMU_RAW_IO +#define CFG_X86EMU_RAW_IO #undef CFG_EXTRA_ENV_SETTINGS #define CFG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h index 36c2510628fc..0ffc0c7d4f0b 100644 --- a/include/configs/dfi-bt700.h +++ b/include/configs/dfi-bt700.h @@ -21,7 +21,7 @@ "stderr=serial\0" #define VIDEO_IO_OFFSET 0 -#define CONFIG_X86EMU_RAW_IO +#define CFG_X86EMU_RAW_IO #undef CFG_EXTRA_ENV_SETTINGS #define CFG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h index f3f645f9d699..e31c6b54652a 100644 --- a/include/configs/minnowmax.h +++ b/include/configs/minnowmax.h @@ -18,6 +18,6 @@ "usb_pgood_delay=40\0" #define VIDEO_IO_OFFSET 0 -#define CONFIG_X86EMU_RAW_IO +#define CFG_X86EMU_RAW_IO #endif /* __CONFIG_H */ diff --git a/include/configs/som-db5800-som-6867.h b/include/configs/som-db5800-som-6867.h index 14cacbfe3f13..33f2e0ffbb5b 100644 --- a/include/configs/som-db5800-som-6867.h +++ b/include/configs/som-db5800-som-6867.h @@ -17,6 +17,6 @@ "stderr=serial,vidconsole\0" #define VIDEO_IO_OFFSET 0 -#define CONFIG_X86EMU_RAW_IO +#define CFG_X86EMU_RAW_IO #endif /* __CONFIG_H */ diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h index 6b65fad50692..b58c14205115 100644 --- a/include/configs/theadorable-x86-common.h +++ b/include/configs/theadorable-x86-common.h @@ -16,7 +16,7 @@ "stderr=serial\0" #define VIDEO_IO_OFFSET 0 -#define CONFIG_X86EMU_RAW_IO +#define CFG_X86EMU_RAW_IO /* Environment settings */ diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h index dfacecbdd501..ccd37abe2611 100644 --- a/include/configs/x86-chromebook.h +++ b/include/configs/x86-chromebook.h @@ -11,7 +11,7 @@ #define CONFIG_X86_REFCODE_RUN_ADDR 0 #define VIDEO_IO_OFFSET 0 -#define CONFIG_X86EMU_RAW_IO +#define CFG_X86EMU_RAW_IO #define CFG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \ "stdout=vidconsole,serial\0" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c0bfa41ab9d8..e9ca514f3cdb 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -252,8 +252,6 @@ CFG_VSC7385_IMAGE CFG_VSC7385_IMAGE_SIZE CFG_WATCHDOG_PRESC CFG_WATCHDOG_RC -CONFIG_WATCHDOG_TIMEOUT -CONFIG_X86EMU_RAW_IO CONFIG_X86_MRC_ADDR CONFIG_X86_REFCODE_ADDR CONFIG_X86_REFCODE_RUN_ADDR -- 2.25.1