summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/zii-imx7d-dev/board.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/boards/zii-imx7d-dev/board.c')
-rw-r--r--arch/arm/boards/zii-imx7d-dev/board.c20
1 files changed, 17 insertions, 3 deletions
diff --git a/arch/arm/boards/zii-imx7d-dev/board.c b/arch/arm/boards/zii-imx7d-dev/board.c
index 89f0515306..2d7b589908 100644
--- a/arch/arm/boards/zii-imx7d-dev/board.c
+++ b/arch/arm/boards/zii-imx7d-dev/board.c
@@ -9,11 +9,11 @@
#include <init.h>
#include <io.h>
#include <gpio.h>
-#include <mach/imx7-regs.h>
+#include <mach/imx/imx7-regs.h>
#include <mfd/imx7-iomuxc-gpr.h>
#include <environment.h>
#include <envfs.h>
-#include <mach/bbu.h>
+#include <mach/imx/bbu.h>
static void zii_imx7d_rpu2_init_fec(void)
{
@@ -33,7 +33,7 @@ static void zii_imx7d_rpu2_init_fec(void)
static int zii_imx7d_rpu2_coredevices_init(void)
{
- if (!of_machine_is_compatible("zii,imx7d-zii-rpu2") &&
+ if (!of_machine_is_compatible("zii,imx7d-rpu2") &&
!of_machine_is_compatible("zii,imx7d-rmu2"))
return 0;
@@ -48,3 +48,17 @@ static int zii_imx7d_rpu2_coredevices_init(void)
}
coredevice_initcall(zii_imx7d_rpu2_coredevices_init);
+static int zii_imx7d_dev_init(void)
+{
+ if (of_machine_is_compatible("zii,imx7d-rpu2"))
+ 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);
+
+ return 0;
+}
+late_initcall(zii_imx7d_dev_init);