From d3263fceb54a93d7d8bf7f4b8b4b451ce2f549f7 Mon Sep 17 00:00:00 2001
From: Jon Mason <jon.mason@arm.com>
Date: Wed, 9 Dec 2020 11:33:50 -0500
Subject: [PATCH] arm-bsp: switch to linux-yocto for a5ds

Keeping with what is being done on the master branch, switch to using
linux-yocto for the 5.3 kernel.

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 meta-arm-bsp/conf/layer.conf                      |  2 +-
 meta-arm-bsp/conf/machine/a5ds.conf               |  5 +++--
 .../recipes-kernel/linux/linux-stable_%.bbappend  |  3 ---
 .../recipes-kernel/linux/linux-yocto_5.3.bb       | 15 +++++++++++++++
 4 files changed, 19 insertions(+), 6 deletions(-)
 delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-stable_%.bbappend
 create mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.3.bb

diff --git a/meta-arm-bsp/conf/layer.conf b/meta-arm-bsp/conf/layer.conf
index 0b6985ca..1a54ddcf 100644
--- a/meta-arm-bsp/conf/layer.conf
+++ b/meta-arm-bsp/conf/layer.conf
@@ -9,5 +9,5 @@ BBFILE_COLLECTIONS += "meta-arm-bsp"
 BBFILE_PATTERN_meta-arm-bsp = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-arm-bsp = "6"
 
-LAYERDEPENDS_meta-arm-bsp = "core openembedded-layer meta-arm meta-kernel"
+LAYERDEPENDS_meta-arm-bsp = "core openembedded-layer meta-arm"
 LAYERSERIES_COMPAT_meta-arm-bsp = "warrior zeus dunfell"
diff --git a/meta-arm-bsp/conf/machine/a5ds.conf b/meta-arm-bsp/conf/machine/a5ds.conf
index e7180e9d..331d2980 100644
--- a/meta-arm-bsp/conf/machine/a5ds.conf
+++ b/meta-arm-bsp/conf/machine/a5ds.conf
@@ -6,9 +6,10 @@
 
 require conf/machine/include/tune-cortexa5.inc
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-stable"
-PREFERRED_VERSION_linux-stable ?= "5.3%"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "5.3%"
 KBUILD_DEFCONFIG = "multi_v7_defconfig"
+KCONFIG_MODE = "--alldefconfig"
 
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"
 
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-stable_%.bbappend b/meta-arm-bsp/recipes-kernel/linux/linux-stable_%.bbappend
deleted file mode 100644
index db850eab..00000000
--- a/meta-arm-bsp/recipes-kernel/linux/linux-stable_%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-# Add support for Arm Platforms (boards or simulators)
-
-require linux-arm-platforms.inc
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.3.bb b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.3.bb
new file mode 100644
index 00000000..9d5e9ce8
--- /dev/null
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.3.bb
@@ -0,0 +1,15 @@
+KBRANCH = "v5.3/base"
+
+require recipes-kernel/linux/linux-yocto.inc
+
+SRCREV_machine = "d4f3318ed8fab6316cb7a269b8f42306632a3876"
+SRCREV_meta = "8d0ed83a864cc91eef4d2abbc90f13d4ecd1c213"
+
+SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
+           git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
+
+LINUX_VERSION = "5.3.18"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
+
+PV = "${LINUX_VERSION}+git${SRCPV}"
+KMETA = "kernel-meta"