kernel: move TEO governor to generic config

This new symbol popped up in few places. Disable it in generic config.

Signed-off-by: Tomasz Maciej Nowak <[email protected]>
[fixed merge conflict in generic/config-5.4]
Signed-off-by: Petr Štetiar <[email protected]>

diff --git a/target/linux/armvirt/64/config-5.4 b/target/linux/armvirt/64/config-5.4
index f910d06ac870b57dbb6249dbe9811cf08087da71..c69ad8943f59bd31c8c0b33767a0ed64800f2514 100644 (file)
--- a/target/linux/armvirt/64/config-5.4
+++ b/target/linux/armvirt/64/config-5.4
@@ -106,7 +106,6 @@ CONFIG_COMMON_CLK_VERSATILE=y
 CONFIG_CPU_IDLE=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_PM=y
 CONFIG_CRYPTO_AES_ARM64=y
 CONFIG_CRYPTO_AES_ARM64_BS=y

diff --git a/target/linux/bcm27xx/bcm2708/config-5.4 b/target/linux/bcm27xx/bcm2708/config-5.4
index ca86cb39f66ff3c524c6db5954d4eb344bf454a5..0b25ac38958224bd725f04554a6a15ce562e1ff0 100644 (file)
--- a/target/linux/bcm27xx/bcm2708/config-5.4
+++ b/target/linux/bcm27xx/bcm2708/config-5.4
@@ -123,7 +123,6 @@ CONFIG_CPU_HAS_ASID=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_PABRT_V6=y
 CONFIG_CPU_PM=y
 # CONFIG_CPU_THERMAL is not set

diff --git a/target/linux/bcm27xx/bcm2709/config-5.4 b/target/linux/bcm27xx/bcm2709/config-5.4
index 53734900b676c0797c690870735219c04e2b5398..6ff73a748d67fa54ad376d559afc3a4d3d4d7bbe 100644 (file)
--- a/target/linux/bcm27xx/bcm2709/config-5.4
+++ b/target/linux/bcm27xx/bcm2709/config-5.4
@@ -149,7 +149,6 @@ CONFIG_CPU_HAS_ASID=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_PABRT_V7=y
 CONFIG_CPU_PM=y
 CONFIG_CPU_RMAP=y

diff --git a/target/linux/bcm27xx/bcm2710/config-5.4 b/target/linux/bcm27xx/bcm2710/config-5.4
index 587c64b75755e89c11f5b2d5ec83e0deef74a8c2..d21c62afd036c7c9123d679804f9610c8f0c92fb 100644 (file)
--- a/target/linux/bcm27xx/bcm2710/config-5.4
+++ b/target/linux/bcm27xx/bcm2710/config-5.4
@@ -203,7 +203,6 @@ CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_PM=y
 CONFIG_CPU_RMAP=y
 # CONFIG_CPU_THERMAL is not set

diff --git a/target/linux/bcm27xx/bcm2711/config-5.4 b/target/linux/bcm27xx/bcm2711/config-5.4
index a4ab0656cb895d3447ea325fa0d7853158eb5a0c..71b6723ac457c4682af73f5c17ed019fef67fe52 100644 (file)
--- a/target/linux/bcm27xx/bcm2711/config-5.4
+++ b/target/linux/bcm27xx/bcm2711/config-5.4
@@ -207,7 +207,6 @@ CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_PM=y
 CONFIG_CPU_RMAP=y
 # CONFIG_CPU_THERMAL is not set

diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4
index ec2b87b0840255387de47b0907d9d8cbb484050a..2f84939c0ce771891f2d6076f69b83a856bdf92f 100644 (file)
--- a/target/linux/generic/config-5.4
+++ b/target/linux/generic/config-5.4
@@ -940,6 +940,7 @@ CONFIG_CONSTRUCTORS=y
 # CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND is not set
 # CONFIG_CPU_IDLE is not set
 # CONFIG_CPU_IDLE_GOV_MENU is not set
+# CONFIG_CPU_IDLE_GOV_TEO is not set
 # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
 # CONFIG_CPU_ISOLATION is not set
 # CONFIG_CPU_NO_EFFICIENT_FFS is not set

diff --git a/target/linux/ipq40xx/config-5.4 b/target/linux/ipq40xx/config-5.4
index f94eb78b34c233a5bb8326fd579e576ae8be92fb..86fabe60100429090723563f4d5bc739cae517c5 100644 (file)
--- a/target/linux/ipq40xx/config-5.4
+++ b/target/linux/ipq40xx/config-5.4
@@ -112,7 +112,6 @@ CONFIG_CPU_HAS_ASID=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
 CONFIG_CPU_PABRT_V7=y
 CONFIG_CPU_PM=y

diff --git a/target/linux/ipq806x/config-5.4 b/target/linux/ipq806x/config-5.4
index d07c02f423f276ee4495bb45f58b220629ad65c5..c9c50c91bc4a049fe11ab3dbb1cc9b568f0a0a0e 100644 (file)
--- a/target/linux/ipq806x/config-5.4
+++ b/target/linux/ipq806x/config-5.4
@@ -113,7 +113,6 @@ CONFIG_CPU_HAS_ASID=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
 CONFIG_CPU_PABRT_V7=y
 CONFIG_CPU_PM=y

diff --git a/target/linux/kirkwood/config-5.4 b/target/linux/kirkwood/config-5.4
index 68eb6569575b96c44d5d287320189f0752500ef2..e149631f0ea1bcdcbcd640270dbb7e3e1571e87b 100644 (file)
--- a/target/linux/kirkwood/config-5.4
+++ b/target/linux/kirkwood/config-5.4
@@ -81,7 +81,6 @@ CONFIG_CPU_FEROCEON=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_PABRT_LEGACY=y
 CONFIG_CPU_PM=y
 CONFIG_CPU_THUMB_CAPABLE=y

diff --git a/target/linux/mediatek/mt7629/config-5.4 b/target/linux/mediatek/mt7629/config-5.4
index 861ce4222befa1e34510f08b038ee24a0ddd9f0d..5ca8444c361ea9d1b7d0cdfcbf6a734a7ab6ea79 100644 (file)
--- a/target/linux/mediatek/mt7629/config-5.4
+++ b/target/linux/mediatek/mt7629/config-5.4
@@ -112,7 +112,6 @@ CONFIG_CPU_HAS_ASID=y
 CONFIG_CPU_IDLE=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_PABRT_V7=y
 CONFIG_CPU_PM=y
 CONFIG_CPU_RMAP=y

diff --git a/target/linux/octeontx/config-5.4 b/target/linux/octeontx/config-5.4
index 4db69184c2350fbd45d77a6a26762bf5b4c0e523..a75bf78d357a6ea3d8bdf46adefe8615fe97dbfa 100644 (file)
--- a/target/linux/octeontx/config-5.4
+++ b/target/linux/octeontx/config-5.4
@@ -172,7 +172,6 @@ CONFIG_CONTIG_ALLOC=y
 CONFIG_CPU_IDLE=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
 CONFIG_CPU_PM=y
 CONFIG_CPU_RMAP=y

diff --git a/target/linux/oxnas/config-5.4 b/target/linux/oxnas/config-5.4
index 5e187ca4c7d2f82c2af6f20a6e4fdfd132a7ed4d..973bbc79dda9cbc563d58319af5b6278db043acd 100644 (file)
--- a/target/linux/oxnas/config-5.4
+++ b/target/linux/oxnas/config-5.4
@@ -97,7 +97,6 @@ CONFIG_CPU_CP15=y
 CONFIG_CPU_CP15_MMU=y
 # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
 # CONFIG_CPU_ICACHE_DISABLE is not set
-# CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_PABRT_LEGACY=y
 CONFIG_CPU_PM=y
 CONFIG_CPU_THUMB_CAPABLE=y

diff --git a/target/linux/x86/config-5.4 b/target/linux/x86/config-5.4
index 3207025bbfdf01b89b558d70ad503d33165da556..4fd590321e658548e094b7ce474c235f59b33286 100644 (file)
--- a/target/linux/x86/config-5.4
+++ b/target/linux/x86/config-5.4
@@ -93,7 +93,6 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_SUP_AMD=y
 CONFIG_CPU_SUP_CENTAUR=y
 CONFIG_CPU_SUP_CYRIX_32=y