Merge pull request #2447 from fewtarius/mainline-3566
Mainline 3566 merge from dev
This commit is contained in:
fewtarius
GitHub
commit
21febb5b0d
12 changed files with 260 additions and 20 deletions
|
|
@ -10,5 +10,5 @@ melonds-sa #Broken OpenGL renderer upstream
|
|||
mupen64plus-sa-ui-console #Causes segfaults
|
||||
nanoboyadvance-sa #SDL version removed after this commit
|
||||
freechaf-lr #build issue, revisit.
|
||||
pcsx_rearmed-lr #pins version as new releases have artifacting issues.
|
||||
kronos-sa #using the release version of kronos had better results.
|
||||
retroarch #pinning to release versions for stability.
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
|
||||
|
||||
PKG_NAME="pcsx_rearmed-lr"
|
||||
PKG_VERSION="e34ef5a"
|
||||
PKG_VERSION="ff3890db8ef473ee5eae6a7120ee39d761a86620"
|
||||
PKG_ARCH="arm aarch64"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://github.com/libretro/pcsx_rearmed"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
|
||||
|
||||
PKG_NAME="retroarch"
|
||||
PKG_VERSION="f091b5a9e9475255e5efaded5f95c9750fdfe15e"
|
||||
PKG_VERSION="6c2cc456284fcfa6fa5f94664950926c020d2f7b" # v1.16.0.3
|
||||
PKG_SITE="https://github.com/libretro/RetroArch"
|
||||
PKG_URL="${PKG_SITE}.git"
|
||||
PKG_LICENSE="GPLv3"
|
||||
|
|
|
|||
10
packages/jelos/autostart/081-usbgadget
Executable file
10
packages/jelos/autostart/081-usbgadget
Executable file
|
|
@ -0,0 +1,10 @@
|
|||
#!/bin/sh
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
|
||||
|
||||
if [ -r /storage/.cache/usbgadget/usbgadget.conf ] ; then
|
||||
USB_MODE=$(cat /storage/.cache/usbgadget/usbgadget.conf | cut -d "=" -f2)
|
||||
if [ "${USB_MODE}" = cdc ] ; then
|
||||
/usr/bin/usbgadget start $USB_MODE
|
||||
fi
|
||||
fi
|
||||
|
|
@ -921,10 +921,14 @@ function set_gambatte() {
|
|||
sed -i "/gambatte_gb_colorization =/d" ${GAMBATTECONF}
|
||||
sed -i "/gambatte_gb_internal_palette =/d" ${GAMBATTECONF}
|
||||
fi
|
||||
local RENDERER=$(game_setting renderer.colorization)
|
||||
if [ -n "${RENDERER}" ]
|
||||
local COLORIZATION=$(game_setting renderer.colorization)
|
||||
local TWB1_COLORIZATION=$(game_setting renderer.twb1_colorization)
|
||||
local TWB2_COLORIZATION=$(game_setting renderer.twb2_colorization)
|
||||
local PIXELSHIFT1_COLORIZATION=$(game_setting renderer.pixelshift1_colorization)
|
||||
|
||||
if [ -n "${COLORIZATION}" ]
|
||||
then
|
||||
case ${RENDERER} in
|
||||
case ${COLORIZATION} in
|
||||
0|false|none)
|
||||
echo 'gambatte_gb_colorization = "disabled"' >> ${GAMBATTECONF}
|
||||
;;
|
||||
|
|
@ -932,11 +936,14 @@ function set_gambatte() {
|
|||
echo 'gambatte_gb_colorization = "auto"' >> ${GAMBATTECONF}
|
||||
;;
|
||||
GBC|SGB)
|
||||
echo 'gambatte_gb_colorization = "'${RENDERER}'"' >> ${GAMBATTECONF}
|
||||
echo 'gambatte_gb_colorization = "'${COLORIZATION}'"' >> ${GAMBATTECONF}
|
||||
;;
|
||||
*)
|
||||
echo 'gambatte_gb_colorization = "internal"' >> ${GAMBATTECONF}
|
||||
echo 'gambatte_gb_internal_palette = "'${RENDERER}'"' >> ${GAMBATTECONF}
|
||||
echo 'gambatte_gb_internal_palette = "'${COLORIZATION}'"' >> ${GAMBATTECONF}
|
||||
echo 'gambatte_gb_palette_twb64_1 = "'${TWB1_COLORIZATION}'"' >> ${GAMBATTECONF}
|
||||
echo 'gambatte_gb_palette_twb64_2 = "'${TWB2_COLORIZATION}'"' >> ${GAMBATTECONF}
|
||||
echo 'gambatte_gb_palette_pixelshift_1 = "'${PIXELSHIFT1_COLORIZATION}'"' >> ${GAMBATTECONF}
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
|
|
|||
93
packages/jelos/sources/scripts/usbgadget
Executable file
93
packages/jelos/sources/scripts/usbgadget
Executable file
|
|
@ -0,0 +1,93 @@
|
|||
#!/bin/sh
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
|
||||
|
||||
for mod in usb_f_ecm ; do
|
||||
modprobe -q ${mod}
|
||||
done
|
||||
|
||||
mkdir -p /storage/.cache/usbgadget
|
||||
|
||||
if [ ! -f /storage/.cache/usbgadget/ip_address.conf ] ; then
|
||||
echo "10.1.1.2" > /storage/.cache/usbgadget/ip_address.conf
|
||||
fi
|
||||
|
||||
if [ ! -f /storage/.cache/usbgadget/udhcpd.conf ] ; then
|
||||
echo -e "interface usb0\nstart 10.1.1.1\nend 10.1.1.1\nopt subnet 255.255.255.0\nopt lease 86400\nmax_leases 1\nlease_file /dev/null\nremaining no" >> /storage/.cache/usbgadget/udhcpd.conf
|
||||
fi
|
||||
|
||||
VENDOR=JELOS
|
||||
MACHINE=$(cat /etc/hostname)
|
||||
UDC_NAME=$(ls -1 /sys/class/udc |head -n1)
|
||||
IP=$(cat /storage/.cache/usbgadget/ip_address.conf)
|
||||
|
||||
usb_disable() {
|
||||
echo "" > /sys/kernel/config/usb_gadget/gadget/UDC
|
||||
echo "USB_MODE=disabled" > /storage/.cache/usbgadget/usbgadget.conf
|
||||
}
|
||||
|
||||
usb_start() {
|
||||
if [ -r /storage/.cache/usbgadget/usbgadget.conf ] ; then
|
||||
. /storage/.cache/usbgadget/usbgadget.conf
|
||||
fi
|
||||
|
||||
if [ "$1" ] ; then
|
||||
USB_MODE=$1
|
||||
fi
|
||||
|
||||
cd /sys/kernel/config/usb_gadget
|
||||
mkdir gadget \
|
||||
gadget/strings/0x409 \
|
||||
gadget/configs/c.1 \
|
||||
gadget/configs/c.1/strings/0x409 \
|
||||
gadget/functions/ecm.usb0
|
||||
|
||||
echo $VENDOR > gadget/strings/0x409/manufacturer
|
||||
echo $MACHINE > gadget/strings/0x409/product
|
||||
|
||||
if [ "${USB_MODE}" = cdc ] ; then
|
||||
echo cdc > gadget/configs/c.1/strings/0x409/configuration
|
||||
echo 0x1d6b > gadget/idVendor
|
||||
echo 0x104 > gadget/idProduct
|
||||
ln -s gadget/functions/ecm.usb0 gadget/configs/c.1
|
||||
echo "${UDC_NAME}" > /sys/kernel/config/usb_gadget/gadget/UDC
|
||||
ifconfig usb0 $IP up
|
||||
/usr/sbin/udhcpd -S /storage/.cache/usbgadget/udhcpd.conf
|
||||
fi
|
||||
|
||||
echo "USB_MODE=$(cat gadget/configs/c.1/strings/0x409/configuration)" > /storage/.cache/usbgadget/usbgadget.conf
|
||||
}
|
||||
|
||||
usb_stop() {
|
||||
(
|
||||
cd /sys/kernel/config/usb_gadget
|
||||
|
||||
usb_disable
|
||||
|
||||
rm -f gadget/configs/c.1/ecm.usb0 \
|
||||
|
||||
rmdir gadget/configs/c.1/strings/0x409 \
|
||||
gadget/configs/c.1 \
|
||||
gadget/functions/ecm.usb0 \
|
||||
gadget/strings/0x409 \
|
||||
gadget
|
||||
|
||||
killall udhcpd
|
||||
) >/dev/null 2>&1
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
usb_start $2
|
||||
;;
|
||||
stop)
|
||||
usb_stop
|
||||
;;
|
||||
restart)
|
||||
usb_stop
|
||||
usb_start $2
|
||||
;;
|
||||
*)
|
||||
echo "Usage: usbgadget [start|stop|restart]"
|
||||
;;
|
||||
esac
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
PKG_NAME="linux"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_VERSION="6.6.2"
|
||||
PKG_VERSION="6.6.3"
|
||||
PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
PKG_SITE="http://www.kernel.org"
|
||||
PKG_DEPENDS_HOST="ccache:host rsync:host openssl:host"
|
||||
|
|
|
|||
|
|
@ -11,14 +11,16 @@ PKG_TOOLCHAIN="manual"
|
|||
|
||||
case ${TARGET_ARCH} in
|
||||
aarch64)
|
||||
TS_ARCH="arm64"
|
||||
TS_ARCH="_arm64"
|
||||
PKG_SHA256="a7c9e801f43c04290481c2f6b0baad6fcaa82db3149fac232b2601115dd65db7"
|
||||
;;
|
||||
x86_64)
|
||||
TS_ARCH="amd64"
|
||||
TS_ARCH="_amd64"
|
||||
PKG_SHA256="e9375a321faaba03c93e006f40318eb986937658e09287cdf0117b9e28ab8fbe"
|
||||
;;
|
||||
esac
|
||||
|
||||
PKG_URL="https://pkgs.tailscale.com/stable/tailscale_${PKG_VERSION}_${TS_ARCH}.tgz"
|
||||
PKG_URL="https://pkgs.tailscale.com/stable/tailscale_${PKG_VERSION}${TS_ARCH}.tgz"
|
||||
|
||||
# Don't wildcard (X55)
|
||||
case ${DEVICE} in
|
||||
|
|
@ -29,7 +31,7 @@ esac
|
|||
|
||||
pre_unpack() {
|
||||
mkdir -p ${PKG_BUILD}
|
||||
tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tgz -C ${PKG_BUILD}
|
||||
tar --strip-components=1 -xf $SOURCES/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tgz -C ${PKG_BUILD} tailscale_${PKG_VERSION}${TS_ARCH}
|
||||
}
|
||||
|
||||
makeinstall_target() {
|
||||
|
|
|
|||
|
|
@ -1006,7 +1006,7 @@ CONFIG_VCONFIG=y
|
|||
# CONFIG_FEATURE_WGET_OPENSSL is not set
|
||||
CONFIG_WHOIS=y
|
||||
# CONFIG_ZCIP is not set
|
||||
# CONFIG_UDHCPD is not set
|
||||
CONFIG_UDHCPD=y
|
||||
# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
|
||||
# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
|
||||
CONFIG_DHCPD_LEASES_FILE=""
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
|
||||
|
||||
PKG_NAME="emulationstation"
|
||||
PKG_VERSION="773c2f6"
|
||||
PKG_VERSION="ee0516ee5934c62c268ad4e5195389b421aba45c"
|
||||
PKG_GIT_CLONE_BRANCH="main"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
|
||||
new file mode 100644
|
||||
index 000000000000..d0a7ba2c2bd4
|
||||
index 000000000000..f42ebb59a59c
|
||||
--- /dev/null
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
|
||||
@@ -0,0 +1,935 @@
|
||||
@@ -0,0 +1,1001 @@
|
||||
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||
+/*
|
||||
+ * Copyright (c) 2022 Neil Armstrong <narmstrong@kernel.org>
|
||||
|
|
@ -11,7 +11,7 @@ index 000000000000..d0a7ba2c2bd4
|
|||
+
|
||||
+/dts-v1/;
|
||||
+
|
||||
+#include "meson-g12b-s922x.dtsi"
|
||||
+#include "meson-g12b-a311d.dtsi"
|
||||
+#include <dt-bindings/input/input.h>
|
||||
+#include <dt-bindings/leds/common.h>
|
||||
+#include <dt-bindings/gpio/meson-g12a-gpio.h>
|
||||
|
|
@ -361,6 +361,72 @@ index 000000000000..d0a7ba2c2bd4
|
|||
+ clock-latency = <50000>;
|
||||
+};
|
||||
+
|
||||
+/* RK817 only supports 12.5mV steps, round up the values */
|
||||
+&cpu_opp_table_0 {
|
||||
+ opp-1000000000 {
|
||||
+ opp-microvolt = <737500>;
|
||||
+ };
|
||||
+ opp-1200000000 {
|
||||
+ opp-microvolt = <737500>;
|
||||
+ };
|
||||
+ opp-1398000000 {
|
||||
+ opp-microvolt = <762500>;
|
||||
+ };
|
||||
+ opp-1512000000 {
|
||||
+ opp-microvolt = <800000>;
|
||||
+ };
|
||||
+ opp-1608000000 {
|
||||
+ opp-microvolt = <837500>;
|
||||
+ };
|
||||
+ opp-1704000000 {
|
||||
+ opp-microvolt = <862500>;
|
||||
+ };
|
||||
+ opp-1800000000 {
|
||||
+ opp-microvolt = <987500>;
|
||||
+ };
|
||||
+ opp-1908000000 {
|
||||
+ opp-hz = /bits/ 64 <1908000000>;
|
||||
+ opp-microvolt = <1050000>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+/* RK818 only supports 12.5mV steps, round up the values */
|
||||
+&cpub_opp_table_1 {
|
||||
+ opp-1000000000 {
|
||||
+ opp-microvolt = <775000>;
|
||||
+ };
|
||||
+ opp-1200000000 {
|
||||
+ opp-microvolt = <775000>;
|
||||
+ };
|
||||
+ opp-1398000000 {
|
||||
+ opp-microvolt = <800000>;
|
||||
+ };
|
||||
+ opp-1512000000 {
|
||||
+ opp-microvolt = <825000>;
|
||||
+ };
|
||||
+ opp-1608000000 {
|
||||
+ opp-microvolt = <862500>;
|
||||
+ };
|
||||
+ opp-1704000000 {
|
||||
+ opp-microvolt = <900000>;
|
||||
+ };
|
||||
+ opp-1800000000 {
|
||||
+ opp-microvolt = <987500>;
|
||||
+ };
|
||||
+ opp-1908000000 {
|
||||
+ opp-microvolt = <1025000>;
|
||||
+ };
|
||||
+ opp-2016000000 {
|
||||
+ opp-microvolt = <1025000>;
|
||||
+ };
|
||||
+ opp-2108000000 {
|
||||
+ opp-microvolt = <1025000>;
|
||||
+ };
|
||||
+ opp-2208000000 {
|
||||
+ opp-microvolt = <1050000>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&i2c_AO {
|
||||
+ status = "okay";
|
||||
+ pinctrl-0 = <&i2c_ao_sck_pins>, <&i2c_ao_sda_pins>;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
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
|
||||
new file mode 100644
|
||||
index 000000000000..fd4f97b5ccd3
|
||||
index 000000000000..877663f6fb7c
|
||||
--- /dev/null
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3.dts
|
||||
@@ -0,0 +1,924 @@
|
||||
@@ -0,0 +1,986 @@
|
||||
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||
+/*
|
||||
+ * Copyright (c) 2022 Neil Armstrong <narmstrong@kernel.org>
|
||||
|
|
@ -350,6 +350,68 @@ index 000000000000..fd4f97b5ccd3
|
|||
+ clock-latency = <50000>;
|
||||
+};
|
||||
+
|
||||
+/* RK817 only supports 12.5mV steps, round up the values */
|
||||
+&cpu_opp_table_0 {
|
||||
+ opp-1000000000 {
|
||||
+ opp-microvolt = <760000>;
|
||||
+ };
|
||||
+ opp-1200000000 {
|
||||
+ opp-microvolt = <780000>;
|
||||
+ };
|
||||
+ opp-1398000000 {
|
||||
+ opp-microvolt = <800000>;
|
||||
+ };
|
||||
+ opp-1512000000 {
|
||||
+ opp-microvolt = <860000>;
|
||||
+ };
|
||||
+ opp-1608000000 {
|
||||
+ opp-microvolt = <900000>;
|
||||
+ };
|
||||
+ opp-1704000000 {
|
||||
+ opp-microvolt = <950000>;
|
||||
+ };
|
||||
+ opp-1800000000 {
|
||||
+ opp-microvolt = <1000000>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+/* RK818 only supports 12.5mV steps, round up the values */
|
||||
+&cpub_opp_table_1 {
|
||||
+ opp-1000000000 {
|
||||
+ opp-microvolt = <775000>;
|
||||
+ };
|
||||
+ opp-1200000000 {
|
||||
+ opp-microvolt = <775000>;
|
||||
+ };
|
||||
+ opp-1398000000 {
|
||||
+ opp-microvolt = <800000>;
|
||||
+ };
|
||||
+ opp-1512000000 {
|
||||
+ opp-microvolt = <825000>;
|
||||
+ };
|
||||
+ opp-1608000000 {
|
||||
+ opp-microvolt = <862500>;
|
||||
+ };
|
||||
+ opp-1704000000 {
|
||||
+ opp-microvolt = <900000>;
|
||||
+ };
|
||||
+ opp-1800000000 {
|
||||
+ opp-microvolt = <987500>;
|
||||
+ };
|
||||
+ opp-1908000000 {
|
||||
+ opp-microvolt = <1025000>;
|
||||
+ };
|
||||
+ opp-2016000000 {
|
||||
+ opp-microvolt = <1025000>;
|
||||
+ };
|
||||
+ opp-2108000000 {
|
||||
+ opp-microvolt = <1025000>;
|
||||
+ };
|
||||
+ opp-2208000000 {
|
||||
+ opp-microvolt = <1050000>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&i2c_AO {
|
||||
+ status = "okay";
|
||||
+ pinctrl-0 = <&i2c_ao_sck_pins>, <&i2c_ao_sda_pins>;
|
||||
|
|
|
|||
Loading…
Reference in a new issue