diff --git a/FunKey/board/funkey/busybox.config b/FunKey/board/funkey/busybox.config index 0cfceed..2ccfc87 100644 --- a/FunKey/board/funkey/busybox.config +++ b/FunKey/board/funkey/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.31.1 -# Tue Sep 15 14:39:00 2020 +# Sun Oct 25 16:55:29 2020 # CONFIG_HAVE_DOT_CONFIG=y diff --git a/FunKey/configs/funkey_defconfig b/FunKey/configs/funkey_defconfig index b49a5d8..6cc4b0b 100644 --- a/FunKey/configs/funkey_defconfig +++ b/FunKey/configs/funkey_defconfig @@ -17,7 +17,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/post-buil BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/FunKey-Project/linux" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="e48e9aa4109265b097456a6203de0181f5e33c54" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="932bc41a1a2ce477855240d39edbf7a9af5b7490" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/linux.config" BR2_LINUX_KERNEL_LZO=y diff --git a/Recovery/board/funkey/busybox.config b/Recovery/board/funkey/busybox.config index 47bcb70..43edd2a 100644 --- a/Recovery/board/funkey/busybox.config +++ b/Recovery/board/funkey/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.31.1 -# Tue Oct 20 22:46:50 2020 +# Sun Oct 25 16:03:31 2020 # CONFIG_HAVE_DOT_CONFIG=y diff --git a/Recovery/board/funkey/linux.config b/Recovery/board/funkey/linux.config index 7b5907d..d1e3519 100644 --- a/Recovery/board/funkey/linux.config +++ b/Recovery/board/funkey/linux.config @@ -95,8 +95,6 @@ CONFIG_BACKLIGHT_PWM=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_LOGO=y -# CONFIG_LOGO_FUNKEY_CLUT224 is not set -CONFIG_LOGO_FUNKEY_RECOVERY_CLUT224=y CONFIG_SOUND=y CONFIG_SND=y # CONFIG_SND_DRIVERS is not set diff --git a/Recovery/board/funkey/uboot.config b/Recovery/board/funkey/uboot.config index 0cc6989..8fa41f0 100644 --- a/Recovery/board/funkey/uboot.config +++ b/Recovery/board/funkey/uboot.config @@ -4,6 +4,7 @@ CONFIG_SPL=y CONFIG_IDENT_STRING=" FunKey" CONFIG_MACH_SUN8I_V3S=y CONFIG_DRAM_CLK=360 +CONFIG_I2C0_ENABLE=y # CONFIG_ARMV7_NONSEC is not set CONFIG_DEFAULT_DEVICE_TREE="sun8i-v3s-funkey" CONFIG_LOCALVERSION="-funkey" @@ -27,3 +28,6 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_USE_DEFAULT_ENV_FILE=y CONFIG_DEFAULT_ENV_FILE="$(BR2_EXTERNAL_RECOVERY_PATH)/board/funkey/rootfs-overlay/etc/u-boot.env" # CONFIG_NET is not set +CONFIG_DM_I2C=y +CONFIG_I2C_SET_DEFAULT_BUS_NUM=y +CONFIG_SYS_I2C_MVTWSI=y diff --git a/Recovery/configs/recovery_defconfig b/Recovery/configs/recovery_defconfig index d98726e..3acc9fa 100644 --- a/Recovery/configs/recovery_defconfig +++ b/Recovery/configs/recovery_defconfig @@ -17,7 +17,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_RECOVERY_PATH)/board/funkey/post-bu BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/FunKey-Project/linux" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="e48e9aa4109265b097456a6203de0181f5e33c54" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="932bc41a1a2ce477855240d39edbf7a9af5b7490" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_RECOVERY_PATH)/board/funkey/linux.config" BR2_LINUX_KERNEL_LZO=y @@ -62,7 +62,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/FunKey-Project/u-boot" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="02e613eaddaacaf0ac0f0b941b90d9645be29f56" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="1b018a310da81c24afac5364d38b345c0b33583c" BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_RECOVERY_PATH)/board/funkey/uboot.config" BR2_TARGET_UBOOT_NEEDS_DTC=y