aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@gmail.com>2022-02-24 17:21:42 +0100
committerChristian Lamparter <chunkeey@gmail.com>2022-02-24 20:45:12 +0100
commit83f2f1ad5840eae4bd265ffc46f1982571514123 (patch)
treebfe3987bcb2f5575699edfd2b38ffb4080a1c0e3
parent3e53eec58958b56c1be02d001f4b51dfb1714525 (diff)
downloadupstream-83f2f1ad5840eae4bd265ffc46f1982571514123.tar.gz
upstream-83f2f1ad5840eae4bd265ffc46f1982571514123.tar.bz2
upstream-83f2f1ad5840eae4bd265ffc46f1982571514123.zip
Revert "bcm27xx: bcm27xx: update defconfig"
This reverts all four commits dbb45421bab "bcm27xx: bcm2708: update defconfig" 332f69583ad "bcm27xx: bcm2709: update defconfig" a478202d74b "bcm27xx: bcm2710: update defconfig" 82da1dfd69a "bcm27xx: bcm2711: update defconfig" this also highlighted an unrelated kconfig failure that warrants investigation. But for now it is important for the bcm27xx target to come back again. |* |* Restart config... |* |* |* Allow override default queue discipline |* |Allow override default queue discipline (NET_SCH_DEFAULT) [Y/n/?] y | Default queuing discipline | 1. Fair Queue (DEFAULT_FQ) (NEW) | 2. Controlled Delay (DEFAULT_CODEL) (NEW) | > 3. Fair Queue Controlled Delay (DEFAULT_FQ_CODEL) | 4. Stochastic Fair Queue (DEFAULT_SFQ) (NEW) | 5. Priority FIFO Fast (DEFAULT_PFIFO_FAST) | choice[1-5?]: |Error in reading or end of file. Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
-rw-r--r--target/linux/bcm27xx/bcm2708/config-5.103
-rw-r--r--target/linux/bcm27xx/bcm2709/config-5.103
-rw-r--r--target/linux/bcm27xx/bcm2710/config-5.105
-rw-r--r--target/linux/bcm27xx/bcm2711/config-5.105
4 files changed, 16 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/bcm2708/config-5.10 b/target/linux/bcm27xx/bcm2708/config-5.10
index c5f71a8636..56e076ba95 100644
--- a/target/linux/bcm27xx/bcm2708/config-5.10
+++ b/target/linux/bcm27xx/bcm2708/config-5.10
@@ -299,6 +299,7 @@ CONFIG_RESET_CONTROLLER=y
# CONFIG_RESET_RASPBERRYPI is not set
CONFIG_RESET_SIMPLE=y
# CONFIG_RPIVID_MEM is not set
+# CONFIG_RPI_AXIPERF is not set
# CONFIG_RPI_POE_POWER is not set
CONFIG_SCSI=y
# CONFIG_SCSI_LOWLEVEL is not set
@@ -318,6 +319,8 @@ CONFIG_SERIAL_MCTRL_GPIO=y
CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_SG_POOL=y
CONFIG_SMSC_PHY=y
+# CONFIG_SND_SOC_AD193X_I2C is not set
+# CONFIG_SND_SOC_AD193X_SPI is not set
CONFIG_SPARSE_IRQ=y
CONFIG_SRCU=y
# CONFIG_STRIP_ASM_SYMS is not set
diff --git a/target/linux/bcm27xx/bcm2709/config-5.10 b/target/linux/bcm27xx/bcm2709/config-5.10
index e4d4b9c67c..f15f6e3562 100644
--- a/target/linux/bcm27xx/bcm2709/config-5.10
+++ b/target/linux/bcm27xx/bcm2709/config-5.10
@@ -376,6 +376,7 @@ CONFIG_RESET_RASPBERRYPI=y
CONFIG_RESET_SIMPLE=y
CONFIG_RFS_ACCEL=y
# CONFIG_RPIVID_MEM is not set
+# CONFIG_RPI_AXIPERF is not set
# CONFIG_RPI_POE_POWER is not set
CONFIG_RPS=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
@@ -399,6 +400,8 @@ CONFIG_SG_POOL=y
CONFIG_SMP=y
CONFIG_SMP_ON_UP=y
CONFIG_SMSC_PHY=y
+# CONFIG_SND_SOC_AD193X_I2C is not set
+# CONFIG_SND_SOC_AD193X_SPI is not set
CONFIG_SPARSE_IRQ=y
CONFIG_SRCU=y
# CONFIG_STRIP_ASM_SYMS is not set
diff --git a/target/linux/bcm27xx/bcm2710/config-5.10 b/target/linux/bcm27xx/bcm2710/config-5.10
index a0d4b9ba11..39c00762ba 100644
--- a/target/linux/bcm27xx/bcm2710/config-5.10
+++ b/target/linux/bcm27xx/bcm2710/config-5.10
@@ -37,6 +37,8 @@ CONFIG_ARM64_VA_BITS=39
CONFIG_ARM64_VA_BITS_39=y
CONFIG_ARM64_VHE=y
CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y
+CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
+CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y
CONFIG_ARM_AMBA=y
CONFIG_ARM_ARCH_TIMER=y
CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
@@ -362,6 +364,7 @@ CONFIG_RESET_SIMPLE=y
CONFIG_RFS_ACCEL=y
CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
# CONFIG_RPIVID_MEM is not set
+# CONFIG_RPI_AXIPERF is not set
# CONFIG_RPI_POE_POWER is not set
CONFIG_RPS=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
@@ -384,6 +387,8 @@ CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_SG_POOL=y
CONFIG_SMP=y
CONFIG_SMSC_PHY=y
+# CONFIG_SND_SOC_AD193X_I2C is not set
+# CONFIG_SND_SOC_AD193X_SPI is not set
CONFIG_SPARSEMEM=y
CONFIG_SPARSEMEM_EXTREME=y
CONFIG_SPARSEMEM_MANUAL=y
diff --git a/target/linux/bcm27xx/bcm2711/config-5.10 b/target/linux/bcm27xx/bcm2711/config-5.10
index b4798353fd..ed095231ae 100644
--- a/target/linux/bcm27xx/bcm2711/config-5.10
+++ b/target/linux/bcm27xx/bcm2711/config-5.10
@@ -37,6 +37,8 @@ CONFIG_ARM64_VA_BITS=39
CONFIG_ARM64_VA_BITS_39=y
CONFIG_ARM64_VHE=y
CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y
+CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
+CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y
CONFIG_ARM_AMBA=y
CONFIG_ARM_ARCH_TIMER=y
CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
@@ -374,6 +376,7 @@ CONFIG_RESET_SIMPLE=y
CONFIG_RFS_ACCEL=y
CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
# CONFIG_RPIVID_MEM is not set
+# CONFIG_RPI_AXIPERF is not set
# CONFIG_RPI_POE_POWER is not set
CONFIG_RPS=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
@@ -395,6 +398,8 @@ CONFIG_SERIAL_MCTRL_GPIO=y
CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_SG_POOL=y
CONFIG_SMP=y
+# CONFIG_SND_SOC_AD193X_I2C is not set
+# CONFIG_SND_SOC_AD193X_SPI is not set
CONFIG_SPARSEMEM=y
CONFIG_SPARSEMEM_EXTREME=y
CONFIG_SPARSEMEM_MANUAL=y