machines: Adjust for new location of tune files in core
PATCH 1/2 machines: Adjust for new location of tune files in core
Signed-off-by Khem Raj <[email protected]>
--- conf/machine/include/rk3066.inc | 2 +- conf/machine/include/rk3188.inc | 2 +- conf/machine/include/rk3288.inc | 2 +- conf/machine/include/rk3328.inc | 2 +- conf/machine/include/rk3399.inc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
conf/machine/include/rk3066.inc +1 -1
@@ -3,7 +3,7 @@ SOC_FAMILY = "rk3066" -require conf/machine/include/tune-cortexa9.inc +require conf/machine/include/arm/armv7a/tune-cortexa9.inc require conf/machine/include/soc-family.inc require conf/machine/include/rockchip-defaults.inc
conf/machine/include/rk3188.inc +1 -1
@@ -3,7 +3,7 @@ SOC_FAMILY = "rk3188" -require conf/machine/include/tune-cortexa9.inc +require conf/machine/include/arm/armv7a/tune-cortexa9.inc require conf/machine/include/soc-family.inc require conf/machine/include/rockchip-defaults.inc
conf/machine/include/rk3288.inc +1 -1
@@ -3,7 +3,7 @@ SOC_FAMILY = "rk3288" -require conf/machine/include/tune-cortexa17.inc +require conf/machine/include/arm/armv7a/tune-cortexa17.inc require conf/machine/include/soc-family.inc require conf/machine/include/rockchip-defaults.inc
conf/machine/include/rk3328.inc +1 -1
@@ -6,7 +6,7 @@ SOC_FAMILY = "rk3328" DEFAULTTUNE ?= "cortexa53-crypto" require conf/machine/include/soc-family.inc -require conf/machine/include/tune-cortexa53.inc +require conf/machine/include/arm/armv8a/tune-cortexa53.inc require conf/machine/include/rockchip-defaults.inc require conf/machine/include/rockchip-wic.inc
conf/machine/include/rk3399.inc +1 -1
@@ -6,7 +6,7 @@ SOC_FAMILY = "rk3399" DEFAULTTUNE ?= "cortexa72-cortexa53-crypto" require conf/machine/include/soc-family.inc -require conf/machine/include/tune-cortexa72-cortexa53.inc +require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc require conf/machine/include/rockchip-defaults.inc require conf/machine/include/rockchip-wic.inc
Signature · 1 line
2.33.0
PATCH 2/2 linux-yocto_5.4: Drop bbappend
5.4 recipe has been dropped from oe-core
Signed-off-by Khem Raj <[email protected]>
--- ...-Keep-rk3288-tinker-SD-card-IO-power.patch | 31 ------------------- recipes-kernel/linux/linux-yocto_5.4.bbappend | 5 --- 2 files changed, 36 deletions(-) delete mode 100644 recipes-kernel/linux/linux-yocto/0001-ARM-dts-rockchip-Keep-rk3288-tinker-SD-card-IO-power.patch delete mode 100644 recipes-kernel/linux/linux-yocto_5.4.bbappend
recipes-kernel/linux/linux-yocto/0001-ARM-dts-rockchip-Keep-rk3288-tinker-SD-card-IO-power.patch deleted +0 -31
@@ -1,31 +0,0 @@ -From 04ab2a1f052f363985b373f07ea71840918378d2 Mon Sep 17 00:00:00 2001 -From: Joshua Watt <[email protected]> -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 <[email protected]> -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 -
recipes-kernel/linux/linux-yocto_5.4.bbappend deleted +0 -5
@@ -1,5 +0,0 @@ -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" -
Signature · 1 line
2.33.0
Re: [meta-rockchip][PATCH 2/2] linux-yocto_5.4: Drop bbappend
Quoted 10 lines · Khem Raj
5.4 recipe has been dropped from oe-core
Signed-off-by Khem Raj <[email protected]>--- ...-Keep-rk3288-tinker-SD-card-IO-power.patch | 31 ------------------- recipes-kernel/linux/linux-yocto_5.4.bbappend | 5 --- 2 files changed, 36 deletions(-) delete mode 100644 recipes-kernel/linux/linux-yocto/0001-ARM-dts-rockchip-Keep-rk3288-tinker-SD-card-IO-power.patch delete mode 100644 recipes-kernel/linux/linux-yocto_5.4.bbappend
added to meta-rockchip master
thanks!
Quoted 8 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- conf/machine/include/rk3066.inc | 2 +- conf/machine/include/rk3188.inc | 2 +- conf/machine/include/rk3288.inc | 2 +- conf/machine/include/rk3328.inc | 2 +- conf/machine/include/rk3399.inc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
added to meta-rockchip master
thanks!