summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Smirnov <andrew.smirnov@gmail.com>2019-06-21 01:11:14 -0700
committerSascha Hauer <s.hauer@pengutronix.de>2019-06-26 08:57:31 +0200
commit73835ac50e59366538293606032d5c48c7e42378 (patch)
tree105e437f0e5c6a09bfadea556708273985f98333
parent23596c820165154a94e04981d9d742701ab81dd9 (diff)
downloadbarebox-73835ac50e59366538293606032d5c48c7e42378.tar.gz
ARM: Rename zii-imx7d-rpu2 to zii-imx7d-dev
To prepare for addition of another ZII i.MX7D based board, i.MX7D RMU2, rename zii-imx7d-rpu2 to zii-imx7d-dev to avoid any image naming confusion. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rwxr-xr-xDocumentation/boards/imx/zii-imx7d-dev/bootstrap.sh (renamed from Documentation/boards/imx/zii-imx7d-rpu2/bootstrap.sh)0
-rw-r--r--Documentation/boards/imx/zii-imx7d-dev/openocd.cfg (renamed from Documentation/boards/imx/zii-imx7d-rpu2/openocd.cfg)2
-rw-r--r--Documentation/boards/imx/zii-imx7d-dev/readme.rst (renamed from Documentation/boards/imx/zii-imx7d-rpu2/readme.rst)4
-rw-r--r--arch/arm/boards/Makefile2
-rw-r--r--arch/arm/boards/zii-imx7d-dev/Makefile (renamed from arch/arm/boards/zii-imx7d-rpu2/Makefile)0
-rw-r--r--arch/arm/boards/zii-imx7d-dev/board.c (renamed from arch/arm/boards/zii-imx7d-rpu2/board.c)0
-rw-r--r--arch/arm/boards/zii-imx7d-dev/flash-header-zii-imx7d-dev.imxcfg (renamed from arch/arm/boards/zii-imx7d-rpu2/flash-header-zii-imx7d-rpu2.imxcfg)0
-rw-r--r--arch/arm/boards/zii-imx7d-dev/lowlevel.c (renamed from arch/arm/boards/zii-imx7d-rpu2/lowlevel.c)2
-rw-r--r--arch/arm/dts/Makefile2
-rw-r--r--arch/arm/mach-imx/Kconfig4
-rw-r--r--images/Makefile.imx8
11 files changed, 12 insertions, 12 deletions
diff --git a/Documentation/boards/imx/zii-imx7d-rpu2/bootstrap.sh b/Documentation/boards/imx/zii-imx7d-dev/bootstrap.sh
index 49bab03..49bab03 100755
--- a/Documentation/boards/imx/zii-imx7d-rpu2/bootstrap.sh
+++ b/Documentation/boards/imx/zii-imx7d-dev/bootstrap.sh
diff --git a/Documentation/boards/imx/zii-imx7d-rpu2/openocd.cfg b/Documentation/boards/imx/zii-imx7d-dev/openocd.cfg
index 33e3bce..f971c3f 100644
--- a/Documentation/boards/imx/zii-imx7d-rpu2/openocd.cfg
+++ b/Documentation/boards/imx/zii-imx7d-dev/openocd.cfg
@@ -132,7 +132,7 @@ proc start_barebox { } {
set MX7_DDR_BASE_ADDR 0x80000000
echo "Bootstrap: Loading Barebox"
halt
- load_image images/barebox-zii-imx7d-rpu2.img $MX7_DDR_BASE_ADDR bin
+ load_image images/barebox-zii-imx7d-dev.img $MX7_DDR_BASE_ADDR bin
arm core_state arm
echo [format "Bootstrap: Jumping to 0x%08x" $MX7_DDR_BASE_ADDR]
resume $MX7_DDR_BASE_ADDR
diff --git a/Documentation/boards/imx/zii-imx7d-rpu2/readme.rst b/Documentation/boards/imx/zii-imx7d-dev/readme.rst
index dd984ac..d47bc90 100644
--- a/Documentation/boards/imx/zii-imx7d-rpu2/readme.rst
+++ b/Documentation/boards/imx/zii-imx7d-dev/readme.rst
@@ -21,14 +21,14 @@ follows:
.. code-block:: sh
cd barebox
- Documentation/boards/imx/zii-imx7d-rpu2/bootstrap.sh
+ Documentation/boards/imx/zii-imx7d-dev/bootstrap.sh
A custom OpenOCD binary and options can be specified as follows:
.. code-block:: sh
OPENOCD="../openocd/src/openocd -s ../openocd/tcl " \
- Documentation/boards/imx/zii-imx7d-rpu2/bootstrap.sh
+ Documentation/boards/imx/zii-imx7d-dev/bootstrap.sh
Disabling DSA in Embedeed Switch
diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile
index bdf78d0..a814ab8 100644
--- a/arch/arm/boards/Makefile
+++ b/arch/arm/boards/Makefile
@@ -164,7 +164,7 @@ obj-$(CONFIG_MACH_ZII_RDU1) += zii-imx51-rdu1/
obj-$(CONFIG_MACH_ZII_RDU2) += zii-imx6q-rdu2/
obj-$(CONFIG_MACH_ZII_IMX8MQ_DEV) += zii-imx8mq-dev/
obj-$(CONFIG_MACH_ZII_VF610_DEV) += zii-vf610-dev/
-obj-$(CONFIG_MACH_ZII_IMX7D_RPU2) += zii-imx7d-rpu2/
+obj-$(CONFIG_MACH_ZII_IMX7D_DEV) += zii-imx7d-dev/
obj-$(CONFIG_MACH_WAGO_PFC_AM35XX) += wago-pfc-am35xx/
obj-$(CONFIG_MACH_LS1046ARDB) += ls1046ardb/
obj-$(CONFIG_MACH_TQMLS1046A) += tqmls1046a/
diff --git a/arch/arm/boards/zii-imx7d-rpu2/Makefile b/arch/arm/boards/zii-imx7d-dev/Makefile
index 01c7a25..01c7a25 100644
--- a/arch/arm/boards/zii-imx7d-rpu2/Makefile
+++ b/arch/arm/boards/zii-imx7d-dev/Makefile
diff --git a/arch/arm/boards/zii-imx7d-rpu2/board.c b/arch/arm/boards/zii-imx7d-dev/board.c
index 0a99976..0a99976 100644
--- a/arch/arm/boards/zii-imx7d-rpu2/board.c
+++ b/arch/arm/boards/zii-imx7d-dev/board.c
diff --git a/arch/arm/boards/zii-imx7d-rpu2/flash-header-zii-imx7d-rpu2.imxcfg b/arch/arm/boards/zii-imx7d-dev/flash-header-zii-imx7d-dev.imxcfg
index 46f3d95..46f3d95 100644
--- a/arch/arm/boards/zii-imx7d-rpu2/flash-header-zii-imx7d-rpu2.imxcfg
+++ b/arch/arm/boards/zii-imx7d-dev/flash-header-zii-imx7d-dev.imxcfg
diff --git a/arch/arm/boards/zii-imx7d-rpu2/lowlevel.c b/arch/arm/boards/zii-imx7d-dev/lowlevel.c
index 1eeab7d..d7f8feb 100644
--- a/arch/arm/boards/zii-imx7d-rpu2/lowlevel.c
+++ b/arch/arm/boards/zii-imx7d-dev/lowlevel.c
@@ -39,7 +39,7 @@ static inline void setup_uart(void)
putc_ll('>');
}
-ENTRY_FUNCTION(start_zii_imx7d_rpu2, r0, r1, r2)
+ENTRY_FUNCTION(start_zii_imx7d_dev, r0, r1, r2)
{
imx7_cpu_lowlevel_init();
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 5616539..4c79b98 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -133,7 +133,7 @@ pbl-dtb-$(CONFIG_MACH_MICROCHIP_KSZ9477_EVB) += at91-microchip-ksz9477-evb.dtb.o
pbl-dtb-$(CONFIG_MACH_AT91SAM9X5EK) += at91sam9x5ek.dtb.o
pbl-dtb-$(CONFIG_MACH_XILINX_ZCU104) += zynqmp-zcu104-revA.dtb.o
-pbl-dtb-$(CONFIG_MACH_ZII_IMX7D_RPU2) += imx7d-zii-rpu2.dtb.o
+pbl-dtb-$(CONFIG_MACH_ZII_IMX7D_DEV) += imx7d-zii-rpu2.dtb.o
pbl-dtb-$(CONFIG_MACH_WAGO_PFC_AM35XX) += am35xx-pfc-750_820x.dtb.o
pbl-dtb-$(CONFIG_MACH_LS1046ARDB) += fsl-ls1046a-rdb.dtb.o
pbl-dtb-$(CONFIG_MACH_TQMLS1046A) += fsl-tqmls1046a-mbls10xxa.dtb.o
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 6a6aab6..b9374fe 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -461,8 +461,8 @@ config MACH_ZII_VF610_DEV
select ARCH_VF610
select CLKDEV_LOOKUP
-config MACH_ZII_IMX7D_RPU2
- bool "ZII i.MX7D RPU2"
+config MACH_ZII_IMX7D_DEV
+ bool "ZII i.MX7D based devices"
select ARCH_IMX7
config MACH_PHYTEC_PHYCORE_IMX7
diff --git a/images/Makefile.imx b/images/Makefile.imx
index 9a7187a..826e774 100644
--- a/images/Makefile.imx
+++ b/images/Makefile.imx
@@ -551,10 +551,10 @@ CFG_start_imx7s_element14_warp7.pblb.imximg = $(board)/element14-warp7/flash-hea
FILE_barebox-element14-imx7s-warp7.img = start_imx7s_element14_warp7.pblb.imximg
image-$(CONFIG_MACH_WARP7) += barebox-element14-imx7s-warp7.img
-pblb-$(CONFIG_MACH_ZII_IMX7D_RPU2) += start_zii_imx7d_rpu2
-CFG_start_zii_imx7d_rpu2.pblb.imximg = $(board)/zii-imx7d-rpu2/flash-header-zii-imx7d-rpu2.imxcfg
-FILE_barebox-zii-imx7d-rpu2.img = start_zii_imx7d_rpu2.pblb.imximg
-image-$(CONFIG_MACH_ZII_IMX7D_RPU2) += barebox-zii-imx7d-rpu2.img
+pblb-$(CONFIG_MACH_ZII_IMX7D_DEV) += start_zii_imx7d_dev
+CFG_start_zii_imx7d_dev.pblb.imximg = $(board)/zii-imx7d-dev/flash-header-zii-imx7d-dev.imxcfg
+FILE_barebox-zii-imx7d-dev.img = start_zii_imx7d_dev.pblb.imximg
+image-$(CONFIG_MACH_ZII_IMX7D_DEV) += barebox-zii-imx7d-dev.img
# ----------------------- i.MX8mq based boards --------------------------
pblb-$(CONFIG_MACH_NXP_IMX8MQ_EVK) += start_nxp_imx8mq_evk