From 384e9a0948397c83da3ba4e8faa7069db5d778dc Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Fri, 12 May 2017 21:05:41 +0300 Subject: [PATCH] Update pine64-default configs --- config/kernel/linux-pine64-default.config | 54 ++++++++++++++----- .../adjust-default-env.patch | 26 +++++++-- 2 files changed, 63 insertions(+), 17 deletions(-) diff --git a/config/kernel/linux-pine64-default.config b/config/kernel/linux-pine64-default.config index af24d856ce..2a6c495c6c 100644 --- a/config/kernel/linux-pine64-default.config +++ b/config/kernel/linux-pine64-default.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 3.10.104 Kernel Configuration +# Linux/arm64 3.10.105 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -284,6 +284,7 @@ CONFIG_ARCH_SUN50IW1P1=y # CONFIG_FPGA_V4_PLATFORM is not set # CONFIG_FPGA_V7_PLATFORM is not set CONFIG_EVB_PLATFORM=y +CONFIG_SUNXI_SOC_NAME="sun50iw1" # # Bus support @@ -1451,6 +1452,7 @@ CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_USB=m CONFIG_RTL8723BS=m CONFIG_RTL8723BS_VQ0=m +CONFIG_RTL8723CS=m CONFIG_RTL8189FS=m # @@ -1632,6 +1634,9 @@ CONFIG_INPUT_GPIO=m # CONFIG_INPUT_ADXL34X is not set CONFIG_INPUT_IMS_PCU=m # CONFIG_INPUT_CMA3000 is not set +CONFIG_INPUT_HALL_GPIO=m +CONFIG_INPUT_HALL_GPIO_REPORT_SW=y +# CONFIG_INPUT_HALL_GPIO_REPORT_KEY is not set # CONFIG_INPUT_SENSOR is not set # @@ -1714,6 +1719,7 @@ CONFIG_DUMP_REG=y CONFIG_DUMP_REG_MISC=y # CONFIG_SUNXI_TRANSFORM is not set CONFIG_SUNXI_SYS_INFO=y +CONFIG_SUNXI_SMC=y CONFIG_SUNXI_TIMER_TEST=m CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y @@ -2365,7 +2371,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_SYS_FOPS is not set # CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set -# CONFIG_FB_BACKLIGHT is not set +CONFIG_FB_BACKLIGHT=y # CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_TILEBLITTING is not set @@ -2392,7 +2398,29 @@ CONFIG_HDMI_DISP2_SUNXI=y # CONFIG_FB_AUO_K190X is not set # CONFIG_FB_SIMPLE is not set # CONFIG_EXYNOS_VIDEO is not set -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_LCD_L4F00242T03=m +CONFIG_LCD_LMS283GF05=m +CONFIG_LCD_LTV350QV=m +CONFIG_LCD_ILI922X=m +CONFIG_LCD_ILI9320=m +CONFIG_LCD_TDO24M=m +CONFIG_LCD_VGG2432A4=m +CONFIG_LCD_PLATFORM=m +CONFIG_LCD_S6E63M0=m +CONFIG_LCD_LD9040=m +CONFIG_LCD_AMS369FG06=m +CONFIG_LCD_LMS501KF03=m +CONFIG_LCD_HX8357=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_GENERIC=m +CONFIG_BACKLIGHT_PWM=m +CONFIG_BACKLIGHT_ADP8860=m +CONFIG_BACKLIGHT_ADP8870=m +CONFIG_BACKLIGHT_LM3630=m +CONFIG_BACKLIGHT_LM3639=m +CONFIG_BACKLIGHT_LP855X=m # CONFIG_ADF is not set # @@ -3356,7 +3384,7 @@ CONFIG_FRAME_WARN=2048 CONFIG_MAGIC_SYSRQ=y # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_READABLE_ASM is not set -CONFIG_UNUSED_SYMBOLS=y +# CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_SECTION_MISMATCH is not set @@ -3375,9 +3403,9 @@ CONFIG_DETECT_HUNG_TASK=y CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 -CONFIG_SCHED_DEBUG=y -CONFIG_SCHEDSTATS=y -CONFIG_TIMER_STATS=y +# CONFIG_SCHED_DEBUG is not set +# CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set # CONFIG_DEBUG_OBJECTS is not set # CONFIG_DEBUG_SLAB is not set CONFIG_HAVE_DEBUG_KMEMLEAK=y @@ -3400,14 +3428,14 @@ CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_WRITECOUNT is not set -CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_MEMORY_INIT is not set # CONFIG_DEBUG_LIST is not set # CONFIG_TEST_LIST_SORT is not set # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set # CONFIG_DEBUG_CREDENTIALS is not set CONFIG_ARCH_WANT_FRAME_POINTERS=y -CONFIG_FRAME_POINTER=y +# CONFIG_FRAME_POINTER is not set # CONFIG_BOOT_PRINTK_DELAY is not set # @@ -3417,8 +3445,8 @@ CONFIG_FRAME_POINTER=y # CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_RCU_TORTURE_TEST is not set CONFIG_RCU_CPU_STALL_TIMEOUT=60 -CONFIG_RCU_CPU_STALL_VERBOSE=y -CONFIG_RCU_CPU_STALL_INFO=y +# CONFIG_RCU_CPU_STALL_VERBOSE is not set +# CONFIG_RCU_CPU_STALL_INFO is not set # CONFIG_RCU_TRACE is not set # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set @@ -3468,8 +3496,8 @@ CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_DYNAMIC_DEBUG is not set # CONFIG_DMA_API_DEBUG is not set -CONFIG_ATOMIC64_SELFTEST=y -CONFIG_ASYNC_RAID6_TEST=m +# CONFIG_ATOMIC64_SELFTEST is not set +# CONFIG_ASYNC_RAID6_TEST is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set diff --git a/patch/u-boot/u-boot-pine64-default/adjust-default-env.patch b/patch/u-boot/u-boot-pine64-default/adjust-default-env.patch index 5fb764b53f..3dcade5a7b 100644 --- a/patch/u-boot/u-boot-pine64-default/adjust-default-env.patch +++ b/patch/u-boot/u-boot-pine64-default/adjust-default-env.patch @@ -1,7 +1,7 @@ -diff --git a/u-boot-pine64/include/configs/sun50iw1p1.h b/u-boot-pine64/include/configs/sun50iw1p1.h -index ccbad4a..f0650ed 100644 ---- a/u-boot-pine64/include/configs/sun50iw1p1.h -+++ b/u-boot-pine64/include/configs/sun50iw1p1.h +diff --git a/include/configs/sun50iw1p1.h b/include/configs/sun50iw1p1.h +index f2eebc0..cd8b0fd 100644 +--- a/include/configs/sun50iw1p1.h ++++ b/include/configs/sun50iw1p1.h @@ -352,7 +352,7 @@ "initrd_filename=initrd.img\0" \ "bootenv_filename=uEnv.txt\0" \ @@ -20,3 +20,21 @@ index ccbad4a..f0650ed 100644 "scriptboot=source ${load_addr}\0" \ "set_cmdline=" \ "setenv bootargs console=${console} ${optargs} " \ +@@ -419,7 +419,8 @@ + + #define CONFIG_AUTOBOOT_KEYED + #define CONFIG_AUTOBOOT_STOP_STR "s" +-#define CONFIG_AUTOBOOT_PROMPT "autoboot in %d seconds, Press s to abort\n",bootdelay ++#define CONFIG_AUTOBOOT_STOP_STR2 "\x1b\x1b" ++#define CONFIG_AUTOBOOT_PROMPT "autoboot in %d seconds, Press s or to abort\n",bootdelay + + // Make it actually useful. + #define CONFIG_SYS_BOOTMAPSZ 0x4000000 +@@ -428,6 +429,7 @@ + #define CONFIG_CMD_BOOTI + #define CONFIG_CMD_EXT4 + #define CONFIG_FAT_WRITE ++#define CONFIG_CMD_FS_GENERIC + #undef CONFIG_ENV_IS_IN_SUNXI_FLASH + #define CONFIG_ENV_IS_IN_FAT + #define FAT_ENV_INTERFACE "mmc"