From 050e61caa30932147564909c350a3a2a2baabf82 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Wed, 7 Jul 2021 18:55:43 -0700 Subject: [PATCH] librem5: upgrade kernel to 5.18.7 The old kernel has an issue with MMC failing to come up sometimes, it's resolved in later kernels. 5.18.7 is the latest kernel release from Purism. The config diff is based on using the defconfig for the L5 in this kernel tree. --- Makefile | 4 ++-- src/linux_config_librem5 | 41 ++++++++++++++++++++++++++++++++++------ 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 414f260..5974ed0 100644 --- a/Makefile +++ b/Makefile @@ -269,8 +269,8 @@ src/linux-pocketpc: src/linux-librem5: @echo "WGET linux-librem5" @mkdir src/linux-librem5 - @wget -c https://source.puri.sm/Librem5/linux-next/-/archive/pureos/5.9.16+librem5.2/linux-next-pureos-5.9.16+librem5.2.tar.gz - @tar -xf linux-next-pureos-5.9.16+librem5.2.tar.gz --strip-components 1 -C src/linux-librem5 + @wget -c https://source.puri.sm/Librem5/linux/-/archive/pureos/5.18.7pureos1/linux-pureos-5.18.7pureos1.tar.gz + @tar -xf linux-pureos-5.18.7pureos1.tar.gz --strip-components 1 -C src/linux-librem5 src/linux-sdm845: @echo "WGET linux-sdm845" diff --git a/src/linux_config_librem5 b/src/linux_config_librem5 index 09dc0ed..cfa4a11 100644 --- a/src/linux_config_librem5 +++ b/src/linux_config_librem5 @@ -4,6 +4,8 @@ CONFIG_POSIX_MQUEUE=y CONFIG_GENERIC_IRQ_DEBUGFS=y CONFIG_NO_HZ_IDLE=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_BPF_SYSCALL=y +CONFIG_BPF_JIT=y CONFIG_PREEMPT=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y @@ -33,7 +35,6 @@ CONFIG_SCHED_AUTOGROUP=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y CONFIG_KALLSYMS_ALL=y -CONFIG_BPF_SYSCALL=y # CONFIG_COMPAT_BRK is not set CONFIG_PROFILING=y CONFIG_ARCH_MXC=y @@ -58,7 +59,6 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y CONFIG_CPUFREQ_DT=y CONFIG_ARM_IMX_CPUFREQ_DT=y -CONFIG_ARM_SCPI_PROTOCOL=y CONFIG_ARM64_CRYPTO=y CONFIG_CRYPTO_SHA256_ARM64=y CONFIG_CRYPTO_AES_ARM64_CE=y @@ -108,6 +108,7 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_IMX_WEIM=y CONFIG_VEXPRESS_CONFIG=y +CONFIG_ARM_SCPI_PROTOCOL=y CONFIG_MTD=y CONFIG_MTD_SPI_NOR=y CONFIG_BLK_DEV_LOOP=y @@ -119,6 +120,7 @@ CONFIG_SCSI_SAS_ATA=y CONFIG_ATA=y CONFIG_SATA_AHCI=y CONFIG_SATA_AHCI_PLATFORM=y +CONFIG_AHCI_IMX=y # CONFIG_ATA_SFF is not set CONFIG_MD=y CONFIG_BLK_DEV_DM=y @@ -134,7 +136,6 @@ CONFIG_NETDEVICES=y # CONFIG_NET_VENDOR_AQUANTIA is not set # CONFIG_NET_VENDOR_ARC is not set # CONFIG_NET_VENDOR_ATHEROS is not set -# CONFIG_NET_VENDOR_AURORA is not set # CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROCADE is not set # CONFIG_NET_VENDOR_CADENCE is not set @@ -211,6 +212,8 @@ CONFIG_KEYBOARD_IMX=y CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_TABLET=y CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_GOODIX=y +CONFIG_TOUCHSCREEN_EDT_FT5X06=y CONFIG_INPUT_MISC=y CONFIG_LEGACY_PTY_COUNT=16 CONFIG_SERIAL_8250=y @@ -226,7 +229,7 @@ CONFIG_SERIAL_IMX_CONSOLE=y CONFIG_SERIAL_FSL_LPUART=y CONFIG_SERIAL_FSL_LPUART_CONSOLE=y CONFIG_SERIAL_DEV_BUS=y -# CONFIG_HW_RANDOM_CAVIUM is not set +CONFIG_HW_RANDOM=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PCA954x=y @@ -241,12 +244,13 @@ CONFIG_SPI_IMX=y CONFIG_SPI_SPIDEV=y CONFIG_SPMI=y CONFIG_PINCTRL=y -CONFIG_PINCTRL_SINGLE=y CONFIG_PINCTRL_MAX77620=y +CONFIG_PINCTRL_SINGLE=y CONFIG_PINCTRL_IMX8MQ=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_DWAPB=y +CONFIG_GPIO_MXC=y CONFIG_GPIO_PL061=y CONFIG_GPIO_XGENE=y CONFIG_GPIO_PCA953X=y @@ -257,7 +261,10 @@ CONFIG_POWER_RESET_VEXPRESS=y CONFIG_POWER_RESET_SYSCON=y CONFIG_POWER_RESET_SYSCON_POWEROFF=y CONFIG_SYSCON_REBOOT_MODE=y +CONFIG_CHARGER_BQ25890=y CONFIG_SENSORS_ARM_SCPI=y +CONFIG_SENSORS_LM90=y +CONFIG_SENSORS_INA2XX=y CONFIG_THERMAL_WRITABLE_TRIPS=y CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y CONFIG_CPU_THERMAL=y @@ -267,6 +274,7 @@ CONFIG_THERMAL_EMULATION=y CONFIG_IMX_THERMAL=y CONFIG_QORIQ_THERMAL=y CONFIG_WATCHDOG=y +CONFIG_IMX2_WDT=y CONFIG_MFD_MAX77620=y CONFIG_MFD_ROHM_BD718XX=y CONFIG_REGULATOR=y @@ -283,12 +291,21 @@ CONFIG_DRM=y CONFIG_DRM_DP_AUX_CHARDEV=y CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_DP_CEC=y +CONFIG_DRM_I2C_CH7006=y +CONFIG_DRM_I2C_SIL164=y +CONFIG_DRM_I2C_NXP_TDA9950=y +CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=y CONFIG_DRM_PANEL_SITRONIX_ST7703=y CONFIG_DRM_NWL_MIPI_DSI=y +CONFIG_DRM_SIMPLE_BRIDGE=y CONFIG_DRM_I2C_ADV7511=y +CONFIG_DRM_CDNS_MHDP8546=y +CONFIG_DRM_IMX_DCSS=y +CONFIG_DRM_IMX_CDNS_MHDP=y CONFIG_DRM_ETNAVIV=y CONFIG_DRM_MXSFB=y +CONFIG_FB=y CONFIG_FB_MODE_HELPERS=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_PWM=y @@ -301,8 +318,11 @@ CONFIG_HIDRAW=y CONFIG_USB=y CONFIG_USB_OTG=y CONFIG_USB_XHCI_HCD=y +CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_USB_DWC3=y +CONFIG_USB_MXS_PHY=y +CONFIG_USB_MXS_PHY=y CONFIG_USB_ULPI=y CONFIG_USB_GADGET=y CONFIG_U_SERIAL_CONSOLE=y @@ -322,6 +342,9 @@ CONFIG_USB_CONFIGFS_F_FS=y CONFIG_USB_CONFIGFS_F_HID=y CONFIG_USB_CONFIGFS_F_PRINTER=y CONFIG_TYPEC=y +CONFIG_TYPEC_TCPM=y +CONFIG_TYPEC_TCPCI=y +CONFIG_TYPEC_UCSI=y CONFIG_TYPEC_TPS6598X=y CONFIG_MMC=y CONFIG_MMC_BLOCK_MINORS=32 @@ -333,10 +356,12 @@ CONFIG_MMC_SPI=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLASS_FLASH=y +CONFIG_LEDS_CLASS_MULTICOLOR=y CONFIG_LEDS_LM3692X=y CONFIG_LEDS_GPIO=y CONFIG_LEDS_PWM=y CONFIG_LEDS_SYSCON=y +CONFIG_LEDS_LM3560=y CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y @@ -351,6 +376,7 @@ CONFIG_RTC_DRV_DS3232=y CONFIG_RTC_DRV_PL031=y CONFIG_RTC_DRV_SNVS=y CONFIG_DMADEVICES=y +CONFIG_IMX_SDMA=m # CONFIG_MX3_IPU is not set # CONFIG_VIRTIO_MENU is not set CONFIG_COMMON_CLK_FIXED_MMIO=y @@ -375,7 +401,9 @@ CONFIG_IIO_TRIGGER=y CONFIG_PWM=y CONFIG_PWM_IMX27=y CONFIG_RESET_CONTROLLER=y +CONFIG_RESET_IMX7=y CONFIG_PHY_XGENE=y +CONFIG_PHY_FSL_IMX8MQ_USB=y CONFIG_PHY_MIXEL_MIPI_DPHY=y CONFIG_POWERCAP=y CONFIG_IDLE_INJECT=y @@ -457,8 +485,9 @@ CONFIG_CRC64=y CONFIG_CMA_SIZE_MBYTES=320 CONFIG_PRINTK_TIME=y CONFIG_DYNAMIC_DEBUG=y -CONFIG_MAGIC_SYSRQ=y + CONFIG_DEBUG_KERNEL=y +CONFIG_MAGIC_SYSRQ=y CONFIG_DETECT_HUNG_TASK=y # CONFIG_SCHED_DEBUG is not set # CONFIG_DEBUG_PREEMPT is not set