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 X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21881C47082 for ; Thu, 3 Jun 2021 13:39:52 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 26B94613E3 for ; Thu, 3 Jun 2021 13:39:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 26B94613E3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 11C1382FDF; Thu, 3 Jun 2021 15:39:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id D3C5882FD2; Thu, 3 Jun 2021 15:39:21 +0200 (CEST) Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) (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 5D00A82FC3 for ; Thu, 3 Jun 2021 15:39:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qt1-f182.google.com with SMTP id z4so1308383qts.4 for ; Thu, 03 Jun 2021 06:39:15 -0700 (PDT) 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; bh=BvWPGRQKM6ok4Tf5z4Db/IL6iMdKwkPE0VF1dCFJbxk=; b=I9Uf3bcBwKhc0O/5d4nWrGZ7FkLlrWEwJJO8CqZFzc88FPbhFNS3bIqbjfYkVM29ua 0dLFA5dTkNT256yTh0espWou9/PtZGzK1zpHllVa7TrnTD7RrxBap8DG2cfxqril8DM4 jQKUJwdxhG/oEQo5L+cF2Cem71I/Xm4km+hByLIK8kZLNEv5PetXZBbSjQg/XwN2L3ay 5u6EdLUJIohQXPr44SuECETBfjKQVXwkhYraau7F1Fx+zW2XANA4Dw51jpsRPWP8FQnA l11KK0tx8df0DzjOZL56MRnWbFZfPLOBpG2tXFda6XlrloCJ7CV0oeDiZclgPhS/4ytS 0ydg== X-Gm-Message-State: AOAM530qLZxjFvq8H3M+No/hAPUKTDv/a7uVSrsGtQarfXvwh1FLqhup FCH5bt1aOY/8cIHgqwx+Qs3aqWto2A== X-Google-Smtp-Source: ABdhPJy5yd5SlOIvocY4fqsIgx62g8lJQQ4dyNjODDfpEJjVr1fy3UdaWuzJYpomKTI7eyxPZZ54Rw== X-Received: by 2002:a05:622a:3c6:: with SMTP id k6mr11713766qtx.341.1622727553955; Thu, 03 Jun 2021 06:39:13 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-7400-11d1-4e05-ef18.res6.spectrum.com. [2603:6081:7b01:cbda:7400:11d1:4e05:ef18]) by smtp.gmail.com with ESMTPSA id q23sm1733794qtn.49.2021.06.03.06.39.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jun 2021 06:39:13 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Alexey Brodkin , Eugeniy Paltsev , Huan Wang , Angelo Dureghello , Rick Chen Subject: [PATCH 4/4] global_data: Ensure we have when symbols are not in Kconfig yet Date: Thu, 3 Jun 2021 09:39:02 -0400 Message-Id: <20210603133902.4192-4-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210603133902.4192-1-trini@konsulko.com> References: <20210518091947.63513-1-rasmus.villemoes@prevas.dk> <20210603133902.4192-1-trini@konsulko.com> 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.4 at phobos.denx.de X-Virus-Status: Clean All symbols that are defined in Kconfig will always be defined (or not) prior to preprocessing due to the -include directive while building. However, symbols which are not yet migrated will only be defined (or not) once the board config.h is included, via . While the end goal must be to migrate all symbols, today we have cases where the size of gd will get mismatched within the build, based on include order. Mitigate this by making sure that any that uses symbols not in Kconfig does start with . Remove this when not needed. Cc: Alexey Brodkin Cc: Eugeniy Paltsev Cc: Huan Wang Cc: Angelo Dureghello Cc: Rick Chen Signed-off-by: Tom Rini --- arch/arc/include/asm/global_data.h | 2 -- arch/arm/include/asm/global_data.h | 2 ++ arch/m68k/include/asm/global_data.h | 2 ++ arch/nds32/include/asm/global_data.h | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arc/include/asm/global_data.h b/arch/arc/include/asm/global_data.h index 8f9c83d3c28d..e35a26f1eb14 100644 --- a/arch/arc/include/asm/global_data.h +++ b/arch/arc/include/asm/global_data.h @@ -6,8 +6,6 @@ #ifndef __ASM_ARC_GLOBAL_DATA_H #define __ASM_ARC_GLOBAL_DATA_H -#include - #ifndef __ASSEMBLY__ /* Architecture-specific global data */ struct arch_global_data { diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h index 2aff1c467c14..79432f3bbd24 100644 --- a/arch/arm/include/asm/global_data.h +++ b/arch/arm/include/asm/global_data.h @@ -9,6 +9,8 @@ #ifndef __ASSEMBLY__ +#include + #include #include diff --git a/arch/m68k/include/asm/global_data.h b/arch/m68k/include/asm/global_data.h index 188055e9d314..273e843c4ae6 100644 --- a/arch/m68k/include/asm/global_data.h +++ b/arch/m68k/include/asm/global_data.h @@ -7,6 +7,8 @@ #ifndef __ASM_GBL_DATA_H #define __ASM_GBL_DATA_H +#include + /* Architecture-specific global data */ struct arch_global_data { #ifdef CONFIG_SYS_I2C_FSL diff --git a/arch/nds32/include/asm/global_data.h b/arch/nds32/include/asm/global_data.h index be04a18857a1..297481beaaef 100644 --- a/arch/nds32/include/asm/global_data.h +++ b/arch/nds32/include/asm/global_data.h @@ -17,6 +17,8 @@ #ifndef __ASM_GBL_DATA_H #define __ASM_GBL_DATA_H +#include + /* Architecture-specific global data */ struct arch_global_data { }; -- 2.17.1