Skip to contentSkip to conversation

tegra: rename board directory for Colibri T20

PATCH Applied Lucas Stach 2 participants 2 messages Feb 13, 2014 – Feb 17, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tegra: rename board directory for Colibri T20

For computer modules the naming standard is to have a single board directory named after the module and have all the baseboard support beneath it.

Also change the CONFIG name, as we may want to build all the baseboards at once.

---
 arch/arm/boards/Makefile                          |  2 +-
 arch/arm/boards/toradex-colibri-t20-iris/Makefile |  2 --
 arch/arm/boards/toradex-colibri-t20-iris/entry.c  | 34 -----------------------
 arch/arm/boards/toradex-colibri-t20/Makefile      |  2 ++
 arch/arm/boards/toradex-colibri-t20/entry.c       | 34 +++++++++++++++++++++++
 arch/arm/configs/tegra_v7_defconfig               |  2 +-
 arch/arm/dts/Makefile                             |  2 +-
 arch/arm/mach-tegra/Kconfig                       |  4 +--
 images/Makefile.tegra                             |  4 +--
 9 files changed, 43 insertions(+), 43 deletions(-)
 delete mode 100644 arch/arm/boards/toradex-colibri-t20-iris/Makefile
 delete mode 100644 arch/arm/boards/toradex-colibri-t20-iris/entry.c
 create mode 100644 arch/arm/boards/toradex-colibri-t20/Makefile
 create mode 100644 arch/arm/boards/toradex-colibri-t20/entry.c
arch/arm/boards/Makefile +1 -1
index a4219d7..c34dd96 100644
@@ -83,7 +83,7 @@ obj-$(CONFIG_MACH_SOLIDRUN_HUMMINGBOARD)	+= solidrun-hummingboard/
 obj-$(CONFIG_MACH_TNY_A9260)			+= tny-a926x/
 obj-$(CONFIG_MACH_TNY_A9263)			+= tny-a926x/
 obj-$(CONFIG_MACH_TNY_A9G20)			+= tny-a926x/
-obj-$(CONFIG_MACH_TORADEX_COLIBRI_T20_IRIS)	+= toradex-colibri-t20-iris/
+obj-$(CONFIG_MACH_TORADEX_COLIBRI_T20)		+= toradex-colibri-t20/
 obj-$(CONFIG_MACH_TOSHIBA_AC100)		+= toshiba-ac100/
 obj-$(CONFIG_MACH_TQMA53)			+= tqma53/
 obj-$(CONFIG_MACH_TQMA6X)			+= tqma6x/
arch/arm/boards/toradex-colibri-t20-iris/Makefile deleted +0 -2
deleted file mode 100644
index 5be3dd0..0000000
@@ -1,2 +0,0 @@
-CFLAGS_pbl-entry.o := -mcpu=arm7tdmi -march=armv4t
-lwl-y += entry.o
arch/arm/boards/toradex-colibri-t20-iris/entry.c deleted +0 -34
deleted file mode 100644
index 886613f..0000000
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2013 Lucas Stach <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <common.h>
-#include <sizes.h>
-#include <asm/barebox-arm.h>
-#include <asm/barebox-arm-head.h>
-#include <mach/lowlevel.h>
-
-extern char __dtb_tegra20_colibri_iris_start[];
-
-ENTRY_FUNCTION(start_toradex_colibri_t20_iris, r0, r1, r2)
-{
-	uint32_t fdt;
-
-	tegra_cpu_lowlevel_setup();
-
-	fdt = (uint32_t)__dtb_tegra20_colibri_iris_start - get_runtime_offset();
-
-	tegra_avp_reset_vector(fdt);
-}
arch/arm/boards/toradex-colibri-t20/Makefile new file +2 -0
new file mode 100644
index 0000000..5be3dd0
@@ -0,0 +1,2 @@
+CFLAGS_pbl-entry.o := -mcpu=arm7tdmi -march=armv4t
+lwl-y += entry.o
arch/arm/boards/toradex-colibri-t20/entry.c new file +34 -0
new file mode 100644
index 0000000..886613f
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2013 Lucas Stach <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <common.h>
+#include <sizes.h>
+#include <asm/barebox-arm.h>
+#include <asm/barebox-arm-head.h>
+#include <mach/lowlevel.h>
+
+extern char __dtb_tegra20_colibri_iris_start[];
+
+ENTRY_FUNCTION(start_toradex_colibri_t20_iris, r0, r1, r2)
+{
+	uint32_t fdt;
+
+	tegra_cpu_lowlevel_setup();
+
+	fdt = (uint32_t)__dtb_tegra20_colibri_iris_start - get_runtime_offset();
+
+	tegra_avp_reset_vector(fdt);
+}
arch/arm/configs/tegra_v7_defconfig +1 -1
index 831c138..f76b501 100644
@@ -1,5 +1,5 @@
 CONFIG_ARCH_TEGRA=y
-CONFIG_MACH_TORADEX_COLIBRI_T20_IRIS=y
+CONFIG_MACH_TORADEX_COLIBRI_T20=y
 CONFIG_MACH_TOSHIBA_AC100=y
 CONFIG_AEABI=y
 CONFIG_CMD_ARM_MMUINFO=y
arch/arm/dts/Makefile +1 -1
index 1718bde..af7b0dd 100644
@@ -44,7 +44,7 @@ pbl-$(CONFIG_MACH_PHYTEC_PFLA02) += imx6q-phytec-pbab01.dtb.o
 pbl-$(CONFIG_MACH_REALQ7) += imx6q-dmo-edmqmx6.dtb.o
 pbl-$(CONFIG_MACH_SOLIDRUN_CUBOX) += dove-cubox.dtb.o
 pbl-$(CONFIG_MACH_GK802) += imx6q-gk802.dtb.o
-pbl-$(CONFIG_MACH_TORADEX_COLIBRI_T20_IRIS) += tegra20-colibri-iris.dtb.o
+pbl-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += tegra20-colibri-iris.dtb.o
 pbl-$(CONFIG_MACH_TOSHIBA_AC100) += tegra20-paz00.dtb.o
 pbl-$(CONFIG_MACH_TQMA53) += imx53-mba53.dtb.o
 pbl-$(CONFIG_MACH_TQMA6X) += imx6dl-mba6x.dtb.o imx6q-mba6x.dtb.o
arch/arm/mach-tegra/Kconfig +2 -2
index 3becb84..34e1c37 100644
@@ -48,8 +48,8 @@ config ARCH_TEGRA_2x_SOC
 
 menu "select Tegra boards to be built"
 
-config MACH_TORADEX_COLIBRI_T20_IRIS
-	bool "Toradex Colibri T20 on Iris Carrier"
+config MACH_TORADEX_COLIBRI_T20
+	bool "Toradex Colibri T20"
 	select ARCH_TEGRA_2x_SOC
 
 config MACH_TOSHIBA_AC100
images/Makefile.tegra +2 -2
index 1cf1432..f03503e 100644
@@ -9,6 +9,6 @@ pblx-$(CONFIG_MACH_TOSHIBA_AC100) += start_toshiba_ac100
 FILE_barebox-tegra20-toshiba-ac100.img = start_toshiba_ac100.pblx
 image-$(CONFIG_MACH_TOSHIBA_AC100) += barebox-tegra20-toshiba-ac100.img
 
-pblx-$(CONFIG_MACH_TORADEX_COLIBRI_T20_IRIS) += start_toradex_colibri_t20_iris
+pblx-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += start_toradex_colibri_t20_iris
 FILE_barebox-tegra20-toradex-colibri-t20-iris.img = start_toradex_colibri_t20_iris.pblx
-image-$(CONFIG_MACH_TORADEX_COLIBRI_T20_IRIS) += barebox-tegra20-toradex-colibri-t20-iris.img
+image-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += barebox-tegra20-toradex-colibri-t20-iris.img
Signature · 7 lines
1.8.5.3


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Applied
#1 lore raw
Quoted 8 lines · Lucas Stach

For computer modules the naming standard is to have a single board directory named after the module and have all the baseboard support beneath it.

Also change the CONFIG name, as we may want to build all the baseboards at once.

Applied, thanks

Sascha

Quoted 186 lines
---
 arch/arm/boards/Makefile                          |  2 +-
 arch/arm/boards/toradex-colibri-t20-iris/Makefile |  2 --
 arch/arm/boards/toradex-colibri-t20-iris/entry.c  | 34 -----------------------
 arch/arm/boards/toradex-colibri-t20/Makefile      |  2 ++
 arch/arm/boards/toradex-colibri-t20/entry.c       | 34 +++++++++++++++++++++++
 arch/arm/configs/tegra_v7_defconfig               |  2 +-
 arch/arm/dts/Makefile                             |  2 +-
 arch/arm/mach-tegra/Kconfig                       |  4 +--
 images/Makefile.tegra                             |  4 +--
 9 files changed, 43 insertions(+), 43 deletions(-)
 delete mode 100644 arch/arm/boards/toradex-colibri-t20-iris/Makefile
 delete mode 100644 arch/arm/boards/toradex-colibri-t20-iris/entry.c
 create mode 100644 arch/arm/boards/toradex-colibri-t20/Makefile
 create mode 100644 arch/arm/boards/toradex-colibri-t20/entry.c
arch/arm/boards/Makefile +1 -1
index a4219d7..c34dd96 100644
@@ -83,7 +83,7 @@ obj-$(CONFIG_MACH_SOLIDRUN_HUMMINGBOARD)	+= solidrun-hummingboard/
 obj-$(CONFIG_MACH_TNY_A9260)			+= tny-a926x/
 obj-$(CONFIG_MACH_TNY_A9263)			+= tny-a926x/
 obj-$(CONFIG_MACH_TNY_A9G20)			+= tny-a926x/
-obj-$(CONFIG_MACH_TORADEX_COLIBRI_T20_IRIS)	+= toradex-colibri-t20-iris/
+obj-$(CONFIG_MACH_TORADEX_COLIBRI_T20)		+= toradex-colibri-t20/
 obj-$(CONFIG_MACH_TOSHIBA_AC100)		+= toshiba-ac100/
 obj-$(CONFIG_MACH_TQMA53)			+= tqma53/
 obj-$(CONFIG_MACH_TQMA6X)			+= tqma6x/
arch/arm/boards/toradex-colibri-t20-iris/Makefile deleted +0 -2
deleted file mode 100644
index 5be3dd0..0000000
@@ -1,2 +0,0 @@
-CFLAGS_pbl-entry.o := -mcpu=arm7tdmi -march=armv4t
-lwl-y += entry.o
arch/arm/boards/toradex-colibri-t20-iris/entry.c deleted +0 -34
deleted file mode 100644
index 886613f..0000000
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2013 Lucas Stach <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <common.h>
-#include <sizes.h>
-#include <asm/barebox-arm.h>
-#include <asm/barebox-arm-head.h>
-#include <mach/lowlevel.h>
-
-extern char __dtb_tegra20_colibri_iris_start[];
-
-ENTRY_FUNCTION(start_toradex_colibri_t20_iris, r0, r1, r2)
-{
-	uint32_t fdt;
-
-	tegra_cpu_lowlevel_setup();
-
-	fdt = (uint32_t)__dtb_tegra20_colibri_iris_start - get_runtime_offset();
-
-	tegra_avp_reset_vector(fdt);
-}
arch/arm/boards/toradex-colibri-t20/Makefile new file +2 -0
new file mode 100644
index 0000000..5be3dd0
@@ -0,0 +1,2 @@
+CFLAGS_pbl-entry.o := -mcpu=arm7tdmi -march=armv4t
+lwl-y += entry.o
arch/arm/boards/toradex-colibri-t20/entry.c new file +34 -0
new file mode 100644
index 0000000..886613f
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2013 Lucas Stach <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <common.h>
+#include <sizes.h>
+#include <asm/barebox-arm.h>
+#include <asm/barebox-arm-head.h>
+#include <mach/lowlevel.h>
+
+extern char __dtb_tegra20_colibri_iris_start[];
+
+ENTRY_FUNCTION(start_toradex_colibri_t20_iris, r0, r1, r2)
+{
+	uint32_t fdt;
+
+	tegra_cpu_lowlevel_setup();
+
+	fdt = (uint32_t)__dtb_tegra20_colibri_iris_start - get_runtime_offset();
+
+	tegra_avp_reset_vector(fdt);
+}
arch/arm/configs/tegra_v7_defconfig +1 -1
index 831c138..f76b501 100644
@@ -1,5 +1,5 @@
 CONFIG_ARCH_TEGRA=y
-CONFIG_MACH_TORADEX_COLIBRI_T20_IRIS=y
+CONFIG_MACH_TORADEX_COLIBRI_T20=y
 CONFIG_MACH_TOSHIBA_AC100=y
 CONFIG_AEABI=y
 CONFIG_CMD_ARM_MMUINFO=y
arch/arm/dts/Makefile +1 -1
index 1718bde..af7b0dd 100644
@@ -44,7 +44,7 @@ pbl-$(CONFIG_MACH_PHYTEC_PFLA02) += imx6q-phytec-pbab01.dtb.o
 pbl-$(CONFIG_MACH_REALQ7) += imx6q-dmo-edmqmx6.dtb.o
 pbl-$(CONFIG_MACH_SOLIDRUN_CUBOX) += dove-cubox.dtb.o
 pbl-$(CONFIG_MACH_GK802) += imx6q-gk802.dtb.o
-pbl-$(CONFIG_MACH_TORADEX_COLIBRI_T20_IRIS) += tegra20-colibri-iris.dtb.o
+pbl-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += tegra20-colibri-iris.dtb.o
 pbl-$(CONFIG_MACH_TOSHIBA_AC100) += tegra20-paz00.dtb.o
 pbl-$(CONFIG_MACH_TQMA53) += imx53-mba53.dtb.o
 pbl-$(CONFIG_MACH_TQMA6X) += imx6dl-mba6x.dtb.o imx6q-mba6x.dtb.o
arch/arm/mach-tegra/Kconfig +2 -2
index 3becb84..34e1c37 100644
@@ -48,8 +48,8 @@ config ARCH_TEGRA_2x_SOC
 
 menu "select Tegra boards to be built"
 
-config MACH_TORADEX_COLIBRI_T20_IRIS
-	bool "Toradex Colibri T20 on Iris Carrier"
+config MACH_TORADEX_COLIBRI_T20
+	bool "Toradex Colibri T20"
 	select ARCH_TEGRA_2x_SOC
 
 config MACH_TOSHIBA_AC100
images/Makefile.tegra +2 -2
index 1cf1432..f03503e 100644
@@ -9,6 +9,6 @@ pblx-$(CONFIG_MACH_TOSHIBA_AC100) += start_toshiba_ac100
 FILE_barebox-tegra20-toshiba-ac100.img = start_toshiba_ac100.pblx
 image-$(CONFIG_MACH_TOSHIBA_AC100) += barebox-tegra20-toshiba-ac100.img
 
-pblx-$(CONFIG_MACH_TORADEX_COLIBRI_T20_IRIS) += start_toradex_colibri_t20_iris
+pblx-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += start_toradex_colibri_t20_iris
 FILE_barebox-tegra20-toradex-colibri-t20-iris.img = start_toradex_colibri_t20_iris.pblx
-image-$(CONFIG_MACH_TORADEX_COLIBRI_T20_IRIS) += barebox-tegra20-toradex-colibri-t20-iris.img
+image-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += barebox-tegra20-toradex-colibri-t20-iris.img
Signature · 7 lines
1.8.5.3


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Signature · 9 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox