Improving compatibility with the 351 series.

2022-03-28 16:06:00 -04:00 · 2022-03-28 16:06:00 -04:00 · 397622d141
commit 397622d141
parent 2a62f77698
11 changed files with 40 additions and 24 deletions
--- a/packages/graphics/imagemagick/package.mk
+++ b/packages/graphics/imagemagick/package.mk
@ -1,12 +1,12 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+# Copyright (C) 2022-present Fewtarius

 PKG_NAME="imagemagick"
-PKG_VERSION="7.0.10-62"
-#PKG_SHA256=""
+PKG_VERSION="4c0b7d2"
 PKG_LICENSE="http://www.imagemagick.org/script/license.php"
-PKG_SITE="http://www.imagemagick.org/"
-PKG_URL="https://github.com/ImageMagick/ImageMagick/archive/$PKG_VERSION.tar.gz"
+PKG_SITE="https://github.com/ImageMagick/ImageMagick"
+PKG_URL="${PKG_SITE}.git"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Software suite to create, edit, compose, or convert bitmap images"

@ -18,5 +18,6 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-openmp \
                           --with-x=no"

 makeinstall_target() {
-  make install DESTDIR=$INSTALL $PKG_MAKEINSTALL_OPTS_TARGET
+  make install DESTDIR=${INSTALL} ${PKG_MAKEINSTALL_OPTS_TARGET}
+  rm ${INSTALL}/usr/bin/*config
 }
--- a/packages/jelos/sources/scripts/show_splash
+++ b/packages/jelos/sources/scripts/show_splash
@ -25,7 +25,7 @@ fi

 if [[ -f "/storage/.config/system/configs/novideo" ]] && [[ ${VIDEO} != "1" ]]
 then
-  /usr/bin/ply-image "${SPLASH}" > /dev/null 2>&1
+  convert "${SPLASH}" -background black -gravity center bgra:/dev/fb0 > /dev/null 2>&1
 else
  # Show intro video
  SPLASH=${VIDEOSPLASH}
--- a/projects/Rockchip/devices/RG351MP/device.config
+++ b/projects/Rockchip/devices/RG351MP/device.config
@ -11,6 +11,10 @@ DEVICE_CONTROLLER_DEV="/dev/input/event2"
 DEVICE_BRIGHTNESS="70"
 DISPLAY_ROTATED=false

+# Kernel Modules
+DEVICE_INTERNAL_WIFI=false
+# DEVICE_WIFI_MODULE=""
+
 # GPIOS
 DEVICE_WIFI="5"
 DEVICE_LED="77"
--- a/projects/Rockchip/devices/RG351MP/linux/linux.aarch64.conf
+++ b/projects/Rockchip/devices/RG351MP/linux/linux.aarch64.conf
@ -2596,6 +2596,7 @@ CONFIG_FB_SYS_COPYAREA=y
 CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=y
+CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
@ -3573,11 +3574,11 @@ CONFIG_TSL2583=y
 # CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
 # CONFIG_SYNC is not set
 # CONFIG_ION is not set
-CONFIG_FIQ_DEBUGGER=y
-CONFIG_FIQ_DEBUGGER_NO_SLEEP=y
+# CONFIG_FIQ_DEBUGGER is not set
+# CONFIG_FIQ_DEBUGGER_NO_SLEEP is not set
 # CONFIG_FIQ_DEBUGGER_WAKEUP_IRQ_ALWAYS_ON is not set
-CONFIG_FIQ_DEBUGGER_CONSOLE=y
-CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y
+# CONFIG_FIQ_DEBUGGER_CONSOLE is not set
+# CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE is not set
 # CONFIG_FIQ_DEBUGGER_TRUST_ZONE is not set
 # CONFIG_FIQ_DEBUGGER_UART_OVERLAY is not set
 # CONFIG_FIQ_WATCHDOG is not set
--- a/projects/Rockchip/devices/RG351MP/options
+++ b/projects/Rockchip/devices/RG351MP/options
@ -10,7 +10,7 @@
        TARGET_PATCH_ARCH="aarch64"
        TARGET_FLOAT="hard"
        TARGET_CPU="cortex-a35"
-		TARGET_CPU_FLAGS="+crc+fp+simd"
+	TARGET_CPU_FLAGS="+crc+fp+simd"
        TARGET_FPU="fp-armv8"
        TARGET_FEATURES="64bit"
        ;;
@ -52,7 +52,7 @@
    HW_CPU="Rockchip RK3326"

  # kernel serial console
-    EXTRA_CMDLINE="quiet console=ttyFIQ0 console=tty0 net.iframes=0 fbcon=rotate:0 ssh consoleblank=0 systemd.show_status=0 loglevel=0 panic=20"
+    EXTRA_CMDLINE="quiet console=tty0 ssh consoleblank=0 systemd.show_status=0 loglevel=0 panic=20"
    
  # additional packages to install
  # ADDITIONAL_PACKAGES=""
--- a/projects/Rockchip/devices/RG351P/device.config
+++ b/projects/Rockchip/devices/RG351P/device.config
@ -11,6 +11,10 @@ DEVICE_CONTROLLER_DEV="/dev/input/event3"
 DEVICE_BRIGHTNESS="70"
 DISPLAY_ROTATED=true

+# Kernel Modules
+DEVICE_INTERNAL_WIFI=true
+DEVICE_WIFI_MODULE="MT7601U"
+
 # GPIOS
 DEVICE_WIFI="5"
 DEVICE_LED="77"
--- a/projects/Rockchip/devices/RG351P/linux/linux.aarch64.conf
+++ b/projects/Rockchip/devices/RG351P/linux/linux.aarch64.conf
@ -2596,6 +2596,7 @@ CONFIG_FB_SYS_COPYAREA=y
 CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=y
+CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
@ -3573,11 +3574,11 @@ CONFIG_TSL2583=y
 # CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
 # CONFIG_SYNC is not set
 # CONFIG_ION is not set
-CONFIG_FIQ_DEBUGGER=y
-CONFIG_FIQ_DEBUGGER_NO_SLEEP=y
+# CONFIG_FIQ_DEBUGGER is not set
+# CONFIG_FIQ_DEBUGGER_NO_SLEEP is not set
 # CONFIG_FIQ_DEBUGGER_WAKEUP_IRQ_ALWAYS_ON is not set
-CONFIG_FIQ_DEBUGGER_CONSOLE=y
-CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y
+# CONFIG_FIQ_DEBUGGER_CONSOLE is not set
+# CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE is not set
 # CONFIG_FIQ_DEBUGGER_TRUST_ZONE is not set
 # CONFIG_FIQ_DEBUGGER_UART_OVERLAY is not set
 # CONFIG_FIQ_WATCHDOG is not set
--- a/projects/Rockchip/devices/RG351P/options
+++ b/projects/Rockchip/devices/RG351P/options
@ -10,7 +10,7 @@
        TARGET_PATCH_ARCH="aarch64"
        TARGET_FLOAT="hard"
        TARGET_CPU="cortex-a35"
-		TARGET_CPU_FLAGS="+crc+fp+simd"
+	TARGET_CPU_FLAGS="+crc+fp+simd"
        TARGET_FPU="fp-armv8"
        TARGET_FEATURES="64bit"
        ;;
@ -52,7 +52,7 @@
    HW_CPU="Rockchip RK3326"

  # kernel serial console
-    EXTRA_CMDLINE="quiet console=ttyFIQ0 console=tty0 net.iframes=0 fbcon=rotate:3 ssh consoleblank=0 systemd.show_status=0 loglevel=0 panic=20"
+    EXTRA_CMDLINE="quiet console=tty0 fbcon=rotate:3 ssh consoleblank=0 systemd.show_status=0 loglevel=0 panic=20"
    
  # additional packages to install
  # ADDITIONAL_PACKAGES=""
--- a/projects/Rockchip/devices/RG351V/device.config
+++ b/projects/Rockchip/devices/RG351V/device.config
@ -11,6 +11,10 @@ DEVICE_CONTROLLER_DEV="/dev/input/event3"
 DEVICE_BRIGHTNESS="70"
 DISPLAY_ROTATED=false

+# Kernel Modules
+DEVICE_INTERNAL_WIFI=true
+DEVICE_WIFI_MODULE="MT7601U"
+
 # GPIOS
 DEVICE_WIFI="5"
 DEVICE_LED="77"
--- a/projects/Rockchip/devices/RG351V/linux/linux.aarch64.conf
+++ b/projects/Rockchip/devices/RG351V/linux/linux.aarch64.conf
@ -2596,6 +2596,7 @@ CONFIG_FB_SYS_COPYAREA=y
 CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=y
+CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
@ -3573,11 +3574,11 @@ CONFIG_TSL2583=y
 # CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
 # CONFIG_SYNC is not set
 # CONFIG_ION is not set
-CONFIG_FIQ_DEBUGGER=y
-CONFIG_FIQ_DEBUGGER_NO_SLEEP=y
+# CONFIG_FIQ_DEBUGGER is not set
+# CONFIG_FIQ_DEBUGGER_NO_SLEEP is not set
 # CONFIG_FIQ_DEBUGGER_WAKEUP_IRQ_ALWAYS_ON is not set
-CONFIG_FIQ_DEBUGGER_CONSOLE=y
-CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y
+# CONFIG_FIQ_DEBUGGER_CONSOLE is not set
+# CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE is not set
 # CONFIG_FIQ_DEBUGGER_TRUST_ZONE is not set
 # CONFIG_FIQ_DEBUGGER_UART_OVERLAY is not set
 # CONFIG_FIQ_WATCHDOG is not set
--- a/projects/Rockchip/devices/RG351V/options
+++ b/projects/Rockchip/devices/RG351V/options
@ -10,7 +10,7 @@
        TARGET_PATCH_ARCH="aarch64"
        TARGET_FLOAT="hard"
        TARGET_CPU="cortex-a35"
-		TARGET_CPU_FLAGS="+crc+fp+simd"
+	TARGET_CPU_FLAGS="+crc+fp+simd"
        TARGET_FPU="fp-armv8"
        TARGET_FEATURES="64bit"
        ;;
@ -52,7 +52,7 @@
    HW_CPU="Rockchip RK3326"

  # kernel serial console
-    EXTRA_CMDLINE="quiet console=ttyFIQ0 console=tty0 net.iframes=0 fbcon=rotate:0 ssh consoleblank=0 systemd.show_status=0 loglevel=0 panic=20"
+    EXTRA_CMDLINE="quiet console=tty0 ssh consoleblank=0 systemd.show_status=0 loglevel=0 panic=20"
    
  # additional packages to install
  # ADDITIONAL_PACKAGES=""