From patchwork Tue Sep 22 18:45:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1369213 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=T55Bvqgd; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4Bwr8t5KqNz9sTS for ; Wed, 23 Sep 2020 04:55:10 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5756A825F5; Tue, 22 Sep 2020 20:48:56 +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="T55Bvqgd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 79268823F0; Tue, 22 Sep 2020 20:47:22 +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.5 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-oi1-x241.google.com (mail-oi1-x241.google.com [IPv6:2607:f8b0:4864:20::241]) (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 90375825E9 for ; Tue, 22 Sep 2020 20:47:09 +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-oi1-x241.google.com with SMTP id c13so22163789oiy.6 for ; Tue, 22 Sep 2020 11:47:09 -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=UP7ymfb+lmkJScBlB8jF4ojB/sGJHCtjoujXs5rPlm0=; b=T55BvqgdqHQJNmvPHtZcailuNQKPnPUVoG96J0GmieCfCZYg8h2koiURPS5DV1qcCJ OUuhZHh81H9dVJBCZeowGLBRorsyTqPLMmOjvSrZBbmeSN05GyqLCDQuEenPlxphR/tE rTQDer7rveS76ibD9ZM514oc13IboA/0RzIRA= 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=UP7ymfb+lmkJScBlB8jF4ojB/sGJHCtjoujXs5rPlm0=; b=m37QOHeKkfHeNmmWLFHAbEv4KfGDS2WktpKFMrbzfveP96sWzaeDPLZO/TMoaD4x3x PMbk0R60IBxqk8u8jFp2u7AMd91M/krYlDYhQ9adE4n/ARew2aLg3Rg3vZbZ+T51axhx IjNUkniOA3/eHwZDqQ88LJgbw5LOUq9kK+pkGoNZsYuwVXTpXYORxOm8m2Ewqh/MrdkE X+1cOaetKzt1aw91/6BkTiay8XDdfY0bESXQG7JdhtAYhKFsAEbxagmUtLjuFaETAswy JTXOSuh7I0GBMHvJv5XKRkyJ8gNjoXDBIxBIDrpMbOzRh2JaeQICAvkPTo3Rv2AsrR/M KHUA== X-Gm-Message-State: AOAM5337hdUCZlBPUw1tFCpohUNSRjMHrwgJ6WlWxboLNO8+OAH3aHYr /QRE99JbixlJ139egBd/UKs8zab6yBD0vSDy X-Google-Smtp-Source: ABdhPJy8CXbkqf1OUtTHU2CROBCRFav3xlIaX/VWaYcveG1/9e6emuCbJxEqrv2ujreguVSDEogRLw== X-Received: by 2002:aca:5752:: with SMTP id l79mr3331169oib.86.1600800427540; Tue, 22 Sep 2020 11:47:07 -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 q24sm7622663oij.19.2020.09.22.11.47.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2020 11:47:07 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Andy Shevchenko , Wolfgang Wallner , Bin Meng , Bernhard Messerklinger , Simon Glass Subject: [PATCH v4 44/59] x86: Correct the assembly guard in e820.h Date: Tue, 22 Sep 2020 12:45:29 -0600 Message-Id: <20200922124521.v4.44.I53dd50cd3b5d7b10e23a609538b86989ba9b580a@changeid> X-Mailer: git-send-email 2.28.0.681.g6f77f65b4e-goog In-Reply-To: <20200922184544.2920969-1-sjg@chromium.org> References: <20200922184544.2920969-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.3 at phobos.denx.de X-Virus-Status: Clean This is currently in the wrong place, so including the file in the device tree fails. Fix it. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- (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(-) diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h index d7f8a4ba1df..a66c0d24891 100644 --- a/arch/x86/include/asm/e820.h +++ b/arch/x86/include/asm/e820.h @@ -22,10 +22,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 */