summaryrefslogtreecommitdiff
path: root/recipes-images/images
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2018-06-25 23:19:38 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2019-03-06 13:44:32 +0100
commit7108b86b5e9a50c587d4461bbdcf1b18d577bc0a (patch)
tree81379a36cf9777f10c175a7150b0972b5ab21b9b /recipes-images/images
parent701b411f5e239408f6e7f3cf075613c9965c5825 (diff)
images: prepare for imx6 use-mainline-bsp machines
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'recipes-images/images')
l---------recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/flash_blk.scr1
l---------recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/flash_eth.scr1
l---------recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/fwd_blk.scr1
l---------recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/fwd_eth.scr1
l---------recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/fwd_mmc.scr1
l---------recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/mk-u-boot-scripts.sh1
l---------recipes-images/images/files/colibri-imx6-mainline/imx_flash/genext3fs.sh1
l---------recipes-images/images/files/colibri-imx6-mainline/update.sh1
-rw-r--r--recipes-images/images/tdx-extra.inc4
-rw-r--r--recipes-images/images/tdx-image-fstype.inc27
10 files changed, 39 insertions, 0 deletions
diff --git a/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/flash_blk.scr b/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/flash_blk.scr
new file mode 120000
index 0000000..e980bc6
--- /dev/null
+++ b/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/flash_blk.scr
@@ -0,0 +1 @@
+../../library/imx6/flash_blk.scr \ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/flash_eth.scr b/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/flash_eth.scr
new file mode 120000
index 0000000..18c02a9
--- /dev/null
+++ b/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/flash_eth.scr
@@ -0,0 +1 @@
+../../library/imx6/flash_eth.scr \ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/fwd_blk.scr b/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/fwd_blk.scr
new file mode 120000
index 0000000..5954646
--- /dev/null
+++ b/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/fwd_blk.scr
@@ -0,0 +1 @@
+../../library/fwd_blk.scr \ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/fwd_eth.scr b/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/fwd_eth.scr
new file mode 120000
index 0000000..decc214
--- /dev/null
+++ b/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/fwd_eth.scr
@@ -0,0 +1 @@
+../../library/fwd_eth.scr \ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/fwd_mmc.scr b/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/fwd_mmc.scr
new file mode 120000
index 0000000..3848cfa
--- /dev/null
+++ b/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/fwd_mmc.scr
@@ -0,0 +1 @@
+../../library/fwd_mmc.scr \ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/mk-u-boot-scripts.sh b/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/mk-u-boot-scripts.sh
new file mode 120000
index 0000000..ce71dbd
--- /dev/null
+++ b/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/mk-u-boot-scripts.sh
@@ -0,0 +1 @@
+../../library/mk-u-boot-scripts.sh \ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx6-mainline/imx_flash/genext3fs.sh b/recipes-images/images/files/colibri-imx6-mainline/imx_flash/genext3fs.sh
new file mode 120000
index 0000000..cc716db
--- /dev/null
+++ b/recipes-images/images/files/colibri-imx6-mainline/imx_flash/genext3fs.sh
@@ -0,0 +1 @@
+../../library/genext3fs.sh \ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx6-mainline/update.sh b/recipes-images/images/files/colibri-imx6-mainline/update.sh
new file mode 120000
index 0000000..fc60d21
--- /dev/null
+++ b/recipes-images/images/files/colibri-imx6-mainline/update.sh
@@ -0,0 +1 @@
+../library/imx6/update.sh \ No newline at end of file
diff --git a/recipes-images/images/tdx-extra.inc b/recipes-images/images/tdx-extra.inc
index c5a597f..ab0a3ff 100644
--- a/recipes-images/images/tdx-extra.inc
+++ b/recipes-images/images/tdx-extra.inc
@@ -261,3 +261,7 @@ IMAGE_INSTALL_append_apalis-t30 = " \
IMAGE_INSTALL_append_apalis-imx6 = " \
${BACKPORTS_WIFI_EXTRA} \
"
+
+IMAGE_INSTALL_remove_use-mainline-bsp = " \
+ backports \
+"
diff --git a/recipes-images/images/tdx-image-fstype.inc b/recipes-images/images/tdx-image-fstype.inc
index c6e909b..13ff51e 100644
--- a/recipes-images/images/tdx-image-fstype.inc
+++ b/recipes-images/images/tdx-image-fstype.inc
@@ -9,6 +9,7 @@ IMAGE_ROOTFS = "${WORKDIR}/${IMAGE_DIR}/rootfs"
UBOOT_EXT = "bin"
UBOOT_EXT_mx6 = "img"
+UBOOT_EXT_use-mainline-bsp = "img"
UBOOT_EXT_colibri-imx6ull = "imx"
UBOOT_EXT_mx7 = "imx"
UBOOT_EXT_vf = "imx"
@@ -26,6 +27,7 @@ UBOOT_BINARY_tegra124m = "u-boot-dtb-tegra.${UBOOT_EXT}"
#we need some native tools for deployment
DEPENDS_append = " pbzip2-native"
DEPENDS_append_mx6 = " imx-loader-native"
+DEPENDS_append_use-mainline-bsp = " imx-loader-native"
DEPENDS_append_mx6ull = " mtd-utils-native imx-loader-native"
DEPENDS_append_mx7 = " mtd-utils-native imx-loader-native"
DEPENDS_append_tegra = " cbootimage-native tegrarcm-native"
@@ -42,6 +44,18 @@ imagedeploytools() {
:
}
+imagedeploytools-all-mx6qdl() {
+ IMAGE_ROOT="${IMAGE_ROOTFS}/../imx_flash/"
+ rm -f ${IMAGE_ROOT}/imx_flash/imx_usb ${IMAGE_ROOT}/imx_flash/*.conf
+ mkdir -p ${IMAGE_ROOT}
+
+ # add imx-loader and its configuration files
+ cp ${STAGING_BINDIR_NATIVE}/imx_usb ${IMAGE_ROOT}/
+ ${BUILD_STRIP} ${IMAGE_ROOT}/imx_usb
+ cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/imx_usb.conf ${IMAGE_ROOT}/
+ cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/mx6_usb_*.conf ${IMAGE_ROOT}/
+}
+
imagedeploytools_append_mx6() {
IMAGE_ROOT="${IMAGE_ROOTFS}/../imx_flash/"
rm -f ${IMAGE_ROOT}/imx_flash/imx_usb ${IMAGE_ROOT}/imx_flash/*.conf
@@ -54,6 +68,19 @@ imagedeploytools_append_mx6() {
cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/mx6_usb_*.conf ${IMAGE_ROOT}/
}
+imagedeploytools_append_use-mainline-bsp() {
+ IMAGE_ROOT="${IMAGE_ROOTFS}/../imx_flash/"
+ rm -f ${IMAGE_ROOT}/imx_flash/imx_usb ${IMAGE_ROOT}/imx_flash/*.conf
+ mkdir -p ${IMAGE_ROOT}
+
+ # add imx-loader and its configuration files
+ cp ${STAGING_BINDIR_NATIVE}/imx_usb ${IMAGE_ROOT}/
+ ${BUILD_STRIP} ${IMAGE_ROOT}/imx_usb
+ cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/imx_usb.conf ${IMAGE_ROOT}/
+ cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/mx6_usb_*.conf ${IMAGE_ROOT}/
+
+}
+
imagedeploytools_append_mx6ull() {
IMAGE_ROOT="${IMAGE_ROOTFS}/../imx_flash/"
rm -f ${IMAGE_ROOT}/mkfs.ubifs ${IMAGE_ROOT}/imx_usb