From patchwork Sun Sep 6 21:43:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1358500 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=hmUAcxHT; 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 4Bl4s43gZbz9sTg for ; Mon, 7 Sep 2020 07:52:40 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7C3EC824C3; Sun, 6 Sep 2020 23:45:30 +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="hmUAcxHT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 644CA82454; Sun, 6 Sep 2020 23:44:59 +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=-2.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-io1-xd42.google.com (mail-io1-xd42.google.com [IPv6:2607:f8b0:4864:20::d42]) (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 85EDE8243A for ; Sun, 6 Sep 2020 23:44: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=sjg@chromium.org Received: by mail-io1-xd42.google.com with SMTP id m17so12211817ioo.1 for ; Sun, 06 Sep 2020 14:44:56 -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=zy4lfbWaX+38fzSoepGI3wGfCORrjZ5I+Krsp4r0C5Q=; b=hmUAcxHT8ITkyQFUsOrA9KKKTRGsGqFVXphaLiLrbYS/m2PwBlDYtaxqR2B/acgT9g F074XoLyXqJNxSUoG+tylYe0mBD8mOP0eqiNmc3ygmN9qqv1QpOKTkK1FktPaU1CDorK MYFY3DGc8rP8y4y0TQOEtOPfoH+R5zPeIkKIc= 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=zy4lfbWaX+38fzSoepGI3wGfCORrjZ5I+Krsp4r0C5Q=; b=X4QQRNhl5rFqGZHlzu3j5wkChxAwc7x3Mq/XTuoM0ZFvF1CP86Za8MwBNaSZzg89LW 3qIp0bKqhCSm/kDAJ5NWaokPl1hZUG2U5MmsJwCOJefIdgdKalpUb+GwAgRo5ZlYkQF8 /8Bl+Jcv3QAPebj10BSqxH2oeup5VMDtWoK6HUrFjOp2E7T/4unhf0zVTIoqFzKYH0Fn FXpEKV+tywVooxnEzZ9w/bYzTDUYcZK6eYqVgvj4RGvAvMKgc1hl6spTtX9mj1qVlmUd XeD4swwQNPxYid+meUw4LHSwKzTTY8tI3Q6AtDY5LEa/+iGvypRZO++NzZPnCKSBFH53 SJWg== X-Gm-Message-State: AOAM531wiZZVhxNa0H24X+p8yzBC/ckU8TTj//b0c+OkYCqiAJmAqd5E V5uT1rzGU9fC6FT8sj1pdTDgS07OSBNPDWpB X-Google-Smtp-Source: ABdhPJwA7tS6qGq0IXRg5kZkdLXIJ6VAudOEnjCXcqPQUXLTNAMTZc7hMGrKdxDQ9GW5ivtwQaVrwQ== X-Received: by 2002:a02:11c2:: with SMTP id 185mr16567824jaf.35.1599428695421; Sun, 06 Sep 2020 14:44:55 -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 w13sm6232663iox.10.2020.09.06.14.44.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Sep 2020 14:44:55 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Wolfgang Wallner , Bin Meng , Bernhard Messerklinger , Andy Shevchenko , Simon Glass Subject: [PATCH v3 44/57] x86: Correct the assembly guard in e820.h Date: Sun, 6 Sep 2020 15:43:52 -0600 Message-Id: <20200906154340.v3.44.I53dd50cd3b5d7b10e23a609538b86989ba9b580a@changeid> X-Mailer: git-send-email 2.28.0.526.ge36021eeef-goog In-Reply-To: <20200906214405.71632-1-sjg@chromium.org> References: <20200906214405.71632-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 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 */