From 922e5e119f65b15aa630deb4559b479b3728f3ef Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
Date: Wed, 8 Dec 2021 17:36:38 +0100
Subject: [PATCH] linux-raspberrypi: Drop local 5.10 recipes in favour of
upstream
meta-raspberrypi now comes with this version already: 5.10. 5.10 in
oniro was an upgrade for dunfell but now that we move to newer layers,
we can drop it and use the latest in upstream.
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
---
.../linux/linux-raspberrypi/android-drivers.cfg | 8 --------
.../linux/linux-raspberrypi/powersave.cfg | 13 -------------
.../linux/linux-raspberrypi_5.10.bb | 14 --------------
.../linux/linux-raspberrypi_5.10.inc | 15 ---------------
4 files changed, 50 deletions(-)
delete mode 100644 meta-oniro-core/recipes-kernel/linux/linux-raspberrypi/android-drivers.cfg
delete mode 100644 meta-oniro-core/recipes-kernel/linux/linux-raspberrypi/powersave.cfg
delete mode 100644 meta-oniro-core/recipes-kernel/linux/linux-raspberrypi_5.10.bb
delete mode 100644 meta-oniro-core/recipes-kernel/linux/linux-raspberrypi_5.10.inc
diff --git a/meta-oniro-core/recipes-kernel/linux/linux-raspberrypi/android-drivers.cfg b/meta-oniro-core/recipes-kernel/linux/linux-raspberrypi/android-drivers.cfg
deleted file mode 100644
index f74ac0e1..00000000
--- a/meta-oniro-core/recipes-kernel/linux/linux-raspberrypi/android-drivers.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-CONFIG_ANDROID=y
-
-#CONFIG_ANDROID_BINDERFS is not set
-CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_BINDER_DEVICES="binder"
-
-CONFIG_ASHMEM=y
-
diff --git a/meta-oniro-core/recipes-kernel/linux/linux-raspberrypi/powersave.cfg b/meta-oniro-core/recipes-kernel/linux/linux-raspberrypi/powersave.cfg
deleted file mode 100644
index 9c48eff1..00000000
--- a/meta-oniro-core/recipes-kernel/linux/linux-raspberrypi/powersave.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION="/dev/mmcblk0p2"
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_AUTOSLEEP=y
-CONFIG_PM_WAKELOCKS=y
-CONFIG_PM_WAKELOCKS_LIMIT=100
-CONFIG_PM_WAKELOCKS_GC=y
-CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
-CONFIG_ARCH_HIBERNATION_HEADER=y
diff --git a/meta-oniro-core/recipes-kernel/linux/linux-raspberrypi_5.10.bb b/meta-oniro-core/recipes-kernel/linux/linux-raspberrypi_5.10.bb
deleted file mode 100644
index 817870fe..00000000
--- a/meta-oniro-core/recipes-kernel/linux/linux-raspberrypi_5.10.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-LINUX_VERSION ?= "5.10.63"
-LINUX_RPI_BRANCH ?= "rpi-5.10.y"
-LINUX_RPI_KMETA_BRANCH ?= "yocto-5.10"
-
-SRCREV_machine = "4117cba235d24a7c4630dc38cb55cc80a04f5cf3"
-SRCREV_meta = "e0147386e9f3c4cabc6f6d256d457fd4e67eb221"
-
-require linux-raspberrypi_5.10.inc
-
-SRC_URI += "\
- file://powersave.cfg \
- file://android-drivers.cfg \
- file://rauc.cfg \
- "
diff --git a/meta-oniro-core/recipes-kernel/linux/linux-raspberrypi_5.10.inc b/meta-oniro-core/recipes-kernel/linux/linux-raspberrypi_5.10.inc
deleted file mode 100644
index fd7c93cf..00000000
--- a/meta-oniro-core/recipes-kernel/linux/linux-raspberrypi_5.10.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-raspberrypi:"
-
-KMETA = "kernel-meta"
-
-SRC_URI = " \
- git://github.com/raspberrypi/linux.git;name=machine;branch=${LINUX_RPI_BRANCH} \
- git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${LINUX_RPI_KMETA_BRANCH};destsuffix=${KMETA} \
- "
-SRC_URI_remove = "file://rpi-kernel-misc.cfg"
-
-require recipes-kernel/linux/linux-raspberrypi.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-
-KERNEL_EXTRA_ARGS_append_rpi = " DTC_FLAGS='-@ -H epapr'"
--
GitLab