summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/zii-imx8mq-dev
diff options
context:
space:
mode:
authorAndrey Smirnov <andrew.smirnov@gmail.com>2020-03-31 11:47:10 -0700
committerSascha Hauer <s.hauer@pengutronix.de>2020-04-03 08:21:28 +0200
commit31300d79e82767b45ffd93a82af083980033a89e (patch)
tree9baa3b9cfb74f2ded8a67d6ee569e2eb2a74e234 /arch/arm/boards/zii-imx8mq-dev
parent1db1f1f98f907ac5e38106db9a29d37714c36ad1 (diff)
downloadbarebox-31300d79e82767b45ffd93a82af083980033a89e.tar.gz
barebox-31300d79e82767b45ffd93a82af083980033a89e.tar.xz
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 <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/zii-imx8mq-dev')
-rw-r--r--arch/arm/boards/zii-imx8mq-dev/board.c1
-rw-r--r--arch/arm/boards/zii-imx8mq-dev/defaultenv-imx8mq-zii-dev/boot/net24
2 files changed, 1 insertions, 24 deletions
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