From 895aba913ce773ede39ac35c0ad95c36d514ff2a Mon Sep 17 00:00:00 2001 From: guowenxue <guowenxue@gmail.com> Date: Sat, 20 Nov 2021 16:23:15 +0800 Subject: [PATCH] Update linux kernel patch, add touch screen support --- bsp/kernel/patch/linux-imx-imx6ull.patch | 278 +++++++++++++++++++++++++----------------------------- 1 files changed, 129 insertions(+), 149 deletions(-) diff --git a/bsp/kernel/patch/linux-imx-imx6ull.patch b/bsp/kernel/patch/linux-imx-imx6ull.patch index 25671fa..e1b5193 100644 --- a/bsp/kernel/patch/linux-imx-imx6ull.patch +++ b/bsp/kernel/patch/linux-imx-imx6ull.patch @@ -1,6 +1,6 @@ diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi linux-imx-imx6ull/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi --- linux-imx/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi 2021-09-08 18:41:11.000000000 +0800 -+++ linux-imx-imx6ull/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi 2021-11-17 23:49:58.757150998 +0800 ++++ linux-imx-imx6ull/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi 2021-11-20 00:00:25.765567396 +0800 @@ -31,7 +31,41 @@ brightness-levels = <0 4 8 16 32 64 128 255>; default-brightness-level = <6>; @@ -44,7 +44,28 @@ pxp_v4l2 { compatible = "fsl,imx6ul-pxp-v4l2", "fsl,imx6sx-pxp-v4l2", "fsl,imx6sl-pxp-v4l2"; -@@ -142,7 +176,7 @@ +@@ -43,19 +77,16 @@ + regulator-name = "VSD_3V3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; +- gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>; + off-on-delay-us = <20000>; + enable-active-high; + }; + + reg_peri_3v3: regulator-peri-3v3 { + compatible = "regulator-fixed"; +- pinctrl-names = "default"; +- pinctrl-0 = <&pinctrl_peri_3v3>; + regulator-name = "VPERI_3V3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; +- gpio = <&gpio5 2 GPIO_ACTIVE_LOW>; ++ + /* + * If you want to want to make this dynamic please + * check schematics and test all affected peripherals: +@@ -142,7 +173,7 @@ compatible = "spi-gpio"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_spi4>; @@ -53,10 +74,24 @@ pinctrl-assert-gpios = <&gpio5 8 GPIO_ACTIVE_LOW>; gpio-sck = <&gpio5 11 0>; gpio-mosi = <&gpio5 10 0>; -@@ -184,6 +218,12 @@ +@@ -184,6 +215,26 @@ pinctrl-0 = <&pinctrl_i2c2>; status = "okay"; ++ gt9xx@5d { ++ compatible = "goodix,gt9147"; ++ reg = <0x5d>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_ts_pins>; ++ ++ irq-gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>; ++ reset-gpios = <&gpio5 3 GPIO_ACTIVE_HIGH>; ++ interrupt-parent = <&gpio5>; ++ interrupts = <2 IRQ_TYPE_EDGE_FALLING>; ++ ++ status = "okay"; ++ }; ++ + rtc@6f { + compatible = "isil,isl1208"; + reg = <0x6f>; @@ -66,7 +101,7 @@ codec: wm8960@1a { #sound-dai-cells = <0>; compatible = "wlf,wm8960"; -@@ -192,7 +232,8 @@ +@@ -192,7 +243,8 @@ wlf,hp-cfg = <3 2 3>; wlf,gpio-cfg = <1 3>; clocks = <&clks IMX6UL_CLK_SAI2>; @@ -76,7 +111,7 @@ }; ov5640: ov5640@3c { -@@ -221,7 +262,9 @@ +@@ -221,7 +273,9 @@ pinctrl-0 = <&pinctrl_enet1>; phy-mode = "rmii"; phy-handle = <ðphy0>; @@ -87,7 +122,7 @@ status = "okay"; }; -@@ -230,15 +273,17 @@ +@@ -230,15 +284,17 @@ pinctrl-0 = <&pinctrl_enet2>; phy-mode = "rmii"; phy-handle = <ðphy1>; @@ -108,7 +143,7 @@ micrel,led-mode = <1>; clocks = <&clks IMX6UL_CLK_ENET_REF>; clock-names = "rmii-ref"; -@@ -301,21 +346,21 @@ +@@ -301,21 +357,21 @@ display0: display@0 { bits-per-pixel = <16>; @@ -140,7 +175,7 @@ hsync-active = <0>; vsync-active = <0>; de-active = <1>; -@@ -332,6 +377,13 @@ +@@ -332,6 +388,13 @@ status = "okay"; }; @@ -154,7 +189,7 @@ &pxp { status = "okay"; }; -@@ -339,7 +391,7 @@ +@@ -339,7 +402,7 @@ &qspi { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_qspi>; @@ -163,7 +198,7 @@ flash0: n25q256a@0 { #address-cells = <1>; -@@ -360,7 +412,7 @@ +@@ -360,7 +423,7 @@ assigned-clock-parents = <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>; assigned-clock-rates = <0>, <12288000>; fsl,sai-mclk-direction-output; @@ -172,16 +207,26 @@ }; &snvs_poweroff { -@@ -451,7 +503,7 @@ +@@ -439,6 +502,7 @@ + pinctrl-1 = <&pinctrl_usdhc1_100mhz>; + pinctrl-2 = <&pinctrl_usdhc1_200mhz>; + cd-gpios = <&gpio1 19 GPIO_ACTIVE_LOW>; ++ no-1-8-v; + keep-power-in-suspend; + wakeup-source; + vmmc-supply = <®_sd1_vmmc>; +@@ -446,8 +510,8 @@ + }; + + &usdhc2 { +- pinctrl-names = "default"; +- pinctrl-0 = <&pinctrl_usdhc2>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_usdhc2>; non-removable; keep-power-in-suspend; wakeup-source; -- status = "okay"; -+ status = "disabled"; /* Not used */ - }; - - &wdog1 { -@@ -463,6 +515,18 @@ +@@ -463,6 +527,25 @@ &iomuxc { pinctrl-names = "default"; @@ -197,10 +242,17 @@ + >; + }; + ++ pinctrl_ts_pins: pinctrl-ts-pins { ++ fsl,pins = < ++ MX6UL_PAD_SNVS_TAMPER2__GPIO5_IO02 0x17059 /* TouchScreen IRQ */ ++ MX6UL_PAD_SNVS_TAMPER3__GPIO5_IO03 0x17059 /* TouchScreen RST */ ++ >; ++ }; ++ pinctrl_csi1: csi1grp { fsl,pins = < MX6UL_PAD_CSI_MCLK__CSI_MCLK 0x1b088 -@@ -490,6 +554,7 @@ +@@ -490,6 +573,7 @@ MX6UL_PAD_ENET1_TX_DATA0__ENET1_TDATA00 0x1b0b0 MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01 0x1b0b0 MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 0x4001b031 @@ -208,7 +260,7 @@ >; }; -@@ -505,6 +570,7 @@ +@@ -505,6 +589,7 @@ MX6UL_PAD_ENET2_TX_DATA0__ENET2_TDATA00 0x1b0b0 MX6UL_PAD_ENET2_TX_DATA1__ENET2_TDATA01 0x1b0b0 MX6UL_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 0x4001b031 @@ -216,7 +268,7 @@ >; }; -@@ -594,7 +660,6 @@ +@@ -594,19 +679,18 @@ MX6UL_PAD_JTAG_TRST_B__SAI2_TX_DATA 0x11088 MX6UL_PAD_JTAG_TCK__SAI2_RX_DATA 0x11088 MX6UL_PAD_JTAG_TMS__SAI2_MCLK 0x17088 @@ -224,20 +276,23 @@ >; }; -@@ -610,6 +675,12 @@ +- pinctrl_peri_3v3: peri3v3grp { ++ pinctrl_pwm1: pwm1grp { + fsl,pins = < +- MX6UL_PAD_SNVS_TAMPER2__GPIO5_IO02 0x1b0b0 ++ MX6UL_PAD_GPIO1_IO08__PWM1_OUT 0x110b0 >; }; +- pinctrl_pwm1: pwm1grp { + pinctrl_pwm2: pwm2grp { -+ fsl,pins = < -+ MX6UL_PAD_GPIO1_IO09__PWM2_OUT 0x110b0 -+ >; -+ }; -+ - pinctrl_sim2: sim2grp { fsl,pins = < - MX6UL_PAD_CSI_DATA03__SIM2_PORT1_PD 0xb808 -@@ -625,7 +696,6 @@ +- MX6UL_PAD_GPIO1_IO08__PWM1_OUT 0x110b0 ++ MX6UL_PAD_GPIO1_IO09__PWM2_OUT 0x110b0 + >; + }; + +@@ -625,7 +709,6 @@ fsl,pins = < MX6UL_PAD_BOOT_MODE0__GPIO5_IO10 0x70a1 MX6UL_PAD_BOOT_MODE1__GPIO5_IO11 0x70a1 @@ -245,18 +300,20 @@ MX6UL_PAD_SNVS_TAMPER8__GPIO5_IO08 0x80000000 >; }; -@@ -679,8 +749,6 @@ +@@ -678,9 +761,7 @@ + MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x17059 MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x17059 MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x17059 - MX6UL_PAD_UART1_RTS_B__GPIO1_IO19 0x17059 /* SD1 CD */ +- MX6UL_PAD_UART1_RTS_B__GPIO1_IO19 0x17059 /* SD1 CD */ - MX6UL_PAD_GPIO1_IO05__USDHC1_VSELECT 0x17059 /* SD1 VSELECT */ - MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x17059 /* SD1 RESET */ ++ MX6UL_PAD_UART1_RTS_B__GPIO1_IO19 0x17059 /* SD1 CD */ >; }; diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/imx6ul.dtsi linux-imx-imx6ull/arch/arm/boot/dts/imx6ul.dtsi --- linux-imx/arch/arm/boot/dts/imx6ul.dtsi 2021-09-08 18:41:11.000000000 +0800 -+++ linux-imx-imx6ull/arch/arm/boot/dts/imx6ul.dtsi 2021-11-17 20:39:10.582219267 +0800 ++++ linux-imx-imx6ull/arch/arm/boot/dts/imx6ul.dtsi 2021-11-18 23:10:08.149821196 +0800 @@ -727,6 +727,7 @@ offset = <0x34>; interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>, @@ -267,8 +324,8 @@ snvs_poweroff: snvs-poweroff { diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/.cfg-imx6ull linux-imx-imx6ull/.cfg-imx6ull --- linux-imx/.cfg-imx6ull 1970-01-01 08:00:00.000000000 +0800 -+++ linux-imx-imx6ull/.cfg-imx6ull 2021-11-17 23:54:02.719749912 +0800 -@@ -0,0 +1,6910 @@ ++++ linux-imx-imx6ull/.cfg-imx6ull 2021-11-19 23:56:45.007385743 +0800 +@@ -0,0 +1,6833 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/arm 5.10.52 Kernel Configuration @@ -2369,10 +2426,13 @@ +# +# Userland interfaces +# -+# CONFIG_INPUT_MOUSEDEV is not set ++CONFIG_INPUT_MOUSEDEV=y ++CONFIG_INPUT_MOUSEDEV_PSAUX=y ++CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 ++CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=y -+CONFIG_INPUT_EVBUG=m ++# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers @@ -2411,44 +2471,18 @@ +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_BCM is not set -+CONFIG_INPUT_MOUSE=y -+CONFIG_MOUSE_PS2=m -+CONFIG_MOUSE_PS2_ALPS=y -+CONFIG_MOUSE_PS2_BYD=y -+CONFIG_MOUSE_PS2_LOGIPS2PP=y -+CONFIG_MOUSE_PS2_SYNAPTICS=y -+CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y -+CONFIG_MOUSE_PS2_CYPRESS=y -+CONFIG_MOUSE_PS2_TRACKPOINT=y -+CONFIG_MOUSE_PS2_ELANTECH=y -+CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y -+# CONFIG_MOUSE_PS2_SENTELIC is not set -+# CONFIG_MOUSE_PS2_TOUCHKIT is not set -+CONFIG_MOUSE_PS2_FOCALTECH=y -+CONFIG_MOUSE_PS2_SMBUS=y -+# CONFIG_MOUSE_SERIAL is not set -+# CONFIG_MOUSE_APPLETOUCH is not set -+# CONFIG_MOUSE_BCM5974 is not set -+# CONFIG_MOUSE_CYAPA is not set -+# CONFIG_MOUSE_ELAN_I2C is not set -+# CONFIG_MOUSE_VSXXXAA is not set -+# CONFIG_MOUSE_GPIO is not set -+# CONFIG_MOUSE_SYNAPTICS_I2C is not set -+# CONFIG_MOUSE_SYNAPTICS_USB is not set ++# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_PROPERTIES=y -+CONFIG_TOUCHSCREEN_ADS7846=y -+CONFIG_TOUCHSCREEN_CT36X_WLD=y ++# CONFIG_TOUCHSCREEN_ADS7846 is not set ++# CONFIG_TOUCHSCREEN_CT36X_WLD is not set +# CONFIG_TOUCHSCREEN_AD7877 is not set -+CONFIG_TOUCHSCREEN_AD7879=y -+CONFIG_TOUCHSCREEN_AD7879_I2C=y -+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set ++# CONFIG_TOUCHSCREEN_AD7879 is not set +# CONFIG_TOUCHSCREEN_ADC is not set +# CONFIG_TOUCHSCREEN_AR1021_I2C is not set -+CONFIG_TOUCHSCREEN_ATMEL_MXT=y -+# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set ++# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set +# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set +# CONFIG_TOUCHSCREEN_BU21013 is not set +# CONFIG_TOUCHSCREEN_BU21029 is not set @@ -2457,18 +2491,18 @@ +# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set +# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set +# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set -+CONFIG_TOUCHSCREEN_DA9052=y ++# CONFIG_TOUCHSCREEN_DA9052 is not set +# CONFIG_TOUCHSCREEN_DYNAPRO is not set +# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set +# CONFIG_TOUCHSCREEN_EETI is not set -+CONFIG_TOUCHSCREEN_EGALAX=y ++# CONFIG_TOUCHSCREEN_EGALAX is not set +# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set +# CONFIG_TOUCHSCREEN_EXC3000 is not set -+CONFIG_TOUCHSCREEN_ELAN_TS=y ++# CONFIG_TOUCHSCREEN_ELAN_TS is not set +# CONFIG_TOUCHSCREEN_FUJITSU is not set +CONFIG_TOUCHSCREEN_GOODIX=y +# CONFIG_TOUCHSCREEN_HIDEEP is not set -+CONFIG_TOUCHSCREEN_ILI210X=y ++# CONFIG_TOUCHSCREEN_ILI210X is not set +# CONFIG_TOUCHSCREEN_S6SY761 is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_EKTF2127 is not set @@ -2476,92 +2510,54 @@ +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set +# CONFIG_TOUCHSCREEN_WACOM_I2C is not set -+CONFIG_TOUCHSCREEN_MAX11801=y ++# CONFIG_TOUCHSCREEN_MAX11801 is not set +# CONFIG_TOUCHSCREEN_MCS5000 is not set +# CONFIG_TOUCHSCREEN_MMS114 is not set +# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set -+CONFIG_TOUCHSCREEN_IMX6UL_TSC=y ++# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set +# CONFIG_TOUCHSCREEN_INEXIO is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set -+CONFIG_TOUCHSCREEN_EDT_FT5X06=y ++# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_PIXCIR is not set +# CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set +# CONFIG_TOUCHSCREEN_WM97XX is not set +# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set -+CONFIG_TOUCHSCREEN_MC13783=y ++# CONFIG_TOUCHSCREEN_MC13783 is not set +# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_TSC_SERIO is not set -+CONFIG_TOUCHSCREEN_TSC200X_CORE=y -+CONFIG_TOUCHSCREEN_TSC2004=y ++# CONFIG_TOUCHSCREEN_TSC2004 is not set +# CONFIG_TOUCHSCREEN_TSC2005 is not set -+CONFIG_TOUCHSCREEN_TSC2007=y -+# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set ++# CONFIG_TOUCHSCREEN_TSC2007 is not set +# CONFIG_TOUCHSCREEN_RM_TS is not set +# CONFIG_TOUCHSCREEN_SILEAD is not set +# CONFIG_TOUCHSCREEN_SIS_I2C is not set +# CONFIG_TOUCHSCREEN_ST1232 is not set +# CONFIG_TOUCHSCREEN_STMFTS is not set -+CONFIG_TOUCHSCREEN_STMPE=y ++# CONFIG_TOUCHSCREEN_STMPE is not set +# CONFIG_TOUCHSCREEN_SUR40 is not set +# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set -+CONFIG_TOUCHSCREEN_SX8654=y ++# CONFIG_TOUCHSCREEN_SX8654 is not set +# CONFIG_TOUCHSCREEN_TPS6507X is not set +# CONFIG_TOUCHSCREEN_ZET6223 is not set +# CONFIG_TOUCHSCREEN_ZFORCE is not set -+CONFIG_TOUCHSCREEN_COLIBRI_VF50=y ++# CONFIG_TOUCHSCREEN_COLIBRI_VF50 is not set +# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set +# CONFIG_TOUCHSCREEN_IQS5XX is not set +# CONFIG_TOUCHSCREEN_ZINITIX is not set -+CONFIG_TOUCHSCREEN_SYNAPTICS_DSX=y -+# CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_I2C is not set -+CONFIG_TOUCHSCREEN_FTS=y -+CONFIG_TOUCHSCREEN_FTS_DIRECTORY="focaltech_touch" -+CONFIG_INPUT_MISC=y -+# CONFIG_INPUT_AD714X is not set -+# CONFIG_INPUT_ATMEL_CAPTOUCH is not set -+# CONFIG_INPUT_BMA150 is not set -+# CONFIG_INPUT_E3X0_BUTTON is not set -+# CONFIG_INPUT_MC13783_PWRBUTTON is not set -+CONFIG_INPUT_MMA8450=y -+# CONFIG_INPUT_GPIO_BEEPER is not set -+# CONFIG_INPUT_GPIO_DECODER is not set -+# CONFIG_INPUT_GPIO_VIBRA is not set -+# CONFIG_INPUT_ATI_REMOTE2 is not set -+# CONFIG_INPUT_KEYSPAN_REMOTE is not set -+# CONFIG_INPUT_KXTJ9 is not set -+# CONFIG_INPUT_POWERMATE is not set -+# CONFIG_INPUT_YEALINK is not set -+# CONFIG_INPUT_CM109 is not set -+# CONFIG_INPUT_REGULATOR_HAPTIC is not set -+# CONFIG_INPUT_UINPUT is not set -+# CONFIG_INPUT_PCF8574 is not set -+# CONFIG_INPUT_PWM_BEEPER is not set -+# CONFIG_INPUT_PWM_VIBRA is not set -+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set -+# CONFIG_INPUT_DA9052_ONKEY is not set -+# CONFIG_INPUT_DA9063_ONKEY is not set -+# CONFIG_INPUT_ADXL34X is not set -+# CONFIG_INPUT_IMS_PCU is not set -+# CONFIG_INPUT_IQS269A is not set -+# CONFIG_INPUT_CMA3000 is not set -+# CONFIG_INPUT_DRV260X_HAPTICS is not set -+# CONFIG_INPUT_DRV2665_HAPTICS is not set -+# CONFIG_INPUT_DRV2667_HAPTICS is not set -+CONFIG_INPUT_MPL3115=y -+CONFIG_SENSOR_FXLS8471=y -+CONFIG_SENSOR_IMX_RPMSG=y -+CONFIG_INPUT_ISL29023=y ++# CONFIG_TOUCHSCREEN_SYNAPTICS_DSX is not set ++# CONFIG_TOUCHSCREEN_FTS is not set ++# CONFIG_INPUT_MISC is not set +# CONFIG_RMI4_CORE is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y -+CONFIG_SERIO_SERPORT=m ++# CONFIG_SERIO_SERPORT is not set +# CONFIG_SERIO_PCIPS2 is not set +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set @@ -2984,7 +2980,6 @@ +# CONFIG_BATTERY_MAX17040 is not set +# CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_ISP1704 is not set -+CONFIG_SABRESD_MAX8903=y +# CONFIG_CHARGER_MAX8903 is not set +# CONFIG_CHARGER_LP8727 is not set +# CONFIG_CHARGER_GPIO is not set @@ -6409,23 +6404,24 @@ +# +# CD-ROM/DVD Filesystems +# -+CONFIG_ISO9660_FS=m -+CONFIG_JOLIET=y -+CONFIG_ZISOFS=y -+CONFIG_UDF_FS=m ++# CONFIG_ISO9660_FS is not set ++# CONFIG_UDF_FS is not set +# end of CD-ROM/DVD Filesystems + +# +# DOS/FAT/EXFAT/NT Filesystems +# +CONFIG_FAT_FS=y -+CONFIG_MSDOS_FS=m ++CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_FAT_DEFAULT_UTF8 is not set -+# CONFIG_EXFAT_FS is not set -+# CONFIG_NTFS_FS is not set ++CONFIG_EXFAT_FS=y ++CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" ++CONFIG_NTFS_FS=y ++# CONFIG_NTFS_DEBUG is not set ++CONFIG_NTFS_RW=y +# end of DOS/FAT/EXFAT/NT Filesystems + +# @@ -6454,24 +6450,8 @@ +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set -+CONFIG_JFFS2_FS=y -+CONFIG_JFFS2_FS_DEBUG=0 -+CONFIG_JFFS2_FS_WRITEBUFFER=y -+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set -+# CONFIG_JFFS2_SUMMARY is not set -+# CONFIG_JFFS2_FS_XATTR is not set -+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set -+CONFIG_JFFS2_ZLIB=y -+CONFIG_JFFS2_RTIME=y -+CONFIG_UBIFS_FS=y -+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set -+CONFIG_UBIFS_FS_LZO=y -+CONFIG_UBIFS_FS_ZLIB=y -+CONFIG_UBIFS_FS_ZSTD=y -+# CONFIG_UBIFS_ATIME_SUPPORT is not set -+CONFIG_UBIFS_FS_XATTR=y -+CONFIG_UBIFS_FS_SECURITY=y -+# CONFIG_UBIFS_FS_AUTHENTICATION is not set ++# CONFIG_JFFS2_FS is not set ++# CONFIG_UBIFS_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_SQUASHFS is not set +# CONFIG_VXFS_FS is not set @@ -7181,7 +7161,7 @@ +# end of Kernel hacking diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/Makefile linux-imx-imx6ull/Makefile --- linux-imx/Makefile 2021-09-08 18:41:11.000000000 +0800 -+++ linux-imx-imx6ull/Makefile 2021-11-17 23:50:00.489132691 +0800 ++++ linux-imx-imx6ull/Makefile 2021-11-19 23:54:49.744292020 +0800 @@ -367,7 +367,8 @@ # Alternatively CROSS_COMPILE can be set in the environment. # Default value for CROSS_COMPILE is not to prefix executables -- Gitblit v1.9.1