8 files changed, 10 insertions, 56 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 25a3011..90b523a 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -17,4 +17,4 @@ BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bb' % layer \
                for layer in BBFILE_COLLECTIONS.split())}"
 
 LAYERDEPENDS_toradex-tegra-layer = "core"
-LAYERSERIES_COMPAT_toradex-tegra-layer = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_toradex-tegra-layer = "hardknott honister kirkstone"
diff --git a/conf/machine/apalis-tk1.conf b/conf/machine/apalis-tk1.conf
index a0126f2..7c9b8f5 100644
--- a/conf/machine/apalis-tk1.conf
+++ b/conf/machine/apalis-tk1.conf
@@ -32,14 +32,13 @@ WKS_FILE_DEPENDS ?= " \
     bmap-tools-native \
 "
 
-WKS_FILE = "sdimage-bootpart-tegra.wks"
-WIC_CREATE_EXTRA_ARGS:append = " --no-fstab-update"
+WKS_FILE = "sdimage-bootpart.wks"
 
 # The kernel lives in a seperate FAT or UBI partition, don't deploy it in /boot
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
+RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
 
-PREFERRED_PROVIDER_u-boot = "u-boot-toradex-tk1"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-tk1"
+PREFERRED_PROVIDER_u-boot = "u-boot"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 UBOOT_MACHINE = "apalis-tk1_defconfig"
 UBOOT_ENTRYPOINT = "0"
 UBOOT_LOADADDRESS = "0x80008000"
@@ -83,4 +82,4 @@ TORADEX_PRODUCT_IDS = "0034"
 TORADEX_FLASH_TYPE = "emmc"
 
 DEFAULTTUNE = "cortexa15hf-neon"
-require conf/machine/include/tune-cortexa15.inc
+require conf/machine/include/arm/armv7a/tune-cortexa15.inc
diff --git a/recipes-bsp/cbootimage/cbootimage.bb b/recipes-bsp/cbootimage/cbootimage.bb
index 440ef6c..d882cb5 100644
--- a/recipes-bsp/cbootimage/cbootimage.bb
+++ b/recipes-bsp/cbootimage/cbootimage.bb
@@ -3,12 +3,12 @@ DESCRIPTION = "Utility to create boot images with boot configuration data (BCT)
 SECTION = "bootloader"
 DEPENDS = ""
 
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRC_URI = "git://github.com/NVIDIA/cbootimage.git"
+SRC_URI = "git://github.com/NVIDIA/cbootimage.git;branch=master;protocol=https"
 SRCREV = "a64c3f12b1b048096d90c44db74d3d110cea6fff"
 PV = "1.7"
 
diff --git a/recipes-bsp/tegrarcm/tegrarcm.bb b/recipes-bsp/tegrarcm/tegrarcm.bb
index 02c789e..30a955b 100644
--- a/recipes-bsp/tegrarcm/tegrarcm.bb
+++ b/recipes-bsp/tegrarcm/tegrarcm.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=395fe5affb633ad84474e42989a8e5be"
 BBCLASSEXTEND = "native nativesdk"
 
 SRC_URI = " \
-    git://github.com/NVIDIA/tegrarcm.git \
+    git://github.com/NVIDIA/tegrarcm.git;branch=master;protocol=https \
     file://0001-makefile-specify-cryptopp-include-path-relative-to-s.patch \
 "
 SRC_URI:append:class-native = " \
diff --git a/recipes-bsp/u-boot/u-boot-toradex-common-tk1.inc b/recipes-bsp/u-boot/u-boot-toradex-common-tk1.inc
deleted file mode 100644
index 14a4db0..0000000
--- a/recipes-bsp/u-boot/u-boot-toradex-common-tk1.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
-SECTION = "bootloaders"
-DEPENDS += "flex-native bison-native"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
-PE = "1"
-
-PV = "2020.07+git${SRCPV}"
-inherit toradex-u-boot-localversion
-
-# We use the revision in order to avoid having to fetch it from the
-# repo during parse
-SRCREV = "0401650db5dfaf5fe67cb2ed8e9285bb198f3245"
-SRCBRANCH = "toradex_2020.07"
-SRCREV:use-head-next = "${AUTOREV}"
-
-SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=https;branch=${SRCBRANCH}"
-
-S = "${WORKDIR}/git"
-
-UBOOT_INITIAL_ENV = "u-boot-initial-env"
diff --git a/recipes-bsp/u-boot/u-boot-toradex-tk1_2020.07.bb b/recipes-bsp/u-boot/u-boot_%.bbappend
index 7e772bf..fcd3a4d 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-tk1_2020.07.bb
+++ b/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -1,27 +1,15 @@
-require u-boot-toradex-common-tk1.inc
-require recipes-bsp/u-boot/u-boot.inc
-
-B = "${WORKDIR}/build"
-
-DEPENDS += "bc-native dtc-native"
+FILESEXTRAPATHS:prepend := "${THISDIR}//files:"
 DEPENDS:append:apalis-tk1 = " cbootimage-native"
 
-PROVIDES += "u-boot"
-
-COMPATIBLE_MACHINE = "(apalis-tk1)"
-
 SRC_URI:append:apalis-tk1 = " \
     file://apalis-tk1.img.cfg \
     file://fw_env.config \
     file://PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct \
 "
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
 do_deploy:append:apalis-tk1() {
     cd ${DEPLOYDIR}
     cp ${WORKDIR}/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct .
     cbootimage -s tegra124 ${WORKDIR}/apalis-tk1.img.cfg apalis-tk1.img
     rm PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct
 }
-
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend
deleted file mode 100644
index 227a5ae..0000000
--- a/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-COMPATIBLE_MACHINE:tegra124 = "(tegra124)"
-
-PACKAGE_ARCH:tegra124 = "${MACHINE_ARCH}"
-
-PACKAGECONFIG:tegra124 ?= "dri2 dri3 xshmfence glamor glx xwayland udev ${XORG_CRYPTO} "
diff --git a/wic/sdimage-bootpart-tegra.wks b/wic/sdimage-bootpart-tegra.wks
deleted file mode 100644
index f58856b..0000000
--- a/wic/sdimage-bootpart-tegra.wks
+++ /dev/null
@@ -1,6 +0,0 @@
-# short-description: Create SD card image with a boot partition
-# long-description: Creates a partitioned SD card image. Boot files
-# are located in the first vfat partition.
-
-part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4 --size 16
-part / --source rootfs --ondisk mmcblk --fstype=ext3 --label root --align 4