summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2020-10-23 09:41:10 -0400
committerScott Murray <scott.murray@konsulko.com>2020-10-23 09:41:10 -0400
commite3c65061a07a459721e6182374b83eeaf01c0f26 (patch)
tree7c2256de0a18e47ec574183a073a73549c28d755
parent66814faec0f8e589b48af8c22a70d94d96bf0957 (diff)
Add AGL reference hardware support to h3ulcb/h3ulcb-nogfxsandbox/scottm/refhw
Update the h3ulcb and h3ulcb-nogfx machine templates to pull in the meta-agl-refhw layer and a new agl_refhw-h3.inc file that enables the reference hardware support. The result is an extra devicetree file that can be used to boot the h3ulcb images on the reference hardware. Bug-AGL: SPEC-3658 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I5bbfd3a6014affb1c9668d1bce9378d84c4c76cb
-rw-r--r--meta-agl-bsp/conf/include/agl_refhw-h3.inc10
-rw-r--r--templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc1
-rw-r--r--templates/machine/h3ulcb-nogfx/50_local.conf.inc3
-rw-r--r--templates/machine/h3ulcb/50_bblayers.conf.inc1
-rw-r--r--templates/machine/h3ulcb/50_local.conf.inc3
5 files changed, 18 insertions, 0 deletions
diff --git a/meta-agl-bsp/conf/include/agl_refhw-h3.inc b/meta-agl-bsp/conf/include/agl_refhw-h3.inc
new file mode 100644
index 0000000..576d8ef
--- /dev/null
+++ b/meta-agl-bsp/conf/include/agl_refhw-h3.inc
@@ -0,0 +1,10 @@
+#MACHINEOVERRIDES_append = ":agl-refhw-h3"
+
+# Reference hardware has USB3
+MACHINE_FEATURES_append = " usb3"
+
+KERNEL_DEVICETREE_append = " renesas/r8a7795-agl-refhw.dtb"
+
+# Disable the meta-agl-refhw-gen3 arm-trusted-firmware bbappend as
+# it makes the firmware reference hardware specific.
+BBMASK = "meta-agl-refhw-gen3/recipes-bsp/arm-trusted-firmware"
diff --git a/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc b/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
index 16397c2..53d7d9a 100644
--- a/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
+++ b/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
BBLAYERS =+ "\
${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/bsp/meta-agl-refhw/meta-agl-refhw-gen3 \
"
diff --git a/templates/machine/h3ulcb-nogfx/50_local.conf.inc b/templates/machine/h3ulcb-nogfx/50_local.conf.inc
index 2f7cd6b..115f666 100644
--- a/templates/machine/h3ulcb-nogfx/50_local.conf.inc
+++ b/templates/machine/h3ulcb-nogfx/50_local.conf.inc
@@ -1,3 +1,6 @@
MACHINE = "h3ulcb"
#see meta-agl/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc
require conf/include/agl_h3ulcb-nogfx.inc
+
+#see meta-agl/meta-agl-bsp/conf/include/agl_refhw-h3.inc
+require conf/include/agl_refhw-h3.inc
diff --git a/templates/machine/h3ulcb/50_bblayers.conf.inc b/templates/machine/h3ulcb/50_bblayers.conf.inc
index 16397c2..53d7d9a 100644
--- a/templates/machine/h3ulcb/50_bblayers.conf.inc
+++ b/templates/machine/h3ulcb/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
BBLAYERS =+ "\
${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/bsp/meta-agl-refhw/meta-agl-refhw-gen3 \
"
diff --git a/templates/machine/h3ulcb/50_local.conf.inc b/templates/machine/h3ulcb/50_local.conf.inc
index 4bb2a82..fabacce 100644
--- a/templates/machine/h3ulcb/50_local.conf.inc
+++ b/templates/machine/h3ulcb/50_local.conf.inc
@@ -2,3 +2,6 @@ MACHINE = "h3ulcb"
#see meta-agl/meta-agl-bsp/conf/include/agl_h3ulcb.inc
require conf/include/agl_h3ulcb.inc
+#see meta-agl/meta-agl-bsp/conf/include/agl_refhw-h3.inc
+require conf/include/agl_refhw-h3.inc
+