From 21125a0f40847060a390c5cb30ae2d1812924bda Mon Sep 17 00:00:00 2001 From: user131 Date: Mon, 7 Aug 2023 12:29:22 +0200 Subject: [PATCH 1/4] opendingux: add the xgame devicetree and update the ABT panel on jz-6.1 Signed-off-by: user131 --- configs/od_gcw0_defconfig | 2 +- configs/od_lepus_defconfig | 4 ++-- configs/od_rs90_defconfig | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/od_gcw0_defconfig b/configs/od_gcw0_defconfig index 0f3694ac8b4..ef58c674818 100644 --- a/configs/od_gcw0_defconfig +++ b/configs/od_gcw0_defconfig @@ -35,7 +35,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/opendingux/create-opk.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="gcw0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/OpenDingux/linux/archive/469a97aaf7ed.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/citral23/linux-1/archive/665c33c8c1b0.tar.gz" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/opendingux/gcw0/linux_defconfig" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y diff --git a/configs/od_lepus_defconfig b/configs/od_lepus_defconfig index e4ffa5ccde1..f6dcfb7b88b 100644 --- a/configs/od_lepus_defconfig +++ b/configs/od_lepus_defconfig @@ -35,14 +35,14 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/opendingux/create-opk.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="lepus" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/OpenDingux/linux/archive/469a97aaf7ed.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/citral23/linux-1/archive/665c33c8c1b0.tar.gz" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/opendingux/lepus/linux_defconfig" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_ZSTD=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="uzImage.bin" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="ingenic/gopher2 ingenic/gopher2b ingenic/ldkv ingenic/ldkh ingenic/papk3plus ingenic/papk3s ingenic/rg300 ingenic/rs07 ingenic/rs97" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="ingenic/gopher2 ingenic/gopher2b ingenic/ldkv ingenic/ldkh ingenic/papk3plus ingenic/papk3s ingenic/rg300 ingenic/rs07 ingenic/rs97 ingenic/xgame" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_LINUX_TOOLS_GPIO=y diff --git a/configs/od_rs90_defconfig b/configs/od_rs90_defconfig index d1c0227eda0..e6fd5034e6d 100644 --- a/configs/od_rs90_defconfig +++ b/configs/od_rs90_defconfig @@ -31,7 +31,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/opendingux/create-opk.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="rs90" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/OpenDingux/linux/archive/469a97aaf7ed.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/citral23/linux-1/archive/665c33c8c1b0.tar.gz" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/opendingux/rs90/linux_defconfig" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y From 90293fdd81841f51fc45697ecd3f9835d1492982 Mon Sep 17 00:00:00 2001 From: user131 Date: Mon, 7 Aug 2023 16:32:48 +0200 Subject: [PATCH 2/4] opendingux: bump ubiboot and odbootd to add specific RG99 ram timings Signed-off-by: user131 Signed-off-by: Christophe Branchereau --- board/opendingux/package/odbootd/odbootd.hash | 2 +- board/opendingux/package/odbootd/odbootd.mk | 4 ++-- board/opendingux/package/ubiboot/ubiboot.hash | 2 +- board/opendingux/package/ubiboot/ubiboot.mk | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/board/opendingux/package/odbootd/odbootd.hash b/board/opendingux/package/odbootd/odbootd.hash index 9e2d6c762db..13ec06eb6a2 100644 --- a/board/opendingux/package/odbootd/odbootd.hash +++ b/board/opendingux/package/odbootd/odbootd.hash @@ -1 +1 @@ -sha256 0e2a64c1547ce4597ac2a357332c6e34636bbf4a0eea4432e8777d175034b7a3 odbootd-a735638.tar.gz +sha256 724009c9e08e00f29441c067cd725efd29de430ef740b5ca5e2b92346a71da78 odbootd-b0b0914.tar.gz diff --git a/board/opendingux/package/odbootd/odbootd.mk b/board/opendingux/package/odbootd/odbootd.mk index 97de1286110..feac5d3d22a 100644 --- a/board/opendingux/package/odbootd/odbootd.mk +++ b/board/opendingux/package/odbootd/odbootd.mk @@ -4,8 +4,8 @@ # ################################################################################ -ODBOOTD_VERSION = a735638 -ODBOOTD_SITE = $(call github,opendingux,odbootd,$(ODBOOTD_VERSION)) +ODBOOTD_VERSION = b0b0914 +ODBOOTD_SITE = $(call github,citral23,odbootd,$(ODBOOTD_VERSION)) ODBOOTD_CONF_OPTS = -DWITH_ODBOOT_CLIENT:BOOL=OFF diff --git a/board/opendingux/package/ubiboot/ubiboot.hash b/board/opendingux/package/ubiboot/ubiboot.hash index 7d592c0be5a..25115b366c9 100644 --- a/board/opendingux/package/ubiboot/ubiboot.hash +++ b/board/opendingux/package/ubiboot/ubiboot.hash @@ -1 +1 @@ -sha256 444eca2671e0b9a890706e3fce88305526a67c75cf8fb29adcc7d56684129205 ubiboot-dc54030.tar.gz +sha256 78ce7523bd97193453a6160c555198c1de6a144a5551434e7da37262edb76b3e ubiboot-c3f4917.tar.gz diff --git a/board/opendingux/package/ubiboot/ubiboot.mk b/board/opendingux/package/ubiboot/ubiboot.mk index bb477c72ed4..7f5ee2d2d8c 100644 --- a/board/opendingux/package/ubiboot/ubiboot.mk +++ b/board/opendingux/package/ubiboot/ubiboot.mk @@ -4,8 +4,8 @@ # ################################################################################ -UBIBOOT_VERSION = dc54030 -UBIBOOT_SITE = $(call github,pcercuei,UBIBoot,$(UBIBOOT_VERSION)) +UBIBOOT_VERSION = c3f4917 +UBIBOOT_SITE = $(call github,citral23,UBIBoot,$(UBIBOOT_VERSION)) UBIBOOT_BOARD_NAME = $(call qstrip,$(BR2_PACKAGE_UBIBOOT_BOARDNAME)) UBIBOOT_LICENSE = GPLv2+ From 1b38ce3fcd3d6be81486277c6720f09357d2bbff Mon Sep 17 00:00:00 2001 From: Christophe Branchereau Date: Mon, 7 Aug 2023 20:00:44 +0200 Subject: [PATCH 3/4] Revert "RS90: fix DAC unmuting" This reverts commit 41ffaf53e08af98c70da85bbbd7aa324ab3ba32d. --- board/opendingux/rs90/overlay/etc/init.d/S49alsa-hack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/opendingux/rs90/overlay/etc/init.d/S49alsa-hack.sh b/board/opendingux/rs90/overlay/etc/init.d/S49alsa-hack.sh index 9f3dc374d2a..ffa8c972870 100755 --- a/board/opendingux/rs90/overlay/etc/init.d/S49alsa-hack.sh +++ b/board/opendingux/rs90/overlay/etc/init.d/S49alsa-hack.sh @@ -9,4 +9,4 @@ psplash_write "Setup ALSA hack..." /usr/bin/aplay /usr/share/alsa/dummy.wav >/dev/null 2>&1 # Unmute DAC -amixer -q -D hw:rs90audio cset "name='DAC Playback Switch'" on +amixer -q -D hw:rs90audio cset "name='Master Playback Switch'" on From 5578ec303d3129f7e304967e2980d1ee655cb749 Mon Sep 17 00:00:00 2001 From: Christophe Branchereau Date: Tue, 8 Aug 2023 17:18:17 +0200 Subject: [PATCH 4/4] rs90: kernel update to add a 10ms debounce interval to the rg99 dpad Signed-off-by: Christophe Branchereau --- configs/od_rs90_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/od_rs90_defconfig b/configs/od_rs90_defconfig index e6fd5034e6d..0d14019e2dd 100644 --- a/configs/od_rs90_defconfig +++ b/configs/od_rs90_defconfig @@ -31,7 +31,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/opendingux/create-opk.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="rs90" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/citral23/linux-1/archive/665c33c8c1b0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/citral23/linux-1/archive/d943f71bba43.tar.gz" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/opendingux/rs90/linux_defconfig" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y