From 31300d79e82767b45ffd93a82af083980033a89e Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Tue, 31 Mar 2020 11:47:10 -0700 Subject: ARM: zii-common: Add common environment directory Establish a common environment directory between all ZII boards, so that we could share common bits and pieces. As a first step, get rid of board scecific net boot scripts and replace them with a single shared one. Signed-off-by: Andrey Smirnov Signed-off-by: Sascha Hauer --- arch/arm/boards/zii-common/Makefile | 1 + .../zii-common/defaultenv-zii-common/boot/net | 29 ++++++++++++++++++++++ arch/arm/boards/zii-imx51-rdu1/board.c | 1 + .../boards/zii-imx51-rdu1/defaultenv-rdu1/boot/net | 24 ------------------ arch/arm/boards/zii-imx6q-rdu2/board.c | 1 + .../boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/net | 24 ------------------ arch/arm/boards/zii-imx7d-dev/board.c | 2 ++ arch/arm/boards/zii-imx8mq-dev/board.c | 1 + .../defaultenv-imx8mq-zii-dev/boot/net | 24 ------------------ arch/arm/boards/zii-vf610-dev/board.c | 1 + arch/arm/mach-imx/Kconfig | 1 + 11 files changed, 37 insertions(+), 72 deletions(-) create mode 100644 arch/arm/boards/zii-common/defaultenv-zii-common/boot/net delete mode 100644 arch/arm/boards/zii-imx51-rdu1/defaultenv-rdu1/boot/net delete mode 100644 arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/net delete mode 100644 arch/arm/boards/zii-imx8mq-dev/defaultenv-imx8mq-zii-dev/boot/net diff --git a/arch/arm/boards/zii-common/Makefile b/arch/arm/boards/zii-common/Makefile index fcc5cdf97d..90bdf21e77 100644 --- a/arch/arm/boards/zii-common/Makefile +++ b/arch/arm/boards/zii-common/Makefile @@ -1 +1,2 @@ obj-y += board.o switch-cmd.o pn-fixup.o +bbenv-y += defaultenv-zii-common diff --git a/arch/arm/boards/zii-common/defaultenv-zii-common/boot/net b/arch/arm/boards/zii-common/defaultenv-zii-common/boot/net new file mode 100644 index 0000000000..8b07cbbc99 --- /dev/null +++ b/arch/arm/boards/zii-common/defaultenv-zii-common/boot/net @@ -0,0 +1,29 @@ +#!/bin/sh + +path="/mnt/tftp" + +# +# Clear seat network config. Some boards don't have that config, so +# check that it is set first +# +if [ -n ${global.linux.bootargs.rdu_network} ]; then + global.linux.bootargs.rdu_network= +fi + +global.bootm.image="${path}/${global.user}-linux-${global.hostname}" + +oftree="${path}/${global.user}-oftree-${global.hostname}" +if [ -f "${oftree}" ]; then + global.bootm.oftree="$oftree" +fi + +nfsroot="/home/${global.user}/nfsroot/${global.hostname}" + +ip_route_get -b ${global.net.server} global.linux.bootargs.dyn.ip + +initramfs="${path}/${global.user}-initramfs-${global.hostname}" +if [ -f "${initramfs}" ]; then + global.bootm.initrd="$initramfs" +else + global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp" +fi diff --git a/arch/arm/boards/zii-imx51-rdu1/board.c b/arch/arm/boards/zii-imx51-rdu1/board.c index 640bb0d1b7..8fdcb76260 100644 --- a/arch/arm/boards/zii-imx51-rdu1/board.c +++ b/arch/arm/boards/zii-imx51-rdu1/board.c @@ -50,6 +50,7 @@ static int zii_rdu1_init(void) BBU_HANDLER_FLAG_DEFAULT | IMX_BBU_FLAG_PARTITION_STARTS_AT_HEADER); + defaultenv_append_directory(defaultenv_zii_common); defaultenv_append_directory(defaultenv_rdu1); return 0; diff --git a/arch/arm/boards/zii-imx51-rdu1/defaultenv-rdu1/boot/net b/arch/arm/boards/zii-imx51-rdu1/defaultenv-rdu1/boot/net deleted file mode 100644 index 4be8e1e2d7..0000000000 --- a/arch/arm/boards/zii-imx51-rdu1/defaultenv-rdu1/boot/net +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -path="/mnt/tftp" - -# clear seat network config -global.linux.bootargs.rdu_network= - -global.bootm.image="${path}/${global.user}-linux-${global.hostname}" - -oftree="${path}/${global.user}-oftree-${global.hostname}" -if [ -f "${oftree}" ]; then - global.bootm.oftree="$oftree" -fi - -nfsroot="/home/${global.user}/nfsroot/${global.hostname}" - -ip_route_get -b ${global.net.server} global.linux.bootargs.dyn.ip - -initramfs="${path}/${global.user}-initramfs-${global.hostname}" -if [ -f "${initramfs}" ]; then - global.bootm.initrd="$initramfs" -else - global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp" -fi diff --git a/arch/arm/boards/zii-imx6q-rdu2/board.c b/arch/arm/boards/zii-imx6q-rdu2/board.c index 0bb4700b60..6d6bc1caaa 100644 --- a/arch/arm/boards/zii-imx6q-rdu2/board.c +++ b/arch/arm/boards/zii-imx6q-rdu2/board.c @@ -155,6 +155,7 @@ static int rdu2_devices_init(void) imx6_bbu_internal_mmcboot_register_handler("eMMC", "/dev/mmc3", 0); + defaultenv_append_directory(defaultenv_zii_common); defaultenv_append_directory(defaultenv_rdu2); return 0; diff --git a/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/net b/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/net deleted file mode 100644 index 4090c2f4a9..0000000000 --- a/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/net +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -path="/mnt/tftp" - -# clear seat network config -global.linux.bootargs.rdu_network= - -global.bootm.image="${path}/${global.user}-linux-${global.hostname}" - -oftree="${path}/${global.user}-oftree-${global.hostname}" -if [ -f "${oftree}" ]; then - global.bootm.oftree="$oftree" -fi - -nfsroot="/home/${global.user}/nfsroot/${global.hostname}" - -ip_route_get -b ${global.net.server} global.linux.bootargs.dyn.ip - -initramfs="${path}/${global.user}-initramfs-${global.hostname}" -if [ -f "${initramfs}" ]; then - global.bootm.initrd="$initramfs" -else - global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp" -fi \ No newline at end of file diff --git a/arch/arm/boards/zii-imx7d-dev/board.c b/arch/arm/boards/zii-imx7d-dev/board.c index b53a6af499..6b409e23b7 100644 --- a/arch/arm/boards/zii-imx7d-dev/board.c +++ b/arch/arm/boards/zii-imx7d-dev/board.c @@ -55,6 +55,8 @@ static int zii_imx7d_dev_init(void) else if (of_machine_is_compatible("zii,imx7d-rmu2")) barebox_set_hostname("rmu2"); + defaultenv_append_directory(defaultenv_zii_common); + return 0; } late_initcall(zii_imx7d_dev_init); diff --git a/arch/arm/boards/zii-imx8mq-dev/board.c b/arch/arm/boards/zii-imx8mq-dev/board.c index ddd15299ce..285e889fe2 100644 --- a/arch/arm/boards/zii-imx8mq-dev/board.c +++ b/arch/arm/boards/zii-imx8mq-dev/board.c @@ -39,6 +39,7 @@ static int zii_imx8mq_dev_init(void) else of_device_enable_path("/chosen/environment-sd"); + defaultenv_append_directory(defaultenv_zii_common); defaultenv_append_directory(defaultenv_imx8mq_zii_dev); return 0; diff --git a/arch/arm/boards/zii-imx8mq-dev/defaultenv-imx8mq-zii-dev/boot/net b/arch/arm/boards/zii-imx8mq-dev/defaultenv-imx8mq-zii-dev/boot/net deleted file mode 100644 index 4090c2f4a9..0000000000 --- a/arch/arm/boards/zii-imx8mq-dev/defaultenv-imx8mq-zii-dev/boot/net +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -path="/mnt/tftp" - -# clear seat network config -global.linux.bootargs.rdu_network= - -global.bootm.image="${path}/${global.user}-linux-${global.hostname}" - -oftree="${path}/${global.user}-oftree-${global.hostname}" -if [ -f "${oftree}" ]; then - global.bootm.oftree="$oftree" -fi - -nfsroot="/home/${global.user}/nfsroot/${global.hostname}" - -ip_route_get -b ${global.net.server} global.linux.bootargs.dyn.ip - -initramfs="${path}/${global.user}-initramfs-${global.hostname}" -if [ -f "${initramfs}" ]; then - global.bootm.initrd="$initramfs" -else - global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp" -fi \ No newline at end of file diff --git a/arch/arm/boards/zii-vf610-dev/board.c b/arch/arm/boards/zii-vf610-dev/board.c index 1d10f12f63..6b80ec4282 100644 --- a/arch/arm/boards/zii-vf610-dev/board.c +++ b/arch/arm/boards/zii-vf610-dev/board.c @@ -141,6 +141,7 @@ static int zii_vf610_dev_set_hostname(void) } } + defaultenv_append_directory(defaultenv_zii_common); defaultenv_append_directory(defaultenv_zii_vf610_dev); return 0; } diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 116761bdad..072c659008 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -484,6 +484,7 @@ config MACH_ZII_VF610_DEV bool "ZII VF610 Dev Family" select ARCH_VF610 select CLKDEV_LOOKUP + select MACH_ZII_COMMON select ARM_USE_COMPRESSED_DTB config MACH_ZII_IMX7D_DEV -- cgit v1.2.3