From 83f2f1ad5840eae4bd265ffc46f1982571514123 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Thu, 24 Feb 2022 17:21:42 +0100 Subject: [PATCH] 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 --- target/linux/bcm27xx/bcm2708/config-5.10 | 3 +++ target/linux/bcm27xx/bcm2709/config-5.10 | 3 +++ target/linux/bcm27xx/bcm2710/config-5.10 | 5 +++++ target/linux/bcm27xx/bcm2711/config-5.10 | 5 +++++ 4 files changed, 16 insertions(+) diff --git a/target/linux/bcm27xx/bcm2708/config-5.10 b/target/linux/bcm27xx/bcm2708/config-5.10 index c5f71a863689a..56e076ba95e1a 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 e4d4b9c67cb31..f15f6e35628ee 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 a0d4b9ba1199a..39c00762bab41 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 b4798353fde9f..ed095231ae522 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