From 0c68449fa2a8d916ef652b76bc3c4cedd45aa5c4 Mon Sep 17 00:00:00 2001 From: zhangzhaopeng Date: Wed, 8 Jan 2025 11:08:24 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=89=8D=E5=90=8E=E6=9D=BF]=E8=A3=81=E5=89=AA?= =?UTF-8?q?=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84=E9=A9=B1=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configs/fastboot_sl100_back/board.dts | 8 +++---- .../fastboot_sl100_back/linux/config-4.9 | 11 ++------- .../configs/fastboot_sl100_front/board.dts | 8 +++---- .../fastboot_sl100_front/linux/config-4.9 | 24 ++++--------------- .../video/fbdev/sunxi/disp2/disp/dev_fb.c | 3 --- .../busybox-init-base-files/etc/init.d/S00mpp | 2 +- .../busybox-init-base-files/etc/profile | 14 +++++------ .../busybox-init-base-files/files/pseudo_init | 1 - .../v851s-fastboot_sl100_back/modules.mk | 4 ++-- .../busybox-init-base-files/usr/bin/run_audio | 2 +- .../v851s3-fastboot_sl100_front/defconfig | 4 ++-- .../v851s3-fastboot_sl100_front/modules.mk | 12 +++++----- 12 files changed, 33 insertions(+), 60 deletions(-) diff --git a/device/config/chips/v851s/configs/fastboot_sl100_back/board.dts b/device/config/chips/v851s/configs/fastboot_sl100_back/board.dts index 45d90251f..f8022b12e 100755 --- a/device/config/chips/v851s/configs/fastboot_sl100_back/board.dts +++ b/device/config/chips/v851s/configs/fastboot_sl100_back/board.dts @@ -1461,8 +1461,8 @@ pa-pin-0 = <&pio PE 11 1 1 1 0>; pa-pin-level-0 = <1>; pa-pin-msleep-0 = <0>; - tx-hub-en; - rx-sync-en; + // tx-hub-en; + // rx-sync-en; status = "okay"; }; @@ -1512,8 +1512,8 @@ /* pinctrl-names= "default","sleep"; */ /* pinctrl-0 = <&daudio0_pins_a>; */ /* pinctrl-1 = <&daudio0_pins_b>; */ - tx-hub-en; - rx-sync-en; + // tx-hub-en; + // rx-sync-en; status = "okay"; }; diff --git a/device/config/chips/v851s/configs/fastboot_sl100_back/linux/config-4.9 b/device/config/chips/v851s/configs/fastboot_sl100_back/linux/config-4.9 index 5919ce19a..b7902ef86 100755 --- a/device/config/chips/v851s/configs/fastboot_sl100_back/linux/config-4.9 +++ b/device/config/chips/v851s/configs/fastboot_sl100_back/linux/config-4.9 @@ -2069,12 +2069,7 @@ CONFIG_SND_VERBOSE_PROCFS=y # CONFIG_SND_OPL4_LIB_SEQ is not set # CONFIG_SND_SBAWE_SEQ is not set # CONFIG_SND_EMU10K1_SEQ is not set -CONFIG_SND_DRIVERS=y -# CONFIG_SND_DUMMY is not set -# CONFIG_SND_ALOOP is not set -# CONFIG_SND_MTPAV is not set -# CONFIG_SND_SERIAL_U16550 is not set -# CONFIG_SND_MPU401 is not set +# CONFIG_SND_DRIVERS is not set # # HD-Audio @@ -2121,9 +2116,7 @@ CONFIG_SND_SOC_SUNXI_SUN8IW21_CODEC=m CONFIG_SND_SOC_SUNXI_AAUDIO=m # CONFIG_SND_SOC_SUNXI_DMIC is not set CONFIG_SND_SOC_SUNXI_DAUDIO=m -CONFIG_SND_SOC_SUNXI_COMPONENTS=m -CONFIG_SND_SOC_SUNXI_RXSYNC=m -# CONFIG_SND_SOC_SUNXI_DEBUG is not set +# CONFIG_SND_SOC_SUNXI_COMPONENTS is not set # CONFIG_SND_SOC_XTFPGA_I2S is not set CONFIG_SND_SOC_I2C_AND_SPI=m diff --git a/device/config/chips/v851s3/configs/fastboot_sl100_front/board.dts b/device/config/chips/v851s3/configs/fastboot_sl100_front/board.dts index 7dcae6634..a761b04b9 100755 --- a/device/config/chips/v851s3/configs/fastboot_sl100_front/board.dts +++ b/device/config/chips/v851s3/configs/fastboot_sl100_front/board.dts @@ -1522,8 +1522,8 @@ pa-pin-0 = <&pio PD 21 1 1 1 0>; pa-pin-level-0 = <1>; pa-pin-msleep-0 = <0>; - tx-hub-en; - rx-sync-en; + // tx-hub-en; + // rx-sync-en; status = "okay"; }; @@ -1573,8 +1573,8 @@ /* pinctrl-names= "default","sleep"; */ /* pinctrl-0 = <&daudio0_pins_a>; */ /* pinctrl-1 = <&daudio0_pins_b>; */ - tx-hub-en; - rx-sync-en; + // tx-hub-en; + // rx-sync-en; status = "okay"; }; diff --git a/device/config/chips/v851s3/configs/fastboot_sl100_front/linux/config-4.9 b/device/config/chips/v851s3/configs/fastboot_sl100_front/linux/config-4.9 index ef02299cd..38ab44428 100755 --- a/device/config/chips/v851s3/configs/fastboot_sl100_front/linux/config-4.9 +++ b/device/config/chips/v851s3/configs/fastboot_sl100_front/linux/config-4.9 @@ -1737,7 +1737,7 @@ CONFIG_VIDEO_V4L2=y CONFIG_VIDEOBUF2_CORE=y CONFIG_VIDEOBUF2_MEMOPS=y CONFIG_VIDEOBUF2_DMA_CONTIG=y -CONFIG_VIDEOBUF2_VMALLOC=y +CONFIG_VIDEOBUF2_VMALLOC=m # CONFIG_TTPCI_EEPROM is not set # @@ -2187,12 +2187,7 @@ CONFIG_SND_VERBOSE_PROCFS=y # CONFIG_SND_OPL4_LIB_SEQ is not set # CONFIG_SND_SBAWE_SEQ is not set # CONFIG_SND_EMU10K1_SEQ is not set -CONFIG_SND_DRIVERS=y -# CONFIG_SND_DUMMY is not set -# CONFIG_SND_ALOOP is not set -# CONFIG_SND_MTPAV is not set -# CONFIG_SND_SERIAL_U16550 is not set -# CONFIG_SND_MPU401 is not set +# CONFIG_SND_DRIVERS is not set # # HD-Audio @@ -2238,9 +2233,7 @@ CONFIG_SND_SOC_SUNXI_SUN8IW21_CODEC=m CONFIG_SND_SOC_SUNXI_AAUDIO=m # CONFIG_SND_SOC_SUNXI_DMIC is not set CONFIG_SND_SOC_SUNXI_DAUDIO=m -CONFIG_SND_SOC_SUNXI_COMPONENTS=m -CONFIG_SND_SOC_SUNXI_RXSYNC=m -# CONFIG_SND_SOC_SUNXI_DEBUG is not set +# CONFIG_SND_SOC_SUNXI_COMPONENTS is not set # CONFIG_SND_SOC_XTFPGA_I2S is not set CONFIG_SND_SOC_I2C_AND_SPI=m @@ -2886,17 +2879,8 @@ CONFIG_OVERLAY_FS=y # # DOS/FAT/NT Filesystems # -CONFIG_FAT_FS=m # CONFIG_MSDOS_FS is not set -# CONFIG_PRELLOCATE_FLAG is not set -# CONFIG_FAT1_UPDATE_ONLY is not set -# CONFIG_OPTIMIZE_METADATA_REFRESH is not set -# CONFIG_TRUNCATE_NOEXPAND is not set -CONFIG_VFAT_FS=m -CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -# CONFIG_FAT_DEFAULT_UTF8 is not set -# CONFIG_FAT_READ_FAT_DIR_SUNXI is not set +# CONFIG_VFAT_FS is not set # CONFIG_NTFS_FS is not set # CONFIG_EXFAT_FS is not set diff --git a/lichee/linux-4.9/drivers/video/fbdev/sunxi/disp2/disp/dev_fb.c b/lichee/linux-4.9/drivers/video/fbdev/sunxi/disp2/disp/dev_fb.c index dbdb05644..df2d4fba7 100644 --- a/lichee/linux-4.9/drivers/video/fbdev/sunxi/disp2/disp/dev_fb.c +++ b/lichee/linux-4.9/drivers/video/fbdev/sunxi/disp2/disp/dev_fb.c @@ -3226,9 +3226,6 @@ s32 fb_init(struct platform_device *pdev) s32 value = 0; char primary_key[20]; sprintf(primary_key, "eink"); -#endif -#if defined(CONFIG_DISP2_SUNXI_KERNEL_LOAD_HAS_LOGO) - unsigned long flags; #endif /* struct sched_param param = { .sched_priority = MAX_RT_PRIO - 1 }; */ diff --git a/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/etc/init.d/S00mpp b/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/etc/init.d/S00mpp index b34473d42..0cdfec79b 100755 --- a/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/etc/init.d/S00mpp +++ b/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/etc/init.d/S00mpp @@ -32,7 +32,7 @@ start() { insmod $MODULES_DIR/snd-pcm-dmaengine.ko insmod $MODULES_DIR/snd-soc-core.ko insmod $MODULES_DIR/snd_soc_sunxi_pcm.ko - insmod $MODULES_DIR/snd_soc_sunxi_component_rxsync.ko + # insmod $MODULES_DIR/snd_soc_sunxi_component_rxsync.ko insmod $MODULES_DIR/snd_soc_sunxi_aaudio.ko insmod $MODULES_DIR/snd_soc_sunxi_daudio.ko insmod $MODULES_DIR/snd_soc_sunxi_internal_codec.ko diff --git a/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/etc/profile b/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/etc/profile index 96712757e..05e3c75a6 100755 --- a/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/etc/profile +++ b/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/etc/profile @@ -32,14 +32,14 @@ ulimit -c unlimited [ -x /bin/ll ] || alias ll='ls -al' #export TSLIB_ROOT=/usr/local/tslib -export TSLIB_TSDEVICE=/dev/input/event2 -export TSLIB_TSEVENTTYPE=input -export TSLIB_CONFFILE=/mnt/ts.conf +# export TSLIB_TSDEVICE=/dev/input/event2 +# export TSLIB_TSEVENTTYPE=input +# export TSLIB_CONFFILE=/mnt/ts.conf #export TSLIB_PLUGINDIR=/usr/local/tslib/lib/ts #export TSLIB_CALIBFILE=/etc/pointercal -export TSLIB_CALIBFILE=/mnt/pointercal +# export TSLIB_CALIBFILE=/mnt/pointercal -export TSLIB_PLUGINDIR=/usr/lib/ts -export TSLIB_CONSOLEDEVICE=none -export TSLIB_FBDEVICE=/dev/fb0 +# export TSLIB_PLUGINDIR=/usr/lib/ts +# export TSLIB_CONSOLEDEVICE=none +# export TSLIB_FBDEVICE=/dev/fb0 diff --git a/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/files/pseudo_init b/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/files/pseudo_init index 419cebc8a..012f1e958 100755 --- a/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/files/pseudo_init +++ b/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/files/pseudo_init @@ -578,7 +578,6 @@ mount_app MODULES_DIR="/lib/modules/`uname -r`" rc_mount insmod $MODULES_DIR/xr806.ko -insmod $MODULES_DIR/gpio_keys.ko /etc/init.d/S50wifidaemon start & # insmod $MODULES_DIR/disp.ko # loaded by kernel insmod $MODULES_DIR/sunxi_gpadc.ko diff --git a/target/allwinner/v851s-fastboot_sl100_back/modules.mk b/target/allwinner/v851s-fastboot_sl100_back/modules.mk index a7d597256..10932eefa 100755 --- a/target/allwinner/v851s-fastboot_sl100_back/modules.mk +++ b/target/allwinner/v851s-fastboot_sl100_back/modules.mk @@ -156,13 +156,13 @@ define KernelPackage/audio FILES+=$(LINUX_DIR)/sound/soc/sunxi_v2/snd_soc_sunxi_aaudio.ko FILES+=$(LINUX_DIR)/sound/soc/sunxi_v2/snd_soc_sunxi_machine.ko FILES+=$(LINUX_DIR)/sound/soc/sunxi_v2/snd_soc_sunxi_internal_codec.ko - FILES+=$(LINUX_DIR)/sound/soc/sunxi_v2/snd_soc_sunxi_component_rxsync.ko + # FILES+=$(LINUX_DIR)/sound/soc/sunxi_v2/snd_soc_sunxi_component_rxsync.ko FILES+=$(LINUX_DIR)/sound/soc/sunxi_v2/snd_soc_sunxi_daudio.ko FILES+=$(LINUX_DIR)/sound/core/snd-pcm-dmaengine.ko FILES+=$(LINUX_DIR)/sound/core/snd.ko FILES+=$(LINUX_DIR)/sound/core/snd-pcm.ko FILES+=$(LINUX_DIR)/sound/core/snd-timer.ko - AUTOLOAD:=$(call AutoProbe, soundcore.ko snd-soc-core.ko snd_soc_sunxi_pcm.ko snd_soc_sunxi_aaudio.ko snd_soc_sunxi_machine.ko snd_soc_sunxi_internal_codec.ko snd_soc_sunxi_component_rxsync.ko snd_soc_sunxi_daudio.ko snd-pcm-dmaengine.ko snd.ko snd-pcm.ko snd-timer.ko) + AUTOLOAD:=$(call AutoProbe, soundcore.ko snd-soc-core.ko snd_soc_sunxi_pcm.ko snd_soc_sunxi_aaudio.ko snd_soc_sunxi_machine.ko snd_soc_sunxi_internal_codec.ko snd_soc_sunxi_daudio.ko snd-pcm-dmaengine.ko snd.ko snd-pcm.ko snd-timer.ko) endef define KernelPackage/audio/description diff --git a/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/usr/bin/run_audio b/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/usr/bin/run_audio index 8f5686db2..049884af7 100755 --- a/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/usr/bin/run_audio +++ b/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/usr/bin/run_audio @@ -8,7 +8,7 @@ insmod $MODULES_DIR/snd-pcm.ko insmod $MODULES_DIR/snd-pcm-dmaengine.ko insmod $MODULES_DIR/snd-soc-core.ko insmod $MODULES_DIR/snd_soc_sunxi_pcm.ko -insmod $MODULES_DIR/snd_soc_sunxi_component_rxsync.ko +# insmod $MODULES_DIR/snd_soc_sunxi_component_rxsync.ko insmod $MODULES_DIR/snd_soc_sunxi_aaudio.ko insmod $MODULES_DIR/snd_soc_sunxi_daudio.ko insmod $MODULES_DIR/snd_soc_sunxi_internal_codec.ko diff --git a/target/allwinner/v851s3-fastboot_sl100_front/defconfig b/target/allwinner/v851s3-fastboot_sl100_front/defconfig index b60c5338c..18a882e41 100755 --- a/target/allwinner/v851s3-fastboot_sl100_front/defconfig +++ b/target/allwinner/v851s3-fastboot_sl100_front/defconfig @@ -2848,7 +2848,7 @@ CONFIG_PACKAGE_libpng=y # CONFIG_PACKAGE_kmod-fs-ntfs is not set # CONFIG_PACKAGE_kmod-fs-reiserfs is not set # CONFIG_PACKAGE_kmod-fs-udf is not set -CONFIG_PACKAGE_kmod-fs-vfat=y +# CONFIG_PACKAGE_kmod-fs-vfat is not set # CONFIG_PACKAGE_kmod-fs-xfs is not set # CONFIG_PACKAGE_kmod-fuse is not set @@ -3066,7 +3066,7 @@ CONFIG_PACKAGE_kmod-audio=y CONFIG_PACKAGE_kmod-fb-disp=y # CONFIG_PACKAGE_kmod-g2d is not set # CONFIG_PACKAGE_kmod-gpio-button-hotplug is not set -CONFIG_PACKAGE_kmod-mmc=y +# CONFIG_PACKAGE_kmod-mmc is not set # CONFIG_PACKAGE_kmod-mmc-over-gpio is not set # CONFIG_PACKAGE_kmod-rotary-gpio-custom is not set # CONFIG_PACKAGE_kmod-rt-media is not set diff --git a/target/allwinner/v851s3-fastboot_sl100_front/modules.mk b/target/allwinner/v851s3-fastboot_sl100_front/modules.mk index 7c733d070..b90ddf02b 100755 --- a/target/allwinner/v851s3-fastboot_sl100_front/modules.mk +++ b/target/allwinner/v851s3-fastboot_sl100_front/modules.mk @@ -77,10 +77,10 @@ define KernelPackage/mmc SUBMENU:=$(OTHER_MENU) TITLE:=mmc support (staging) DEPENDS:= - FILES:=$(LINUX_DIR)/drivers/mmc/core/mmc_core.ko - FILES+=$(LINUX_DIR)/drivers/mmc/host/sunxi_mmc_host.ko - FILES+=$(LINUX_DIR)/drivers/mmc/card/mmc_block.ko - AUTOLOAD:=$(call AutoProbe, mmc_core sunxi_mmc_host, mmc_block) + # FILES:=$(LINUX_DIR)/drivers/mmc/core/mmc_core.ko + # FILES+=$(LINUX_DIR)/drivers/mmc/host/sunxi_mmc_host.ko + # FILES+=$(LINUX_DIR)/drivers/mmc/card/mmc_block.ko + AUTOLOAD:=$(call AutoProbe, ) endef define KernelPackage/mmc/description @@ -160,7 +160,7 @@ define KernelPackage/audio FILES+=$(LINUX_DIR)/sound/soc/sunxi_v2/snd_soc_sunxi_aaudio.ko FILES+=$(LINUX_DIR)/sound/soc/sunxi_v2/snd_soc_sunxi_machine.ko FILES+=$(LINUX_DIR)/sound/soc/sunxi_v2/snd_soc_sunxi_internal_codec.ko - FILES+=$(LINUX_DIR)/sound/soc/sunxi_v2/snd_soc_sunxi_component_rxsync.ko + # FILES+=$(LINUX_DIR)/sound/soc/sunxi_v2/snd_soc_sunxi_component_rxsync.ko FILES+=$(LINUX_DIR)/sound/soc/sunxi_v2/snd_soc_sunxi_daudio.ko FILES+=$(LINUX_DIR)/sound/core/snd-pcm-dmaengine.ko FILES+=$(LINUX_DIR)/sound/core/snd.ko @@ -169,7 +169,7 @@ define KernelPackage/audio #FILES+=$(LINUX_DIR)/drivers/usb/gadget/function/u_audio.ko #FILES+=$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_uac1.ko #AUTOLOAD:=$(call AutoProbe, soundcore.ko snd-soc-core.ko snd_soc_sunxi_pcm.ko snd_soc_sunxi_aaudio.ko snd_soc_sunxi_machine.ko snd_soc_sunxi_internal_codec.ko snd_soc_sunxi_component_rxsync.ko snd_soc_sunxi_daudio.ko snd-pcm-dmaengine.ko snd.ko snd-pcm.ko snd-timer.ko u_audio.ko usb_f_uac1.ko) - AUTOLOAD:=$(call AutoProbe, soundcore.ko snd-soc-core.ko snd_soc_sunxi_pcm.ko snd_soc_sunxi_aaudio.ko snd_soc_sunxi_machine.ko snd_soc_sunxi_internal_codec.ko snd_soc_sunxi_component_rxsync.ko snd_soc_sunxi_daudio.ko snd-pcm-dmaengine.ko snd.ko snd-pcm.ko snd-timer.ko) + AUTOLOAD:=$(call AutoProbe, soundcore.ko snd-soc-core.ko snd_soc_sunxi_pcm.ko snd_soc_sunxi_aaudio.ko snd_soc_sunxi_machine.ko snd_soc_sunxi_internal_codec.ko snd_soc_sunxi_daudio.ko snd-pcm-dmaengine.ko snd.ko snd-pcm.ko snd-timer.ko) endef define KernelPackage/audio/description