summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2021-03-26 12:59:00 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2021-03-26 12:59:34 +0100
commit532864c6676439d12dd159dc33aeb584f7fcedbc (patch)
treeb1552336f425955b8192e7b56d766d5b6a934902 /arch
parent809e66d4efe5f80fe045a7df99444742dccf614e (diff)
downloadbarebox-532864c6676439d12dd159dc33aeb584f7fcedbc.tar.gz
barebox-532864c6676439d12dd159dc33aeb584f7fcedbc.tar.xz
ARM: i.MX: Fix overwriting defaultenv with zii board specific env
zii_imx7d_dev_init() lacks a protection against running on the wrong hardware. Add it so that the defaultenv no longer gets overwritten with a board specific variant. Fixes: 31300d79e8 ("ARM: zii-common: Add common environment directory") Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boards/zii-imx7d-dev/board.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boards/zii-imx7d-dev/board.c b/arch/arm/boards/zii-imx7d-dev/board.c
index 6b409e23b7..5f7314b0b8 100644
--- a/arch/arm/boards/zii-imx7d-dev/board.c
+++ b/arch/arm/boards/zii-imx7d-dev/board.c
@@ -54,6 +54,8 @@ static int zii_imx7d_dev_init(void)
barebox_set_hostname("rpu2");
else if (of_machine_is_compatible("zii,imx7d-rmu2"))
barebox_set_hostname("rmu2");
+ else
+ return 0;
defaultenv_append_directory(defaultenv_zii_common);