Up to cip80 kernel (+ revert of two wrongly backported patches)

[packages/kernel.git] / kernel-multiarch.config

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 35e895a52d62c6b402732d82733d6bcdd7f57d0d..1d9407aa84150d54ecfdce41284adba6f358bfd0 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -476,6 +476,7 @@ BCMA_DEBUG all=n
 BLK_DEV all=y
 BLK_DEV_NULL_BLK all=m
 BLK_DEV_FD all=m sparc=y
+BLK_DEV_FD_RAWCMD all=n
 MAC_FLOPPY ppc=m
 PARIDE all=m
 #- file drivers/block/paride/Kconfig goes here
@@ -949,6 +950,7 @@ EFI_VARS_PSTORE all=m
 EFI_VARS_PSTORE_DEFAULT_DISABLE all=n
 EFI_RUNTIME_MAP all=y
 EFI_FAKE_MEMMAP all=n
+EFI_CAPSULE_LOADER all=m
 
 #-
 #- *** FILE: drivers/firmware/google/Kconfig ***
@@ -980,6 +982,7 @@ DEBUG_GPIO all=n
 GPIO_SYSFS all=y
 GPIO_AMDPT all=m
 GPIO_DWAPB all=m
+GPIO_EXAR all=m
 GPIO_GENERIC_PLATFORM all=m
 GPIO_ICH all=m
 GPIO_LYNXPOINT all=y
@@ -1719,6 +1722,7 @@ NAU7802 all=m
 QCOM_SPMI_IADC all=m
 QCOM_SPMI_VADC all=m
 TI_ADC081C all=m
+TI_ADC108S102 all=m
 TI_ADC128S052 all=m
 TI_AM335X_ADC all=m
 VIPERBOARD_ADC all=m
@@ -5966,6 +5970,7 @@ RTC_DRV_ISL12057 all=m
 RTC_DRV_X1205 all=m
 RTC_DRV_PCF2127 all=m
 RTC_DRV_PCF8523 all=m
+RTC_DRV_PCF85363 all=m
 RTC_DRV_PCF8563 all=m
 RTC_DRV_PCF85063 all=m
 RTC_DRV_PCF8583 all=m sparc=n
@@ -7159,6 +7164,7 @@ SERIAL_8250_DEPRECATED_OPTIONS all=y
 SERIAL_8250_PNP all=y
 SERIAL_8250_CONSOLE all=y
 SERIAL_8250_PCI all=y
+SERIAL_8250_EXAR all=y
 SERIAL_8250_CS all=m
 SERIAL_8250_NR_UARTS all=8
 SERIAL_8250_RUNTIME_UARTS all=4
@@ -7748,8 +7754,6 @@ BACKLIGHT_BD6107 all=m
 #- *** FILE: drivers/video/console/Kconfig ***
 #-
 VGA_CONSOLE all=y
-VGACON_SOFT_SCROLLBACK all=n ia64=y
-VGACON_SOFT_SCROLLBACK_SIZE ia64=64
 MDA_CONSOLE alpha=m i386=m
 DUMMY_CONSOLE all=y
 DUMMY_CONSOLE_COLUMNS all=80
@@ -7997,6 +8001,7 @@ W1_SLAVE_BQ27000 all=m
 WATCHDOG all=y
 WATCHDOG_CORE all=y
 WATCHDOG_NOWAYOUT all=n
+WATCHDOG_HANDLE_BOOT_ENABLED all=y
 #- Watchdog Device Drivers
 SOFT_WATCHDOG all=m
 DA9052_WATCHDOG all=m
@@ -8812,6 +8817,7 @@ BPF_SYSCALL all=y
 BPF_JIT_ALWAYS_ON all=y
 SHMEM all=y
 AIO all=y
+BPF_UNPRIV_DEFAULT_OFF all=y
 USERFAULTFD all=y
 PCI_QUIRKS all=y
 EMBEDDED all=n
@@ -9093,6 +9099,7 @@ TEST_UDELAY all=m
 TEST_STATIC_KEYS all=m
 #- file samples/Kconfig goes here
 #- file lib/Kconfig.kgdb goes here
+#- file lib/Kconfig.ubsan goes here
 
 #-
 #- *** FILE: lib/Kconfig.kasan ***
@@ -9117,6 +9124,11 @@ KDB_CONTINUE_CATASTROPHIC all=0
 #-
 KMEMCHECK all=n
 
+#-
+#- *** FILE: lib/Kconfig.ubsan ***
+#-
+UBSAN all=n
+
 #-
 #- *** FILE: lib/fonts/Kconfig ***
 #-
@@ -9186,7 +9198,8 @@ IDLE_PAGE_TRACKING all=y
 #-
 PAGE_EXTENSION all=n
 DEBUG_PAGEALLOC all=n
-PAGE_POISONING sparc=n ia64=n alpha=n
+PAGE_POISONING all=n
+PAGE_POISONING_ZERO all=n
 
 #-
 #- *** FILE: net/6lowpan/Kconfig ***
@@ -10894,6 +10907,8 @@ USB_DWC3_DEBUG all=n
 USB_FUSBH200_HCD all=m
 USB_RIO500 all=m
 USB_WPAN_HCD all=m
+VGACON_SOFT_SCROLLBACK all=n ia64=y
+VGACON_SOFT_SCROLLBACK_SIZE ia64=64
 VIDEO_BTCX all=m sparc=
 VIDEO_BWQCAM all=m
 VIDEO_CQCAM all=m