wbrawner/distribution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Amlogic: rename RGB10 Max 3 to RGB10 Max 3 Pro

Browse source
This commit is contained in:
adamg 2024-01-28 15:14:49 +00:00
parent 2c2cd9cd8f
commit 5b9f168293
8 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/apps/portmaster/scripts/portmaster_compatibility.sh
View file

@ -7,7 +7,7 @@
if [[ "${UI_SERVICE}" =~ weston.service ]]; then
case "${QUIRK_DEVICE}" in
"Hardkernel ODROID-GO-Ultra"|"Powkiddy RGB10 MAX 3"|"Hardkernel ODROID-N2*")
"Hardkernel ODROID-GO-Ultra"|"Powkiddy RGB10 MAX 3 Pro"|"Hardkernel ODROID-N2*")
#Fixing ports on S922X, exclude FNA games
for port in /storage/roms/ports/*.sh; do
if ! grep -q FNA "$port"; then

2
packages/apps/portmaster/sources/control.txt
View file

@ -30,7 +30,7 @@ case "${QUIRK_DEVICE}" in
lres="N"
sticks="2"
;;
"Hardkernel ODROID-GO-Ultra"|"Powkiddy RGB10 MAX 3")
"Hardkernel ODROID-GO-Ultra"|"Powkiddy RGB10 MAX 3 Pro")
profile="s922x"
lres="N"
sticks="2"

0
packages/hardware/quirks/devices/Powkiddy RGB10 MAX 3/050-audio_path → packages/hardware/quirks/devices/Powkiddy RGB10 MAX 3 Pro/050-audio_path
View file

0
packages/hardware/quirks/devices/Powkiddy RGB10 MAX 3/050-game_configs → packages/hardware/quirks/devices/Powkiddy RGB10 MAX 3 Pro/050-game_configs
View file

2
projects/Amlogic/bootloader/mkimage
View file

@ -44,7 +44,7 @@ mkimage_gou_extras() {
case "${SUBDEVICE}" in
Odroid_GOU)
DTB=("meson-g12b-odroid-go-ultra" "meson-g12b-powkiddy-rgb10-max-3")
DTB=("meson-g12b-odroid-go-ultra" "meson-g12b-powkiddy-rgb10-max-3-pro")
mkimage_dtb
mkimage_bootini
mkimage_gou_extras

3
projects/Amlogic/bootloader/update.sh
View file

@ -78,6 +78,9 @@ if [ -n "$DT_ID" ]; then
esac
fi
# Rename RGB10 Max 3 device tree after buildroot changes, remove this in the future
[ -f $BOOT_ROOT/meson-g12b-powkiddy-rgb10-max-3.dtb ] && mv $BOOT_ROOT/meson-g12b-powkiddy-rgb10-max-3.dtb $BOOT_ROOT/meson-g12b-powkiddy-rgb10-max-3-pro.dtb
for all_dtb in $BOOT_ROOT/*.dtb; do
dtb=$(basename $all_dtb)
if [ -f $SYSTEM_ROOT/usr/share/bootloader/$dtb ]; then

10
projects/Amlogic/packages/linux/patches/S922X/001.03-Add-Powkiddy-RGB10-MAX-3-device-tree.patch → projects/Amlogic/packages/linux/patches/S922X/001.03-Add-Powkiddy-RGB10-MAX-3-Pro-device-tree.patch
View file

@ -1,8 +1,8 @@
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3.dts
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3-pro.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3-pro.dts
new file mode 100644
index 000000000000..df5dde6eec79
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3-pro.dts
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
@ -14,8 +14,8 @@ index 000000000000..df5dde6eec79
+#include "meson-g12b-odroid-go-ultra.dts"
+
+/ {
+ compatible = "powkiddy,rgb10-max-3", "amlogic,a311d", "amlogic,g12b";
+ model = "Powkiddy RGB10 MAX 3";
+ compatible = "powkiddy,rgb10-max-3-pro", "amlogic,a311d", "amlogic,g12b";
+ model = "Powkiddy RGB10 MAX 3 Pro";
+
+ /delete-node/ hp-detect-switch;
+
@ -40,6 +40,6 @@ index 000000000000..df5dde6eec79
+ };
+
+ sound {
+ model = "RGB10-MAX3";
+ model = "RGB10-MAX-3-PRO";
+ };
+};

2
projects/Amlogic/packages/u-boot-Odroid_GOU/patches/001-multiboot.patch
View file

@ -27,7 +27,7 @@ index d08f0aac00..a9c6a13279 100755
+ setenv("fdtfile", "meson-g12b-odroid-go-ultra.dtb");
+ } else {
+ setenv("variant", "max3");
+ setenv("fdtfile", "meson-g12b-powkiddy-rgb10-max-3.dtb");
+ setenv("fdtfile", "meson-g12b-powkiddy-rgb10-max-3-pro.dtb");
+ }
+
+ // board_set_dtbfile("meson64_odroid%s.dtb");