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 AF378C4338F for ; Wed, 25 Aug 2021 00:42:09 +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 2786B610F8 for ; Wed, 25 Aug 2021 00:42:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2786B610F8 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 F334B82EE0; Wed, 25 Aug 2021 02:41:59 +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 708A582EA8; Wed, 25 Aug 2021 02:41: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 43B7E82E68 for ; Wed, 25 Aug 2021 02:41:14 +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 m21so25261858qkm.13 for ; Tue, 24 Aug 2021 17:41:14 -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=LfhJEwiilDxlFQSoj19i/Hf7q5venbStZR0zoBkU2cQ=; b=bZr7IP8tB91YwDDg9splFafRGgLjDxaNNUA3G4ajogYTVeuXGP+0c2k+8u+4xWAH/w RzoncN9eBCYPF829zl9cI8olr038GrpzXQQ6EkoceIwcPVtJlwVy73rYFKnZxOU3r+cx q0aF4GpVeMy+9OPIjISeJ3JMV1YnprIWiqQF6GEH575jyM7f0jQZ33qggBfb+5slmzXk jiZjKV/P55wtVGaTTPah2DRmNkumi+xE189LUqMXAXEalf5pDTnN6iC1opJOfK7JPa2q AGzDcb+wSwgTTR5KvvQk2HnQqK0Boxr1A7SMdo0LqwPAwFlcE1uj14lRdKnEU+wjd3Ob pdjA== X-Gm-Message-State: AOAM531z17Um5A9UivMRWp/VsPCDJc9AhFtuK+JZ9gaPwNWukJ/IcgHz kPLgE1OvYdHpLSO5VKzYa6PsWNjNF9T9 X-Google-Smtp-Source: ABdhPJzGntRUDcXtbrnukLpPQ+n5vVZeMIZFVLM7WFzENHcHThovEZqtgZwmT2OixY0IQgXGZVx1WQ== X-Received: by 2002:a05:620a:4147:: with SMTP id k7mr29720883qko.140.1629852072816; Tue, 24 Aug 2021 17:41:12 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-48fb-97cb-8afe-8d4e.res6.spectrum.com. [2603:6081:7b01:cbda:48fb:97cb:8afe:8d4e]) by smtp.gmail.com with ESMTPSA id r128sm11772953qke.98.2021.08.24.17.41.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Aug 2021 17:41:12 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Troy Kisky Subject: [PATCH 5/6] nitrogen6x: Populate FDTFILE at build-time for all platforms Date: Tue, 24 Aug 2021 20:41:03 -0400 Message-Id: <20210825004104.6648-5-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210825004104.6648-1-trini@konsulko.com> References: <20210825004104.6648-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.103.2 at phobos.denx.de X-Virus-Status: Clean Rather than using CONFIG_SABRELITE to set FDTFILE for only that platform, switch to always setting this based on CONFIG_DEFAULT_DEVICE_TREE as this should always match the kernel device tree name anyhow. Cc: Troy Kisky Signed-off-by: Tom Rini --- configs/mx6qsabrelite_defconfig | 1 - include/configs/nitrogen6x.h | 10 +--------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig index 9f0882e932f4..b496df8a4dac 100644 --- a/configs/mx6qsabrelite_defconfig +++ b/configs/mx6qsabrelite_defconfig @@ -16,7 +16,6 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabrelite" CONFIG_CMD_HDMIDETECT=y CONFIG_AHCI=y CONFIG_DISTRO_DEFAULTS=y -CONFIG_SYS_EXTRA_OPTIONS="SABRELITE" CONFIG_BOOTDELAY=3 # CONFIG_USE_BOOTCOMMAND is not set CONFIG_USE_PREBOOT=y diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 0c407503517d..1a0d970de716 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -90,14 +90,6 @@ #define DISTRO_BOOT_DEV_DHCP(func) #endif - -#if defined(CONFIG_SABRELITE) -#define FDTFILE "fdtfile=imx6q-sabrelite.dtb\0" -#else -/* FIXME: nitrogen6x covers multiple configs. Define fdtfile for each supported config. */ -#define FDTFILE -#endif - #define BOOT_TARGET_DEVICES(func) \ DISTRO_BOOT_DEV_MMC(func) \ DISTRO_BOOT_DEV_SATA(func) \ @@ -113,7 +105,7 @@ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_addr_r=0x18000000\0" \ - FDTFILE \ + "fdtfile=" __stringify(CONFIG_DEFAULT_DEVICE_TREE) ".dtb\0" \ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ -- 2.17.1