diff --git a/recipes-bsp/imx8/conf/machine/imx8-nmhw23.conf b/conf/machine/imx8-nmhw23.conf similarity index 97% rename from recipes-bsp/imx8/conf/machine/imx8-nmhw23.conf rename to conf/machine/imx8-nmhw23.conf index 28da3bc..0cc57f7 100644 --- a/recipes-bsp/imx8/conf/machine/imx8-nmhw23.conf +++ b/conf/machine/imx8-nmhw23.conf @@ -37,3 +37,6 @@ UBOOT_CONFIG ??= "flash" UBOOT_CONFIG[flash] = "imx8_nmhw23_defconfig" MACHINE_FEATURES += "toby-l2" + +ACCEPT_FSL_EULA = "1" + diff --git a/recipes-bsp/imx8/conf/bblayers.conf.sample b/recipes-bsp/imx8/conf/bblayers.conf.sample deleted file mode 100644 index 2a86c91..0000000 --- a/recipes-bsp/imx8/conf/bblayers.conf.sample +++ /dev/null @@ -1,27 +0,0 @@ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf -# changes incompatibly -LCONF_VERSION = "7" - -BBPATH = "${TOPDIR}" -BBFILES ?= "" - -YOCTOROOT = "${@os.path.abspath(os.path.join("${TOPDIR}", os.pardir))}" - -BBLAYERS ?= " \ - ${YOCTOROOT}/meta \ - ${YOCTOROOT}/meta-poky \ - ${YOCTOROOT}/meta-yocto-bsp \ - ${YOCTOROOT}/meta-netmodule-bsp \ - ${YOCTOROOT}/meta-netmodule-bsp/recipes-bsp/imx8 \ - ${YOCTOROOT}/meta-netmodule-distro \ - ${YOCTOROOT}/meta-openembedded/meta-python \ - ${YOCTOROOT}/meta-openembedded/meta-oe \ - ${YOCTOROOT}/meta-openembedded/meta-networking \ - ${YOCTOROOT}/meta-openembedded/meta-filesystems \ - ${YOCTOROOT}/meta-updater \ - ${YOCTOROOT}/meta-freescale\ - " -BBLAYERS_NON_REMOVABLE ?= " \ - ${YOCTOROOT}/meta \ - ${YOCTOROOT}/meta-yocto \ - " diff --git a/recipes-bsp/imx8/conf/layer.conf b/recipes-bsp/imx8/conf/layer.conf deleted file mode 100644 index 8a53f3f..0000000 --- a/recipes-bsp/imx8/conf/layer.conf +++ /dev/null @@ -1,22 +0,0 @@ -# Layer configuration for meta-imx8bsp layer -# Copyright 2012 Intel Corporation - -# We have a conf and classes directory, add to BBPATH -BBPATH .= ":${LAYERDIR}" - -# We have various recipe-* directories, add to BBFILES -BBFILES += "${LAYERDIR}/*/*.bb ${LAYERDIR}/*/*.bbappend" - -BBFILE_COLLECTIONS += "imx8bsp" -BBFILE_PATTERN_imx8bsp := "^${LAYERDIR}/" -BBFILE_PRIORITY_imx8bsp = "11" - -# This should only be incremented on significant changes that will -# cause compatibility issues with other layers -LAYERVERSION_imx8bsp = "1" - -LAYERDEPENDS_imx8bsp = "core freescale-layer" - -LAYERSERIES_COMPAT_imx8bsp = "warrior" - -LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/recipes-bsp/imx8/conf/local.conf.sample b/recipes-bsp/imx8/conf/local.conf.sample deleted file mode 100644 index 0b3cdad..0000000 --- a/recipes-bsp/imx8/conf/local.conf.sample +++ /dev/null @@ -1,52 +0,0 @@ -BB_NUMBER_THREADS ?= "4" -PARALLEL_MAKE ?= "-j 4" -PACKAGE_CLASSES ?= "package_rpm" -USER_CLASSES ?= "buildstats image-mklibs image-prelink" -PATCHRESOLVE = "noop" -BB_DISKMON_DIRS = "\ - STOPTASKS,${TMPDIR},1G,100K \ - STOPTASKS,${DL_DIR},1G,100K \ - STOPTASKS,${SSTATE_DIR},1G,100K \ - STOPTASKS,/tmp,100M,100K \ - ABORT,${TMPDIR},100M,1K \ - ABORT,${DL_DIR},100M,1K \ - ABORT,${SSTATE_DIR},100M,1K \ - ABORT,/tmp,10M,1K" -ASSUME_PROVIDED += "libsdl-native" -CONF_VERSION = "1" -IMAGE_FEATURES_append = " debug-tweaks" - -INHERIT += "rm_work" - -ERROR_QA_remove += "version-going-backwards" -WARN_QA_append += "version-going-backwards" - -INHERIT += "buildhistory" -BUILDHISTORY_COMMIT = "1" -BUILDHISTORY_COMMIT_AUTHOR = "Mr Jenkins " - -# Mirror GIT repo in download folders -BB_GENERATE_MIRROR_TARBALLS = "1" - -# Add licences file to the rootfs -COPY_LIC_MANIFEST = "1" -COPY_LIC_DIRS = "1" -LICENSE_CREATE_PACKAGE = "1" - -INHERIT += "buildstats-summary" - -YOCTOROOT = "${@os.path.abspath(os.path.join("${TOPDIR}", os.pardir))}" - -SSTATE_DIR ?= "${HOME}/yocto-share/sstate-cache" -DL_DIR ?= "${HOME}/yocto-share/downloads" -BUILDHISTORY_DIR = "${HOME}/yocto-share/buildhistory" - -TMPDIR = "${YOCTOROOT}/shared-build/tmp" -ACCEPT_FSL_EULA = "1" - - -### Environment variables needed to build -#MACHINE = "am335x-nmhw21" -#DISTRO = "netmodule-linux" / "netmodule-linux-ostree" -#OSTREE_BRANCHNAME = "${MACHINE}-vcu" -#OSTREE_OSNAME = "hancock-os" diff --git a/recipes-bsp/imx8/u-boot/u-boot-imx8-nmhw23_git.bb b/recipes-bsp/u-boot/u-boot-imx8-nmhw23_git.bb similarity index 98% rename from recipes-bsp/imx8/u-boot/u-boot-imx8-nmhw23_git.bb rename to recipes-bsp/u-boot/u-boot-imx8-nmhw23_git.bb index 3a4c7f2..26c0cea 100644 --- a/recipes-bsp/imx8/u-boot/u-boot-imx8-nmhw23_git.bb +++ b/recipes-bsp/u-boot/u-boot-imx8-nmhw23_git.bb @@ -16,7 +16,7 @@ SRCREV ?= "${AUTOREV}" S = "${WORKDIR}/git" -inherit fsl-u-boot-localversion +#inherit fsl-u-boot-localversion LOCALVERSION ?= "-${SRCBRANCH}" diff --git a/recipes-bsp/imx8/firmware-imx/firmware-imx-8.1.inc b/recipes-imx/firmware-imx/firmware-imx-8.1.inc similarity index 100% rename from recipes-bsp/imx8/firmware-imx/firmware-imx-8.1.inc rename to recipes-imx/firmware-imx/firmware-imx-8.1.inc diff --git a/recipes-bsp/imx8/firmware-imx/firmware-imx-8x_8.1.bb b/recipes-imx/firmware-imx/firmware-imx-8x_8.1.bb similarity index 100% rename from recipes-bsp/imx8/firmware-imx/firmware-imx-8x_8.1.bb rename to recipes-imx/firmware-imx/firmware-imx-8x_8.1.bb diff --git a/recipes-bsp/imx8/imx-atf/imx-atf/0001-Allow-BUILD_STRING-to-be-set-in-.revision-file.patch b/recipes-imx/imx-atf/imx-atf/0001-Allow-BUILD_STRING-to-be-set-in-.revision-file.patch similarity index 100% rename from recipes-bsp/imx8/imx-atf/imx-atf/0001-Allow-BUILD_STRING-to-be-set-in-.revision-file.patch rename to recipes-imx/imx-atf/imx-atf/0001-Allow-BUILD_STRING-to-be-set-in-.revision-file.patch diff --git a/recipes-bsp/imx8/imx-atf/imx-atf_1.5.0.bb b/recipes-imx/imx-atf/imx-atf_1.5.0.bb similarity index 100% rename from recipes-bsp/imx8/imx-atf/imx-atf_1.5.0.bb rename to recipes-imx/imx-atf/imx-atf_1.5.0.bb diff --git a/recipes-bsp/imx8/imx-mkimage/imx-boot_0.2.bb b/recipes-imx/imx-mkimage/imx-boot_0.2.bb similarity index 100% rename from recipes-bsp/imx8/imx-mkimage/imx-boot_0.2.bb rename to recipes-imx/imx-mkimage/imx-boot_0.2.bb diff --git a/recipes-bsp/imx8/imx-mkimage/imx-mkimage_git.bb b/recipes-imx/imx-mkimage/imx-mkimage_git.bb similarity index 100% rename from recipes-bsp/imx8/imx-mkimage/imx-mkimage_git.bb rename to recipes-imx/imx-mkimage/imx-mkimage_git.bb diff --git a/recipes-bsp/imx8/imx-mkimage/imx-mkimage_git.inc b/recipes-imx/imx-mkimage/imx-mkimage_git.inc similarity index 100% rename from recipes-bsp/imx8/imx-mkimage/imx-mkimage_git.inc rename to recipes-imx/imx-mkimage/imx-mkimage_git.inc diff --git a/recipes-bsp/imx8/imx-sc-firmware/files/README b/recipes-imx/imx-sc-firmware/files/README similarity index 100% rename from recipes-bsp/imx8/imx-sc-firmware/files/README rename to recipes-imx/imx-sc-firmware/files/README diff --git a/recipes-bsp/imx8/imx-sc-firmware/files/scfw_tcm_cfw.bin b/recipes-imx/imx-sc-firmware/files/scfw_tcm_cfw.bin similarity index 100% rename from recipes-bsp/imx8/imx-sc-firmware/files/scfw_tcm_cfw.bin rename to recipes-imx/imx-sc-firmware/files/scfw_tcm_cfw.bin diff --git a/recipes-bsp/imx8/imx-sc-firmware/imx-sc-firmware_0.9.bb b/recipes-imx/imx-sc-firmware/imx-sc-firmware_0.9.bb similarity index 100% rename from recipes-bsp/imx8/imx-sc-firmware/imx-sc-firmware_0.9.bb rename to recipes-imx/imx-sc-firmware/imx-sc-firmware_0.9.bb diff --git a/recipes-bsp/imx8/imx-uuc/imx-uuc_git.bb b/recipes-imx/imx-uuc/imx-uuc_git.bb similarity index 100% rename from recipes-bsp/imx8/imx-uuc/imx-uuc_git.bb rename to recipes-imx/imx-uuc/imx-uuc_git.bb