Merge branch 'JustEnoughLinuxOS:dev' into dev

This commit is contained in:
Glazed_Belmont 2023-12-13 23:18:14 -05:00 committed by GitHub
commit 55be56a88c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
68 changed files with 176 additions and 195 deletions

View file

@ -51,4 +51,4 @@ jobs:
- name: Build World
run: |
set -e
CUSTOM_VERSION="${{ steps.version.outputs.version }}" DOCKER_WORK_DIR="/work" DOCKER_EXTRA_OPTS="-v /buildroot:/buildroot" make docker-world
CUSTOM_VERSION="${{ steps.version.outputs.version }}" DOCKER_WORK_DIR="/work" DOCKER_EXTRA_OPTS="-v /buildroot:/buildroot" make docker-world >/tmp/build.log 2>&1

View file

@ -51,7 +51,7 @@ jobs:
- name: Build World
run: |
set -e
CUSTOM_VERSION="${{ steps.version.outputs.version }}" DOCKER_WORK_DIR="/work" DOCKER_EXTRA_OPTS="-v /buildroot:/buildroot" make docker-world
CUSTOM_VERSION="${{ steps.version.outputs.version }}" DOCKER_WORK_DIR="/work" DOCKER_EXTRA_OPTS="-v /buildroot:/buildroot" make docker-world >/tmp/build.log 2>&1
- name: Create release as draft at first to hide during uploads
if: github.event.action == 'release-main'
uses: ncipollo/release-action@v1

View file

@ -4,7 +4,7 @@ SYSTEM_MANUFACTURER="Sega"
SYSTEM_RELEASE="1998"
SYSTEM_HARDWARE="console"
SYSTEM_PATH="/storage/roms/dreamcast"
SYSTEM_EXTENSION=".cdi .gdi .chd .m3u"
SYSTEM_EXTENSION=".cdi .gdi .chd .m3u .cue"
SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\""
SYSTEM_PLATFORM="dreamcast"
SYSTEM_THEME="dreamcast"

View file

@ -89,7 +89,7 @@ This document describes all available systems emulators and cores available for
|Panasonic|3DO (3do)|1993|`3do`|.iso .bin .chd .cue|**retroarch:** opera (default)<br>|
|Philips|VideoPac (videopac)|1978|`videopac`|.bin .zip .7z|**retroarch:** o2em (default)<br>|
|Sammy|Atomiswave (atomiswave)|2003|`atomiswave`|.lst .bin .dat .zip .7z|**retroarch:** flycast (default)<br>**flycast:** flycast-sa<br>|
|Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u|**retroarch:** flycast2021<br>**retroarch:** flycast (default)<br>**flycast:** flycast-sa<br>|
|Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u .cue|**retroarch:** flycast2021<br>**retroarch:** flycast (default)<br>**flycast:** flycast-sa<br>|
|Sega|Game Gear (gamegear)|1990|`gamegear`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>**mednafen:** gg<br>|
|Sega|Game Gear (Hacks) (ggh)|1990|`gamegearh`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>**mednafen:** gg<br>|
|Sega|Genesis (genesis)|1989|`genesis`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** genesis_plus_gx_wide<br>**retroarch:** picodrive<br>**mednafen:** md<br>|

View file

@ -83,7 +83,7 @@ This document describes all available systems emulators and cores available for
|Panasonic|3DO (3do)|1993|`3do`|.iso .bin .chd .cue|**retroarch:** opera (default)<br>|
|Philips|VideoPac (videopac)|1978|`videopac`|.bin .zip .7z|**retroarch:** o2em (default)<br>|
|Sammy|Atomiswave (atomiswave)|2003|`atomiswave`|.lst .bin .dat .zip .7z|**flycast:** flycast-sa<br>**retroarch:** flycast (default)<br>|
|Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u|**flycast:** flycast-sa<br>**retroarch:** flycast (default)<br>|
|Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u .cue|**flycast:** flycast-sa<br>**retroarch:** flycast (default)<br>|
|Sega|Game Gear (gamegear)|1990|`gamegear`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>**mednafen:** gg<br>|
|Sega|Game Gear (Hacks) (ggh)|1990|`gamegearh`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>**mednafen:** gg<br>|
|Sega|Genesis (genesis)|1989|`genesis`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** genesis_plus_gx_wide<br>**retroarch:** picodrive<br>|

View file

@ -85,7 +85,7 @@ This document describes all available systems emulators and cores available for
|Panasonic|3DO (3do)|1993|`3do`|.iso .bin .chd .cue|**retroarch:** opera (default)<br>|
|Philips|VideoPac (videopac)|1978|`videopac`|.bin .zip .7z|**retroarch:** o2em (default)<br>|
|Sammy|Atomiswave (atomiswave)|2003|`atomiswave`|.lst .bin .dat .zip .7z|**flycast:** flycast-sa<br>**retroarch:** flycast (default)<br>|
|Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u|**flycast:** flycast-sa<br>**retroarch:** flycast (default)<br>|
|Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u .cue|**flycast:** flycast-sa<br>**retroarch:** flycast (default)<br>|
|Sega|Game Gear (gamegear)|1990|`gamegear`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>**mednafen:** gg<br>|
|Sega|Game Gear (Hacks) (ggh)|1990|`gamegearh`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>**mednafen:** gg<br>|
|Sega|Genesis (genesis)|1989|`genesis`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** genesis_plus_gx_wide<br>**retroarch:** picodrive<br>**mednafen:** md<br>|

View file

@ -83,7 +83,7 @@ This document describes all available systems emulators and cores available for
|Panasonic|3DO (3do)|1993|`3do`|.iso .bin .chd .cue|**retroarch:** opera (default)<br>|
|Philips|VideoPac (videopac)|1978|`videopac`|.bin .zip .7z|**retroarch:** o2em (default)<br>|
|Sammy|Atomiswave (atomiswave)|2003|`atomiswave`|.lst .bin .dat .zip .7z|**retroarch:** flycast2021<br>**retroarch:** flycast32 (default)<br>**retroarch:** flycast<br>**flycast:** flycast-sa<br>|
|Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u|**retroarch:** flycast2021<br>**retroarch:** flycast32 (default)<br>**retroarch:** flycast<br>**flycast:** flycast-sa<br>|
|Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u .cue|**retroarch:** flycast2021<br>**retroarch:** flycast32 (default)<br>**retroarch:** flycast<br>**flycast:** flycast-sa<br>|
|Sega|Game Gear (gamegear)|1990|`gamegear`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>|
|Sega|Game Gear (Hacks) (ggh)|1990|`gamegearh`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>|
|Sega|Genesis (genesis)|1989|`genesis`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** genesis_plus_gx_wide<br>**retroarch:** picodrive<br>|

View file

@ -83,7 +83,7 @@ This document describes all available systems emulators and cores available for
|Panasonic|3DO (3do)|1993|`3do`|.iso .bin .chd .cue|**retroarch:** opera (default)<br>|
|Philips|VideoPac (videopac)|1978|`videopac`|.bin .zip .7z|**retroarch:** o2em (default)<br>|
|Sammy|Atomiswave (atomiswave)|2003|`atomiswave`|.lst .bin .dat .zip .7z|**retroarch:** flycast2021<br>**retroarch:** flycast32 (default)<br>**retroarch:** flycast<br>**flycast:** flycast-sa<br>|
|Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u|**retroarch:** flycast2021<br>**retroarch:** flycast32 (default)<br>**retroarch:** flycast<br>**flycast:** flycast-sa<br>|
|Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u .cue|**retroarch:** flycast2021<br>**retroarch:** flycast32 (default)<br>**retroarch:** flycast<br>**flycast:** flycast-sa<br>|
|Sega|Game Gear (gamegear)|1990|`gamegear`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>|
|Sega|Game Gear (Hacks) (ggh)|1990|`gamegearh`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>|
|Sega|Genesis (genesis)|1989|`genesis`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** genesis_plus_gx_wide<br>**retroarch:** picodrive<br>|

View file

@ -85,7 +85,7 @@ This document describes all available systems emulators and cores available for
|Panasonic|3DO (3do)|1993|`3do`|.iso .bin .chd .cue|**retroarch:** opera (default)<br>|
|Philips|VideoPac (videopac)|1978|`videopac`|.bin .zip .7z|**retroarch:** o2em (default)<br>|
|Sammy|Atomiswave (atomiswave)|2003|`atomiswave`|.lst .bin .dat .zip .7z|**retroarch:** flycast2021<br>**retroarch:** flycast32 (default)<br>**retroarch:** flycast<br>**flycast:** flycast-sa<br>|
|Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u|**retroarch:** flycast2021<br>**retroarch:** flycast32 (default)<br>**retroarch:** flycast<br>**flycast:** flycast-sa<br>|
|Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u .cue|**retroarch:** flycast2021<br>**retroarch:** flycast32 (default)<br>**retroarch:** flycast<br>**flycast:** flycast-sa<br>|
|Sega|Game Gear (gamegear)|1990|`gamegear`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>|
|Sega|Game Gear (Hacks) (ggh)|1990|`gamegearh`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>|
|Sega|Genesis (genesis)|1989|`genesis`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** genesis_plus_gx_wide<br>**retroarch:** picodrive<br>|

View file

@ -86,7 +86,7 @@ This document describes all available systems emulators and cores available for
|Panasonic|3DO (3do)|1993|`3do`|.iso .bin .chd .cue|**retroarch:** opera (default)<br>|
|Philips|VideoPac (videopac)|1978|`videopac`|.bin .zip .7z|**retroarch:** o2em (default)<br>|
|Sammy|Atomiswave (atomiswave)|2003|`atomiswave`|.lst .bin .dat .zip .7z|**retroarch:** flycast2021<br>**flycast:** flycast-sa (default)<br>**retroarch:** flycast<br>|
|Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u|**retroarch:** flycast2021<br>**flycast:** flycast-sa (default)<br>**retroarch:** flycast<br>|
|Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u .cue|**retroarch:** flycast2021<br>**flycast:** flycast-sa (default)<br>**retroarch:** flycast<br>|
|Sega|Game Gear (gamegear)|1990|`gamegear`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>|
|Sega|Game Gear (Hacks) (ggh)|1990|`gamegearh`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>|
|Sega|Genesis (genesis)|1989|`genesis`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** genesis_plus_gx_wide<br>**retroarch:** picodrive<br>|

View file

@ -14,7 +14,7 @@ if [ "${TARGET_ARCH}" = "x86_64" ]
then
PKG_SITE+="qt"
PKG_URL="${PKG_SITE}.git"
PKG_VERSION="f374e88bac47910fca3221ff322d8d80ea23e40a"
PKG_VERSION="1ef083c952b72f9ec1f8217d6ce7f3e91d13b636"
PKG_DEPENDS_TARGET+=" qt5"
PKG_TOOLCHAIN="manual"
make_target() {
@ -32,7 +32,7 @@ then
else
PKG_SITE+="embedded"
PKG_URL="${PKG_SITE}.git"
PKG_VERSION="d578fd8"
PKG_VERSION="3b72f5195b6843be772a2eb6846ac10ceed39bf4"
PKG_TOOLCHAIN="cmake"
post_makeinstall_target() {
mkdir -p ${INSTALL}/usr/config/moonlight

View file

@ -2,7 +2,7 @@
# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS)
PKG_NAME="portmaster"
PKG_VERSION="8.5.2_0811"
PKG_VERSION="8.5.13_1130"
PKG_SITE="https://github.com/PortsMaster/PortMaster-GUI"
PKG_URL="${PKG_SITE}/releases/download/${PKG_VERSION}/PortMaster.zip"
COMPAT_URL="https://github.com/brooksytech/JelosAddOns/raw/main/compat.zip"

View file

@ -5,10 +5,8 @@
. /etc/profile
PORTPLATFORM=$(tr -d '\0' </sys/firmware/devicetree/base/model 2>/dev/null)
if [[ "${UI_SERVICE}" =~ weston.service ]]; then
case ${PORTPLATFORM} in
case "${QUIRK_DEVICE}" in
"Hardkernel ODROID-GO-Ultra"|"Powkiddy RGB10 MAX 3"|"Hardkernel ODROID-N2*")
#Fixing ports on S922X, exclude FNA games
for port in /storage/roms/ports/*.sh; do
@ -19,9 +17,20 @@ case ${PORTPLATFORM} in
done;
;;
*)
#Remove gl4es libs on devices that support OpenGL
#Remove gl4es libs on devices that support OpenGL and sed any port that refrences it
rm -rf /storage/roms/ports/*/lib*/libEGL*
rm -rf /storage/roms/ports/*/lib*/libGL*
for port in /storage/roms/ports/*.sh; do
sed -i '/^export SDL_VIDEO_GL_DRIVER/c\#export SDL_VIDEO_GL_DRIVER"' "$port"
sed -i '/^export SDL_VIDEO_EGL_DRIVER/c\#export SDL_VIDEO_EGL_DRIVER' "$port"
echo Fixing: "$port";
done;
#Remove S922X fix if exists
for port in /storage/roms/ports/*.sh; do
sed -i '/get_controls && export/c\get_controls' "$port"
echo Fixing: "$port";
done;
;;
esac
fi

View file

@ -66,7 +66,10 @@ else
fi
#Make sure permissions are correct in the PortMaster folder
chmod 755 /storage/roms/ports/PortMaster/* -R
find /storage/roms/ports/ -not -perm 755 -exec chmod 755 {} \;
#Fix compatability for some portmaster ports
/usr/bin/portmaster_compatibility.sh
#Start PortMaster
@LIBEGL@

View file

@ -3,10 +3,10 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2023-present - The JELOS Project (https://github.com/JustEnoughLinuxOS)
# This file can and should be sourced by ports for various parameters to
# This file can and should be sourced by ports for various parameters to
# minimize script customizations and allow for easier future updates
# like adding additional supported devices.
# Thanks to JohnnyonFlame, dhwz, romadu, and shantigilbert for the
# Thanks to JohnnyonFlame, dhwz, romadu, and shantigilbert for the
# suggestion and assistance with this.
# Source used for gptokeyb available at
# https://github.com/christianhaitian/gptokeyb
@ -23,9 +23,8 @@ SDLDBUSERFILE="/storage/.config/SDL-GameControllerDB/gamecontrollerdb.txt"
clibs="/usr/lib/compat/"
raloc="/usr/bin"
raconf="--config /storage/.config/retroarch/retroarch.cfg"
pdevice=$(tr -d '\0' </sys/firmware/devicetree/base/model 2>/dev/null)
case ${pdevice} in
case "${QUIRK_DEVICE}" in
"Anbernic RG552")
profile="rg552"
lres="N"
@ -90,7 +89,6 @@ get_controls() {
# Set compatability libs and run compatability script
export LD_LIBRARY_PATH=${clibs}
/usr/bin/portmaster_compatibility.sh
# Now find any controller mapped on emulationstation...
/storage/.config/PortMaster/mapper.txt SDL_GAMECONTROLLERCONFIG_FILE > /dev/null 2>&1

View file

@ -2,7 +2,7 @@
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="box64"
PKG_VERSION="13612d4024c50dbc79c5900e1cf1d8b5319ae1ba"
PKG_VERSION="b07ea3460ea337f6ac45d6ea53d0c890923d408e"
PKG_ARCH="aarch64"
PKG_LICENSE="MIT"
PKG_SITE="https://github.com/ptitSeb/box64"

View file

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="beetle-pce-fast-lr"
PKG_VERSION="1ce7a4a941b10aa0c2973cb441b89ee99e2c8d0e"
PKG_VERSION="fe662eb161f73749a372657192c7fe234bc8e3ad"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPLv2"

View file

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="beetle-pce-lr"
PKG_VERSION="903c58ec2f14f50c8c07e001469121eb513dce61"
PKG_VERSION="65977d85040622d15e96b6aa6581e30e6c6829e8"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPLv2"

View file

@ -2,7 +2,7 @@
# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS)
PKG_NAME="beetle-psx-lr"
PKG_VERSION="9d07ee164ce18d5c98a12c1fb48d637306d4e8ee"
PKG_VERSION="853532c906f4a6ce46b670357a0d4d392212f63b"
PKG_LICENSE="GPLv2"
PKG_SITE="https://git.libretro.com/libretro/beetle-psx-libretro"
PKG_URL="${PKG_SITE}.git"

View file

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="beetle-supergrafx-lr"
PKG_VERSION="9eb9dcae1f6e37516d20fdc4a8879c8204ad4045"
PKG_VERSION="47c977c169cd60f1518d64ccf1fc83481bf6e869"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPLv2"

View file

@ -2,7 +2,7 @@
# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS)
PKG_NAME="bsnes-lr"
PKG_VERSION="22e032a4998161be196d84834303af921e51c0cd"
PKG_VERSION="370a8642b1ec06d60d65467f4db1b098e4cb49f1"
PKG_LICENSE="GPLv2"
PKG_SITE="https://github.com/libretro/bsnes-libretro"
PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"

View file

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="dosbox-pure-lr"
PKG_VERSION="a34cfe9b3ad98fd8c7cb8d11a556b9e98525c5b9"
PKG_VERSION="8b790959d5fa5b267cfd2746af7d400a6ff76609"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPLv2"

View file

@ -1,54 +0,0 @@
diff --git a/Makefile b/Makefile
index 3e7941c..ceb21c3 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,6 @@ SOURCES := \
src/*/*/*.cpp
CPUFLAGS := $(MAKE_CPUFLAGS)
-STRIPCMD := strip --strip-all
ifneq ($(ISWIN),)
OUTNAME := dosbox_pure_libretro.dll
CXX ?= g++
@@ -58,7 +57,6 @@ else ifneq (,$(findstring ios,$(platform)))
MINVERSION = -miphoneos-version-min=5.0
endif
COMMONFLAGS += $(MINVERSION) -Wno-ignored-optimization-argument -Wno-unknown-warning-option
- STRIPCMD := strip -xS
else ifeq ($(platform),tvos-arm64)
ifeq ($(IOSSDK),)
IOSSDK := $(shell xcodebuild -version -sdk appletvos Path)
@@ -67,7 +65,6 @@ else ifeq ($(platform),tvos-arm64)
CXX = c++ -arch arm64 -isysroot $(IOSSDK)
LDFLAGS := -Wl,-dead_strip
COMMONFLAGS += -DDISABLE_DYNAREC=1 -Wno-unknown-warning-option
- STRIPCMD := strip -xS
else ifneq ($(ISMAC),)
OUTNAME := dosbox_pure_libretro.dylib
CXX ?= c++
@@ -81,7 +78,6 @@ else ifneq ($(ISMAC),)
endif
COMMONFLAGS += $(ARCHFLAGS)
LDFLAGS += $(ARCHFLAGS)
- STRIPCMD := strip -xS
else ifeq ($(platform),windows) # For MSYS2 only
OUTNAME := dosbox_pure_libretro.dll
CXX ?= g++
@@ -138,7 +134,6 @@ else ifeq ($(platform),gcw0)
LDFLAGS := -Wl,--gc-sections -fno-ident
CPUFLAGS := -ffast-math -march=mips32r2 -mtune=mips32r2 -mhard-float -fexpensive-optimizations -frename-registers
COMMONFLAGS += -pthread
- STRIPCMD := /opt/gcw0-toolchain/usr/mipsel-gcw0-linux-uclibc/bin/strip --strip-all
else ifneq ($(findstring Haiku,$(shell uname -s)),)
OUTNAME := dosbox_pure_libretro.so
LDFLAGS := -Wl,--gc-sections -fno-ident -lroot -lnetwork
@@ -245,9 +240,6 @@ ifeq ($(STATIC_LINKING), 1)
else
$(info Linking $@ ...)
$(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS)
-ifneq ($(BUILD),DEBUG)
- $(STRIPCMD) $@
-endif
endif
define COMPILE

View file

@ -3,7 +3,7 @@
# Copyright (C) 2022-present Lakka (https://www.lakka.tv)
PKG_NAME="fake08-lr"
PKG_VERSION="8594cfd27029857d6e0937e8f35a88f652aadccc"
PKG_VERSION="d52e9ba89ca25e70b94cf8872aad7931f4184e5f"
PKG_LICENSE="MIT"
PKG_SITE="https://github.com/jtothebell/fake-08"
PKG_URL="${PKG_SITE}.git"

View file

@ -4,7 +4,7 @@
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="fbneo-lr"
PKG_VERSION="6522cbbd39d2999bf916cf9bf5ddea0fc6752b4d"
PKG_VERSION="c6cb6e43497f45a7d39e1194447f318eb0b27b16"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="Non-commercial"

View file

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="gambatte-lr"
PKG_VERSION="9b232311f4f462a5dc26187b511ea361d30c5959"
PKG_VERSION="035dbe127a38ce55501a0dfc3913d85f6446fe9a"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPLv2"

View file

@ -15,7 +15,7 @@
################################################################################
PKG_NAME="gearboy-lr"
PKG_VERSION="49438e4f90de9203615aeba2a0ef6362fe8144d9"
PKG_VERSION="7e2b48051875ea5fe9a61d68b821bab763646c85"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View file

@ -15,7 +15,7 @@
################################################################################
PKG_NAME="gearcoleco-lr"
PKG_VERSION="6c67da0462061a9056cacdb633c6ab4fd8a650f7"
PKG_VERSION="09f8d89f1c35bbd5d6eaf5fb47c090a3fdad28ba"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View file

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="gearsystem-lr"
PKG_VERSION="9fdc04d58f1c7176c4834f4569e2a6a00de56608"
PKG_VERSION="302fc34fc36e33d017bbc6dbe3ca101e6e3fafae"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPLv3"

View file

@ -21,7 +21,7 @@
################################################################################
PKG_NAME="genesis-plus-gx-lr"
PKG_VERSION="5745c8a4d0c2db2597ab6c403791888967dd249a"
PKG_VERSION="5ca4135eed69e8ce153c76e403491eae560eae69"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="Non-commercial"

View file

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="libretro-database"
PKG_VERSION="77d8296123e5c06b4db660afe557bfa772aacfab"
PKG_VERSION="02dac2c8a7b779b495d5ce93d8fedd01738fc566"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View file

@ -2,7 +2,7 @@
# Copyright (C) 2019 Trond Haugland (trondah@gmail.com)
PKG_NAME="mame-lr"
PKG_VERSION="0ef9aa356162ce6b51232aecbe309af2e7fbe167"
PKG_VERSION="7d5e270850c90e7e167fe53105d0c11c1c1c87b1"
PKG_ARCH="any"
PKG_LICENSE="GPLv2"
PKG_SITE="https://github.com/libretro/mame"

View file

@ -21,7 +21,7 @@
################################################################################
PKG_NAME="mame2003-plus-lr"
PKG_VERSION="eddec6d603a21d5620ff6a2cb890ec90133cdb02"
PKG_VERSION="59e49400fa6fc95237885c06732dfeef27687dec"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="MAME"

View file

@ -3,7 +3,7 @@
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="pcsx_rearmed-lr"
PKG_VERSION="ff3890db8ef473ee5eae6a7120ee39d761a86620"
PKG_VERSION="963f41620dce6ddb2527b7e3dced09564031f783"
PKG_ARCH="arm aarch64"
PKG_LICENSE="GPLv2"
PKG_SITE="https://github.com/libretro/pcsx_rearmed"

View file

@ -21,7 +21,7 @@
################################################################################
PKG_NAME="puae-lr"
PKG_VERSION="9332f19b8c7386c69508cc51aca21c747629690d"
PKG_VERSION="b7f0d707d4b3c40557c701ebea933872b828f57c"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View file

@ -21,7 +21,7 @@
################################################################################
PKG_NAME="puae2021-lr"
PKG_VERSION="82ec6148d219904365d8ea7bff718803a4bfa415"
PKG_VERSION="144987e45284b46b7775adb4c4da1fda8f61a641"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View file

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="sameduck-lr"
PKG_VERSION="5cc014b23af963f9e9a77091a1e6ff7a7852e8a7"
PKG_VERSION="5619abdb01cee6bedb47599cdb5532c318443b52"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="MIT"

View file

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="scummvm-lr"
PKG_VERSION="6cf2ea54ea66a2bcc6c1b0842348fed9b3ccd4b9"
PKG_VERSION="0db091d15ac2a1a6058c8f0d69df36d23bc3638f"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPLv2"

View file

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="slang-shaders"
PKG_VERSION="2a4f904bfd19e64c3df532289e8b15c2d8d763eb"
PKG_VERSION="41a011230071b5b4163e9321d24489542d9d840a"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View file

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="stella-lr"
PKG_VERSION="e05761311af89768b1e42879d89eb7f03a51f4da"
PKG_VERSION="8fe2adf28affc0477ee91689edef3b90168cd3ce"
PKG_REV="1"
PKG_LICENSE="GPL2"
PKG_SITE="https://github.com/stella-emu/stella"

View file

@ -2,7 +2,7 @@
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="tic80-lr"
PKG_VERSION="4b1ec3a52ff3e632e93aeb0f511721d2070ef67f"
PKG_VERSION="8bae7dd6fae8e2660f2523992392a07357e6eabf"
PKG_LICENSE="MIT"
PKG_SITE="https://github.com/nesbox/TIC-80"
PKG_URL="${PKG_SITE}.git"

View file

@ -21,7 +21,7 @@
################################################################################
PKG_NAME="vice-lr"
PKG_VERSION="a2385eb1103a9f5c86333bae0f308ca678fc7d82"
PKG_VERSION="0046085610289777b5806495d8eef213e0a201aa"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPLv2"

View file

@ -3,7 +3,7 @@
PKG_NAME="amiberry"
PKG_ARCH="aarch64"
PKG_VERSION="346d096d8478b1bc489bf36c25c18f2ddb1e8ba3"
PKG_VERSION="5c54536997c0039aaa72bb0552cefdc3c967ad8d"
PKG_LICENSE="GPLv3"
PKG_SITE="https://github.com/midwan/amiberry"
PKG_URL="${PKG_SITE}.git"

View file

@ -3,7 +3,7 @@
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="cemu-sa"
PKG_VERSION="f3c95f72e74d8a5f5873061fbb994643c63ec9c5"
PKG_VERSION="dee764473db26462a898aae8ea73c65a9cbafda1"
PKG_ARCH="x86_64"
PKG_LICENSE="MPL-2.0"
PKG_SITE="https://github.com/cemu-project/Cemu"

View file

@ -17,7 +17,7 @@ case ${DEVICE} in
;;
*)
PKG_URL="${PKG_SITE}.git"
PKG_VERSION="875f5eaad5d3e1a6303cdb9d767dd5d4ac86d988"
PKG_VERSION="60584e861d15f5cf1f64890c03e8090460d3f7c4"
;;
esac

View file

@ -3,7 +3,7 @@
# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS)
PKG_NAME="flycast-sa"
PKG_VERSION="ea83b08f89d75e45b11a8c7f5d8607c6a7270e86"
PKG_VERSION="f4f087a6ea83a5483dedf23ad2b38763988eccc5"
PKG_LICENSE="GPLv2"
PKG_SITE="https://github.com/flyinghead/flycast"
PKG_URL="${PKG_SITE}.git"

View file

@ -1,7 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2021-present 351ELEC (https://github.com/351ELEC)
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
# Copyright (C) 2023-present brooksytech (https://github.com/brookstech)
PKG_NAME="gzdoom-sa"
PKG_VERSION="d05ea1965ad1f070859806a3a67aaf5ea6c46234"

View file

@ -2,7 +2,7 @@
# Copyright (C) 2018-present 5schatten (https://github.com/5schatten)
PKG_NAME="hatarisa"
PKG_VERSION="96d7e168b8a79d9c0add5308e17ad89e952b1071"
PKG_VERSION="4017c93ee54a99d6c28284d02eb62b981c742e8a"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/hatari/hatari"
PKG_URL="https://github.com/hatari/hatari/archive/${PKG_VERSION}.tar.gz"

View file

@ -11,7 +11,10 @@ GUID1="$(mednafen --list-joysticks | grep ID | awk 'NR==1 {print $2}')"
sed -e "s/@GUID1@/${GUID1}/g" ${MEDNAFEN_CONFIG} >> $MEDNAFEN_HOME/mednafen.cfg
NAME="$(mednafen --list-joysticks | grep ID | awk 'NR==1 {print $5$6}')"
if [[ "$(mednafen --list-joysticks | grep ID | awk 'NR==1 {print $4}')" = "8BitDo" ]]
then
NAME="X-Box360"
fi
# Controller config for 360 and GPIO handled separately
if [[ "${NAME}" = "X-Box360" ]]

View file

@ -7,7 +7,7 @@ PKG_REV="1"
PKG_ARCH="any"
PKG_SITE="https://github.com/hrydgard/ppsspp"
PKG_URL="${PKG_SITE}.git"
PKG_VERSION="d6324d10a648555e9aad9ea2972ca9ccfd41ef69"
PKG_VERSION="03bd7c1cacf0d9849edc60905e6b737fea1abb81"
PKG_LICENSE="GPLv2"
PKG_DEPENDS_TARGET="toolchain ffmpeg libzip SDL2 zlib zip"
PKG_SHORTDESC="PPSSPPDL"

View file

@ -2,7 +2,7 @@
# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS)
PKG_NAME="yuzu-sa"
PKG_VERSION="5fb1a83e4cbb43f5bb2e07d003e544dca580e0de"
PKG_VERSION="875568bb3e34725578f7fa3661c8bad89f23a173"
PKG_ARCH="x86_64"
PKG_LICENSE="GPLv3"
PKG_SITE="https://github.com/yuzu-emu/yuzu"

View file

@ -2,7 +2,7 @@
# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS)
PKG_NAME="control-gen"
PKG_VERSION="47234c710a073ff02fe1a99e1b6dff912259ac32"
PKG_VERSION="16179c655447007c2580243659fc36a34e6a749d"
PKG_ARCH="any"
PKG_LICENSE="GPLv2"
PKG_DEPENDS_TARGET="toolchain"

View file

@ -2,7 +2,7 @@
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="gamecontrollerdb"
PKG_VERSION="d4ab609121ee6e687bc3d3a7e80244b3b26d1164"
PKG_VERSION="a2ae8f6968dfb27a57a15c8f62ea9f20b05362c4"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_DEPENDS_TARGET="toolchain SDL2"

View file

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="retroarch-assets"
PKG_VERSION="b98616483faa58be348626393f0ef1bdd74ca51e"
PKG_VERSION="1440f6737840f010f3b12a6b68b7a3871506e207"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/libretro/retroarch-assets"
PKG_URL="https://github.com/libretro/retroarch-assets/archive/${PKG_VERSION}.tar.gz"

View file

@ -2,7 +2,7 @@
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="retroarch-joypads"
PKG_VERSION="830f79ff3754df3812618b547af23e5a84a5300b"
PKG_VERSION="a57f1489ac289415d7fbdae4d56d55ed01c45714"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/libretro/retroarch-joypad-autoconfig"
PKG_URL="${PKG_SITE}.git"

View file

@ -0,0 +1,12 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2023-present - The JELOS Project (https://github.com/JustEnoughLinuxOS)
PKG_NAME="libwebp"
PKG_VERSION="89c5b917463c07bfb5b6390b81d258c49d5fe8c6"
PKG_LICENSE="BSD"
PKG_SITE="https://github.com/webmproject/libwebp"
PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"
PKG_DEPENDS_HOST="toolchain:host"
PKG_DEPENDS_TARGET="toolchain"
PKG_LONGDESC="WebP codec is a library to encode and decode images in WebP format."
PKG_TOOLCHAIN="cmake"

View file

@ -7,7 +7,7 @@
MYSLEEPMODE=$(get_setting system.suspendmode)
if [ -z "${MYSLEEPMODE}" ]
then
/usr/bin/suspendmode freeze
/usr/bin/suspendmode mem
fi
echo s2idle >/sys/power/mem_sleep

View file

@ -7,7 +7,7 @@
MYSLEEPMODE=$(get_setting system.suspendmode)
if [ -z "${MYSLEEPMODE}" ]
then
/usr/bin/suspendmode freeze
/usr/bin/suspendmode mem
fi
echo s2idle >/sys/power/mem_sleep

View file

@ -7,7 +7,7 @@
MYSLEEPMODE=$(get_setting system.suspendmode)
if [ -z "${MYSLEEPMODE}" ]
then
/usr/bin/suspendmode freeze
/usr/bin/suspendmode mem
fi
echo s2idle >/sys/power/mem_sleep

View file

@ -7,7 +7,7 @@
MYSLEEPMODE=$(get_setting system.suspendmode)
if [ -z "${MYSLEEPMODE}" ]
then
/usr/bin/suspendmode freeze
/usr/bin/suspendmode mem
fi
echo s2idle >/sys/power/mem_sleep

View file

@ -7,7 +7,7 @@
MYSLEEPMODE=$(get_setting system.suspendmode)
if [ -z "${MYSLEEPMODE}" ]
then
/usr/bin/suspendmode freeze
/usr/bin/suspendmode mem
fi
echo s2idle >/sys/power/mem_sleep

View file

@ -46,7 +46,6 @@ function start_ms() {
then
log $0 "Executing bind mount of ${MOUNT_PATH} to ${MS_PATH}"
mount --bind ${MOUNT_PATH}/roms ${MS_PATH}
exit 0
else
log $0 "Enabling merged storage of /storage/games-${LOWER} and /storage/games-${UPPER} to ${MS_PATH}."
@ -70,14 +69,6 @@ then
exit 0
fi
function create_game_dirs() {
### We don't want systemd to manage this or the directories could be created in the wrong location.
if [ -e "/usr/config/system-dirs.conf" ]
then
systemd-tmpfiles --create /usr/config/system-dirs.conf >/dev/null 2>&1 ||:
fi
}
function load_modules() {
for MODULE in exfat vfat
do
@ -134,7 +125,6 @@ function mount_games() {
/usr/bin/busybox mount ${1} ${MOUNT_PATH} >/dev/null 2>&1
fi
start_ms external
create_game_dirs
exit 0
}
@ -179,7 +169,6 @@ function find_games() {
set_setting system.merged.device internal
fi
start_ms internal
create_game_dirs
exit 0
fi
}

View file

@ -4,7 +4,7 @@
PKG_NAME="linux"
PKG_LICENSE="GPL"
PKG_VERSION="6.6.4"
PKG_VERSION="6.6.6"
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 rdfind:host"

View file

@ -55,6 +55,12 @@
browseable = yes
writeable = yes
[games-roms]
path = /storage/roms
available = yes
browseable = yes
writeable = yes
[games-internal]
path = /storage/games-internal
available = yes

View file

@ -4,7 +4,7 @@
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="es-theme-art-book-next"
PKG_VERSION="15263a47b34d0a762139fd90aef927bfa6483f85"
PKG_VERSION="28e8820c8627f9e263e96c5ff058a2319cefbb03"
PKG_ARCH="any"
PKG_LICENSE="CUSTOM"
PKG_SITE="https://github.com/anthonycaccese/art-book-next-jelos"

View file

@ -3,7 +3,7 @@
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="emulationstation"
PKG_VERSION="0f013c2"
PKG_VERSION="cfde267"
PKG_GIT_CLONE_BRANCH="main"
PKG_REV="1"
PKG_ARCH="any"

View file

@ -70,7 +70,7 @@
WINDOWMANAGER="weston"
# kernel serial console
EXTRA_CMDLINE="quiet rootwait console=tty0 ssh consoleblank=0 systemd.show_status=0 loglevel=0 panic=20"
EXTRA_CMDLINE="quiet rootwait console=ttyFIQ0 console=tty0 ssh consoleblank=0 systemd.show_status=0 loglevel=0 panic=20"
# additional packages to install
ADDITIONAL_PACKAGES=""

View file

@ -1,6 +1,6 @@
diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/Makefile linux/arch/arm64/boot/dts/rockchip/Makefile
--- linux.orig/arch/arm64/boot/dts/rockchip/Makefile 2023-10-27 21:46:01.208549984 +0000
+++ linux/arch/arm64/boot/dts/rockchip/Makefile 2023-10-28 04:02:49.341614140 +0000
--- linux.orig/arch/arm64/boot/dts/rockchip/Makefile 2023-12-04 19:26:30.034642584 +0000
+++ linux/arch/arm64/boot/dts/rockchip/Makefile 2023-12-04 19:27:51.016354008 +0000
@@ -7,7 +7,11 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-ev
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-roc-cc.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-rock-pi-s.dtb
@ -14,9 +14,9 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/Makefile linux/arch/arm64/boo
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb
diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/px30.dtsi linux/arch/arm64/boot/dts/rockchip/px30.dtsi
--- linux.orig/arch/arm64/boot/dts/rockchip/px30.dtsi 2023-10-27 21:46:01.208549984 +0000
+++ linux/arch/arm64/boot/dts/rockchip/px30.dtsi 2023-10-28 04:02:49.341614140 +0000
@@ -114,12 +114,6 @@
--- linux.orig/arch/arm64/boot/dts/rockchip/px30.dtsi 2023-12-04 19:26:30.034642584 +0000
+++ linux/arch/arm64/boot/dts/rockchip/px30.dtsi 2023-12-04 20:09:47.777097235 +0000
@@ -114,27 +114,11 @@
compatible = "operating-points-v2";
opp-shared;
@ -26,10 +26,25 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/px30.dtsi linux/arch/arm64/bo
- clock-latency-ns = <40000>;
- opp-suspend;
- };
opp-816000000 {
opp-hz = /bits/ 64 <816000000>;
opp-microvolt = <1050000 1050000 1350000>;
@@ -210,12 +204,6 @@
- opp-816000000 {
- opp-hz = /bits/ 64 <816000000>;
- opp-microvolt = <1050000 1050000 1350000>;
- clock-latency-ns = <40000>;
- };
opp-1008000000 {
opp-hz = /bits/ 64 <1008000000>;
opp-microvolt = <1175000 1175000 1350000>;
clock-latency-ns = <40000>;
};
- opp-1200000000 {
- opp-hz = /bits/ 64 <1200000000>;
- opp-microvolt = <1300000 1300000 1350000>;
- clock-latency-ns = <40000>;
- };
opp-1296000000 {
opp-hz = /bits/ 64 <1296000000>;
opp-microvolt = <1350000 1350000 1350000>;
@@ -210,12 +194,6 @@
cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
contribution = <4096>;
};
@ -42,7 +57,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/px30.dtsi linux/arch/arm64/bo
};
};
@@ -223,6 +211,33 @@
@@ -223,6 +201,33 @@
polling-delay-passive = <100>; /* milliseconds */
polling-delay = <1000>; /* milliseconds */
thermal-sensors = <&tsadc 1>;
@ -76,7 +91,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/px30.dtsi linux/arch/arm64/bo
};
};
@@ -328,6 +343,32 @@
@@ -328,6 +333,32 @@
};
};
@ -100,8 +115,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/px30.dtsi linux/arch/arm64/bo
+
+ dmc_opp_table: dmc_opp_table {
+ compatible = "operating-points-v2";
+ opp-786000000 {
+ opp-hz = /bits/ 64 <786000000>;
+ opp-924000000 {
+ opp-hz = /bits/ 64 <924000000>;
+ opp-microvolt = <1125000>;
+ };
+ };
@ -109,7 +124,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/px30.dtsi linux/arch/arm64/bo
pmugrf: syscon@ff010000 {
compatible = "rockchip,px30-pmugrf", "syscon", "simple-mfd";
reg = <0x0 0xff010000 0x0 0x1000>;
@@ -453,7 +494,7 @@
@@ -453,7 +484,7 @@
#address-cells = <1>;
#size-cells = <0>;
@ -118,7 +133,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/px30.dtsi linux/arch/arm64/bo
reg = <0>;
#address-cells = <1>;
#size-cells = <0>;
@@ -468,6 +509,10 @@
@@ -468,6 +499,10 @@
remote-endpoint = <&vopl_out_lvds>;
};
};
@ -129,7 +144,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/px30.dtsi linux/arch/arm64/bo
};
};
};
@@ -1039,10 +1084,6 @@
@@ -1039,20 +1074,12 @@
gpu_opp_table: opp-table-1 {
compatible = "operating-points-v2";
@ -137,10 +152,11 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/px30.dtsi linux/arch/arm64/bo
- opp-hz = /bits/ 64 <200000000>;
- opp-microvolt = <950000>;
- };
opp-300000000 {
opp-hz = /bits/ 64 <300000000>;
opp-microvolt = <975000>;
@@ -1051,8 +1092,8 @@
- opp-300000000 {
- opp-hz = /bits/ 64 <300000000>;
- opp-microvolt = <975000>;
- };
opp-400000000 {
opp-hz = /bits/ 64 <400000000>;
opp-microvolt = <1050000>;
};
@ -151,7 +167,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/px30.dtsi linux/arch/arm64/bo
opp-microvolt = <1125000>;
};
};
@@ -1113,7 +1154,7 @@
@@ -1113,7 +1140,7 @@
#address-cells = <1>;
#size-cells = <0>;
@ -160,7 +176,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/px30.dtsi linux/arch/arm64/bo
reg = <0>;
#address-cells = <1>;
#size-cells = <0>;
@@ -1128,6 +1169,10 @@
@@ -1128,6 +1155,10 @@
remote-endpoint = <&vopl_out_dsi>;
};
};
@ -173,7 +189,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/px30.dtsi linux/arch/arm64/bo
diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351m.dts linux/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351m.dts
--- linux.orig/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351m.dts 1970-01-01 00:00:00.000000000 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351m.dts 2023-10-28 04:02:49.341614140 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351m.dts 2023-12-04 19:27:51.016354008 +0000
@@ -0,0 +1,58 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
@ -235,7 +251,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351m.dts li
+};
diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351p.dts linux/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351p.dts
--- linux.orig/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351p.dts 1970-01-01 00:00:00.000000000 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351p.dts 2023-10-28 04:02:49.341614140 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351p.dts 2023-12-04 19:27:51.016354008 +0000
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
@ -296,7 +312,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351p.dts li
+};
diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351v.dts linux/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351v.dts
--- linux.orig/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351v.dts 1970-01-01 00:00:00.000000000 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351v.dts 2023-10-28 04:02:49.341614140 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351v.dts 2023-12-04 19:27:51.016354008 +0000
@@ -0,0 +1,124 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
@ -424,7 +440,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351v.dts li
+};
diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi linux/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi
--- linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi 1970-01-01 00:00:00.000000000 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi 2023-10-28 04:02:49.341614140 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi 2023-12-04 19:27:51.016354008 +0000
@@ -0,0 +1,566 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
@ -994,7 +1010,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi linux/a
+};
diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2-v11.dts linux/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2-v11.dts
--- linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2-v11.dts 1970-01-01 00:00:00.000000000 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2-v11.dts 2023-10-28 04:02:49.341614140 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2-v11.dts 2023-12-04 19:27:51.016354008 +0000
@@ -0,0 +1,303 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
@ -1300,8 +1316,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2-v11.dts lin
+ };
+};
diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts linux/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts
--- linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts 2023-10-27 21:46:01.208549984 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts 2023-10-28 04:02:49.341614140 +0000
--- linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts 2023-12-04 19:26:30.034642584 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts 2023-12-04 19:27:51.016354008 +0000
@@ -2,55 +2,185 @@
/*
* Copyright (c) 2019 Hardkernel Co., Ltd
@ -2161,7 +2177,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts linux/a
};
diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go3.dts linux/arch/arm64/boot/dts/rockchip/rk3326-odroid-go3.dts
--- linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go3.dts 1970-01-01 00:00:00.000000000 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-odroid-go3.dts 2023-10-28 04:02:49.341614140 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3326-odroid-go3.dts 2023-12-04 19:27:51.016354008 +0000
@@ -0,0 +1,284 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
@ -2448,8 +2464,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3326-odroid-go3.dts linux/a
+ };
+};
diff -rupN linux.orig/drivers/devfreq/Kconfig linux/drivers/devfreq/Kconfig
--- linux.orig/drivers/devfreq/Kconfig 2023-10-27 21:46:01.712562721 +0000
+++ linux/drivers/devfreq/Kconfig 2023-10-28 04:02:49.341614140 +0000
--- linux.orig/drivers/devfreq/Kconfig 2023-12-04 19:26:31.526673911 +0000
+++ linux/drivers/devfreq/Kconfig 2023-12-04 19:27:51.016354008 +0000
@@ -142,6 +142,12 @@ config ARM_RK3399_DMC_DEVFREQ
It sets the frequency for the memory controller and reads the usage counts
from hardware.
@ -2464,8 +2480,8 @@ diff -rupN linux.orig/drivers/devfreq/Kconfig linux/drivers/devfreq/Kconfig
tristate "sun8i/sun50i MBUS DEVFREQ Driver"
depends on ARCH_SUNXI || COMPILE_TEST
diff -rupN linux.orig/drivers/devfreq/Makefile linux/drivers/devfreq/Makefile
--- linux.orig/drivers/devfreq/Makefile 2023-10-27 21:46:01.712562721 +0000
+++ linux/drivers/devfreq/Makefile 2023-10-28 04:02:49.341614140 +0000
--- linux.orig/drivers/devfreq/Makefile 2023-12-04 19:26:31.526673911 +0000
+++ linux/drivers/devfreq/Makefile 2023-12-04 19:27:51.016354008 +0000
@@ -13,6 +13,7 @@ obj-$(CONFIG_ARM_IMX_BUS_DEVFREQ) += imx
obj-$(CONFIG_ARM_IMX8M_DDRC_DEVFREQ) += imx8m-ddrc.o
obj-$(CONFIG_ARM_MEDIATEK_CCI_DEVFREQ) += mtk-cci-devfreq.o
@ -2476,7 +2492,7 @@ diff -rupN linux.orig/drivers/devfreq/Makefile linux/drivers/devfreq/Makefile
diff -rupN linux.orig/drivers/devfreq/rockchip_bus.c linux/drivers/devfreq/rockchip_bus.c
--- linux.orig/drivers/devfreq/rockchip_bus.c 1970-01-01 00:00:00.000000000 +0000
+++ linux/drivers/devfreq/rockchip_bus.c 2023-10-28 04:02:49.341614140 +0000
+++ linux/drivers/devfreq/rockchip_bus.c 2023-12-04 19:27:51.016354008 +0000
@@ -0,0 +1,258 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@ -2737,8 +2753,8 @@ diff -rupN linux.orig/drivers/devfreq/rockchip_bus.c linux/drivers/devfreq/rockc
+MODULE_AUTHOR("Tony Xie <tony.xie@rock-chips.com>");
+MODULE_DESCRIPTION("rockchip busfreq driver with devfreq framework");
diff -rupN linux.orig/drivers/gpu/drm/panel/Kconfig linux/drivers/gpu/drm/panel/Kconfig
--- linux.orig/drivers/gpu/drm/panel/Kconfig 2023-10-27 21:46:02.268576773 +0000
+++ linux/drivers/gpu/drm/panel/Kconfig 2023-10-28 04:02:49.341614140 +0000
--- linux.orig/drivers/gpu/drm/panel/Kconfig 2023-12-04 19:26:32.890702556 +0000
+++ linux/drivers/gpu/drm/panel/Kconfig 2023-12-04 19:27:51.016354008 +0000
@@ -296,6 +296,15 @@ config DRM_PANEL_NEC_NL8048HL11
panel (found on the Zoom2/3/3630 SDP boards). To compile this driver
as a module, choose M here.
@ -2756,8 +2772,8 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/Kconfig linux/drivers/gpu/drm/panel/
tristate "NewVision NV3052C RGB/SPI panel"
depends on OF && SPI
diff -rupN linux.orig/drivers/gpu/drm/panel/Makefile linux/drivers/gpu/drm/panel/Makefile
--- linux.orig/drivers/gpu/drm/panel/Makefile 2023-10-27 21:46:02.268576773 +0000
+++ linux/drivers/gpu/drm/panel/Makefile 2023-10-28 04:02:49.341614140 +0000
--- linux.orig/drivers/gpu/drm/panel/Makefile 2023-12-04 19:26:32.890702556 +0000
+++ linux/drivers/gpu/drm/panel/Makefile 2023-12-04 19:27:51.016354008 +0000
@@ -27,6 +27,7 @@ obj-$(CONFIG_DRM_PANEL_LEADTEK_LTK500HD1
obj-$(CONFIG_DRM_PANEL_LG_LB035Q02) += panel-lg-lb035q02.o
obj-$(CONFIG_DRM_PANEL_LG_LG4573) += panel-lg-lg4573.o
@ -2767,8 +2783,8 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/Makefile linux/drivers/gpu/drm/panel
obj-$(CONFIG_DRM_PANEL_NOVATEK_NT35510) += panel-novatek-nt35510.o
obj-$(CONFIG_DRM_PANEL_NOVATEK_NT35560) += panel-novatek-nt35560.o
diff -rupN linux.orig/drivers/gpu/drm/panel/panel-elida-kd35t133.c linux/drivers/gpu/drm/panel/panel-elida-kd35t133.c
--- linux.orig/drivers/gpu/drm/panel/panel-elida-kd35t133.c 2023-10-27 21:46:02.272576875 +0000
+++ linux/drivers/gpu/drm/panel/panel-elida-kd35t133.c 2023-10-28 04:03:32.770593063 +0000
--- linux.orig/drivers/gpu/drm/panel/panel-elida-kd35t133.c 2023-12-04 19:26:32.894702641 +0000
+++ linux/drivers/gpu/drm/panel/panel-elida-kd35t133.c 2023-12-04 19:27:51.016354008 +0000
@@ -51,14 +51,6 @@ static inline struct kd35t133 *panel_to_
return container_of(panel, struct kd35t133, panel);
}
@ -2840,7 +2856,7 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/panel-elida-kd35t133.c linux/drivers
return 0;
diff -rupN linux.orig/drivers/gpu/drm/panel/panel-newvision-nv3051d.c linux/drivers/gpu/drm/panel/panel-newvision-nv3051d.c
--- linux.orig/drivers/gpu/drm/panel/panel-newvision-nv3051d.c 1970-01-01 00:00:00.000000000 +0000
+++ linux/drivers/gpu/drm/panel/panel-newvision-nv3051d.c 2023-10-28 04:02:49.341614140 +0000
+++ linux/drivers/gpu/drm/panel/panel-newvision-nv3051d.c 2023-12-04 19:27:51.016354008 +0000
@@ -0,0 +1,518 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@ -3361,8 +3377,8 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/panel-newvision-nv3051d.c linux/driv
+MODULE_DESCRIPTION("DRM driver for Newvision NV3051D based MIPI DSI panels");
+MODULE_LICENSE("GPL");
diff -rupN linux.orig/drivers/gpu/drm/panel/panel-sitronix-st7701.c linux/drivers/gpu/drm/panel/panel-sitronix-st7701.c
--- linux.orig/drivers/gpu/drm/panel/panel-sitronix-st7701.c 2023-10-27 21:46:02.272576875 +0000
+++ linux/drivers/gpu/drm/panel/panel-sitronix-st7701.c 2023-10-28 04:02:49.341614140 +0000
--- linux.orig/drivers/gpu/drm/panel/panel-sitronix-st7701.c 2023-12-04 19:26:32.898702724 +0000
+++ linux/drivers/gpu/drm/panel/panel-sitronix-st7701.c 2023-12-04 19:27:51.016354008 +0000
@@ -19,6 +19,9 @@
/* Command2 BKx selection command */
@ -3678,8 +3694,8 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/panel-sitronix-st7701.c linux/driver
{ }
};
diff -rupN linux.orig/drivers/input/Kconfig linux/drivers/input/Kconfig
--- linux.orig/drivers/input/Kconfig 2023-10-27 21:46:02.400580110 +0000
+++ linux/drivers/input/Kconfig 2023-10-28 04:02:49.341614140 +0000
--- linux.orig/drivers/input/Kconfig 2023-12-04 19:26:33.286710875 +0000
+++ linux/drivers/input/Kconfig 2023-12-04 19:27:51.016354008 +0000
@@ -51,6 +51,19 @@ config INPUT_FF_MEMLESS
To compile this driver as a module, choose M here: the
module will be called ff-memless.
@ -3701,8 +3717,8 @@ diff -rupN linux.orig/drivers/input/Kconfig linux/drivers/input/Kconfig
tristate "Sparse keymap support library"
help
diff -rupN linux.orig/drivers/input/Makefile linux/drivers/input/Makefile
--- linux.orig/drivers/input/Makefile 2023-10-27 21:46:02.400580110 +0000
+++ linux/drivers/input/Makefile 2023-10-28 04:02:49.341614140 +0000
--- linux.orig/drivers/input/Makefile 2023-12-04 19:26:33.286710875 +0000
+++ linux/drivers/input/Makefile 2023-12-04 19:27:51.016354008 +0000
@@ -10,6 +10,7 @@ input-core-y := input.o input-compat.o i
input-core-y += touchscreen.o
@ -3713,7 +3729,7 @@ diff -rupN linux.orig/drivers/input/Makefile linux/drivers/input/Makefile
obj-$(CONFIG_INPUT_VIVALDIFMAP) += vivaldi-fmap.o
diff -rupN linux.orig/drivers/input/input-polldev.c linux/drivers/input/input-polldev.c
--- linux.orig/drivers/input/input-polldev.c 1970-01-01 00:00:00.000000000 +0000
+++ linux/drivers/input/input-polldev.c 2023-10-28 04:02:49.341614140 +0000
+++ linux/drivers/input/input-polldev.c 2023-12-04 19:27:51.016354008 +0000
@@ -0,0 +1,362 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
@ -4078,8 +4094,8 @@ diff -rupN linux.orig/drivers/input/input-polldev.c linux/drivers/input/input-po
+}
+EXPORT_SYMBOL(input_unregister_polled_device);
diff -rupN linux.orig/drivers/input/joystick/Kconfig linux/drivers/input/joystick/Kconfig
--- linux.orig/drivers/input/joystick/Kconfig 2023-10-27 21:46:02.400580110 +0000
+++ linux/drivers/input/joystick/Kconfig 2023-10-28 04:02:49.341614140 +0000
--- linux.orig/drivers/input/joystick/Kconfig 2023-12-04 19:26:33.290710958 +0000
+++ linux/drivers/input/joystick/Kconfig 2023-12-04 19:27:51.016354008 +0000
@@ -400,6 +400,21 @@ config JOYSTICK_N64
Say Y here if you want enable support for the four
built-in controller ports on the Nintendo 64 console.
@ -4103,8 +4119,8 @@ diff -rupN linux.orig/drivers/input/joystick/Kconfig linux/drivers/input/joystic
tristate "Raspberry Pi Sense HAT joystick"
depends on INPUT && I2C
diff -rupN linux.orig/drivers/input/joystick/Makefile linux/drivers/input/joystick/Makefile
--- linux.orig/drivers/input/joystick/Makefile 2023-10-27 21:46:02.400580110 +0000
+++ linux/drivers/input/joystick/Makefile 2023-10-28 04:02:49.341614140 +0000
--- linux.orig/drivers/input/joystick/Makefile 2023-12-04 19:26:33.290710958 +0000
+++ linux/drivers/input/joystick/Makefile 2023-12-04 19:27:51.016354008 +0000
@@ -25,6 +25,9 @@ obj-$(CONFIG_JOYSTICK_JOYDUMP) += joydu
obj-$(CONFIG_JOYSTICK_MAGELLAN) += magellan.o
obj-$(CONFIG_JOYSTICK_MAPLE) += maplecontrol.o
@ -4117,7 +4133,7 @@ diff -rupN linux.orig/drivers/input/joystick/Makefile linux/drivers/input/joysti
obj-$(CONFIG_JOYSTICK_QWIIC) += qwiic-joystick.o
diff -rupN linux.orig/drivers/input/joystick/odroidgo2-joypad.c linux/drivers/input/joystick/odroidgo2-joypad.c
--- linux.orig/drivers/input/joystick/odroidgo2-joypad.c 1970-01-01 00:00:00.000000000 +0000
+++ linux/drivers/input/joystick/odroidgo2-joypad.c 2023-10-28 04:02:49.341614140 +0000
+++ linux/drivers/input/joystick/odroidgo2-joypad.c 2023-12-04 19:27:51.016354008 +0000
@@ -0,0 +1,878 @@
+/*
+ * SARADC joystick & GPIO Button driver for Linux(Hardkernel ODROIDGO2-Advance)
@ -4999,7 +5015,7 @@ diff -rupN linux.orig/drivers/input/joystick/odroidgo2-joypad.c linux/drivers/in
+/*----------------------------------------------------------------------------*/
diff -rupN linux.orig/drivers/input/joystick/odroidgo2-v11-joypad.c linux/drivers/input/joystick/odroidgo2-v11-joypad.c
--- linux.orig/drivers/input/joystick/odroidgo2-v11-joypad.c 1970-01-01 00:00:00.000000000 +0000
+++ linux/drivers/input/joystick/odroidgo2-v11-joypad.c 2023-10-28 04:02:49.341614140 +0000
+++ linux/drivers/input/joystick/odroidgo2-v11-joypad.c 2023-12-04 19:27:51.016354008 +0000
@@ -0,0 +1,878 @@
+/*
+ * SARADC joystick & GPIO Button driver for Linux(Hardkernel ODROIDGO2-Advance)
@ -5881,7 +5897,7 @@ diff -rupN linux.orig/drivers/input/joystick/odroidgo2-v11-joypad.c linux/driver
+/*----------------------------------------------------------------------------*/
diff -rupN linux.orig/drivers/input/joystick/odroidgo3-joypad.c linux/drivers/input/joystick/odroidgo3-joypad.c
--- linux.orig/drivers/input/joystick/odroidgo3-joypad.c 1970-01-01 00:00:00.000000000 +0000
+++ linux/drivers/input/joystick/odroidgo3-joypad.c 2023-10-28 04:02:49.341614140 +0000
+++ linux/drivers/input/joystick/odroidgo3-joypad.c 2023-12-04 19:27:51.016354008 +0000
@@ -0,0 +1,1086 @@
+/*
+ * SARADC joystick & GPIO Button driver for Linux(Hardkernel ODROIDGO2-Advance)
@ -6970,8 +6986,8 @@ diff -rupN linux.orig/drivers/input/joystick/odroidgo3-joypad.c linux/drivers/in
+
+/*----------------------------------------------------------------------------*/
diff -rupN linux.orig/drivers/power/supply/rk817_charger.c linux/drivers/power/supply/rk817_charger.c
--- linux.orig/drivers/power/supply/rk817_charger.c 2023-10-27 21:46:02.984594866 +0000
+++ linux/drivers/power/supply/rk817_charger.c 2023-10-28 04:02:49.341614140 +0000
--- linux.orig/drivers/power/supply/rk817_charger.c 2023-12-04 19:26:35.226751631 +0000
+++ linux/drivers/power/supply/rk817_charger.c 2023-12-04 19:27:51.016354008 +0000
@@ -679,7 +679,7 @@ static enum power_supply_usb_type rk817_
};
@ -6983,7 +6999,7 @@ diff -rupN linux.orig/drivers/power/supply/rk817_charger.c linux/drivers/power/s
.num_properties = ARRAY_SIZE(rk817_bat_props),
diff -rupN linux.orig/include/linux/input-polldev.h linux/include/linux/input-polldev.h
--- linux.orig/include/linux/input-polldev.h 1970-01-01 00:00:00.000000000 +0000
+++ linux/include/linux/input-polldev.h 2023-10-28 04:02:49.341614140 +0000
+++ linux/include/linux/input-polldev.h 2023-12-04 19:27:51.016354008 +0000
@@ -0,0 +1,58 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef _INPUT_POLLDEV_H