All of lore.kernel.org
 help / color / mirror / Atom feed
From: Troy Kisky <troy.kisky@boundarydevices.com>
To: sjg@chromium.org, trini@konsulko.com
Cc: fabio.estevam@nxp.com, u-boot@lists.denx.de,
	Troy Kisky <troy.kisky@boundarydevices.com>
Subject: [PATCH v1 5/5] nitrogen6x: move board specific files to nitrogen6x directory
Date: Fri, 17 Dec 2021 15:01:31 -0800	[thread overview]
Message-ID: <20211217230131.2715940-6-troy.kisky@boundarydevices.com> (raw)
In-Reply-To: <20211217230131.2715940-1-troy.kisky@boundarydevices.com>

This makes it clearer which board uses a file.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
---
 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 <troy.kisky@boundarydevices.com>
 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 <info@boundarydevices.com>
 
 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 <configs/mx6_common.h>
 
 #define CONFIG_USBD_HS
 
-- 
2.32.0


  parent reply	other threads:[~2021-12-17 23:02 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-17 23:01 [PATCH v1 0/5] Move board specific files to board directory Troy Kisky
2021-12-17 23:01 ` [PATCH v1 1/5] kconfig: allow defconfigs to live in " Troy Kisky
2021-12-28  8:33   ` Simon Glass
2022-01-06 21:00     ` Troy Kisky
2021-12-17 23:01 ` [PATCH v1 2/5] dts: allow dts files " Troy Kisky
2021-12-28  8:33   ` Simon Glass
2022-01-06 21:01     ` Troy Kisky
2021-12-17 23:01 ` [PATCH v1 3/5] scripts: Makefile.autoconf: allow CONFIG_SYS_CONFIG_NAME file to live " Troy Kisky
2021-12-28  8:33   ` Simon Glass
2022-01-06 21:09     ` Troy Kisky
2022-01-30 23:14       ` Simon Glass
2021-12-17 23:01 ` [PATCH v1 4/5] genboardcfg: allow defconfigs " Troy Kisky
2021-12-28  8:33   ` Simon Glass
2021-12-17 23:01 ` Troy Kisky [this message]
2021-12-28  8:33   ` [PATCH v1 5/5] nitrogen6x: move board specific files to nitrogen6x directory Simon Glass
2021-12-28  8:33 ` [PATCH v1 0/5] Move board specific files to board directory Simon Glass
2021-12-28 13:11   ` Tom Rini
2022-01-06 21:14     ` Troy Kisky
2022-01-07 15:12       ` Tom Rini
2022-01-07 18:33         ` Troy Kisky
2022-01-30 23:14           ` Simon Glass
2022-02-08 14:30           ` Tom Rini
2022-03-15 19:08             ` Troy Kisky
2022-03-15 20:01               ` Tom Rini
2022-03-15 20:23                 ` Troy Kisky
2022-03-16 14:48                   ` Tom Rini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211217230131.2715940-6-troy.kisky@boundarydevices.com \
    --to=troy.kisky@boundarydevices.com \
    --cc=fabio.estevam@nxp.com \
    --cc=sjg@chromium.org \
    --cc=trini@konsulko.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.