MIRRORS/meta-rockchip
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-rockchip.git synced 2025-07-05 05:04:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use linux-yocto kernel from OE-core

Browse Source 
Updates all machines to use the linux-yocto kernel from OE-core instead
of maintaining distinct kernels in this repository.

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
This commit is contained in:
Joshua Watt 2020-04-14 08:32:15 -05:00 committed by Trevor Woerner
parent fa06a975a8
commit 18b5329e2c
11 changed files with 41 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/machine/include/rk3288.inc
View File

@ -7,7 +7,7 @@ require conf/machine/include/tune-cortexa17.inc
require conf/machine/include/soc-family.inc
require conf/machine/include/rockchip-defaults.inc
KBUILD_DEFCONFIG = "multi_v7_defconfig"
KBUILD_DEFCONFIG ?= "multi_v7_defconfig"
KERNEL_IMAGETYPE = "zImage"
SERIAL_CONSOLES = "115200;ttyS2"

3
conf/machine/include/rockchip-defaults.inc
View File

@ -1,7 +1,8 @@
# meta-rockchip default settings
# kernel
PREFERRED_PROVIDER_virtual/kernel ?= "linux-stable"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
KCONFIG_MODE ?= "alldefconfig"
LINUX_VERSION_EXTENSION ?= "-rockchip"
# xserver

51
recipes-kernel/linux/files/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch
View File

@ -1,51 +0,0 @@
From 846b11d8c834af4fa62393dadb490ea8246b332c Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Mon, 2 Jul 2018 23:10:28 -0400
Subject: [PATCH] menuconfig,mconf-cfg: Allow specification of ncurses location
In some cross build environments such as the Yocto Project build
environment it provides an ncurses library that is compiled
differently than the host's version. This causes display corruption
problems when the host's curses includes are used instead of the
includes from the provided compiler are overridden. There is a second
case where there is no curses libraries at all on the host system and
menuconfig will just fail entirely.
The solution is simply to allow an override variable in
check-lxdialog.sh for environments such as the Yocto Project. Adding
a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing
compiling and linking against the right headers and libraries.
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
cc: Michal Marek <mmarek@suse.cz>
cc: linux-kbuild@vger.kernel.org
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
scripts/kconfig/mconf-cfg.sh | 8 ++++++++
1 file changed, 8 insertions(+)
mode change 100755 => 100644 scripts/kconfig/mconf-cfg.sh
diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh
old mode 100755
new mode 100644
index c812872d7f9d..65a9b9e5b8a6
--- a/scripts/kconfig/mconf-cfg.sh
+++ b/scripts/kconfig/mconf-cfg.sh
@@ -4,6 +4,14 @@
PKG="ncursesw"
PKG2="ncurses"
+if [ "$CROSS_CURSES_LIB" != "" ]; then
+ echo libs=\'$CROSS_CURSES_LIB\'
+ if [ x"$CROSS_CURSES_INC" != x ]; then
+ echo cflags=\'$CROSS_CURSES_INC\'
+ fi
+ exit 0
+fi
+
if [ -n "$(command -v pkg-config)" ]; then
if pkg-config --exists $PKG; then
echo cflags=\"$(pkg-config --cflags $PKG)\"
--
2.20.1

9
recipes-kernel/linux/linux-longterm_4.19.bb
View File

@ -1,9 +0,0 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
LINUX_VERSION ?= "4.19.113"
KBRANCH ?= "linux-4.19.y"
SRCREV ?= "54b4fa6d39551639cb10664f6ac78b01993a1d7e"
require linux-mutual.inc
COMPATIBLE_MACHINE = "(firefly-rk3288|marsboard-rk3066|radxarock|rock2-square|^tinker-board$|vyasa-rk3288)"

7
recipes-kernel/linux/linux-longterm_5.4.bb
View File

@ -1,7 +0,0 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
LINUX_VERSION ?= "5.4.28"
KBRANCH ?= "linux-5.4.y"
SRCREV ?= "462afcd6e7ea94a7027a96a3bb12d0140b0b4216"
require linux-mutual.inc

9
recipes-kernel/linux/linux-mainline_5.6.bb
View File

@ -1,9 +0,0 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
LINUX_VERSION ?= "5.6-rc7"
KBRANCH ?= "master"
SRCREV ?= "16fbf79b0f83bc752cee8589279f1ebfe57b3b6e"
require linux-mutual.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"

18
recipes-kernel/linux/linux-mutual.inc
View File

@ -1,18 +0,0 @@
DESCRIPTION = "Linux Kernel"
SECTION = "kernel"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
SRC_URI = " \
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git;branch=${KBRANCH} \
file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \
"
inherit kernel
require recipes-kernel/linux/linux-yocto.inc
PV = "${LINUX_VERSION}+git${SRCPV}"
KCONF_BSP_AUDIT_LEVEL = "0"
deltask kernel_configme

7
recipes-kernel/linux/linux-stable_5.5.bb
View File

@ -1,7 +0,0 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
LINUX_VERSION ?= "5.5.13"
KBRANCH ?= "linux-5.5.y"
SRCREV ?= "fe5ae687d01e74854ed33666c932a9c11e22139c"
require linux-mutual.inc

31
recipes-kernel/linux/linux-yocto/0001-ARM-dts-rockchip-Keep-rk3288-tinker-SD-card-IO-power.patch Normal file
View File

@ -0,0 +1,31 @@
From 04ab2a1f052f363985b373f07ea71840918378d2 Mon Sep 17 00:00:00 2001
From: Joshua Watt <JPEWhacker@gmail.com>
Date: Wed, 19 Feb 2020 13:10:32 -0600
Subject: [PATCH] ARM: dts: rockchip: Keep rk3288-tinker SD card IO powered
during reboot
IO voltage regulator for the SD card must be kept on all the time,
otherwise when the board reboots the SD card can't be read by the
bootloader.
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Upstream-Status: Accepted in 5.7
---
arch/arm/boot/dts/rk3288-tinker.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
index 312582c1bd37..acfaa12ec239 100644
--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
@@ -276,6 +276,7 @@
};
vccio_sd: LDO_REG5 {
+ regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
--
2.17.1

2
recipes-kernel/linux/linux-yocto_%.bbappend Normal file
View File

@ -0,0 +1,2 @@
COMPATIBLE_MACHINE .= "|firefly-rk3288|marsboard-rk3066|radxarock|rock-pi-4|rock2-square|tinker-board-s|tinker-board|vyasa-rk3288"

5
recipes-kernel/linux/linux-yocto_5.4.bbappend Normal file
View File

@ -0,0 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
# tinker-board and tinker-board-s. rk3288 covers both
SRC_URI_append_rk3288 = " file://0001-ARM-dts-rockchip-Keep-rk3288-tinker-SD-card-IO-power.patch"