From patchwork Fri Dec 17 23:01:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 1570401 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=boundarydevices.com header.i=@boundarydevices.com header.a=rsa-sha256 header.s=google header.b=SnOP3F8m; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4JG4JS6pv2z9s1l for ; Sat, 18 Dec 2021 10:02:48 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 33BC6837BD; Sat, 18 Dec 2021 00:02:25 +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="SnOP3F8m"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 846BB83784; Sat, 18 Dec 2021 00:02:14 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 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 122F083740 for ; Sat, 18 Dec 2021 00:02:09 +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 p18so3055585pld.13 for ; Fri, 17 Dec 2021 15:02:08 -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=u9lpb/0wedOiozGPrcDPRxIogG/6lBS2VK74f4XS92Y=; b=SnOP3F8mDcmcBWX9aODbpWgpoNQXvRbXAF/Na/HnluOq/hhTxabicJzB8TmvzT4NL6 rwjKPx79VR64k07VnFeBLMX/gfFAg1pGoYBWSne8tGKhf4A/L++XH79DWGWlLxmiA2xH JYjQ3r5m0tZYW3lNGDSCq235qt11GLlmTm90g= 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=u9lpb/0wedOiozGPrcDPRxIogG/6lBS2VK74f4XS92Y=; b=XXnmHBe2yiYrwcc00FYOmOtSurLVmfzlgKzQVCK3NlaPX4TmwhSbZyT/2keWHEWLes llgZTqWt9WpuQyRf8IB7jqCKOOwnKEGzmgU2GnWrXtNxRSehEiMsJnqh4ayXn09/KxM2 OUrcsq590RS2Jo/AV9vw75Z7maBILIg17lBBXaTJtyBWgzIhs2GptErT6oWPFudsAqMW dFR0S9Ug4LVlssrf+dvCihANcspQwRwbeThDq3SoR/D1O/qNuiGE6f5N/xJ7uHo36Vgn sjD37jikhLxuTlSuZZ2hrIHtIl6cYIbbWLnbQLWsii9TMrF5j/lCK7CULbi441KRq0rI E+mA== X-Gm-Message-State: AOAM531SIjcBxWPCbMhvSxmqwXWWoaj44fNJVTr+9Ft3w8PRhoIqzF3W PXnQYy9n7a9XoDVdtYU0XvnfgQ== X-Google-Smtp-Source: ABdhPJzEkGgGFKMugu+7I7YqZEFX3h7YBz7keMlEIu05nw2MgJM2uOhuaX4dUvnOi8FLJtKi1HCABw== X-Received: by 2002:a17:902:70cc:b0:148:aa3a:8c65 with SMTP id l12-20020a17090270cc00b00148aa3a8c65mr5497779plt.114.1639782127442; Fri, 17 Dec 2021 15:02:07 -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.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Dec 2021 15:02:07 -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 5/5] nitrogen6x: move board specific files to nitrogen6x directory Date: Fri, 17 Dec 2021 15:01:31 -0800 Message-Id: <20211217230131.2715940-6-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 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 This makes it clearer which board uses a file. Signed-off-by: Troy Kisky --- arch/arm/dts/Makefile | 3 --- board/boundary/nitrogen6x/MAINTAINERS | 13 ------------- board/boundary/nitrogen6x/Makefile | 13 +++++++++++++ .../boundary/nitrogen6x}/imx6dl-nitrogen6x.dts | 0 .../boundary/nitrogen6x}/imx6q-nitrogen6x.dts | 0 .../boundary/nitrogen6x}/imx6q-sabrelite.dts | 0 .../boundary/nitrogen6x}/imx6qdl-nitrogen6x.dtsi | 0 .../boundary/nitrogen6x}/imx6qdl-sabrelite.dtsi | 0 .../boundary/nitrogen6x}/mx6qsabrelite_defconfig | 0 .../boundary/nitrogen6x}/nitrogen6dl2g_defconfig | 0 .../boundary/nitrogen6x}/nitrogen6dl_defconfig | 0 .../boundary/nitrogen6x}/nitrogen6q2g_defconfig | 0 .../boundary/nitrogen6x}/nitrogen6q_defconfig | 0 .../boundary/nitrogen6x}/nitrogen6s1g_defconfig | 0 .../boundary/nitrogen6x}/nitrogen6s_defconfig | 0 .../boundary/nitrogen6x}/nitrogen6x.h | 2 +- 16 files changed, 14 insertions(+), 17 deletions(-) rename {arch/arm/dts => board/boundary/nitrogen6x}/imx6dl-nitrogen6x.dts (100%) rename {arch/arm/dts => board/boundary/nitrogen6x}/imx6q-nitrogen6x.dts (100%) rename {arch/arm/dts => board/boundary/nitrogen6x}/imx6q-sabrelite.dts (100%) rename {arch/arm/dts => board/boundary/nitrogen6x}/imx6qdl-nitrogen6x.dtsi (100%) rename {arch/arm/dts => board/boundary/nitrogen6x}/imx6qdl-sabrelite.dtsi (100%) rename {configs => board/boundary/nitrogen6x}/mx6qsabrelite_defconfig (100%) rename {configs => board/boundary/nitrogen6x}/nitrogen6dl2g_defconfig (100%) rename {configs => board/boundary/nitrogen6x}/nitrogen6dl_defconfig (100%) rename {configs => board/boundary/nitrogen6x}/nitrogen6q2g_defconfig (100%) rename {configs => board/boundary/nitrogen6x}/nitrogen6q_defconfig (100%) rename {configs => board/boundary/nitrogen6x}/nitrogen6s1g_defconfig (100%) rename {configs => board/boundary/nitrogen6x}/nitrogen6s_defconfig (100%) rename {include/configs => board/boundary/nitrogen6x}/nitrogen6x.h (98%) diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 7f622fedbda..a864a6dd4b8 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -744,7 +744,6 @@ dtb-y += \ imx6dl-mba6a.dtb \ imx6dl-mba6b.dtb \ imx6dl-mamoj.dtb \ - imx6dl-nitrogen6x.dtb \ imx6dl-pico.dtb \ imx6dl-udoo.dtb \ imx6dl-riotboard.dtb \ @@ -792,13 +791,11 @@ dtb-y += \ imx6q-mba6a.dtb \ imx6q-mba6b.dtb \ imx6q-mccmon6.dtb\ - imx6q-nitrogen6x.dtb \ imx6q-novena.dtb \ imx6q-pico.dtb \ imx6q-phytec-mira-rdk-nand.dtb \ imx6q-udoo.dtb \ imx6q-sabreauto.dtb \ - imx6q-sabrelite.dtb \ imx6q-sabresd.dtb \ imx6q-tbs2910.dtb \ imx6q-wandboard-revd1.dtb \ diff --git a/board/boundary/nitrogen6x/MAINTAINERS b/board/boundary/nitrogen6x/MAINTAINERS index 17018d69f64..b11bc1f20d1 100644 --- a/board/boundary/nitrogen6x/MAINTAINERS +++ b/board/boundary/nitrogen6x/MAINTAINERS @@ -1,17 +1,4 @@ NITROGEN6X BOARD M: Troy Kisky S: Maintained -F: arch/arm/dts/imx6dl-nitrogen6x.dts -F: arch/arm/dts/imx6q-nitrogen6x.dts -F: arch/arm/dts/imx6q-sabrelite.dts -F: arch/arm/dts/imx6qdl-nitrogen6x.dtsi -F: arch/arm/dts/imx6qdl-sabrelite.dtsi F: board/boundary/nitrogen6x/ -F: include/configs/nitrogen6x.h -F: configs/mx6qsabrelite_defconfig -F: configs/nitrogen6dl_defconfig -F: configs/nitrogen6dl2g_defconfig -F: configs/nitrogen6q_defconfig -F: configs/nitrogen6q2g_defconfig -F: configs/nitrogen6s_defconfig -F: configs/nitrogen6s1g_defconfig diff --git a/board/boundary/nitrogen6x/Makefile b/board/boundary/nitrogen6x/Makefile index c8433bd7488..dd627411fa9 100644 --- a/board/boundary/nitrogen6x/Makefile +++ b/board/boundary/nitrogen6x/Makefile @@ -5,3 +5,16 @@ # Copyright (C) 2013, Boundary Devices obj-y := nitrogen6x.o + +dtb-y += imx6dl-nitrogen6x.dtb \ + imx6q-nitrogen6x.dtb \ + imx6q-sabrelite.dtb \ + +# Add any required device tree compiler flags here +DTC_FLAGS += -a 0x8 + +PHONY += dtbs +dtbs: $(addprefix $(obj)/, $(dtb-y)) + @: + +clean-files := $(dtb-y) diff --git a/arch/arm/dts/imx6dl-nitrogen6x.dts b/board/boundary/nitrogen6x/imx6dl-nitrogen6x.dts similarity index 100% rename from arch/arm/dts/imx6dl-nitrogen6x.dts rename to board/boundary/nitrogen6x/imx6dl-nitrogen6x.dts diff --git a/arch/arm/dts/imx6q-nitrogen6x.dts b/board/boundary/nitrogen6x/imx6q-nitrogen6x.dts similarity index 100% rename from arch/arm/dts/imx6q-nitrogen6x.dts rename to board/boundary/nitrogen6x/imx6q-nitrogen6x.dts diff --git a/arch/arm/dts/imx6q-sabrelite.dts b/board/boundary/nitrogen6x/imx6q-sabrelite.dts similarity index 100% rename from arch/arm/dts/imx6q-sabrelite.dts rename to board/boundary/nitrogen6x/imx6q-sabrelite.dts diff --git a/arch/arm/dts/imx6qdl-nitrogen6x.dtsi b/board/boundary/nitrogen6x/imx6qdl-nitrogen6x.dtsi similarity index 100% rename from arch/arm/dts/imx6qdl-nitrogen6x.dtsi rename to board/boundary/nitrogen6x/imx6qdl-nitrogen6x.dtsi diff --git a/arch/arm/dts/imx6qdl-sabrelite.dtsi b/board/boundary/nitrogen6x/imx6qdl-sabrelite.dtsi similarity index 100% rename from arch/arm/dts/imx6qdl-sabrelite.dtsi rename to board/boundary/nitrogen6x/imx6qdl-sabrelite.dtsi diff --git a/configs/mx6qsabrelite_defconfig b/board/boundary/nitrogen6x/mx6qsabrelite_defconfig similarity index 100% rename from configs/mx6qsabrelite_defconfig rename to board/boundary/nitrogen6x/mx6qsabrelite_defconfig diff --git a/configs/nitrogen6dl2g_defconfig b/board/boundary/nitrogen6x/nitrogen6dl2g_defconfig similarity index 100% rename from configs/nitrogen6dl2g_defconfig rename to board/boundary/nitrogen6x/nitrogen6dl2g_defconfig diff --git a/configs/nitrogen6dl_defconfig b/board/boundary/nitrogen6x/nitrogen6dl_defconfig similarity index 100% rename from configs/nitrogen6dl_defconfig rename to board/boundary/nitrogen6x/nitrogen6dl_defconfig diff --git a/configs/nitrogen6q2g_defconfig b/board/boundary/nitrogen6x/nitrogen6q2g_defconfig similarity index 100% rename from configs/nitrogen6q2g_defconfig rename to board/boundary/nitrogen6x/nitrogen6q2g_defconfig diff --git a/configs/nitrogen6q_defconfig b/board/boundary/nitrogen6x/nitrogen6q_defconfig similarity index 100% rename from configs/nitrogen6q_defconfig rename to board/boundary/nitrogen6x/nitrogen6q_defconfig diff --git a/configs/nitrogen6s1g_defconfig b/board/boundary/nitrogen6x/nitrogen6s1g_defconfig similarity index 100% rename from configs/nitrogen6s1g_defconfig rename to board/boundary/nitrogen6x/nitrogen6s1g_defconfig diff --git a/configs/nitrogen6s_defconfig b/board/boundary/nitrogen6x/nitrogen6s_defconfig similarity index 100% rename from configs/nitrogen6s_defconfig rename to board/boundary/nitrogen6x/nitrogen6s_defconfig diff --git a/include/configs/nitrogen6x.h b/board/boundary/nitrogen6x/nitrogen6x.h similarity index 98% rename from include/configs/nitrogen6x.h rename to board/boundary/nitrogen6x/nitrogen6x.h index 1a1c08bd308..2c86a2a99d0 100644 --- a/include/configs/nitrogen6x.h +++ b/board/boundary/nitrogen6x/nitrogen6x.h @@ -9,7 +9,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -#include "mx6_common.h" +#include #define CONFIG_USBD_HS