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 ED496C4338F for ; Thu, 19 Aug 2021 19:16:28 +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 5EE3460C3E for ; Thu, 19 Aug 2021 19:16:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5EE3460C3E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9A3C681BC5; Thu, 19 Aug 2021 21:16:26 +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 CE0B282999; Thu, 19 Aug 2021 21:16:24 +0200 (CEST) Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) (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 BD78280F4B for ; Thu, 19 Aug 2021 21:16:20 +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-qk1-f172.google.com with SMTP id 22so8352956qkg.2 for ; Thu, 19 Aug 2021 12:16:20 -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:subject:date:message-id; bh=39XycFZXaq/t/6uV6VMcHKgMmOE7w6JodmxDpYCvNRk=; b=U0Nd7JCa1dTUuBgWdeEDoZezG3DULK4ThKM79nq1jcgPOWVLM4CsrFCZfxJ6+0ECcv APqhodsECzUaoKVT9knAtMf0ORZXLg/858agGz5Ql8+kEkmUPZZEyDBjwm45JSAW6qUM NK8JMvbg7Qstih94fEn+RiFgmoKGkUAuXacsrZJP6ecMydZApRu9kVjsSJURfkDX7K5d HDCSWvNYoemj8IZ6ofNU1X2ShyyGjeIh4idtSR1Kpgv5jUOjg+XNm3SaAG/AAPGqdpxG tuKBX0WuotWZ08pPCF46P+AUvaPIoQYZqEUM+pn5qXva7sfURyjEH5AiXzYdTjOKfcyU 5u7w== X-Gm-Message-State: AOAM533k8koxy9mIcowNsLiDOURujZ3Iz9+TK7zYfMGYskW202vRVedZ PDPyvR1yZsn9hCPZP/DaAxM2vFaLG+o3 X-Google-Smtp-Source: ABdhPJysSGxH/h1tc5EwronN/ThFiiqlthOy2BYPsSQWsqoVSxIPxbwCrswQP1ZJAIuZN/sZQHik0g== X-Received: by 2002:a37:a45:: with SMTP id 66mr5214602qkk.137.1629400579301; Thu, 19 Aug 2021 12:16:19 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-599d-dbbd-fe12-cbbd.res6.spectrum.com. [2603:6081:7b01:cbda:599d:dbbd:fe12:cbbd]) by smtp.gmail.com with ESMTPSA id s20sm711204qtw.14.2021.08.19.12.16.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Aug 2021 12:16:18 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH] astro_mcf5373l: Rework ASTRO_ID logic Date: Thu, 19 Aug 2021 15:16:15 -0400 Message-Id: <20210819191615.4886-1-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 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.103.2 at phobos.denx.de X-Virus-Status: Clean Rather than using CONFIG namespace for logic internal to include/configs/astro_mcf5373l.h to select ASTRO_ID (and populate the default environment), strip CONFIG from the various options used and set. Signed-off-by: Tom Rini --- include/configs/astro_mcf5373l.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 12488b66c30b..65c7d03efc1c 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -22,17 +22,17 @@ * set the card type to actually compile for; either of * the possibilities listed below has to be used! */ -#define CONFIG_ASTRO_V532 1 +#define ASTRO_V532 1 -#if CONFIG_ASTRO_V532 +#if ASTRO_V532 #define ASTRO_ID 0xF8 -#elif CONFIG_ASTRO_V512 +#elif ASTRO_V512 #define ASTRO_ID 0xFA -#elif CONFIG_ASTRO_TWIN7S2 +#elif ASTRO_TWIN7S2 #define ASTRO_ID 0xF9 -#elif CONFIG_ASTRO_V912 +#elif ASTRO_V912 #define ASTRO_ID 0xFC -#elif CONFIG_ASTRO_COFDMDUOS2 +#elif ASTRO_COFDMDUOS2 #define ASTRO_ID 0xFB #else #error No card type defined! @@ -144,7 +144,7 @@ #ifdef CONFIG_MONITOR_IS_IN_RAM #define CONFIG_BOOTCOMMAND "" /* no autoboot in this case */ #else -#if CONFIG_ASTRO_V532 +#if ASTRO_V532 #define CONFIG_BOOTCOMMAND "protect off 0x80000 0x1ffffff;run env_check;"\ "run xilinxload&&run alteraload&&bootm 0x80000;"\ "update;reset" -- 2.17.1