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 C3CC2C433EF for ; Fri, 17 Dec 2021 23:02:37 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D10678376C; Sat, 18 Dec 2021 00:02:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=boundarydevices.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=boundarydevices.com header.i=@boundarydevices.com header.b="d0B4fRuD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 77AC78370D; Sat, 18 Dec 2021 00:02:12 +0100 (CET) Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) (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 ADF9E83784 for ; Sat, 18 Dec 2021 00:02:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=boundarydevices.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=troy.kisky@boundarydevices.com Received: by mail-pl1-x62e.google.com with SMTP id u17so3073012plg.9 for ; Fri, 17 Dec 2021 15:02:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+Nj9CEjmYSF/G3Aj49QyVrRZZMs0Rtm1XNwmtTgQl+o=; b=d0B4fRuDTPAYX+/fPvS1EiorTHrWBq8nX/9uhm3oJiSL3VKxAmrwekRAQ1uNqiG1+Q ViKJxkszb1eSpAt03Hj6eesTqhjzDu35wXnuXd2ZOg8NRoXrDqNDTu7lDcB0Fm/e7fb5 BcSqSuueEHGBf1JLGUO57bEHgtXboNhiAqqLc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+Nj9CEjmYSF/G3Aj49QyVrRZZMs0Rtm1XNwmtTgQl+o=; b=ulj0HYLL7664ZWwFSE/hjt3AhEHPVg679tLlE279W07W4C1Sq7ldCJxfvYaU+SDcWF uH1qbUqgcLFWChLMyVf9qq0UUMcmecyz+oou3H3d7UafOwRNQwo/vdbE1UKerzbCP6/o pUwxs//tN4ybuL05Be7kxUGmkZIzrZyjxWshWvhZPxwvVVikvC5ixLpv1eolnKQ+9jnh /lHkeOHdvX9UeWQ4NThmrPf7zER8OxbeiabVoxLXSWdUaBr2W9bJ4wDuvoGV6iA5pWva LpiwXGaN0xAN2yPax4xLQIIe1wVs/JNqr3jnR/UVWMOpRGh3eBMss7P7eOXz3nYujLkp nsiA== X-Gm-Message-State: AOAM532hAG4XJc7f9s1pVPQ7CCN/ZeWATSmx4B2+adLYuJz9CT7d7zWm pc3mAJczSpGIWNbE1//WUFikNg== X-Google-Smtp-Source: ABdhPJwC6DQVcQRX79a7GajyOdzJJzKqtRUq7ldn8Dz/kKSPDztTzkLzdpsDVcSdodLtSb1Hrdpc7Q== X-Received: by 2002:a17:903:246:b0:148:d321:a083 with SMTP id j6-20020a170903024600b00148d321a083mr5697153plh.83.1639782125212; Fri, 17 Dec 2021 15:02:05 -0800 (PST) Received: from OS2.boundarydevices.com. (wsip-72-200-236-186.oc.oc.cox.net. [72.200.236.186]) by smtp.googlemail.com with ESMTPSA id f7sm11130388pfj.41.2021.12.17.15.02.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Dec 2021 15:02:04 -0800 (PST) From: Troy Kisky To: sjg@chromium.org, trini@konsulko.com Cc: fabio.estevam@nxp.com, u-boot@lists.denx.de, Troy Kisky Subject: [PATCH v1 3/5] scripts: Makefile.autoconf: allow CONFIG_SYS_CONFIG_NAME file to live in board directory Date: Fri, 17 Dec 2021 15:01:29 -0800 Message-Id: <20211217230131.2715940-4-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211217230131.2715940-1-troy.kisky@boundarydevices.com> References: <20211217230131.2715940-1-troy.kisky@boundarydevices.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 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.2 at phobos.denx.de X-Virus-Status: Clean Let the board specific include file live in the board directory. Signed-off-by: Troy Kisky --- scripts/Makefile.autoconf | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf index 8a3efdb2db0..6a725a3e2ff 100644 --- a/scripts/Makefile.autoconf +++ b/scripts/Makefile.autoconf @@ -103,9 +103,14 @@ define filechk_config_h echo \#define CONFIG_$$i \ | sed '/=/ {s/=/ /;q; } ; { s/$$/ 1/; }'; \ done; \ - echo \#define CONFIG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\ + config_boarddir=board/$(if $(VENDOR),$(VENDOR)/)$(BOARD); \ + echo \#define CONFIG_BOARDDIR $$config_boarddir; \ echo \#include \; \ - echo \#include \; \ + if [ -f $(srctree)/$$config_boarddir/$(CONFIG_SYS_CONFIG_NAME).h ] ; then \ + echo \#include \"../$$config_boarddir/$(CONFIG_SYS_CONFIG_NAME).h\"; \ + else \ + echo \#include \; \ + fi; \ echo \#include \; \ echo \#include \; \ echo \#include \;) -- 2.32.0