Message ID | 20200829173153.v2.44.I53dd50cd3b5d7b10e23a609538b86989ba9b580a@changeid |
---|---|
State | Superseded |
Delegated to: | Bin Meng |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Z7aYv4zU; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BfCdr11mDz9sSJ for <incoming@patchwork.ozlabs.org>; Sun, 30 Aug 2020 09:41:04 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 78576823B6; Sun, 30 Aug 2020 01:34:02 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="Z7aYv4zU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5858D82338; Sun, 30 Aug 2020 01:33:07 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-3.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x141.google.com (mail-il1-x141.google.com [IPv6:2607:f8b0:4864:20::141]) (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 5C4C082325 for <u-boot@lists.denx.de>; Sun, 30 Aug 2020 01:33:04 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x141.google.com with SMTP id t13so3677703ile.9 for <u-boot@lists.denx.de>; Sat, 29 Aug 2020 16:33:04 -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=SZb7r1S2PrZI854IN/2FebgnsKovwi1cVBsm5BxO03Q=; b=Z7aYv4zUR7kbahdl4czIkht2tXADW6pLlYAqzLzL6KHFLRQIrK5gV5+tvaAResSFUq okX1lnx28tjvoI19y+c9F9qykMyCAzICjTNN/2b/E5NfTeUyTNhpkzUPwwvwIQuaMSVW 8y7uMjj9mSKNrRP0PFaqS4Tqa0EQILo+sOCOI= 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=SZb7r1S2PrZI854IN/2FebgnsKovwi1cVBsm5BxO03Q=; b=uhTGX5LaT7qUg70gC8Hj4kpWTqUegs+XyCLaANv0m1YmlqE153YcHoYq3pvnYdznO+ yDSlPhk4AwTSAWE1XZiWq19SimOJdc+o/shiZhb7h6mhajyLkYqZnkfDTxWEulGuIt8N qaSYPMS5HWIO0Lsv6TQA9gASzBNg+qCV96Dw2orMHq6BF6IW3BSgumVW0vYZf9jAYK1s 5n1mmooAubT1srjfnt1B514BzVFXCUYcOcEDctMFxIt8mSZwP73e1q1TL6edSly6wf/N fAr/Au1ijhNfdzlCO6RZcZTnXWIEi/DG8n1WwtRVpMXUPEKyFgvjmDAVkwdMTZmgKeZu 2Aww== X-Gm-Message-State: AOAM533vFEyMQk7l1FsXAI0zomr5NV6ePpwij7k/FXol1alLnbhZdIH4 a97CfAHEg9tCNEH5SN8txQxeBZ1odgUD9rW2 X-Google-Smtp-Source: ABdhPJxTvXCRfM3jKGmvjRHwRGVTNmlKErvhqMv9akfGDZZg9ZcpqPVIJ/xq7Lh+1vOju9yJiTZjQQ== X-Received: by 2002:a05:6e02:686:: with SMTP id o6mr3768427ils.188.1598743983229; Sat, 29 Aug 2020 16:33:03 -0700 (PDT) Received: from localhost.localdomain (c-73-14-175-90.hsd1.co.comcast.net. [73.14.175.90]) by smtp.gmail.com with ESMTPSA id i85sm2121831ile.27.2020.08.29.16.33.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Aug 2020 16:33:02 -0700 (PDT) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Bin Meng <bmeng.cn@gmail.com>, Andy Shevchenko <andriy.shevchenko@linux.intel.com>, Wolfgang Wallner <wolfgang.wallner@br-automation.com>, Bernhard Messerklinger <bernhard.messerklinger@br-automation.com>, Simon Glass <sjg@chromium.org> Subject: [PATCH v2 44/57] x86: Correct the assembly guard in e820.h Date: Sat, 29 Aug 2020 17:32:03 -0600 Message-Id: <20200829173153.v2.44.I53dd50cd3b5d7b10e23a609538b86989ba9b580a@changeid> X-Mailer: git-send-email 2.28.0.402.g5ffc5be6b7-goog In-Reply-To: <20200829233217.3821412-1-sjg@chromium.org> References: <20200829233217.3821412-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean |
Series |
dm: Add programatic generation of ACPI tables (part D)
|
expand
|
diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h index 9d29f82f972..87af0f492ec 100644 --- a/arch/x86/include/asm/e820.h +++ b/arch/x86/include/asm/e820.h @@ -21,10 +21,9 @@ struct e820_entry { #define ISA_START_ADDRESS 0xa0000 #define ISA_END_ADDRESS 0x100000 -#endif /* __ASSEMBLY__ */ - /* Implementation defined function to install an e820 map */ unsigned int install_e820_map(unsigned int max_entries, struct e820_entry *); +#endif /* __ASSEMBLY__ */ #endif /* _ASM_X86_E820_H */
This is currently in the wrong place, so including the file in the device tree fails. Fix it. Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v1) Changes in v1: - Update commit message with a comma arch/x86/include/asm/e820.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)