diff options
author | Lucas Stach <l.stach@pengutronix.de> | 2016-07-22 14:31:30 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-08-03 07:30:41 +0200 |
commit | 0c619050256735ebe48f1376e320b26b716d64a3 (patch) | |
tree | 4370d62ebe34d406090037f7697628ba993c965c /arch | |
parent | b82e9f62d98db90757949a53695216c08302bec2 (diff) | |
download | barebox-0c619050256735ebe48f1376e320b26b716d64a3.tar.gz barebox-0c619050256735ebe48f1376e320b26b716d64a3.tar.xz |
ARM: nitrogen: rename to nitrogen6
Now that the MAX variant of the board is also supported by the
same code, rename the board directory to the more generic nitrogen6.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boards/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/boards/boundarydevices-nitrogen6/1066mhz_4x128mx16.imxcfg (renamed from arch/arm/boards/boundarydevices-nitrogen6x/1066mhz_4x128mx16.imxcfg) | 0 | ||||
-rw-r--r-- | arch/arm/boards/boundarydevices-nitrogen6/1066mhz_4x256mx16.imxcfg (renamed from arch/arm/boards/boundarydevices-nitrogen6x/1066mhz_4x256mx16.imxcfg) | 0 | ||||
-rw-r--r-- | arch/arm/boards/boundarydevices-nitrogen6/1066mhz_4x512mx16-qp.imxcfg (renamed from arch/arm/boards/boundarydevices-nitrogen6x/1066mhz_4x512mx16-qp.imxcfg) | 0 | ||||
-rw-r--r-- | arch/arm/boards/boundarydevices-nitrogen6/800mhz_4x128mx16.imxcfg (renamed from arch/arm/boards/boundarydevices-nitrogen6x/800mhz_4x128mx16.imxcfg) | 0 | ||||
-rw-r--r-- | arch/arm/boards/boundarydevices-nitrogen6/800mhz_4x256mx16.imxcfg (renamed from arch/arm/boards/boundarydevices-nitrogen6x/800mhz_4x256mx16.imxcfg) | 0 | ||||
-rw-r--r-- | arch/arm/boards/boundarydevices-nitrogen6/Makefile (renamed from arch/arm/boards/boundarydevices-nitrogen6x/Makefile) | 0 | ||||
-rw-r--r-- | arch/arm/boards/boundarydevices-nitrogen6/board.c (renamed from arch/arm/boards/boundarydevices-nitrogen6x/board.c) | 0 | ||||
-rw-r--r-- | arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6dl-1g.imxcfg (renamed from arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6dl-1g.imxcfg) | 0 | ||||
-rw-r--r-- | arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6dl-2g.imxcfg (renamed from arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6dl-2g.imxcfg) | 0 | ||||
-rw-r--r-- | arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6q-1g.imxcfg (renamed from arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6q-1g.imxcfg) | 0 | ||||
-rw-r--r-- | arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6q-2g.imxcfg (renamed from arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6q-2g.imxcfg) | 0 | ||||
-rw-r--r-- | arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6qp-max.imxcfg (renamed from arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6qp-max.imxcfg) | 0 | ||||
-rw-r--r-- | arch/arm/boards/boundarydevices-nitrogen6/lowlevel.c (renamed from arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c) | 0 | ||||
-rw-r--r-- | arch/arm/boards/boundarydevices-nitrogen6/ram-base.imxcfg (renamed from arch/arm/boards/boundarydevices-nitrogen6x/ram-base.imxcfg) | 0 | ||||
-rw-r--r-- | arch/arm/configs/imx_v7_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/dts/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/Kconfig | 4 |
18 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile index e3dcc6a615..35b636f0cf 100644 --- a/arch/arm/boards/Makefile +++ b/arch/arm/boards/Makefile @@ -15,7 +15,7 @@ obj-$(CONFIG_MACH_BEAGLE) += beagle/ obj-$(CONFIG_MACH_BEAGLEBONE) += beaglebone/ obj-$(CONFIG_MACH_CANON_A1100) += canon-a1100/ obj-$(CONFIG_MACH_CM_FX6) += cm-fx6/ -obj-$(CONFIG_MACH_NITROGEN6X) += boundarydevices-nitrogen6x/ +obj-$(CONFIG_MACH_NITROGEN6) += boundarydevices-nitrogen6/ obj-$(CONFIG_MACH_CCMX51) += ccxmx51/ obj-$(CONFIG_MACH_CCMX53) += ccxmx53/ obj-$(CONFIG_MACH_CFA10036) += crystalfontz-cfa10036/ diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/1066mhz_4x128mx16.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/1066mhz_4x128mx16.imxcfg index c5a286b4e0..c5a286b4e0 100644 --- a/arch/arm/boards/boundarydevices-nitrogen6x/1066mhz_4x128mx16.imxcfg +++ b/arch/arm/boards/boundarydevices-nitrogen6/1066mhz_4x128mx16.imxcfg diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/1066mhz_4x256mx16.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/1066mhz_4x256mx16.imxcfg index 4d8a715150..4d8a715150 100644 --- a/arch/arm/boards/boundarydevices-nitrogen6x/1066mhz_4x256mx16.imxcfg +++ b/arch/arm/boards/boundarydevices-nitrogen6/1066mhz_4x256mx16.imxcfg diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/1066mhz_4x512mx16-qp.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/1066mhz_4x512mx16-qp.imxcfg index 6409b745d7..6409b745d7 100644 --- a/arch/arm/boards/boundarydevices-nitrogen6x/1066mhz_4x512mx16-qp.imxcfg +++ b/arch/arm/boards/boundarydevices-nitrogen6/1066mhz_4x512mx16-qp.imxcfg diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/800mhz_4x128mx16.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/800mhz_4x128mx16.imxcfg index 936a2f54bf..936a2f54bf 100644 --- a/arch/arm/boards/boundarydevices-nitrogen6x/800mhz_4x128mx16.imxcfg +++ b/arch/arm/boards/boundarydevices-nitrogen6/800mhz_4x128mx16.imxcfg diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/800mhz_4x256mx16.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/800mhz_4x256mx16.imxcfg index 09c855544d..09c855544d 100644 --- a/arch/arm/boards/boundarydevices-nitrogen6x/800mhz_4x256mx16.imxcfg +++ b/arch/arm/boards/boundarydevices-nitrogen6/800mhz_4x256mx16.imxcfg diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/Makefile b/arch/arm/boards/boundarydevices-nitrogen6/Makefile index 0ec04ce898..0ec04ce898 100644 --- a/arch/arm/boards/boundarydevices-nitrogen6x/Makefile +++ b/arch/arm/boards/boundarydevices-nitrogen6/Makefile diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/board.c b/arch/arm/boards/boundarydevices-nitrogen6/board.c index d9514d9d48..d9514d9d48 100644 --- a/arch/arm/boards/boundarydevices-nitrogen6x/board.c +++ b/arch/arm/boards/boundarydevices-nitrogen6/board.c diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6dl-1g.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6dl-1g.imxcfg index 0773f4d276..0773f4d276 100644 --- a/arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6dl-1g.imxcfg +++ b/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6dl-1g.imxcfg diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6dl-2g.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6dl-2g.imxcfg index 6622c517fa..6622c517fa 100644 --- a/arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6dl-2g.imxcfg +++ b/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6dl-2g.imxcfg diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6q-1g.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6q-1g.imxcfg index bd4134f8a9..bd4134f8a9 100644 --- a/arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6q-1g.imxcfg +++ b/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6q-1g.imxcfg diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6q-2g.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6q-2g.imxcfg index 89aa21c300..89aa21c300 100644 --- a/arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6q-2g.imxcfg +++ b/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6q-2g.imxcfg diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6qp-max.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6qp-max.imxcfg index 66f0e1a860..66f0e1a860 100644 --- a/arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6qp-max.imxcfg +++ b/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6qp-max.imxcfg diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c b/arch/arm/boards/boundarydevices-nitrogen6/lowlevel.c index bee70a5af4..bee70a5af4 100644 --- a/arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c +++ b/arch/arm/boards/boundarydevices-nitrogen6/lowlevel.c diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/ram-base.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/ram-base.imxcfg index 5d675883fd..5d675883fd 100644 --- a/arch/arm/boards/boundarydevices-nitrogen6x/ram-base.imxcfg +++ b/arch/arm/boards/boundarydevices-nitrogen6/ram-base.imxcfg diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index 8594965b54..e3a8f478d2 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -18,7 +18,7 @@ CONFIG_MACH_TX6X=y CONFIG_MACH_SABRELITE=y CONFIG_MACH_SABRESD=y CONFIG_MACH_FREESCALE_IMX6SX_SABRESDB=y -CONFIG_MACH_NITROGEN6X=y +CONFIG_MACH_NITROGEN6=y CONFIG_MACH_SOLIDRUN_MICROSOM=y CONFIG_MACH_TECHNEXION_WANDBOARD=y CONFIG_MACH_EMBEST_RIOTBOARD=y diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 7a59402106..09bf68ea2b 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -29,7 +29,7 @@ pbl-dtb-$(CONFIG_MACH_GW_VENTANA) += imx6q-gw54xx.dtb.o pbl-dtb-$(CONFIG_MACH_LENOVO_IX4_300D) += armada-xp-lenovo-ix4-300d-bb.dtb.o pbl-dtb-$(CONFIG_MACH_MARVELL_ARMADA_XP_GP) += armada-xp-gp-bb.dtb.o pbl-dtb-$(CONFIG_MACH_NETGEAR_RN104) += armada-370-rn104-bb.dtb.o -pbl-dtb-$(CONFIG_MACH_NITROGEN6X) += imx6q-nitrogen6x.dtb.o imx6dl-nitrogen6x.dtb.o imx6qp-nitrogen6_max.dtb.o +pbl-dtb-$(CONFIG_MACH_NITROGEN6) += imx6q-nitrogen6x.dtb.o imx6dl-nitrogen6x.dtb.o imx6qp-nitrogen6_max.dtb.o pbl-dtb-$(CONFIG_MACH_NVIDIA_BEAVER) += tegra30-beaver.dtb.o pbl-dtb-$(CONFIG_MACH_NVIDIA_JETSON) += tegra124-jetson-tk1.dtb.o pbl-dtb-$(CONFIG_MACH_PCA100) += imx27-phytec-phycard-s-rdk-bb.dtb.o diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 80f8fd80ae..82fc945d5b 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -279,8 +279,8 @@ config MACH_FREESCALE_IMX6SX_SABRESDB select I2C select I2C_IMX -config MACH_NITROGEN6X - bool "BoundaryDevices Nitrogen6x" +config MACH_NITROGEN6 + bool "BoundaryDevices Nitrogen6 boards" select ARCH_IMX6 config MACH_SOLIDRUN_MICROSOM |