diff mbox series

[meta-rockchip,v2,05/16] add rockchip MACHINEOVERRIDES

Message ID 20240515-rk3588-family-v2-5-f81897a3ac50@cherry.de
State New
Headers show
Series various reworks around u-boot and rkbin + fixes for MACHINEOVERRIDES | expand

Commit Message

Quentin Schulz May 15, 2024, 4:02 p.m. UTC 
From: Quentin Schulz <quentin.schulz@cherry.de>

Add "rockchip" to the MACHINEOVERRIDES so that it can be used to easily
identify things that apply only to Rockchip-based devices and keeping
other devices untouched.

Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
---
 conf/machine/include/px30.inc              | 2 +-
 conf/machine/include/rk3066.inc            | 2 +-
 conf/machine/include/rk3188.inc            | 2 +-
 conf/machine/include/rk3288.inc            | 2 +-
 conf/machine/include/rk3308.inc            | 2 +-
 conf/machine/include/rk3328.inc            | 2 +-
 conf/machine/include/rk3399.inc            | 2 +-
 conf/machine/include/rk3568.inc            | 2 +-
 conf/machine/include/rk3588s.inc           | 2 +-
 conf/machine/include/rockchip-defaults.inc | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)
diff mbox series

Patch

diff --git a/conf/machine/include/px30.inc b/conf/machine/include/px30.inc
index badcbcd..d78409e 100644
--- a/conf/machine/include/px30.inc
+++ b/conf/machine/include/px30.inc
@@ -6,8 +6,8 @@  SOC_FAMILY = "px30"
 DEFAULTTUNE ?= "cortexa35-crypto"
 
 require conf/machine/include/soc-family.inc
-require conf/machine/include/arm/armv8a/tune-cortexa35.inc
 require conf/machine/include/rockchip-defaults.inc
+require conf/machine/include/arm/armv8a/tune-cortexa35.inc
 require conf/machine/include/rockchip-wic.inc
 
 KBUILD_DEFCONFIG ?= "defconfig"
diff --git a/conf/machine/include/rk3066.inc b/conf/machine/include/rk3066.inc
index a2685af..026d5b5 100644
--- a/conf/machine/include/rk3066.inc
+++ b/conf/machine/include/rk3066.inc
@@ -4,8 +4,8 @@ 
 SOC_FAMILY = "rk3066"
 
 require conf/machine/include/soc-family.inc
-require conf/machine/include/arm/armv7a/tune-cortexa9.inc
 require conf/machine/include/rockchip-defaults.inc
+require conf/machine/include/arm/armv7a/tune-cortexa9.inc
 
 SERIAL_CONSOLES = "115200;ttyS2"
 
diff --git a/conf/machine/include/rk3188.inc b/conf/machine/include/rk3188.inc
index c85710d..0120e2f 100644
--- a/conf/machine/include/rk3188.inc
+++ b/conf/machine/include/rk3188.inc
@@ -4,8 +4,8 @@ 
 SOC_FAMILY  = "rk3188"
 
 require conf/machine/include/soc-family.inc
-require conf/machine/include/arm/armv7a/tune-cortexa9.inc
 require conf/machine/include/rockchip-defaults.inc
+require conf/machine/include/arm/armv7a/tune-cortexa9.inc
 
 SERIAL_CONSOLES = "115200;ttyFIQ0"
 
diff --git a/conf/machine/include/rk3288.inc b/conf/machine/include/rk3288.inc
index e0dbd6c..684e864 100644
--- a/conf/machine/include/rk3288.inc
+++ b/conf/machine/include/rk3288.inc
@@ -4,8 +4,8 @@ 
 SOC_FAMILY = "rk3288"
 
 require conf/machine/include/soc-family.inc
-require conf/machine/include/arm/armv7a/tune-cortexa17.inc
 require conf/machine/include/rockchip-defaults.inc
+require conf/machine/include/arm/armv7a/tune-cortexa17.inc
 
 SERIAL_CONSOLES = "115200;ttyS2"
 
diff --git a/conf/machine/include/rk3308.inc b/conf/machine/include/rk3308.inc
index 5a5dafd..2802d4e 100644
--- a/conf/machine/include/rk3308.inc
+++ b/conf/machine/include/rk3308.inc
@@ -3,8 +3,8 @@  SOC_FAMILY = "rk3308"
 DEFAULTTUNE ?= "cortexa35-crypto"
 
 require conf/machine/include/soc-family.inc
-require conf/machine/include/arm/armv8a/tune-cortexa35.inc
 require conf/machine/include/rockchip-defaults.inc
+require conf/machine/include/arm/armv8a/tune-cortexa35.inc
 require conf/machine/include/rockchip-wic.inc
 
 SERIAL_CONSOLES = "1500000;ttyS0"
diff --git a/conf/machine/include/rk3328.inc b/conf/machine/include/rk3328.inc
index 6be777c..4ecd681 100644
--- a/conf/machine/include/rk3328.inc
+++ b/conf/machine/include/rk3328.inc
@@ -6,8 +6,8 @@  SOC_FAMILY = "rk3328"
 DEFAULTTUNE ?= "cortexa53-crypto"
 
 require conf/machine/include/soc-family.inc
-require conf/machine/include/arm/armv8a/tune-cortexa53.inc
 require conf/machine/include/rockchip-defaults.inc
+require conf/machine/include/arm/armv8a/tune-cortexa53.inc
 require conf/machine/include/rockchip-wic.inc
 
 KBUILD_DEFCONFIG ?= "defconfig"
diff --git a/conf/machine/include/rk3399.inc b/conf/machine/include/rk3399.inc
index 5a3f439..47f0560 100644
--- a/conf/machine/include/rk3399.inc
+++ b/conf/machine/include/rk3399.inc
@@ -6,8 +6,8 @@  SOC_FAMILY = "rk3399"
 DEFAULTTUNE ?= "cortexa72-cortexa53-crypto"
 
 require conf/machine/include/soc-family.inc
-require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc
 require conf/machine/include/rockchip-defaults.inc
+require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc
 require conf/machine/include/rockchip-wic.inc
 
 KBUILD_DEFCONFIG ?= "defconfig"
diff --git a/conf/machine/include/rk3568.inc b/conf/machine/include/rk3568.inc
index 3c227dc..92d9d6d 100644
--- a/conf/machine/include/rk3568.inc
+++ b/conf/machine/include/rk3568.inc
@@ -3,8 +3,8 @@  SOC_FAMILY = "rk3568"
 DEFAULTTUNE ?= "cortexa55"
 
 require conf/machine/include/soc-family.inc
-require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc
 require conf/machine/include/rockchip-defaults.inc
+require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc
 require conf/machine/include/rockchip-wic.inc
 
 KBUILD_DEFCONFIG ?= "defconfig"
diff --git a/conf/machine/include/rk3588s.inc b/conf/machine/include/rk3588s.inc
index 6e700d8..6e01ede 100644
--- a/conf/machine/include/rk3588s.inc
+++ b/conf/machine/include/rk3588s.inc
@@ -2,8 +2,8 @@  SOC_FAMILY ?= "rk3588s"
 MACHINEOVERRIDES =. "rk3588s:"
 DEFAULTTUNE ?= "cortexa76-cortexa55-crypto"
 
-require conf/machine/include/arm/armv8-2a/tune-cortexa76-cortexa55.inc
 require conf/machine/include/rockchip-defaults.inc
+require conf/machine/include/arm/armv8-2a/tune-cortexa76-cortexa55.inc
 require conf/machine/include/rockchip-wic.inc
 
 KBUILD_DEFCONFIG ?= "defconfig"
diff --git a/conf/machine/include/rockchip-defaults.inc b/conf/machine/include/rockchip-defaults.inc
index 2387eb9..b15725d 100644
--- a/conf/machine/include/rockchip-defaults.inc
+++ b/conf/machine/include/rockchip-defaults.inc
@@ -1,5 +1,5 @@ 
 # meta-rockchip default settings
-
+MACHINEOVERRIDES =. "rockchip:"
 # kernel
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 KCONFIG_MODE ?= "alldefconfig"