From 81d00289101113648810037c883669c123cc8a43 Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
Date: Wed, 8 Dec 2021 17:41:55 +0100
Subject: [PATCH] linux-raspberrypi: CMDLINE is not handled by a rpi-cmdline
 recipe

The BSP layer migrated to a separate recipe for cmdline: rpi-cmdline.
Align accordingly.

Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
---
 meta-oniro-core/recipes-bsp/bootfiles/rpi-cmdline.bbappend  | 6 ++++++
 .../recipes-kernel/linux/linux-raspberrypi_%.bbappend       | 3 ---
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 meta-oniro-core/recipes-bsp/bootfiles/rpi-cmdline.bbappend

diff --git a/meta-oniro-core/recipes-bsp/bootfiles/rpi-cmdline.bbappend b/meta-oniro-core/recipes-bsp/bootfiles/rpi-cmdline.bbappend
new file mode 100644
index 00000000..02c55ce6
--- /dev/null
+++ b/meta-oniro-core/recipes-bsp/bootfiles/rpi-cmdline.bbappend
@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# Make rootfstype defined based on ROOT_FSTYPE (selected by wic configuration)
+CMDLINE_ROOT_FSTYPE = "rootfstype=${ROOT_FSTYPE} ro"
diff --git a/meta-oniro-core/recipes-kernel/linux/linux-raspberrypi_%.bbappend b/meta-oniro-core/recipes-kernel/linux/linux-raspberrypi_%.bbappend
index daa096e9..87786b93 100644
--- a/meta-oniro-core/recipes-kernel/linux/linux-raspberrypi_%.bbappend
+++ b/meta-oniro-core/recipes-kernel/linux/linux-raspberrypi_%.bbappend
@@ -5,6 +5,3 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/linux:"
 
 SRC_URI += "file://squashfs.cfg"
-
-# Make rootfstype defined based on ROOT_FSTYPE (selected be wic configuration)
-CMDLINE = "dwc_otg.lpm_enable=0 ${SERIAL} root=/dev/mmcblk0p2 rootfstype=${ROOT_FSTYPE} rootwait ro"
-- 
GitLab