aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-agl-bsp/classes/sdcard_image-socfpga.bbclass5
-rw-r--r--meta-agl-bsp/conf/include/agl_dragonboard-820c.inc2
-rw-r--r--meta-agl-bsp/meta-qcom/recipes-kernel/linux/linux-linaro-qcomlt-db820c_4.11.bbappend3
-rw-r--r--meta-agl/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bb3
-rw-r--r--meta-agl/recipes-graphics/wayland/weston-ini-conf.bb2
-rw-r--r--templates/machine/dragonboard-820c/50_bblayers.conf.inc1
-rw-r--r--templates/machine/dragonboard-820c/50_local.conf.inc3
7 files changed, 14 insertions, 5 deletions
diff --git a/meta-agl-bsp/classes/sdcard_image-socfpga.bbclass b/meta-agl-bsp/classes/sdcard_image-socfpga.bbclass
index e1f7b1846..2967063e0 100644
--- a/meta-agl-bsp/classes/sdcard_image-socfpga.bbclass
+++ b/meta-agl-bsp/classes/sdcard_image-socfpga.bbclass
@@ -41,14 +41,15 @@ SDIMG_ROOTFS_TYPE = "ext3"
SDIMG_ROOTFS = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}"
-do_image_socfpga-sdimg[depends] += " \
+do_image_socfpga_sdimg[depends] += " \
+ coreutils-native:do_populate_sysroot \
parted-native:do_populate_sysroot \
mtools-native:do_populate_sysroot \
dosfstools-native:do_populate_sysroot \
virtual/kernel:do_deploy \
virtual/bootloader:do_deploy \
"
-
+
rootfs[depends] += "virtual/kernel:do_deploy"
# SD card image name
diff --git a/meta-agl-bsp/conf/include/agl_dragonboard-820c.inc b/meta-agl-bsp/conf/include/agl_dragonboard-820c.inc
new file mode 100644
index 000000000..f74d703fa
--- /dev/null
+++ b/meta-agl-bsp/conf/include/agl_dragonboard-820c.inc
@@ -0,0 +1,2 @@
+# Install 96boards-tools for resizing partition
+IMAGE_INSTALL_append = " 96boards-tools"
diff --git a/meta-agl-bsp/meta-qcom/recipes-kernel/linux/linux-linaro-qcomlt-db820c_4.11.bbappend b/meta-agl-bsp/meta-qcom/recipes-kernel/linux/linux-linaro-qcomlt-db820c_4.11.bbappend
new file mode 100644
index 000000000..0b2b99d4d
--- /dev/null
+++ b/meta-agl-bsp/meta-qcom/recipes-kernel/linux/linux-linaro-qcomlt-db820c_4.11.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+require recipes-kernel/linux/linux-agl.inc
diff --git a/meta-agl/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bb b/meta-agl/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bb
index 96c171fa8..b1ecccf85 100644
--- a/meta-agl/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bb
+++ b/meta-agl/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bb
@@ -2,8 +2,7 @@ SUMMARY = "Runs AGL postinstall scripts on first boot of the target device"
SECTION = "devel"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
SRC_URI = "file://run-agl-postinsts \
file://run-agl-postinsts.service"
diff --git a/meta-agl/recipes-graphics/wayland/weston-ini-conf.bb b/meta-agl/recipes-graphics/wayland/weston-ini-conf.bb
index 02a6ea7e8..4628f96f8 100644
--- a/meta-agl/recipes-graphics/wayland/weston-ini-conf.bb
+++ b/meta-agl/recipes-graphics/wayland/weston-ini-conf.bb
@@ -1,6 +1,6 @@
SUMMARY = "Startup script and systemd unit file for the Weston Wayland compositor"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
SRC_URI = "file://core.cfg \
file://ivishell.cfg \
diff --git a/templates/machine/dragonboard-820c/50_bblayers.conf.inc b/templates/machine/dragonboard-820c/50_bblayers.conf.inc
new file mode 100644
index 000000000..01ffb7f17
--- /dev/null
+++ b/templates/machine/dragonboard-820c/50_bblayers.conf.inc
@@ -0,0 +1 @@
+BBLAYERS =+ "${METADIR}/meta-qcom"
diff --git a/templates/machine/dragonboard-820c/50_local.conf.inc b/templates/machine/dragonboard-820c/50_local.conf.inc
new file mode 100644
index 000000000..1cd53d60c
--- /dev/null
+++ b/templates/machine/dragonboard-820c/50_local.conf.inc
@@ -0,0 +1,3 @@
+MACHINE = "dragonboard-820c"
+#see meta-agl/meta-agl-bsp/conf/include/agl_dragonboard-410c.inc
+require conf/include/agl_dragonboard-820c.inc