Merge pull request #852 from Kwiboo/sync-s905

C2/Hub/Play2: Sync kernel config, options and more

projects/Odroid_C2/filesystem/usr/lib/systemd/system/serial-console.service

@@ -1,18 +1,17 @@
 [Unit]
-Description=Debug Shell on /dev/console
+Description=Debug Shell on /dev/ttyS0
 DefaultDependencies=no
-ConditionKernelCommandLine=console
+ConditionKernelCommandLine=console=ttyS0,115200n8
 
 [Service]
 WorkingDirectory=/storage
 Environment="ENV=/etc/profile"
+ExecStartPre=/bin/sh -c 'echo -en "\033[?25h"'
 ExecStart=/bin/sh
 Restart=always
 RestartSec=0
 StandardInput=tty
-TTYPath=/dev/console
+TTYPath=/dev/ttyS0
-TTYReset=yes
-TTYVHangup=yes
 KillMode=process
 IgnoreSIGPIPE=no
 # bash ignores SIGTERM

projects/Odroid_C2/linux/linux.aarch64.conf

@@ -967,7 +967,7 @@ CONFIG_AM_VDEC_AVS=y
 CONFIG_AM_TIMESYNC=y
 CONFIG_AM_STREAMING=y
 CONFIG_AM_SUBTITLE=y
-# CONFIG_AM_VIDEOCAPTURE is not set
+CONFIG_AM_VIDEOCAPTURE=y
 # CONFIG_AM_HEVCENC is not set
 
 #
@@ -1026,8 +1026,8 @@ CONFIG_GXBB_POWER_RESET=y
 #
 # Amlogic ion video support
 #
-CONFIG_VIDEOBUF2_ION=y
+# CONFIG_VIDEOBUF2_ION is not set
-CONFIG_AMLOGIC_IONVIDEO=y
+# CONFIG_AMLOGIC_IONVIDEO is not set
 
 #
 # V4L2 Video Support
@@ -1054,12 +1054,8 @@ CONFIG_TVIN_HDMI=y
 #
 # Amlogic amvecm Driver
 #
-CONFIG_AM_VECM=y
+# CONFIG_AM_VECM is not set
-CONFIG_AML_NAND=y
+# CONFIG_AML_NAND is not set
-CONFIG_AML_NEXT_GEN_NAND=y
-CONFIG_AML_NFTL_NEW=m
-CONFIG_AML_NAND_KEY=y
-# CONFIG_SECURE_NAND is not set
 CONFIG_AM_INPUT=y
 CONFIG_AM_SARADC=y
 CONFIG_MESON_NEW_INPUT_REMOTE=y

projects/Odroid_C2/options

@@ -17,6 +17,7 @@
         # arm1136j-s arm1136jf-s mpcore mpcorenovfp arm1156t2-s
         # arm1176jz-s arm1176jzf-s cortex-a8 cortex-a9 cortex-r4
         # cortex-r4f cortex-m3 cortex-m1 xscale iwmmxt iwmmxt2 ep9312.
+        #
         TARGET_CPU="cortex-a53"
         TARGET_CPU_FLAGS="+crc+fp+simd"
         ;;
@@ -47,6 +48,7 @@
   # default:  default mainline kernel
     LINUX="amlogic-3.14"
 
+
 ################################################################################
 # setup build defaults
 ################################################################################
@@ -127,7 +129,3 @@
 
   # kernel image name
     KERNEL_NAME="KERNEL"
-
-  # set the addon dirs
-    ADDON_PATH="$ADDON_VERSION/$PROJECT/$TARGET_ARCH"
-    ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"

projects/WeTek_Hub/install/updater-script

@@ -33,4 +33,4 @@ write_raw_image(package_extract_file("bootloader.img"), "bootloader");
 
 set_bootloader_env("upgrade_step", "1");
 show_progress(0.100000, 0);
-ui_print("OpenELEC Installed Successfully");
+ui_print("LibreELEC Installed Successfully");

projects/WeTek_Hub/linux/linux.aarch64.conf

@@ -935,13 +935,13 @@ CONFIG_AM_VDEC_MPEG12=y
 CONFIG_AM_VDEC_MPEG4=y
 CONFIG_AM_VDEC_VC1=y
 CONFIG_AM_VDEC_H264=y
-# CONFIG_AM_VDEC_H264MVC is not set
+CONFIG_AM_VDEC_H264MVC=y
 CONFIG_AM_VDEC_H264_4K2K=y
 CONFIG_AM_VDEC_H265=y
 CONFIG_AM_VDEC_VP9=y
 CONFIG_AM_VDEC_MJPEG=y
 CONFIG_AM_ENCODER=y
-# CONFIG_AM_JPEG_ENCODER is not set
+CONFIG_AM_JPEG_ENCODER=y
 CONFIG_AM_PIC_DEC=y
 CONFIG_AM_VDEC_REAL=y
 CONFIG_AM_VDEC_AVS=y
@@ -968,7 +968,7 @@ CONFIG_EFUSE=y
 #
 # key management Support
 #
-# CONFIG_KEY_MANAGE is not set
+CONFIG_KEY_MANAGE=y
 
 #
 # Audio Interface
@@ -978,7 +978,7 @@ CONFIG_AMAUDIO=y
 #
 # Amlogic Audio Interface V2
 #
-CONFIG_AMAUDIO2=y
+# CONFIG_AMAUDIO2 is not set
 
 #
 # Audio dsp process
@@ -990,7 +990,7 @@ CONFIG_AML_AUDIO_DSP=y
 #
 CONFIG_POST_PROCESS_MANAGER=y
 CONFIG_POST_PROCESS_MANAGER_PPSCALER=y
-# CONFIG_POST_PROCESS_MANAGER_3D_PROCESS is not set
+CONFIG_POST_PROCESS_MANAGER_3D_PROCESS=y
 
 #
 # Amlogic Wifi Driver
@@ -1097,7 +1097,7 @@ CONFIG_AML_CODEC_MM=y
 #
 # CONFIG_AMLOGIC_SPICC_MASTER is not set
 # CONFIG_AMLOGIC_JTAG is not set
-# CONFIG_AMLOGIC_CPU_INFO is not set
+CONFIG_AMLOGIC_CPU_INFO=y
 
 #
 # defend img file update support

projects/WeTek_Play_2/initramfs/platform_init

@@ -1,5 +1,5 @@
 #!/bin/sh
-###############################################################################
+################################################################################
 #      This file is part of LibreELEC - https://LibreELEC.tv
 #      Copyright (C) 2016 Team LibreELEC
 #
@@ -17,7 +17,7 @@
 #  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-hdmimode=720p
+hdmimode=1080p60hz
 
 # Parse command line arguments
 for arg in $(cat /proc/cmdline); do
@@ -28,8 +28,6 @@ for arg in $(cat /proc/cmdline); do
   esac
 done
 
-# echo "$hdmimode" > /sys/class/display/mode
-
 # Enable first framebuffer
 echo 0 > /sys/class/graphics/fb0/blank
 
@@ -38,18 +36,31 @@ echo 1 > /sys/class/graphics/fb1/blank
 
 # Disable framebuffer scaling
 echo 0 > /sys/class/graphics/fb0/free_scale
+echo 0 > /sys/class/graphics/fb1/free_scale
 
 # set initial video state
 echo 1 > /sys/class/video/disable_video
 
 # Set framebuffer geometry to match the resolution
-case "$hdmimode" in
+case $hdmimode in
-  720*)
+  480*)            X=720  Y=480  ;;
-    fbset -fb /dev/fb0 -g 1280 720 1920 2160 32
+  576*)            X=720  Y=576  ;;
-    ;;
+  720p*)           X=1280 Y=720  ;;
-  1080*)
+  *)               X=1920 Y=1080 ;;
-    fbset -fb /dev/fb0 -g 1920 1080 1920 2160 32
+esac
-    ;;
+
+fbset -fb /dev/fb0 -g $X $Y 1920 2160 32
+fbset -fb /dev/fb1 -g 32 32 32 32 32
+
+# Enable scaling for 4K output
+case $hdmimode in
+  4k*|smpte*|2160*)
+    echo 0 0 1919 1079 > /sys/class/graphics/fb0/free_scale_axis
+    echo 0 0 3839 2159 > /sys/class/graphics/fb0/window_axis
+    echo 1920 > /sys/class/graphics/fb0/scale_width
+    echo 1080 > /sys/class/graphics/fb0/scale_height
+    echo 0x10001 > /sys/class/graphics/fb0/free_scale
+  ;;
 esac
 
 # Include deinterlacer into default VFM map

projects/WeTek_Play_2/linux/linux.aarch64.conf

@@ -263,7 +263,7 @@ CONFIG_FREEZER=y
 #
 # Platform selection
 #
-CONFIG_ARCH_VEXPRESS=y
+# CONFIG_ARCH_VEXPRESS is not set
 # CONFIG_ARCH_XGENE is not set
 # CONFIG_ARCH_MESON64_ODROIDC2 is not set
 
@@ -935,13 +935,13 @@ CONFIG_AM_VDEC_MPEG12=y
 CONFIG_AM_VDEC_MPEG4=y
 CONFIG_AM_VDEC_VC1=y
 CONFIG_AM_VDEC_H264=y
-# CONFIG_AM_VDEC_H264MVC is not set
+CONFIG_AM_VDEC_H264MVC=y
 CONFIG_AM_VDEC_H264_4K2K=y
 CONFIG_AM_VDEC_H265=y
 CONFIG_AM_VDEC_VP9=y
 CONFIG_AM_VDEC_MJPEG=y
 CONFIG_AM_ENCODER=y
-# CONFIG_AM_JPEG_ENCODER is not set
+CONFIG_AM_JPEG_ENCODER=y
 CONFIG_AM_PIC_DEC=y
 CONFIG_AM_VDEC_REAL=y
 CONFIG_AM_VDEC_AVS=y
@@ -978,7 +978,7 @@ CONFIG_AMAUDIO=y
 #
 # Amlogic Audio Interface V2
 #
-CONFIG_AMAUDIO2=y
+# CONFIG_AMAUDIO2 is not set
 
 #
 # Audio dsp process
@@ -990,7 +990,7 @@ CONFIG_AML_AUDIO_DSP=y
 #
 CONFIG_POST_PROCESS_MANAGER=y
 CONFIG_POST_PROCESS_MANAGER_PPSCALER=y
-# CONFIG_POST_PROCESS_MANAGER_3D_PROCESS is not set
+CONFIG_POST_PROCESS_MANAGER_3D_PROCESS=y
 
 #
 # Amlogic Wifi Driver
@@ -1089,7 +1089,7 @@ CONFIG_AML_CODEC_MM=y
 #
 # CONFIG_AMLOGIC_SPICC_MASTER is not set
 # CONFIG_AMLOGIC_JTAG is not set
-# CONFIG_AMLOGIC_CPU_INFO is not set
+CONFIG_AMLOGIC_CPU_INFO=y
 
 #
 # defend img file update support
@@ -3201,14 +3201,11 @@ CONFIG_LIRC_IGORPLUGUSB=m
 # Android
 #
 CONFIG_ANDROID=y
-CONFIG_ANDROID_BINDER_IPC=y
+# CONFIG_ANDROID_BINDER_IPC is not set
-# CONFIG_ANDROID_BINDER_IPC_32BIT is not set
+# CONFIG_ASHMEM is not set
-CONFIG_ASHMEM=y
+# CONFIG_ANDROID_LOGGER is not set
-CONFIG_ANDROID_LOGGER=y
+# CONFIG_ANDROID_TIMED_OUTPUT is not set
-CONFIG_ANDROID_TIMED_OUTPUT=y
+# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
-# CONFIG_ANDROID_TIMED_GPIO is not set
-CONFIG_ANDROID_LOW_MEMORY_KILLER=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
 # CONFIG_ANDROID_INTF_ALARM_DEV is not set
 CONFIG_SYNC=y
 # CONFIG_SW_SYNC is not set
@@ -3529,7 +3526,7 @@ CONFIG_NLS_UTF8=y
 CONFIG_PRINTK_TIME=y
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 # CONFIG_BOOT_PRINTK_DELAY is not set
-CONFIG_DYNAMIC_DEBUG=y
+# CONFIG_DYNAMIC_DEBUG is not set
 
 #
 # Compile-time checks and compiler options

projects/WeTek_Play_2/options

@@ -19,6 +19,7 @@
         # cortex-r4f cortex-m3 cortex-m1 xscale iwmmxt iwmmxt2 ep9312.
         #
         TARGET_CPU="cortex-a53"
+        TARGET_CPU_FLAGS="+crc+fp+simd"
         ;;
     esac