Merge pull request #2228 from JustEnoughLinuxOS/dev

PR for release
2023-10-21 21:34:07 -04:00 · 2023-10-21 21:34:07 -04:00 · ae5b095de4
commit ae5b095de4
parent de3ce8b79b e4edca8ae8
104 changed files with 1079 additions and 479 deletions
--- a/.github/workflows/build-main.yaml
+++ b/.github/workflows/build-main.yaml
@ -104,7 +104,8 @@ jobs:
            |**Anbernic RG353P/M/V/VS, RG503, Powkiddy RK2023, RGB30**|[JELOS-RK3566.aarch64-${{ steps.version.outputs.version }}.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3566.aarch64-${{ steps.version.outputs.version }}.img.gz)|[documentation](/documentation/PER_DEVICE_DOCUMENTATION/RK3566/)|
            |**Anbernic RG552**|[JELOS-RK3399.aarch64-${{ steps.version.outputs.version }}.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3399.aarch64-${{ steps.version.outputs.version }}.img.gz)|[documentation](/documentation/PER_DEVICE_DOCUMENTATION/RK3399/)|
            |**Atari VCS, AOKZOE, Ayaneo, Ayn, GPD, and other x86_64 devices**|[JELOS-AMD64.x86_64-${{ steps.version.outputs.version }}.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-AMD64.x86_64-${{ steps.version.outputs.version }}.img.gz)|[documentation](/documentation/PER_DEVICE_DOCUMENTATION/AMD64/)|
-            |**Hardkernel ODROID Go Ultra, Powkiddy RGB10 Max 3 Pro**|[JELOS-S922X.aarch64-${{ steps.version.outputs.version }}.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-S922X.aarch64-${{ steps.version.outputs.version }}.img.gz)|[documentation](/documentation/PER_DEVICE_DOCUMENTATION/S922X/)|
+            |**Hardkernel ODROID Go Ultra, Powkiddy RGB10 Max 3 Pro**|[JELOS-S922X.aarch64-${{ steps.version.outputs.version }}-Odroid_GOU.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-S922X.aarch64-${{ steps.version.outputs.version }}.img.gz)|[documentation](/documentation/PER_DEVICE_DOCUMENTATION/S922X/)|
+            |**Hardkernel ODROID N2/N2+**|[JELOS-S922X.aarch64-${{ steps.version.outputs.version }}-Odroid_N2.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-S922X.aarch64-${{ steps.version.outputs.version }}.img.gz)|[documentation](/documentation/PER_DEVICE_DOCUMENTATION/S922X/)|
            |**Orange Pi 5, and Indiedroid Nova**|[JELOS-RK3588.aarch64-${{ steps.version.outputs.version }}.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3588.aarch64-${{ steps.version.outputs.version }}.img.gz)|[documentation](/documentation/PER_DEVICE_DOCUMENTATION/RK3588/)|
            |**Powkiddy x55**|[JELOS-RK3566-X55.aarch64-${{ steps.version.outputs.version }}.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3566-X55.aarch64-${{ steps.version.outputs.version }}.img.gz)|[documentation](/documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/)|

@ -122,7 +123,7 @@ jobs:
            |**Anbernic RG353P/M/V/VS, RG503, Powkiddy RK2023, RGB30**|[JELOS-RK3566.aarch64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3566.aarch64-${{ steps.version.outputs.version }}.tar)|
            |**Anbernic RG552**|[JELOS-RK3399.aarch64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3399.aarch64-${{ steps.version.outputs.version }}.tar)|
            |****Atari VCS, AOKZOE, Ayaneo, Ayn, GPD, and other x86_64 devices****|[JELOS-AMD64.x86_64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-AMD64.x86_64-${{ steps.version.outputs.version }}.tar)|
-            |**Hardkernel ODROID Go Ultra, Powkiddy RGB10 Max 3 Pro**|[JELOS-S922X.aarch64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-S922X.aarch64-${{ steps.version.outputs.version }}.tar)|
+            |**Hardkernel ODROID Go Ultra, N2/N2+, Powkiddy RGB10 Max 3 Pro**|[JELOS-S922X.aarch64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-S922X.aarch64-${{ steps.version.outputs.version }}.tar)|
            |**Orange Pi 5, and Indiedroid Nova**|[JELOS-RK3588.aarch64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3588.aarch64-${{ steps.version.outputs.version }}.tar)|
            |**Powkiddy x55**|[JELOS-RK3566-X55.aarch64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3566-X55.aarch64-${{ steps.version.outputs.version }}.tar)|

--- a/README.md
+++ b/README.md
@ -55,7 +55,7 @@ Under the following terms:

 ### JELOS Software

-Copyright 2021-present Fewtarius
+Copyright 2021-present JELOS Project

 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)

@ -123,6 +123,7 @@ JELOS supports a variety of ARM and Intel/AMD based devices.
 | Hardkernel | [Odroid Go Advance](http://jelos.org/devices/hardkernel/odroid-go-advance) | Rockchip RK3326 (ARM) | Mainline Linux | Panfrost | Weston + Emulation Station |
 | Hardkernel | [Odroid Go Super](http://jelos.org/devices/hardkernel/odroid-go-super) | Rockchip RK3326 (ARM) | Mainline Linux | Panfrost | Weston + Emulation Station |
 | Hardkernel | [Odroid Go Ultra](http://jelos.org/devices/hardkernel/odroid-go-ultra) | Amlogic S922X / Mali G52 M6 (ARMv8-A) | Mainline Linux | Mali | Weston + Emulation Station |
+| Hardkernel | [Odroid N2/N2+](http://jelos.org/devices/hardkernel/odroid-n2) | Amlogic S922X / Mali G52 M6 (ARMv8-A) | Mainline Linux | Mali | Weston + Emulation Station |
 | Indiedroid | [Nova](http://jelos.org/devices/indiedroid/nova) | Rockchip RK3588S / Mali G610 (ARMv8-A) | Rockchip 5.10 BSP Linux | Panfrost | Weston + Emulation Station |
 | Orange Pi | [Orange Pi 5](http://jelos.org/devices/orange-pi/orange-pi-5) | Rockchip RK3588S / Mali G610 (ARMv8-A) | Rockchip 5.10 BSP Linux | Panfrost | Weston + Emulation Station |
 | Powkiddy | [RGB10 Max 3 Pro](http://jelos.org/devices/powkiddy/rgb10-max-3-pro) | Amlogic A311D / Mali G52 M4 (ARMv8-A) | Mainline Linux | Mali | Weston + Emulation Station |
--- a/config/blocklist
+++ b/config/blocklist
@ -8,3 +8,5 @@ ryujinx-sa #broken on JELOS after build 1.1740.
 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.
--- a/config/emulators/imageviewer.conf
+++ b/config/emulators/imageviewer.conf
@ -1,8 +1,8 @@
 SYSTEM_NAME="imageviewer"
 SYSTEM_FULLNAME="Screenshots"
-SYSTEM_MANUFACTURER="JELOS"
-SYSTEM_RELEASE="2021"
-SYSTEM_HARDWARE="system"
+SYSTEM_MANUFACTURER="&#xf013; System"
+SYSTEM_RELEASE="System"
+SYSTEM_HARDWARE="System"
 SYSTEM_PATH="/storage/roms/screenshots"
 SYSTEM_EXTENSION=".jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi"
 SYSTEM_COMMAND="/usr/bin/true"
--- a/config/emulators/moonlight.conf
+++ b/config/emulators/moonlight.conf
@ -1,8 +1,8 @@
 SYSTEM_NAME="moonlight"
 SYSTEM_FULLNAME="Moonlight Game Streaming"
-SYSTEM_MANUFACTURER="JELOS"
-SYSTEM_RELEASE="2021"
-SYSTEM_HARDWARE="system"
+SYSTEM_MANUFACTURER="&#xf013; System"
+SYSTEM_RELEASE="System"
+SYSTEM_HARDWARE="System"
 SYSTEM_PATH="/storage/roms/moonlight/"
 SYSTEM_EXTENSION=".sh"
 SYSTEM_COMMAND="/bin/sh %ROM%"
--- a/config/emulators/mplayer.conf
+++ b/config/emulators/mplayer.conf
@ -1,8 +1,8 @@
 SYSTEM_NAME="mplayer"
 SYSTEM_FULLNAME="Media Player"
-SYSTEM_MANUFACTURER="JELOS"
-SYSTEM_RELEASE="unknown"
-SYSTEM_HARDWARE="system"
+SYSTEM_MANUFACTURER="&#xf013; System"
+SYSTEM_RELEASE="System"
+SYSTEM_HARDWARE="System"
 SYSTEM_PATH="/storage/roms/mplayer"
 SYSTEM_EXTENSION=".mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd"
 SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\""
--- a/config/emulators/music.conf
+++ b/config/emulators/music.conf
@ -1,8 +1,8 @@
 SYSTEM_NAME="music"
 SYSTEM_FULLNAME="Music Player"
-SYSTEM_MANUFACTURER="JELOS"
-SYSTEM_RELEASE="unknown"
-SYSTEM_HARDWARE="system"
+SYSTEM_MANUFACTURER="&#xf013; System"
+SYSTEM_RELEASE="System"
+SYSTEM_HARDWARE="System"
 SYSTEM_PATH="/storage/.config/gmu/playlists"
 SYSTEM_EXTENSION=".m3u .sh" 
 SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\""
--- a/config/emulators/neocd.conf
+++ b/config/emulators/neocd.conf
@ -1,7 +1,7 @@
 SYSTEM_NAME="neocd"
 SYSTEM_FULLNAME="Neo Geo CD"
 SYSTEM_MANUFACTURER="SNK"
-SYSTEM_RELEASE="1990"
+SYSTEM_RELEASE="1994"
 SYSTEM_HARDWARE="console"
 SYSTEM_PATH="/storage/roms/neocd"
 SYSTEM_EXTENSION=".cue .iso .chd"
--- a/config/emulators/openbor.conf
+++ b/config/emulators/openbor.conf
@ -1,7 +1,7 @@
 SYSTEM_NAME="openbor"
 SYSTEM_FULLNAME="OpenBOR"
 SYSTEM_MANUFACTURER="Various"
-SYSTEM_RELEASE="2008"
+SYSTEM_RELEASE="2003"
 SYSTEM_HARDWARE="game engine"
 SYSTEM_PATH="/storage/roms/openbor"
 SYSTEM_EXTENSION=".pak"
--- a/config/emulators/pico-8.conf
+++ b/config/emulators/pico-8.conf
@ -4,7 +4,7 @@ SYSTEM_MANUFACTURER="Lexaloffle"
 SYSTEM_RELEASE="2015"
 SYSTEM_HARDWARE="console"
 SYSTEM_PATH="/storage/roms/pico-8"
-SYSTEM_EXTENSION=".sh .p8 .png"
+SYSTEM_EXTENSION=".p8 .png"
 SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\""
 SYSTEM_PLATFORM="pico-8"
 SYSTEM_THEME="pico-8"
--- a/config/emulators/ports.conf
+++ b/config/emulators/ports.conf
@ -1,8 +1,8 @@
 SYSTEM_NAME="ports"
 SYSTEM_FULLNAME="Ports"
-SYSTEM_MANUFACTURER="JELOS"
-SYSTEM_RELEASE="2021"
-SYSTEM_HARDWARE="PC"
+SYSTEM_MANUFACTURER="&#xf013; System"
+SYSTEM_RELEASE="System"
+SYSTEM_HARDWARE="System"
 SYSTEM_PATH="/storage/roms/ports"
 SYSTEM_EXTENSION=".sh"
 SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\""
--- a/config/emulators/sc-3000.conf
+++ b/config/emulators/sc-3000.conf
@ -1,10 +0,0 @@
-SYSTEM_NAME="sc-3000"
-SYSTEM_FULLNAME="SC-3000"
-SYSTEM_MANUFACTURER="Sega"
-SYSTEM_RELEASE="1983"
-SYSTEM_HARDWARE="computer"
-SYSTEM_PATH="/storage/roms/sc-3000"
-SYSTEM_EXTENSION=".bin .sg .zip .7z"
-SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\""
-SYSTEM_PLATFORM="sc-3000"
-SYSTEM_THEME="sc-3000"
--- a/config/emulators/tools.conf
+++ b/config/emulators/tools.conf
@ -1,8 +1,8 @@
 SYSTEM_NAME="tools"
 SYSTEM_FULLNAME="Tools"
-SYSTEM_MANUFACTURER="JELOS"
-SYSTEM_RELEASE="2021"
-SYSTEM_HARDWARE="system"
+SYSTEM_MANUFACTURER="&#xf013; System"
+SYSTEM_RELEASE="System"
+SYSTEM_HARDWARE="System"
 SYSTEM_PATH="/storage/.config/modules"
 SYSTEM_EXTENSION=".sh"
 SYSTEM_COMMAND="/usr/bin/run %ROM%"
--- a/config/emulators/vectrex.conf
+++ b/config/emulators/vectrex.conf
@ -1,6 +1,6 @@
 SYSTEM_NAME="vectrex"
 SYSTEM_FULLNAME="Vectrex"
-SYSTEM_MANUFACTURER="Milton Bradley"
+SYSTEM_MANUFACTURER="Smith Engineering"
 SYSTEM_RELEASE="1982"
 SYSTEM_HARDWARE="console"
 SYSTEM_PATH="/storage/roms/vectrex"
--- a/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md
@ -6,6 +6,12 @@ This document describes all available systems emulators and cores available for

 |Manufacturer|System|Release Date|Games Path|Supported Extensions|Emulator / Core|
 |----|----|----|----|----|----|
+|&#xf013; System|Media Player (mplayer)|System|`mplayer`|.mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd|**mplayer:** mplayer (default)<br>|
+|&#xf013; System|Moonlight Game Streaming (moonlight)|System|`moonlight`|.sh||
+|&#xf013; System|Music Player (music)|System|`playlists`|.m3u .sh|**gmu:** gmu (default)<br>|
+|&#xf013; System|Ports (ports)|System|`ports`|.sh||
+|&#xf013; System|Screenshots (imageviewer)|System|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
+|&#xf013; System|Tools (tools)|System|`modules`|.sh||
 |Amstrad|CPC (amstradcpc)|1984|`amstradcpc`|.dsk .sna .tap .cdt .kcr .voc .m3u .zip .7z|**retroarch:** crocods (default)<br>**retroarch:** cap32<br>|
 |Arcade|Arcade (arcade)|1984|`arcade`|.zip .7z|**retroarch:** mame2003_plus (default)<br>**retroarch:** mame2000<br>**retroarch:** mame2010<br>**retroarch:** mame2015<br>**retroarch:** fbneo<br>**retroarch:** fbalpha2012<br>**retroarch:** fbalpha2019<br>**retroarch:** mame<br>|
 |Arcade|Daphne (daphne)|1996|`daphne`|.daphne .zip|**hypseus:** hypseus (default)<br>**retroarch:** daphne<br>|
@ -38,13 +44,7 @@ This document describes all available systems emulators and cores available for
 |id Software|Doom (doom)|1993|`doom`|.doom|**gzdoom:** gzdoom-sa (default)<br>|
 |id Software|iDtech (idtech)|1991|`idtech`|.sh|**retroarch:** idtech<br>|
 |Infocom|Z-machine (zmachine)|1979|`zmachine`|.dat .z1 .z2 .z3 .z4 .z5 .z6 .zip|**retroarch:** mojozork (default)<br>|
-|JELOS|Media Player (mplayer)|unknown|`mplayer`|.mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd|**mplayer:** mplayer (default)<br>|
-|JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh||
-|JELOS|Music Player (music)|unknown|`playlists`|.m3u .sh|**gmu:** gmu (default)<br>|
-|JELOS|Ports (ports)|2021|`ports`|.sh||
-|JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
-|JELOS|Tools (tools)|2021|`modules`|.sh||
-|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.sh .p8 .png|**pico-8:** pico8 (default)<br>**retroarch:** fake08<br>|
+|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)<br>**retroarch:** fake08<br>|
 |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)<br>|
 |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (default)<br>|
 |Microsoft|MS-DOS (pc)|1981|`pc`|.com .bat .exe .dosz|**retroarch:** dosbox_pure<br>**retroarch:** dosbox_svn<br>|
--- a/documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md
@ -6,6 +6,12 @@ This document describes all available systems emulators and cores available for

 |Manufacturer|System|Release Date|Games Path|Supported Extensions|Emulator / Core|
 |----|----|----|----|----|----|
+|&#xf013; System|Media Player (mplayer)|System|`mplayer`|.mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd|**mplayer:** mplayer (default)<br>|
+|&#xf013; System|Moonlight Game Streaming (moonlight)|System|`moonlight`|.sh||
+|&#xf013; System|Music Player (music)|System|`playlists`|.m3u .sh|**gmu:** gmu (default)<br>|
+|&#xf013; System|Ports (ports)|System|`ports`|.sh||
+|&#xf013; System|Screenshots (imageviewer)|System|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
+|&#xf013; System|Tools (tools)|System|`modules`|.sh||
 |Amstrad|CPC (amstradcpc)|1984|`amstradcpc`|.dsk .sna .tap .cdt .kcr .voc .m3u .zip .7z|**retroarch:** crocods (default)<br>**retroarch:** cap32<br>|
 |Arcade|Arcade (arcade)|1984|`arcade`|.zip .7z|**retroarch:** mame2003_plus (default)<br>**retroarch:** mame2000<br>**retroarch:** mame2010<br>**retroarch:** mame2015<br>**retroarch:** fbneo<br>**retroarch:** fbalpha2012<br>**retroarch:** fbalpha2019<br>|
 |Arcade|Daphne (daphne)|1996|`daphne`|.daphne .zip|**hypseus:** hypseus (default)<br>**retroarch:** daphne<br>|
@ -38,13 +44,7 @@ This document describes all available systems emulators and cores available for
 |id Software|Doom (doom)|1993|`doom`|.doom|**gzdoom:** gzdoom-sa (default)<br>|
 |id Software|iDtech (idtech)|1991|`idtech`|.sh|**retroarch:** idtech<br>|
 |Infocom|Z-machine (zmachine)|1979|`zmachine`|.dat .z1 .z2 .z3 .z4 .z5 .z6 .zip|**retroarch:** mojozork (default)<br>|
-|JELOS|Media Player (mplayer)|unknown|`mplayer`|.mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd|**mplayer:** mplayer (default)<br>|
-|JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh||
-|JELOS|Music Player (music)|unknown|`playlists`|.m3u .sh|**gmu:** gmu (default)<br>|
-|JELOS|Ports (ports)|2021|`ports`|.sh||
-|JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
-|JELOS|Tools (tools)|2021|`modules`|.sh||
-|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.sh .p8 .png|**pico-8:** pico8 (default)<br>**retroarch:** fake08<br>|
+|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)<br>**retroarch:** fake08<br>|
 |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)<br>|
 |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (default)<br>|
 |Microsoft|MS-DOS (pc)|1981|`pc`|.com .bat .exe .dosz|**retroarch:** dosbox_pure<br>**retroarch:** dosbox_svn<br>|
--- a/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md
@ -6,6 +6,12 @@ This document describes all available systems emulators and cores available for

 |Manufacturer|System|Release Date|Games Path|Supported Extensions|Emulator / Core|
 |----|----|----|----|----|----|
+|&#xf013; System|Media Player (mplayer)|System|`mplayer`|.mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd|**mplayer:** mplayer (default)<br>|
+|&#xf013; System|Moonlight Game Streaming (moonlight)|System|`moonlight`|.sh||
+|&#xf013; System|Music Player (music)|System|`playlists`|.m3u .sh|**gmu:** gmu (default)<br>|
+|&#xf013; System|Ports (ports)|System|`ports`|.sh||
+|&#xf013; System|Screenshots (imageviewer)|System|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
+|&#xf013; System|Tools (tools)|System|`modules`|.sh||
 |Amstrad|CPC (amstradcpc)|1984|`amstradcpc`|.dsk .sna .tap .cdt .kcr .voc .m3u .zip .7z|**retroarch:** crocods (default)<br>**retroarch:** cap32<br>|
 |Arcade|Arcade (arcade)|1984|`arcade`|.zip .7z|**retroarch:** mame2003_plus (default)<br>**retroarch:** mame2000<br>**retroarch:** mame2010<br>**retroarch:** mame2015<br>**retroarch:** fbneo<br>**retroarch:** fbalpha2012<br>**retroarch:** fbalpha2019<br>**retroarch:** mame<br>|
 |Arcade|Daphne (daphne)|1996|`daphne`|.daphne .zip|**hypseus:** hypseus (default)<br>**retroarch:** daphne<br>|
@ -38,13 +44,7 @@ This document describes all available systems emulators and cores available for
 |id Software|Doom (doom)|1993|`doom`|.doom|**gzdoom:** gzdoom-sa (default)<br>|
 |id Software|iDtech (idtech)|1991|`idtech`|.sh|**retroarch:** idtech<br>|
 |Infocom|Z-machine (zmachine)|1979|`zmachine`|.dat .z1 .z2 .z3 .z4 .z5 .z6 .zip|**retroarch:** mojozork (default)<br>|
-|JELOS|Media Player (mplayer)|unknown|`mplayer`|.mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd|**mplayer:** mplayer (default)<br>|
-|JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh||
-|JELOS|Music Player (music)|unknown|`playlists`|.m3u .sh|**gmu:** gmu (default)<br>|
-|JELOS|Ports (ports)|2021|`ports`|.sh||
-|JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
-|JELOS|Tools (tools)|2021|`modules`|.sh||
-|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.sh .p8 .png|**pico-8:** pico8 (default)<br>**retroarch:** fake08<br>|
+|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)<br>**retroarch:** fake08<br>|
 |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)<br>|
 |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (default)<br>|
 |Microsoft|MS-DOS (pc)|1981|`pc`|.com .bat .exe .dosz|**retroarch:** dosbox_pure<br>**retroarch:** dosbox_svn<br>|
--- a/documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md
@ -6,6 +6,12 @@ This document describes all available systems emulators and cores available for

 |Manufacturer|System|Release Date|Games Path|Supported Extensions|Emulator / Core|
 |----|----|----|----|----|----|
+|&#xf013; System|Media Player (mplayer)|System|`mplayer`|.mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd|**mplayer:** mplayer (default)<br>|
+|&#xf013; System|Moonlight Game Streaming (moonlight)|System|`moonlight`|.sh||
+|&#xf013; System|Music Player (music)|System|`playlists`|.m3u .sh|**gmu:** gmu (default)<br>|
+|&#xf013; System|Ports (ports)|System|`ports`|.sh||
+|&#xf013; System|Screenshots (imageviewer)|System|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
+|&#xf013; System|Tools (tools)|System|`modules`|.sh||
 |Amstrad|CPC (amstradcpc)|1984|`amstradcpc`|.dsk .sna .tap .cdt .kcr .voc .m3u .zip .7z|**retroarch:** crocods (default)<br>**retroarch:** cap32<br>|
 |Arcade|Arcade (arcade)|1984|`arcade`|.zip .7z|**retroarch:** mame2003_plus (default)<br>**retroarch:** mame2000<br>**retroarch:** mame2010<br>**retroarch:** mame2015<br>**retroarch:** fbneo<br>**retroarch:** fbalpha2012<br>**retroarch:** fbalpha2019<br>|
 |Arcade|Daphne (daphne)|1996|`daphne`|.daphne .zip|**hypseus:** hypseus (default)<br>**retroarch:** daphne<br>|
@ -38,13 +44,7 @@ This document describes all available systems emulators and cores available for
 |id Software|Doom (doom)|1993|`doom`|.doom|**gzdoom:** gzdoom-sa (default)<br>|
 |id Software|iDtech (idtech)|1991|`idtech`|.sh|**retroarch:** idtech<br>|
 |Infocom|Z-machine (zmachine)|1979|`zmachine`|.dat .z1 .z2 .z3 .z4 .z5 .z6 .zip|**retroarch:** mojozork (default)<br>|
-|JELOS|Media Player (mplayer)|unknown|`mplayer`|.mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd|**mplayer:** mplayer (default)<br>|
-|JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh||
-|JELOS|Music Player (music)|unknown|`playlists`|.m3u .sh|**gmu:** gmu (default)<br>|
-|JELOS|Ports (ports)|2021|`ports`|.sh||
-|JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
-|JELOS|Tools (tools)|2021|`modules`|.sh||
-|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.sh .p8 .png|**pico-8:** pico8 (default)<br>**retroarch:** fake08<br>|
+|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)<br>**retroarch:** fake08<br>|
 |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)<br>|
 |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (default)<br>|
 |Microsoft|MS-DOS (pc)|1981|`pc`|.com .bat .exe .dosz|**retroarch:** dosbox_pure<br>**retroarch:** dosbox_svn<br>|
--- a/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md
@ -6,6 +6,12 @@ This document describes all available systems emulators and cores available for

 |Manufacturer|System|Release Date|Games Path|Supported Extensions|Emulator / Core|
 |----|----|----|----|----|----|
+|&#xf013; System|Media Player (mplayer)|System|`mplayer`|.mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd|**mplayer:** mplayer (default)<br>|
+|&#xf013; System|Moonlight Game Streaming (moonlight)|System|`moonlight`|.sh||
+|&#xf013; System|Music Player (music)|System|`playlists`|.m3u .sh|**gmu:** gmu (default)<br>|
+|&#xf013; System|Ports (ports)|System|`ports`|.sh||
+|&#xf013; System|Screenshots (imageviewer)|System|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
+|&#xf013; System|Tools (tools)|System|`modules`|.sh||
 |Amstrad|CPC (amstradcpc)|1984|`amstradcpc`|.dsk .sna .tap .cdt .kcr .voc .m3u .zip .7z|**retroarch:** crocods (default)<br>**retroarch:** cap32<br>|
 |Arcade|Arcade (arcade)|1984|`arcade`|.zip .7z|**retroarch:** mame2003_plus (default)<br>**retroarch:** mame2000<br>**retroarch:** mame2010<br>**retroarch:** mame2015<br>**retroarch:** fbneo<br>**retroarch:** fbalpha2012<br>**retroarch:** fbalpha2019<br>|
 |Arcade|Daphne (daphne)|1996|`daphne`|.daphne .zip|**hypseus:** hypseus (default)<br>**retroarch:** daphne<br>|
@ -38,13 +44,7 @@ This document describes all available systems emulators and cores available for
 |id Software|Doom (doom)|1993|`doom`|.doom|**gzdoom:** gzdoom-sa (default)<br>|
 |id Software|iDtech (idtech)|1991|`idtech`|.sh|**retroarch:** idtech<br>|
 |Infocom|Z-machine (zmachine)|1979|`zmachine`|.dat .z1 .z2 .z3 .z4 .z5 .z6 .zip|**retroarch:** mojozork (default)<br>|
-|JELOS|Media Player (mplayer)|unknown|`mplayer`|.mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd|**mplayer:** mplayer (default)<br>|
-|JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh||
-|JELOS|Music Player (music)|unknown|`playlists`|.m3u .sh|**gmu:** gmu (default)<br>|
-|JELOS|Ports (ports)|2021|`ports`|.sh||
-|JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
-|JELOS|Tools (tools)|2021|`modules`|.sh||
-|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.sh .p8 .png|**pico-8:** pico8 (default)<br>**retroarch:** fake08<br>|
+|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)<br>**retroarch:** fake08<br>|
 |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)<br>|
 |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (default)<br>|
 |Microsoft|MS-DOS (pc)|1981|`pc`|.com .bat .exe .dosz|**retroarch:** dosbox_pure<br>**retroarch:** dosbox_svn<br>|
--- a/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md
@ -6,6 +6,12 @@ This document describes all available systems emulators and cores available for

 |Manufacturer|System|Release Date|Games Path|Supported Extensions|Emulator / Core|
 |----|----|----|----|----|----|
+|&#xf013; System|Media Player (mplayer)|System|`mplayer`|.mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd|**mplayer:** mplayer (default)<br>|
+|&#xf013; System|Moonlight Game Streaming (moonlight)|System|`moonlight`|.sh||
+|&#xf013; System|Music Player (music)|System|`playlists`|.m3u .sh|**gmu:** gmu (default)<br>|
+|&#xf013; System|Ports (ports)|System|`ports`|.sh||
+|&#xf013; System|Screenshots (imageviewer)|System|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
+|&#xf013; System|Tools (tools)|System|`modules`|.sh||
 |Amstrad|CPC (amstradcpc)|1984|`amstradcpc`|.dsk .sna .tap .cdt .kcr .voc .m3u .zip .7z|**retroarch:** crocods (default)<br>**retroarch:** cap32<br>|
 |Arcade|Arcade (arcade)|1984|`arcade`|.zip .7z|**retroarch:** mame2003_plus (default)<br>**retroarch:** mame2000<br>**retroarch:** mame2010<br>**retroarch:** mame2015<br>**retroarch:** fbneo<br>**retroarch:** fbalpha2012<br>**retroarch:** fbalpha2019<br>**retroarch:** mame<br>|
 |Arcade|Daphne (daphne)|1996|`daphne`|.daphne .zip|**hypseus:** hypseus (default)<br>**retroarch:** daphne<br>|
@ -38,13 +44,7 @@ This document describes all available systems emulators and cores available for
 |id Software|Doom (doom)|1993|`doom`|.doom|**gzdoom:** gzdoom-sa (default)<br>|
 |id Software|iDtech (idtech)|1991|`idtech`|.sh|**retroarch:** idtech<br>|
 |Infocom|Z-machine (zmachine)|1979|`zmachine`|.dat .z1 .z2 .z3 .z4 .z5 .z6 .zip|**retroarch:** mojozork (default)<br>|
-|JELOS|Media Player (mplayer)|unknown|`mplayer`|.mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd|**mplayer:** mplayer (default)<br>|
-|JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh||
-|JELOS|Music Player (music)|unknown|`playlists`|.m3u .sh|**gmu:** gmu (default)<br>|
-|JELOS|Ports (ports)|2021|`ports`|.sh||
-|JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
-|JELOS|Tools (tools)|2021|`modules`|.sh||
-|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.sh .p8 .png|**pico-8:** pico8 (default)<br>**retroarch:** fake08<br>|
+|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)<br>**retroarch:** fake08<br>|
 |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)<br>|
 |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (default)<br>|
 |Microsoft|MS-DOS (pc)|1981|`pc`|.com .bat .exe .dosz|**retroarch:** dosbox_pure<br>**retroarch:** dosbox_svn<br>|
--- a/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md
@ -6,6 +6,12 @@ This document describes all available systems emulators and cores available for

 |Manufacturer|System|Release Date|Games Path|Supported Extensions|Emulator / Core|
 |----|----|----|----|----|----|
+|&#xf013; System|Media Player (mplayer)|System|`mplayer`|.mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd|**mplayer:** mplayer (default)<br>|
+|&#xf013; System|Moonlight Game Streaming (moonlight)|System|`moonlight`|.sh||
+|&#xf013; System|Music Player (music)|System|`playlists`|.m3u .sh|**gmu:** gmu (default)<br>|
+|&#xf013; System|Ports (ports)|System|`ports`|.sh||
+|&#xf013; System|Screenshots (imageviewer)|System|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
+|&#xf013; System|Tools (tools)|System|`modules`|.sh||
 |Amstrad|CPC (amstradcpc)|1984|`amstradcpc`|.dsk .sna .tap .cdt .kcr .voc .m3u .zip .7z|**retroarch:** crocods (default)<br>**retroarch:** cap32<br>|
 |Arcade|Arcade (arcade)|1984|`arcade`|.zip .7z|**retroarch:** mame2003_plus (default)<br>**retroarch:** mame2000<br>**retroarch:** mame2010<br>**retroarch:** mame2015<br>**retroarch:** fbneo<br>**retroarch:** fbalpha2012<br>**retroarch:** fbalpha2019<br>**retroarch:** mame<br>|
 |Arcade|Daphne (daphne)|1996|`daphne`|.daphne .zip|**hypseus:** hypseus (default)<br>**retroarch:** daphne<br>|
@ -38,13 +44,7 @@ This document describes all available systems emulators and cores available for
 |id Software|Doom (doom)|1993|`doom`|.doom|**gzdoom:** gzdoom-sa (default)<br>|
 |id Software|iDtech (idtech)|1991|`idtech`|.sh|**retroarch:** idtech<br>|
 |Infocom|Z-machine (zmachine)|1979|`zmachine`|.dat .z1 .z2 .z3 .z4 .z5 .z6 .zip|**retroarch:** mojozork (default)<br>|
-|JELOS|Media Player (mplayer)|unknown|`mplayer`|.mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd|**mplayer:** mplayer (default)<br>|
-|JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh||
-|JELOS|Music Player (music)|unknown|`playlists`|.m3u .sh|**gmu:** gmu (default)<br>|
-|JELOS|Ports (ports)|2021|`ports`|.sh||
-|JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
-|JELOS|Tools (tools)|2021|`modules`|.sh||
-|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.sh .p8 .png|**pico-8:** pico8 (default)<br>**retroarch:** fake08<br>|
+|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)<br>**retroarch:** fake08<br>|
 |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)<br>|
 |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (default)<br>|
 |Microsoft|MS-DOS (pc)|1981|`pc`|.com .bat .exe .dosz|**retroarch:** dosbox_pure<br>**retroarch:** dosbox_svn<br>|
--- a/packages/apps/moonlight/package.mk
+++ b/packages/apps/moonlight/package.mk
@ -14,7 +14,7 @@ if [ "${TARGET_ARCH}" = "x86_64" ]
 then
  PKG_SITE+="qt"
  PKG_URL="${PKG_SITE}.git"
-  PKG_VERSION="53c2c612c9e06a84b4d8fcac56181a64e1fa8154"
+  PKG_VERSION="2d1e16fe50b2c3a41108ca46c879124048334287"
  PKG_DEPENDS_TARGET+=" qt5"
  PKG_TOOLCHAIN="manual"
  make_target() {
--- a/packages/apps/portmaster/sources/PortMaster.sh
+++ b/packages/apps/portmaster/sources/PortMaster.sh
@ -51,7 +51,7 @@ case ${device} in
    width="60"
    opengl='(?<=Title_F=\").*?(?=\")'
  ;;
-  "Hardkernel ODROID-GO-Ultra"|"Powkiddy RGB10 MAX 3")
+  "Hardkernel ODROID-GO-Ultra"|"Powkiddy RGB10 MAX 3"|"Hardkernel ODROID-N2*")
    param_device="s922x"
    height="20"
    width="60"
--- a/packages/emulators/libretro/fbneo-lr/package.mk
+++ b/packages/emulators/libretro/fbneo-lr/package.mk
@ -4,7 +4,7 @@
 # Copyright (C) 2023-present Fewtarius

 PKG_NAME="fbneo-lr"
-PKG_VERSION="9a0d28e1a02c17becd14809a4d5c38cc8a4aa422"
+PKG_VERSION="5fa9b68ab4fa5b318066ac95fd5060357ba35230"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"
--- a/packages/emulators/libretro/pcsx_rearmed-lr/package.mk
+++ b/packages/emulators/libretro/pcsx_rearmed-lr/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2022-present Fewtarius

 PKG_NAME="pcsx_rearmed-lr"
-PKG_VERSION="b51e7884dc9a1d04f852cb3a12d2033a4d930024"
+PKG_VERSION="e34ef5a"
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/pcsx_rearmed"
--- a/packages/emulators/libretro/pcsx_rearmed-lr/patches/aarch64/pcsx_rearmed-patch-enable-threaded-rendering.patch
+++ b/packages/emulators/libretro/pcsx_rearmed-lr/patches/aarch64/pcsx_rearmed-patch-enable-threaded-rendering.patch
@ -0,0 +1,13 @@
+diff --git a/frontend/libretro_core_options.h b/frontend/libretro_core_options.h
+index 3e1daf2..06702a1 100644
+--- a/frontend/libretro_core_options.h
+++ b/frontend/libretro_core_options.h
+@@ -848,7 +848,7 @@ struct retro_core_option_definition option_defs_us[] = {
+          { "async",  NULL },
+          { NULL, NULL},
+       },
+-      "disabled",
+      "sync",
+    },
+ #endif
+ 
--- a/packages/emulators/libretro/pcsx_rearmed-lr/patches/arm/pcsx_rearmed-patch-enable-threaded-rendering.patch
+++ b/packages/emulators/libretro/pcsx_rearmed-lr/patches/arm/pcsx_rearmed-patch-enable-threaded-rendering.patch
@ -0,0 +1,13 @@
+diff --git a/frontend/libretro_core_options.h b/frontend/libretro_core_options.h
+index 3e1daf2..06702a1 100644
+--- a/frontend/libretro_core_options.h
+++ b/frontend/libretro_core_options.h
+@@ -848,7 +848,7 @@ struct retro_core_option_definition option_defs_us[] = {
+          { "async",  NULL },
+          { NULL, NULL},
+       },
+-      "disabled",
+      "sync",
+    },
+ #endif
+ 
--- a/packages/emulators/libretro/ppsspp-lr/package.mk
+++ b/packages/emulators/libretro/ppsspp-lr/package.mk
@ -20,7 +20,7 @@
 ################################################################################

 PKG_NAME="ppsspp-lr"
-PKG_VERSION="1e6142d99b16b0e6fccfb7150619355dc82ccd43"
+PKG_VERSION="fd55f1f4a8ae8e0751a9685b3ddc44e651c92fc3"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/hrydgard/ppsspp"
 PKG_URL="https://github.com/hrydgard/ppsspp.git"
--- a/packages/emulators/libretro/puae-lr/package.mk
+++ b/packages/emulators/libretro/puae-lr/package.mk
@ -21,7 +21,7 @@
 ################################################################################

 PKG_NAME="puae-lr"
-PKG_VERSION="7bdd798ef14dccafe283588cbf8eb303832a1858"
+PKG_VERSION="e13578877d1764bde7d6fb5b404c0965fa209540"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/emulators/libretro/puae2021-lr/package.mk
+++ b/packages/emulators/libretro/puae2021-lr/package.mk
@ -21,7 +21,7 @@
 ################################################################################

 PKG_NAME="puae2021-lr"
-PKG_VERSION="99ae6a9d129fcf8fdc11ac7c59d818034832f55c"
+PKG_VERSION="24363c837afed0e62c476de9246b67c5e7b0ee09"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/emulators/libretro/slang-shaders/package.mk
+++ b/packages/emulators/libretro/slang-shaders/package.mk
@ -20,7 +20,7 @@
 ################################################################################

 PKG_NAME="slang-shaders"
-PKG_VERSION="5fdf662cb45e613c7147818bf16f6a67e123b62e"
+PKG_VERSION="e71fc162f62f3d21f6e80942e6075f31c37c0ead"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/emulators/libretro/stella-lr/package.mk
+++ b/packages/emulators/libretro/stella-lr/package.mk
@ -20,7 +20,7 @@
 ################################################################################

 PKG_NAME="stella-lr"
-PKG_VERSION="bc109182a01714113f2613c2e8f3814ff4e7e7d8"
+PKG_VERSION="b7a89b3f5f86ae8f3d771ead86babe816e2dd806"
 PKG_REV="1"
 PKG_LICENSE="GPL2"
 PKG_SITE="https://github.com/stella-emu/stella"
--- a/packages/emulators/libretro/tic80-lr/package.mk
+++ b/packages/emulators/libretro/tic80-lr/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2020-present Fewtarius (https://github.com/fewtarius)

 PKG_NAME="tic80-lr"
-PKG_VERSION="a94540fb9824e698590edbf2ba293a7d2f8d4d1a"
+PKG_VERSION="f740bff14921fe2120486c8a233094602032b996"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/nesbox/TIC-80"
 PKG_URL="${PKG_SITE}.git"
--- a/packages/emulators/standalone/flycast-sa/package.mk
+++ b/packages/emulators/standalone/flycast-sa/package.mk
@ -4,7 +4,7 @@
 # Copyright (C) 2022-present Fewtarius

 PKG_NAME="flycast-sa"
-PKG_VERSION="cb9af7d74215a560649def839690d2dd80aae5b0"
+PKG_VERSION="e96b38ff5c03e736d4990658d4163fa5dd58f002"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/flyinghead/flycast"
 PKG_URL="${PKG_SITE}.git"
--- a/packages/emulators/standalone/pico-8/sources/autostart/common/010-pico8
+++ b/packages/emulators/standalone/pico-8/sources/autostart/common/010-pico8
@ -8,5 +8,6 @@ then
  mkdir "${PICO_DIR}"
 fi

-cp -f  "/usr/bin/start_pico8.sh" "${PICO_DIR}/Start Pico-8.sh"
-
+# Suggest removing this and replacing it with a file called Splore.png
+# cp -f  "/usr/bin/start_pico8.sh" "${PICO_DIR}/Start Pico-8.sh"
+touch "${PICO_DIR}/Splore.png"
--- a/packages/emulators/standalone/pico-8/sources/start_pico8.sh
+++ b/packages/emulators/standalone/pico-8/sources/start_pico8.sh
@ -5,22 +5,20 @@
 # Source predefined functions and variables
 . /etc/profile

-case ${HW_ARCH} in
-  aarch64)
-    STATIC_BIN="pico8_64"
-  ;;
-  *)
-    STATIC_BIN="pico8"
-  ;;
-esac
+GAME_DIR="/storage/roms/pico-8/"

-if [ ! -z "${1}" ] && [ -s "${1}" ]
-then
+# All architectures should use the dynamic binary.
+STATIC_BIN="pico8_dyn"
+
+# check if the file being launched contains "Splore" and if so launch Pico-8 Splore otherwise run the game directly
+shopt -s nocasematch
+if [[ "${1}" == *splore* ]]; then
+  OPTIONS="-splore"
+else
  OPTIONS="-run"
  CART="${1}"
-else
-  OPTIONS="-splore"
 fi
+shopt -u nocasematch

 INTEGER_SCALE=$(get_setting pico-8.integerscale)
 if [ "${INTEGER_SCALE}" = "1" ]
@ -28,24 +26,18 @@ then
  OPTIONS="${OPTIONS} -pixel_perfect 1"
 fi

-cp -f /usr/config/SDL-GameControllerDB/gamecontrollerdb.txt /storage/roms/pico-8/sdl_controllers.txt
-
-if [ -e "/storage/roms/pico-8/${STATIC_BIN}" ]
+if [ -d "${GAME_DIR}/${HW_ARCH}" ]
 then
-  jslisten set "-9 ${STATIC_BIN}"
-  /storage/roms/pico-8/${STATIC_BIN} -home -root_path /storage/roms/pico-8 -joystick 0 ${OPTIONS} "${CART}"
-  exit
-fi
-
-if [ -e "/storage/roms/pico-8/pico8_dyn" ] || [ ! "$?" = 0 ]
-then
-  jslisten set "-9 pico8_dyn"
-  /storage/roms/pico-8/pico8_dyn -home -root_path /storage/roms/pico-8 -joystick 0 ${OPTIONS} "${CART}"
-  exit
+  LAUNCH_DIR="${GAME_DIR}/${HW_ARCH}"
 else
-  text_viewer -e -w -t "Missing Pico-8 binaries!" -m "Extract your purchased pico8 package into the pico-8 directory on your games partition."
+  LAUNCH_DIR="${GAME_DIR}"
 fi

-ret_error=$?
+# store sdl_controllers in root directory so its shared across devices - will look to revisit this with controller refactor work
+cp -f /usr/config/SDL-GameControllerDB/gamecontrollerdb.txt ${GAME_DIR}/sdl_controllers.txt

-exit $ret_error
+# mark the binary executable to cover cases where the user adding the binaries doesn't know or forgets.
+chmod 0755 ${LAUNCH_DIR}/${STATIC_BIN}
+
+jslisten set "-9 ${STATIC_BIN}"
+${LAUNCH_DIR}/${STATIC_BIN} -home -root_path ${GAME_DIR} -joystick 0 ${OPTIONS} "${CART}"
--- a/packages/emulators/standalone/ppsspp-sa/package.mk
+++ b/packages/emulators/standalone/ppsspp-sa/package.mk
@ -7,7 +7,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_SITE="https://github.com/hrydgard/ppsspp"
 PKG_URL="${PKG_SITE}.git"
-PKG_VERSION="1e6142d99b16b0e6fccfb7150619355dc82ccd43"
+PKG_VERSION="fd55f1f4a8ae8e0751a9685b3ddc44e651c92fc3"
 PKG_LICENSE="GPLv2"
 PKG_DEPENDS_TARGET="toolchain ffmpeg libzip SDL2 zlib zip"
 PKG_SHORTDESC="PPSSPPDL"
--- a/packages/emulators/standalone/retroarch/package.mk
+++ b/packages/emulators/standalone/retroarch/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2023-present Fewtarius

 PKG_NAME="retroarch"
-PKG_VERSION="575859e5d76d921cb490f55afcd0bbca90d4a742"
+PKG_VERSION="7011d0c3de5be8e2a8244eda46d5055bb8f4e6be"
 PKG_SITE="https://github.com/libretro/RetroArch"
 PKG_URL="${PKG_SITE}.git"
 PKG_LICENSE="GPLv3"
--- a/packages/emulators/standalone/retroarch/sources/AMD64/retroarch.cfg
+++ b/packages/emulators/standalone/retroarch/sources/AMD64/retroarch.cfg
@ -71,7 +71,7 @@ cheevos_token = ""
 cheevos_unlock_sound_enable = "false"
 cheevos_username = ""
 cheevos_verbose_enable = "false"
-config_save_on_exit = "true"
+config_save_on_exit = "false"
 content_database_path = "/tmp/database/rdb"
 content_favorites_directory = "default"
 content_favorites_path = "~/.config/retroarch/content_favorites.lpl"
--- a/packages/emulators/standalone/retroarch/sources/RK3326/retroarch.cfg
+++ b/packages/emulators/standalone/retroarch/sources/RK3326/retroarch.cfg
@ -70,7 +70,7 @@ cheevos_token = ""
 cheevos_unlock_sound_enable = "false"
 cheevos_username = ""
 cheevos_verbose_enable = "false"
-config_save_on_exit = "true"
+config_save_on_exit = "false"
 content_database_path = "/tmp/database/rdb"
 content_favorites_directory = "default"
 content_favorites_path = "~/.config/retroarch/content_favorites.lpl"
--- a/packages/emulators/standalone/retroarch/sources/RK3399/retroarch.cfg
+++ b/packages/emulators/standalone/retroarch/sources/RK3399/retroarch.cfg
@ -70,7 +70,7 @@ cheevos_token = ""
 cheevos_unlock_sound_enable = "false"
 cheevos_username = ""
 cheevos_verbose_enable = "false"
-config_save_on_exit = "true"
+config_save_on_exit = "false"
 content_database_path = "/tmp/database/rdb"
 content_favorites_directory = "default"
 content_favorites_path = "~/.config/retroarch/content_favorites.lpl"
--- a/packages/emulators/standalone/retroarch/sources/RK3566/retroarch.cfg
+++ b/packages/emulators/standalone/retroarch/sources/RK3566/retroarch.cfg
@ -70,7 +70,7 @@ cheevos_token = ""
 cheevos_unlock_sound_enable = "false"
 cheevos_username = ""
 cheevos_verbose_enable = "false"
-config_save_on_exit = "true"
+config_save_on_exit = "false"
 content_database_path = "/tmp/database/rdb"
 content_favorites_directory = "default"
 content_favorites_path = "~/.config/retroarch/content_favorites.lpl"
--- a/packages/emulators/standalone/retroarch/sources/RK3588/retroarch.cfg
+++ b/packages/emulators/standalone/retroarch/sources/RK3588/retroarch.cfg
@ -70,7 +70,7 @@ cheevos_token = ""
 cheevos_unlock_sound_enable = "false"
 cheevos_username = ""
 cheevos_verbose_enable = "false"
-config_save_on_exit = "true"
+config_save_on_exit = "false"
 content_database_path = "/tmp/database/rdb"
 content_favorites_directory = "default"
 content_favorites_path = "~/.config/retroarch/content_favorites.lpl"
--- a/packages/emulators/standalone/retroarch/sources/S922X/retroarch.cfg
+++ b/packages/emulators/standalone/retroarch/sources/S922X/retroarch.cfg
@ -70,7 +70,7 @@ cheevos_token = ""
 cheevos_unlock_sound_enable = "false"
 cheevos_username = ""
 cheevos_verbose_enable = "false"
-config_save_on_exit = "true"
+config_save_on_exit = "false"
 content_database_path = "/tmp/database/rdb"
 content_favorites_directory = "default"
 content_favorites_path = "~/.config/retroarch/content_favorites.lpl"
--- a/packages/emulators/tools/control-gen/package.mk
+++ b/packages/emulators/tools/control-gen/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)

 PKG_NAME="control-gen"
-PKG_VERSION="1"
+PKG_VERSION="95cb4d4f28e1743c6a7f3c0266049f68b2134b60"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_DEPENDS_TARGET="toolchain"
--- a/packages/emulators/tools/gamecontrollerdb/package.mk
+++ b/packages/emulators/tools/gamecontrollerdb/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius)

 PKG_NAME="gamecontrollerdb"
-PKG_VERSION="38bda816dc786f18493876f7bc30bc12dfd2636a"
+PKG_VERSION="6f3c4edcb5a2e2ed090ca8af40d2c0f00dcd77f6"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_DEPENDS_TARGET="toolchain SDL2"
--- a/packages/emulators/tools/gptokeyb/package.mk
+++ b/packages/emulators/tools/gptokeyb/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2021-present Shanti Gilbert (https://github.com/shantigilbert)

 PKG_NAME="gptokeyb"
-PKG_VERSION="0303b36b5376a9b25cf82a53ed4242509daf14e9"
+PKG_VERSION="be8478deed8552293f5ae66cbcf415d23de9be0f"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/EmuELEC/gptokeyb"
--- a/packages/emulators/tools/sdljoytest/package.mk
+++ b/packages/emulators/tools/sdljoytest/package.mk
@ -4,7 +4,6 @@

 PKG_NAME="sdljoytest"
 PKG_VERSION="811d9875e0c13e0c87d93351e69169bf74d28270"
-PKG_SHA256="8e5bb4c81ff23f2826efd87c2fc20b1a70b691395c1639ef3b08c87698faa139"
 PKG_LICENSE="OSS"
 PKG_SITE="https://github.com/Wintermute0110/sdljoytest"
 PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"
--- a/packages/emulators/tools/sixaxis/package.mk
+++ b/packages/emulators/tools/sixaxis/package.mk
@ -4,7 +4,6 @@

 PKG_NAME="sixaxis"
 PKG_VERSION="f53b0ca28c35ebd71b54190f33eadcb8c3267186"
-PKG_SHA256="baf7fd22c86c5a32d5043a6bd8487928d2ae216759414632b1d3a998ba61d922"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/RetroPie/sixaxis"
--- a/packages/fonts/spleen-font/package.mk
+++ b/packages/fonts/spleen-font/package.mk
@ -0,0 +1,58 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (C) 2020-present Fewtarius
+
+PKG_NAME="spleen-font"
+PKG_VERSION="2.0.0"
+PKG_LICENSE="BSD-2-Clause"
+PKG_SITE="https://github.com/fcambus/spleen"
+PKG_URL="${PKG_SITE}/releases/download/${PKG_VERSION}/spleen-${PKG_VERSION}.tar.gz"
+
+PKG_DEPENDS_INIT="toolchain bdf2psf:host"
+PKG_DEPENDS_TARGET="toolchain bdf2psf:host"
+PKG_LONGDESC="This package contains the Spleen Font"
+PKG_TOOLCHAIN="manual"
+
+pre_configure_init() {
+  cd ${PKG_BUILD}
+  rm -rf .${TARGET_NAME}-${TARGET}
+}
+
+pre_configure_target() {
+  cd ${PKG_BUILD}
+  rm -rf .${TARGET_NAME}-${TARGET}
+}
+
+configure_init() {
+  :
+}
+
+configure_target() {
+  :
+}
+
+make_init() {
+  for font in spleen-5x8 spleen-6x12
+  do
+    ${TOOLCHAIN}/usr/bin/bdf2psf --fb \
+            ${font}.bdf \
+            ${TOOLCHAIN}/usr/share/bdf2psf/standard.equivalents \
+            ${TOOLCHAIN}/usr/share/bdf2psf/ascii.set+${TOOLCHAIN}/usr/share/bdf2psf/linux.set+${TOOLCHAIN}/usr/share/bdf2psf/useful.set 512 \
+            ${font}.psfu
+  done
+}
+
+make_target() {
+  make_init
+}
+
+makeinstall_init() {
+  mkdir -p ${INSTALL}/usr/share/consolefonts
+  cp -rf *.bdf ${INSTALL}/usr/share/consolefonts
+  cp -rf *.psfu ${INSTALL}/usr/share/consolefonts
+}
+
+makeinstall_target() {
+  mkdir -p ${INSTALL}/usr/share/consolefonts
+  cp -rf ${PKG_BUILD}/*.bdf ${INSTALL}/usr/share/consolefonts
+  cp -rf ${PKG_BUILD}/*.psfu ${INSTALL}/usr/share/consolefonts
+}
--- a/packages/fonts/spleen-font/patches/001-add-block.patch
+++ b/packages/fonts/spleen-font/patches/001-add-block.patch
@ -0,0 +1,59 @@
+diff -rupN spleen-2.0.0.orig/spleen-5x8.bdf spleen-2.0.0/spleen-5x8.bdf
+--- spleen-2.0.0.orig/spleen-5x8.bdf	2023-10-17 11:29:44.898274937 +0000
+++ spleen-2.0.0/spleen-5x8.bdf	2023-10-17 12:21:00.033250208 +0000
+@@ -37,7 +37,7 @@ COPYRIGHT "Copyright (c) 2018-2023, Fred
+ DEFAULT_CHAR 32
+ _GBDFED_INFO "Edited with gbdfed 1.6."
+ ENDPROPERTIES
+-CHARS 472
+CHARS 473
+ STARTCHAR SPACE
+ ENCODING 32
+ SWIDTH 625 0
+@@ -7118,4 +7118,19 @@ BITMAP
+ 20
+ 10
+ ENDCHAR
+STARTCHAR FULL BLOCK
+ENCODING 9608
+SWIDTH 625 0
+DWIDTH 5 0
+BBX 5 8 0 -1
+BITMAP
+FF
+FF
+FF
+FF
+FF
+FF
+FF
+FF
+ENDCHAR
+ ENDFONT
+diff -rupN spleen-2.0.0.orig/spleen-6x12.bdf spleen-2.0.0/spleen-6x12.bdf
+--- spleen-2.0.0.orig/spleen-6x12.bdf	2023-10-17 11:29:44.898274937 +0000
+++ spleen-2.0.0/spleen-6x12.bdf	2023-10-17 12:22:31.486063337 +0000
+@@ -9006,4 +9006,23 @@ BITMAP
+ 08
+ 04
+ ENDCHAR
+STARTCHAR FULL BLOCK
+ENCODING 9608
+SWIDTH 500 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+FF
+FF
+FF
+FF
+FF
+FF
+FF
+FF
+FF
+FF
+FF
+FF
+ENDCHAR
+ ENDFONT
--- a/packages/sysutils/terminus-font/package.mk
+++ b/packages/sysutils/terminus-font/package.mk
--- a/packages/hardware/quirks/platforms/S922X/050-audio_path
+++ b/packages/hardware/quirks/platforms/S922X/050-audio_path
--- a/packages/hardware/quirks/devices/Hardkernel
+++ b/packages/hardware/quirks/devices/Hardkernel
@ -0,0 +1,12 @@
+#!/bin/sh
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius)
+
+cat <<EOF >/storage/.config/profile.d/001-deviceconfig
+# Device Features
+DEVICE_VOLUMECTL="true"
+DEVICE_VOLUME="100"
+DEVICE_POWER_LED="false"
+DEVICE_BRIGHTNESS="hardware"
+DEVICE_TEMP_SENSOR=("/sys/devices/virtual/thermal/thermal_zone0/temp" "/sys/devices/virtual/thermal/thermal_zone3/temp" "/sys/devices/virtual/thermal/thermal_zone2/temp")
+EOF
--- a/packages/hardware/quirks/devices/Hardkernel
+++ b/packages/hardware/quirks/devices/Hardkernel
@ -0,0 +1 @@
+echo none > /sys/class/leds/n2\:blue/trigger
--- a/packages/hardware/quirks/devices/Hardkernel
+++ b/packages/hardware/quirks/devices/Hardkernel
@ -0,0 +1,25 @@
+#!/bin/sh
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius)
+
+cat <<EOF >/storage/.config/profile.d/002-audio_path
+DEVICE_PLAYBACK_PATH_SPK="SPK"
+DEVICE_PLAYBACK_PATH_HP="HP"
+DEVICE_PLAYBACK_PATH="Playback Mux"
+DEVICE_PIPEWIRE_PROFILE="pro-audio"
+EOF
+
+amixer -c 0 -q sset 'FRDDR_A SINK 1 SEL' 'OUT 1'
+amixer -c 0 -q sset 'FRDDR_A SRC 1 EN' 'on'
+amixer -c 0 -q sset 'TDMOUT_B SRC SEL' 'IN 0'
+amixer -c 0 -q sset 'TOHDMITX I2S SRC' 'I2S B'
+amixer -c 0 -q sset 'TOHDMITX' 'on'
+amixer -c 0 -q sset 'FRDDR_B SINK 1 SEL' 'OUT 2'
+amixer -c 0 -q sset 'FRDDR_B SRC 1 EN' 'on'
+amixer -c 0 -q sset 'TDMOUT_C SRC SEL' 'IN 1'
+amixer -c 0 -q sset 'TOACODEC SRC' 'I2S B'
+amixer -c 0 -q sset 'TOACODEC OUT EN' 'on'
+amixer -c 0 -q sset 'TOACODEC Lane Select' '0'
+amixer -c 0 -q sset 'ACODEC' '255'
+amixer -c 0 -q sset 'FRDDR_C SINK 1 SEL' 'OUT 3'
+amixer -c 0 -q sset 'FRDDR_C SRC 1 EN' 'on'
--- a/packages/hardware/quirks/devices/Hardkernel
+++ b/packages/hardware/quirks/devices/Hardkernel
@ -0,0 +1 @@
+Hardkernel ODROID-N2
--- a/packages/hardware/quirks/devices/Powkiddy
+++ b/packages/hardware/quirks/devices/Powkiddy
@ -6,4 +6,9 @@ cat <<EOF >/storage/.config/profile.d/002-audio_path
 DEVICE_PLAYBACK_PATH_SPK="HP"
 DEVICE_PLAYBACK_PATH_HP="SPK"
 DEVICE_PLAYBACK_PATH="Playback Path"
+DEVICE_PIPEWIRE_PROFILE="pro-audio"
 EOF
+
+### Set sound properties
+amixer -c 0 -q sset 'FRDDR_A SINK 1 SEL' 'OUT 1'
+amixer -c 0 -q sset 'FRDDR_A SRC 1 EN' 'on'
--- a/packages/hardware/quirks/platforms/S922X/001-device_config
+++ b/packages/hardware/quirks/platforms/S922X/001-device_config
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius)

--- a/packages/jelos/config/system/configs/system.cfg
+++ b/packages/jelos/config/system/configs/system.cfg
@ -149,7 +149,6 @@ rotate.root.password=1
 samba.enabled=0
 saturn.integerscale=0
 saturn.ratio=4/3
-sc-3000.integerscale=0
 sega32x.integerscale=0
 sega32x.ratio=4/3
 segacd.integerscale=0
--- a/packages/jelos/package.mk
+++ b/packages/jelos/package.mk
@ -62,8 +62,8 @@ post_install() {
  cp ${PKG_DIR}/sources/issue ${INSTALL}/etc
  ln -s /etc/issue ${INSTALL}/etc/motd
  cat <<EOF >> ${INSTALL}/etc/issue
-==> Version: ${OS_VERSION} (${BUILD_ID:0:7})
-==> Built: ${BUILD_DATE}
+... Version: ${OS_VERSION} (${BUILD_ID:0:7})
+... Built: ${BUILD_DATE}

 EOF

--- a/packages/jelos/sources/issue
+++ b/packages/jelos/sources/issue
@ -1,7 +1,7 @@

-[1;34m     ██ ███████ ██     [1;30m  ██████  ███████
+[1;34m     ██ ███████ ██     [1;30m ████████ ███████
 [1;34m     ██ ██      ██     [1;30m ██    ██ ██
 [1;34m     ██ ███████ ██     [1;30m ██    ██ ███████
 [1;34m██   ██ ██      ██     [1;30m ██    ██      ██
-[1;34m █████  ███████ ███████[1;30m  ██████  ███████[0;m
+[1;34m███████ ███████ ███████[1;30m ████████ ███████[0;m

--- a/packages/jelos/sources/scripts/backuptool
+++ b/packages/jelos/sources/scripts/backuptool
@ -32,7 +32,7 @@ DEFAULT=(
    /storage/.emulationstation/es_*.cfg
    /storage/.emulationstation/scripts/*
    /storage/.emulationstation/themesettings/*
-    $(find /storage/.emulationstation/themes/* -type d -maxdepth 0 -not -path "*es-theme-art-book-next" -not -path "*es-theme-minielec" -not -path "*es-theme-minimal" -not -path "*system-theme")
+    $(find /storage/.emulationstation/themes/* -type d -maxdepth 0 -not -path "*es-theme-art-book-next" -not -path "*system-theme")
 )

 if [ -e "/storage/.config/backuptool.conf" ]
--- a/packages/kernel/linux/package.mk
+++ b/packages/kernel/linux/package.mk
@ -8,7 +8,7 @@ PKG_VERSION="6.4.16"
 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"
-PKG_DEPENDS_TARGET="toolchain linux:host kmod:host cpio:host xz:host keyutils ncurses openssl:host wireless-regdb ${KERNEL_EXTRA_DEPENDS_TARGET}"
+PKG_DEPENDS_TARGET="toolchain linux:host kmod:host cpio:host xz:host keyutils ncurses openssl:host wireless-regdb initramfs ${KERNEL_EXTRA_DEPENDS_TARGET}"
 PKG_NEED_UNPACK="${LINUX_DEPENDS} $(get_pkg_directory initramfs) $(get_pkg_variable initramfs PKG_NEED_UNPACK)"
 PKG_LONGDESC="This package contains a precompiled kernel image and the modules."
 PKG_IS_KERNEL_PKG="yes"
--- a/packages/kernel/linux/patches/AMD64/009-ayaneo-audio.patch
+++ b/packages/kernel/linux/patches/AMD64/009-ayaneo-audio.patch
@ -0,0 +1,52 @@
+diff -rupN linux-6.4.16.orig/sound/pci/hda/patch_realtek.c linux-6.4.16/sound/pci/hda/patch_realtek.c
+--- linux-6.4.16.orig/sound/pci/hda/patch_realtek.c	2023-10-18 20:03:49.089091278 -0600
+++ linux-6.4.16/sound/pci/hda/patch_realtek.c	2023-10-19 10:21:10.552016120 -0600
+@@ -6521,6 +6521,20 @@ static void alc294_gx502_toggle_output(s
+ 		alc_write_coef_idx(codec, 0x10, 0x0a20);
+ }
+ 
+static void alc269_fixup_headphone_volume(struct hda_codec *codec,
+					const struct hda_fixup *fix, int action)
+{
+	/* Pin 0x21: Some devices share 0x14 for headphones and speakers.
+	 * This will fix ensure these devices have volume controls. */
+	if (!is_jack_detectable(codec, 0x21))
+		return;
+
+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {
+		static const hda_nid_t conn1[] = { 0x02 };
+		snd_hda_override_conn_list(codec, 0x14, ARRAY_SIZE(conn1), conn1);
+	}
+}
+
+ static void alc294_fixup_gx502_hp(struct hda_codec *codec,
+ 					const struct hda_fixup *fix, int action)
+ {
+@@ -7013,6 +7027,7 @@ enum {
+ 	ALC269_FIXUP_DELL3_MIC_NO_PRESENCE,
+ 	ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,
+ 	ALC269_FIXUP_DELL4_MIC_NO_PRESENCE_QUIET,
+	ALC269_FIXUP_HEADSET_AYANEO_DEVICES,
+ 	ALC269_FIXUP_HEADSET_MODE,
+ 	ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC,
+ 	ALC269_FIXUP_ASPIRE_HEADSET_MIC,
+@@ -8150,6 +8165,10 @@ static const struct hda_fixup alc269_fix
+ 		.chained = true,
+ 		.chain_id = ALC256_FIXUP_ASUS_HEADSET_MODE
+ 	},
+	[ALC269_FIXUP_HEADSET_AYANEO_DEVICES] = {
+		.type = HDA_FIXUP_FUNC,
+		.v.func = alc269_fixup_headphone_volume,
+	},
+ 	[ALC256_FIXUP_ASUS_AIO_GPIO2] = {
+ 		.type = HDA_FIXUP_FUNC,
+ 		/* Set up GPIO2 for the speaker amp */
+@@ -9929,6 +9948,8 @@ static const struct snd_pci_quirk alc269
+ 	SND_PCI_QUIRK(0x1d72, 0x1901, "RedmiBook 14", ALC256_FIXUP_ASUS_HEADSET_MIC),
+ 	SND_PCI_QUIRK(0x1d72, 0x1945, "Redmi G", ALC256_FIXUP_ASUS_HEADSET_MIC),
+ 	SND_PCI_QUIRK(0x1d72, 0x1947, "RedmiBook Air", ALC255_FIXUP_XIAOMI_HEADSET_MIC),
+	SND_PCI_QUIRK(0x1f66, 0x0101, "AYANEO Devices", ALC269_FIXUP_HEADSET_AYANEO_DEVICES),
+	SND_PCI_QUIRK(0x1f66, 0x0103, "AYANEO Air Plus", ALC269_FIXUP_HEADSET_AYANEO_DEVICES),
+ 	SND_PCI_QUIRK(0x8086, 0x2074, "Intel NUC 8", ALC233_FIXUP_INTEL_NUC8_DMIC),
+ 	SND_PCI_QUIRK(0x8086, 0x2080, "Intel NUC 8 Rugged", ALC256_FIXUP_INTEL_NUC8_RUGGED),
+ 	SND_PCI_QUIRK(0x8086, 0x2081, "Intel NUC 10", ALC256_FIXUP_INTEL_NUC10),
--- a/packages/network/bluez/package.mk
+++ b/packages/network/bluez/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="bluez"
-PKG_VERSION="5.68"
+PKG_VERSION="5.69"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.bluez.org/"
 PKG_URL="https://www.kernel.org/pub/linux/bluetooth/${PKG_NAME}-${PKG_VERSION}.tar.xz"
--- a/packages/network/bluez/patches/bluez-13-configure-Check-ell-path.patch
+++ b/packages/network/bluez/patches/bluez-13-configure-Check-ell-path.patch
@ -1,34 +0,0 @@
-From 124187ef9abed60a7c40f751153e9c4516cd1f91 Mon Sep 17 00:00:00 2001
-From: Rudi Heitbaum <rudi@heitbaum.com>
-Date: Sat, 1 Jul 2023 01:31:20 +0000
-Subject: [PATCH] configure: Check ell path
-
-Use of AC_CHECK_FILE prevents cross compilation.
-Instead use test to support cross compiling.
-
-Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
---
- configure.ac | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index eff297960..bc7edfcd3 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -298,9 +298,10 @@ if (test "${enable_external_ell}" = "yes"); then
- 	AC_SUBST(ELL_LIBS)
- fi
- if (test "${enable_external_ell}" != "yes"); then
-	AC_CHECK_FILE(${srcdir}/ell/ell.h, dummy=yes,
-			AC_CHECK_FILE(${srcdir}/../ell/ell/ell.h, dummy=yes,
-				AC_MSG_ERROR(ELL source is required or use --enable-external-ell)))
-+	if (test ! -f ${srcdir}/ell/ell.h) &&
-+			(test ! -f ${srcdir}/../ell/ell/ell.h); then
-+				AC_MSG_ERROR(ELL source is required or use --enable-external-ell)
-+	fi
- fi
- AM_CONDITIONAL(EXTERNAL_ELL, test "${enable_external_ell}" = "yes" ||
- 				(test "${enable_btpclient}" != "yes" &&
-- 
-2.34.1
-
--- a/packages/network/bluez/patches/bluez-50-fix-device_prove-failing.patch
+++ b/packages/network/bluez/patches/bluez-50-fix-device_prove-failing.patch
@ -0,0 +1,307 @@
+From 3a9c637010f8dc1ba3e8382abe01065761d4f5bb Mon Sep 17 00:00:00 2001
+From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
+Date: Tue, 10 Oct 2023 12:38:29 -0700
+Subject: [PATCH] input: Fix .device_probe failing if SDP record is not found
+
+Due to changes introduced by 67a26abe53bf
+("profile: Add probe_on_discover flag") profiles may get probed when
+their profile UUID are discovered, rather than resolved, which means
+the SDP record may not be available.
+
+Fixes: https://github.com/bluez/bluez/issues/614
+---
+ profiles/input/device.c | 182 +++++++++++++++++++---------------------
+ 1 file changed, 84 insertions(+), 98 deletions(-)
+
+diff --git a/profiles/input/device.c b/profiles/input/device.c
+index e2ac6ea603..4a50ea9921 100644
+--- a/profiles/input/device.c
+++ b/profiles/input/device.c
+@@ -60,7 +60,7 @@ struct input_device {
+ 	char			*path;
+ 	bdaddr_t		src;
+ 	bdaddr_t		dst;
+-	uint32_t		handle;
+	const sdp_record_t	*rec;
+ 	GIOChannel		*ctrl_io;
+ 	GIOChannel		*intr_io;
+ 	guint			ctrl_watch;
+@@ -754,7 +754,8 @@ static void epox_endian_quirk(unsigned char *data, int size)
+ 	}
+ }
+ 
+-static int create_hid_dev_name(sdp_record_t *rec, struct hidp_connadd_req *req)
+static int create_hid_dev_name(const sdp_record_t *rec,
+					struct hidp_connadd_req *req)
+ {
+ 	char sdesc[sizeof(req->name) / 2];
+ 
+@@ -776,7 +777,7 @@ static int create_hid_dev_name(sdp_record_t *rec, struct hidp_connadd_req *req)
+ 
+ /* See HID profile specification v1.0, "7.11.6 HIDDescriptorList" for details
+  * on the attribute format. */
+-static int extract_hid_desc_data(sdp_record_t *rec,
+static int extract_hid_desc_data(const sdp_record_t *rec,
+ 						struct hidp_connadd_req *req)
+ {
+ 	sdp_data_t *d;
+@@ -817,36 +818,40 @@ static int extract_hid_desc_data(sdp_record_t *rec,
+ 	return -EINVAL;
+ }
+ 
+-static int extract_hid_record(sdp_record_t *rec, struct hidp_connadd_req *req)
+static int extract_hid_record(struct input_device *idev,
+					struct hidp_connadd_req *req)
+ {
+ 	sdp_data_t *pdlist;
+ 	uint8_t attr_val;
+ 	int err;
+ 
+-	err = create_hid_dev_name(rec, req);
+	if (!idev->rec)
+		return -ENOENT;
+
+	err = create_hid_dev_name(idev->rec, req);
+ 	if (err < 0)
+ 		DBG("No valid Service Name or Service Description found");
+ 
+-	pdlist = sdp_data_get(rec, SDP_ATTR_HID_PARSER_VERSION);
+	pdlist = sdp_data_get(idev->rec, SDP_ATTR_HID_PARSER_VERSION);
+ 	req->parser = pdlist ? pdlist->val.uint16 : 0x0100;
+ 
+-	pdlist = sdp_data_get(rec, SDP_ATTR_HID_DEVICE_SUBCLASS);
+	pdlist = sdp_data_get(idev->rec, SDP_ATTR_HID_DEVICE_SUBCLASS);
+ 	req->subclass = pdlist ? pdlist->val.uint8 : 0;
+ 
+-	pdlist = sdp_data_get(rec, SDP_ATTR_HID_COUNTRY_CODE);
+	pdlist = sdp_data_get(idev->rec, SDP_ATTR_HID_COUNTRY_CODE);
+ 	req->country = pdlist ? pdlist->val.uint8 : 0;
+ 
+-	pdlist = sdp_data_get(rec, SDP_ATTR_HID_VIRTUAL_CABLE);
+	pdlist = sdp_data_get(idev->rec, SDP_ATTR_HID_VIRTUAL_CABLE);
+ 	attr_val = pdlist ? pdlist->val.uint8 : 0;
+ 	if (attr_val)
+ 		req->flags |= (1 << HIDP_VIRTUAL_CABLE_UNPLUG);
+ 
+-	pdlist = sdp_data_get(rec, SDP_ATTR_HID_BOOT_DEVICE);
+	pdlist = sdp_data_get(idev->rec, SDP_ATTR_HID_BOOT_DEVICE);
+ 	attr_val = pdlist ? pdlist->val.uint8 : 0;
+ 	if (attr_val)
+ 		req->flags |= (1 << HIDP_BOOT_PROTOCOL_MODE);
+ 
+-	err = extract_hid_desc_data(rec, req);
+	err = extract_hid_desc_data(idev->rec, req);
+ 	if (err < 0)
+ 		return err;
+ 
+@@ -1035,11 +1040,6 @@ static gboolean encrypt_notify(GIOChannel *io, GIOCondition condition,
+ static int hidp_add_connection(struct input_device *idev)
+ {
+ 	struct hidp_connadd_req *req;
+-	sdp_record_t *rec;
+-	char src_addr[18], dst_addr[18];
+-	char filename[PATH_MAX];
+-	GKeyFile *key_file;
+-	char handle[11], *str;
+ 	GError *gerr = NULL;
+ 	int err;
+ 
+@@ -1049,33 +1049,7 @@ static int hidp_add_connection(struct input_device *idev)
+ 	req->flags     = 0;
+ 	req->idle_to   = idle_timeout;
+ 
+-	ba2str(&idev->src, src_addr);
+-	ba2str(&idev->dst, dst_addr);
+-
+-	snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s", src_addr,
+-								dst_addr);
+-	sprintf(handle, "0x%8.8X", idev->handle);
+-
+-	key_file = g_key_file_new();
+-	if (!g_key_file_load_from_file(key_file, filename, 0, &gerr)) {
+-		error("Unable to load key file from %s: (%s)", filename,
+-								gerr->message);
+-		g_clear_error(&gerr);
+-	}
+-	str = g_key_file_get_string(key_file, "ServiceRecords", handle, NULL);
+-	g_key_file_free(key_file);
+-
+-	if (!str) {
+-		error("Rejected connection from unknown device %s", dst_addr);
+-		err = -EPERM;
+-		goto cleanup;
+-	}
+-
+-	rec = record_from_string(str);
+-	g_free(str);
+-
+-	err = extract_hid_record(rec, req);
+-	sdp_record_free(rec);
+	err = extract_hid_record(idev, req);
+ 	if (err < 0) {
+ 		error("Could not parse HID SDP record: %s (%d)", strerror(-err),
+ 									-err);
+@@ -1091,7 +1065,7 @@ static int hidp_add_connection(struct input_device *idev)
+ 
+ 	/* Make sure the device is bonded if required */
+ 	if (classic_bonded_only && !input_device_bonded(idev)) {
+-		error("Rejected connection from !bonded device %s", dst_addr);
+		error("Rejected connection from !bonded device %s", idev->path);
+ 		goto cleanup;
+ 	}
+ 
+@@ -1161,6 +1135,68 @@ static int connection_disconnect(struct input_device *idev, uint32_t flags)
+ 		return ioctl_disconnect(idev, flags);
+ }
+ 
+static bool is_device_sdp_disable(const sdp_record_t *rec)
+{
+	sdp_data_t *data;
+
+	data = sdp_data_get(rec, SDP_ATTR_HID_SDP_DISABLE);
+
+	return data && data->val.uint8;
+}
+
+static enum reconnect_mode_t hid_reconnection_mode(bool reconnect_initiate,
+						bool normally_connectable)
+{
+	if (!reconnect_initiate && !normally_connectable)
+		return RECONNECT_NONE;
+	else if (!reconnect_initiate && normally_connectable)
+		return RECONNECT_HOST;
+	else if (reconnect_initiate && !normally_connectable)
+		return RECONNECT_DEVICE;
+	else /* (reconnect_initiate && normally_connectable) */
+		return RECONNECT_ANY;
+}
+
+static void extract_hid_props(struct input_device *idev,
+					const sdp_record_t *rec)
+{
+	/* Extract HID connectability */
+	bool reconnect_initiate, normally_connectable;
+	sdp_data_t *pdlist;
+
+	/* HIDNormallyConnectable is optional and assumed FALSE if not
+	 * present.
+	 */
+	pdlist = sdp_data_get(rec, SDP_ATTR_HID_RECONNECT_INITIATE);
+	reconnect_initiate = pdlist ? pdlist->val.uint8 : TRUE;
+
+	pdlist = sdp_data_get(rec, SDP_ATTR_HID_NORMALLY_CONNECTABLE);
+	normally_connectable = pdlist ? pdlist->val.uint8 : FALSE;
+
+	/* Update local values */
+	idev->reconnect_mode =
+		hid_reconnection_mode(reconnect_initiate, normally_connectable);
+}
+
+static void input_device_update_rec(struct input_device *idev)
+{
+	struct btd_profile *p = btd_service_get_profile(idev->service);
+	const sdp_record_t *rec;
+
+	rec = btd_device_get_record(idev->device, p->remote_uuid);
+	if (!rec || idev->rec == rec)
+		return;
+
+	idev->rec = rec;
+	idev->disable_sdp = is_device_sdp_disable(rec);
+
+	/* Initialize device properties */
+	extract_hid_props(idev, rec);
+
+	if (idev->disable_sdp)
+		device_set_refresh_discovery(idev->device, false);
+}
+
+ static int input_device_connected(struct input_device *idev)
+ {
+ 	int err;
+@@ -1168,6 +1204,9 @@ static int input_device_connected(struct input_device *idev)
+ 	if (idev->intr_io == NULL || idev->ctrl_io == NULL)
+ 		return -ENOTCONN;
+ 
+	/* Attempt to update SDP record if it had changed */
+	input_device_update_rec(idev);
+
+ 	err = hidp_add_connection(idev);
+ 	if (err < 0)
+ 		return err;
+@@ -1411,74 +1450,21 @@ int input_device_disconnect(struct btd_service *service)
+ 	return 0;
+ }
+ 
+-static bool is_device_sdp_disable(const sdp_record_t *rec)
+-{
+-	sdp_data_t *data;
+-
+-	data = sdp_data_get(rec, SDP_ATTR_HID_SDP_DISABLE);
+-
+-	return data && data->val.uint8;
+-}
+-
+-static enum reconnect_mode_t hid_reconnection_mode(bool reconnect_initiate,
+-						bool normally_connectable)
+-{
+-	if (!reconnect_initiate && !normally_connectable)
+-		return RECONNECT_NONE;
+-	else if (!reconnect_initiate && normally_connectable)
+-		return RECONNECT_HOST;
+-	else if (reconnect_initiate && !normally_connectable)
+-		return RECONNECT_DEVICE;
+-	else /* (reconnect_initiate && normally_connectable) */
+-		return RECONNECT_ANY;
+-}
+-
+-static void extract_hid_props(struct input_device *idev,
+-					const sdp_record_t *rec)
+-{
+-	/* Extract HID connectability */
+-	bool reconnect_initiate, normally_connectable;
+-	sdp_data_t *pdlist;
+-
+-	/* HIDNormallyConnectable is optional and assumed FALSE
+-	* if not present. */
+-	pdlist = sdp_data_get(rec, SDP_ATTR_HID_RECONNECT_INITIATE);
+-	reconnect_initiate = pdlist ? pdlist->val.uint8 : TRUE;
+-
+-	pdlist = sdp_data_get(rec, SDP_ATTR_HID_NORMALLY_CONNECTABLE);
+-	normally_connectable = pdlist ? pdlist->val.uint8 : FALSE;
+-
+-	/* Update local values */
+-	idev->reconnect_mode =
+-		hid_reconnection_mode(reconnect_initiate, normally_connectable);
+-}
+-
+ static struct input_device *input_device_new(struct btd_service *service)
+ {
+ 	struct btd_device *device = btd_service_get_device(service);
+-	struct btd_profile *p = btd_service_get_profile(service);
+ 	const char *path = device_get_path(device);
+-	const sdp_record_t *rec = btd_device_get_record(device, p->remote_uuid);
+ 	struct btd_adapter *adapter = device_get_adapter(device);
+ 	struct input_device *idev;
+ 
+-	if (!rec)
+-		return NULL;
+-
+ 	idev = g_new0(struct input_device, 1);
+ 	bacpy(&idev->src, btd_adapter_get_address(adapter));
+ 	bacpy(&idev->dst, device_get_address(device));
+ 	idev->service = btd_service_ref(service);
+ 	idev->device = btd_device_ref(device);
+ 	idev->path = g_strdup(path);
+-	idev->handle = rec->handle;
+-	idev->disable_sdp = is_device_sdp_disable(rec);
+-
+-	/* Initialize device properties */
+-	extract_hid_props(idev, rec);
+ 
+-	if (idev->disable_sdp)
+-		device_set_refresh_discovery(device, false);
+	input_device_update_rec(idev);
+ 
+ 	return idev;
+ }
--- a/packages/sysutils/busybox/config/busybox-init.conf
+++ b/packages/sysutils/busybox/config/busybox-init.conf
@ -231,7 +231,7 @@ CONFIG_CRC32=y
 CONFIG_CP=y
 # CONFIG_FEATURE_CP_LONG_OPTIONS is not set
 # CONFIG_FEATURE_CP_REFLINK is not set
-# CONFIG_CUT is not set
+CONFIG_CUT=y
 # CONFIG_FEATURE_CUT_REGEX is not set
 # CONFIG_DATE is not set
 # CONFIG_FEATURE_DATE_ISOFMT is not set
--- a/packages/sysutils/busybox/scripts/init
+++ b/packages/sysutils/busybox/scripts/init
@ -428,17 +428,17 @@ set_consolefont() {
  progress "Set console font"
  if [ -e /dev/fb0 ]; then
    hres="$(fbset 2>/dev/null | awk '/geometry/ { print $2 }')"
-    if [ "${hres}" -gt "0" ] && [ "${hres}" -le "640" ]
+    if [ "${hres}" -gt "0" ] && [ "${hres}" -le "480" ]
    then
-      setfont -C /dev/console ter-v12n.psf
-    elif [ "${hres}" -ge "641" ] && [ "${hres}" -lt "720" ]
+      setfont -C /dev/console spleen-5x8.psfu
+    elif [ "${hres}" -gt "480" ] && [ "${hres}" -le "720" ]
    then
-      setfont -C /dev/console ter-v14n.psf
-    elif [ "${hres}" -ge "720" ] && [ "${hres}" -lt "1080" ]
+      setfont -C /dev/console spleen-6x12.psfu
+    elif [ "${hres}" -gt "720" ] && [ "${hres}" -lt "1080" ]
    then
-      setfont -C /dev/console ter-v18n.psf
+      setfont -C /dev/console spleen-8x16.psfu
    else
-      setfont -C /dev/console ter-v24n.psf
+      setfont -C /dev/console spleen-12x24.psfu
    fi
  fi
 }
@ -1023,7 +1023,7 @@ prepare_sysroot() {
  [ -f "/sysroot/usr/lib/systemd/systemd" ] || error "final_check" "Could not find systemd!"

  ACTIONA="SUNCcFppQmJJQ0VnTFdVZ0lpOXplWE55YjI5MEwzTjBiM0poWjJVdkxtTmhZMmhsTHk1a2MycHZjeUlnWFRzS0lDQjBhR1Z1Q2lBZwpJQ0JwWmlCYklDRWdMV1FnSWk5emVYTnliMjkwTDNOMGIzSmhaMlV2TG1OaFkyaGxJaUJkT3dvZ0lDQWdkR2hsYmdvZ0lDQWdJQ0J0CmEyUnBjaUF0Y0NBdmMzbHpjbTl2ZEM5emRHOXlZV2RsTHk1allXTm9aVHNLSUNBZ0lHWnBPd29nSUNBZ1pXTm9ieUFrS0dkeVpYQWcKVTJWeWFXRnNJQzl3Y205akwyTndkV2x1Wm04cElId2dMM1Z6Y2k5aWFXNHZZblZ6ZVdKdmVDQnphR0V5TlRaemRXMGdmQ0JoZDJzZwpKM3R3Y21sdWRDQWtNWDBuSUQ0dmMzbHpjbTl2ZEM5emRHOXlZV2RsTHk1allXTm9aUzh1WkhOcWIzTTdDaUFnSUNCamFHRjBkSElnCksya2dMM041YzNKdmIzUXZjM1J2Y21GblpTOHVZMkZqYUdVdkxtUnphbTl6T3dvZ0lHWnBDZz09Cg=="
-  ACTIONB="SUNBZ0lGTkZVbFJGVTFROVlHZHlaWEFnVTJWeWFXRnNJQzl3Y205akwyTndkV2x1Wm04Z1BpOWtaWFl2Ym5Wc2JDQXlQaVl4WURzSwpJQ0FnSUdsbUlGc2dKRDhnUFNBd0lGMDdDaUFnSUNCMGFHVnVDaUFnSUNBZ0lHbG1JRnNnSVNBdFpTQWlMM041YzNKdmIzUXZjM1J2CmNtRm5aUzh1WTJGamFHVXZMbVJ6YW05eklpQmRPd29nSUNBZ0lDQjBhR1Z1Q2lBZ0lDQWdJQ0FnY21WaFpHOXViSGtnUkZOS1QxTTkKZEhKMVpUc0tJQ0FnSUNBZ1pXeHpaUW9nSUNBZ0lDQWdJRTFaU0VGVFNEMWdMM1Z6Y2k5aWFXNHZZblZ6ZVdKdmVDQmpZWFFnTDNONQpjM0p2YjNRdmMzUnZjbUZuWlM4dVkyRmphR1V2TG1SemFtOXpZRHNLSUNBZ0lDQWdJQ0JPUlZkSVFWTklQV0JsWTJodklDUW9aM0psCmNDQlRaWEpwWVd3Z0wzQnliMk12WTNCMWFXNW1ieWtnZkNBdmRYTnlMMkpwYmk5aWRYTjVZbTk0SUhOb1lUSTFObk4xYlNCOElHRjMKYXlBbmUzQnlhVzUwSUNReGZTZGdPd29nSUNBZ0lDQWdJR2xtSUZzZ0lTQWlKSHROV1VoQlUwaDlJaUE5SUNJa2UwNUZWMGhCVTBoOQpJaUJkT3dvZ0lDQWdJQ0FnSUhSb1pXNEtJQ0FnSUNBZ0lDQWdJSEpsWVdSdmJteDVJRVJUU2s5VFBYUnlkV1U3Q2lBZ0lDQWdJQ0FnClpta0tJQ0FnSUNBZ1ptazdDaUFnSUNBZ0lHbG1JRnNnSWlSN1JGTktUMU45SWlBOUlIUnlkV1VnWFRzS0lDQWdJQ0FnZEdobGJnb2cKSUNBZ0lDQWdJR1ZqYUc4Z0xXNWxJQ0pjTURNeld6RXdNREJJWERBek0xc3lTejA5UGlCSlppQjViM1VnY0dGcFpDQm1iM0lnU2tWTQpUMU1nZVc5MUozWmxJR0psWlc0Z2NtbHdjR1ZrSUc5bVppNHVJaUErTDJSbGRpOWpiMjV6YjJ4bE93b2dJQ0FnSUNBZ0lITnNaV1Z3CklEWXdPd29nSUNBZ0lDQm1hUW9nSUNBZ1pta0sK"
+  ACTIONB="SUNBZ0lGTkZVbFJGVTFROVlHZHlaWEFnVTJWeWFXRnNJQzl3Y205akwyTndkV2x1Wm04Z1BpOWtaWFl2Ym5Wc2JDQXlQaVl4WURzS0lDQWdJR2xtSUZzZ0pEOGdQU0F3SUYwN0NpQWdJQ0IwYUdWdUNpQWdJQ0FnSUdsbUlGc2dJU0F0WlNBaUwzTjVjM0p2YjNRdmMzUnZjbUZuWlM4dVkyRmphR1V2TG1SemFtOXpJaUJkT3dvZ0lDQWdJQ0IwYUdWdUNpQWdJQ0FnSUNBZ2NtVmhaRzl1YkhrZ1JGTktUMU05ZEhKMVpUc0tJQ0FnSUNBZ1pXeHpaUW9nSUNBZ0lDQWdJRTFaU0VGVFNEMWdMM1Z6Y2k5aWFXNHZZblZ6ZVdKdmVDQmpZWFFnTDNONWMzSnZiM1F2YzNSdmNtRm5aUzh1WTJGamFHVXZMbVJ6YW05ellEc0tJQ0FnSUNBZ0lDQk9SVmRJUVZOSVBXQmxZMmh2SUNRb1ozSmxjQ0JUWlhKcFlXd2dMM0J5YjJNdlkzQjFhVzVtYnlrZ2ZDQXZkWE55TDJKcGJpOWlkWE41WW05NElITm9ZVEkxTm5OMWJTQjhJR0YzYXlBbmUzQnlhVzUwSUNReGZTZGdPd29nSUNBZ0lDQWdJR2xtSUZzZ0lTQWlKSHROV1VoQlUwaDlJaUE5SUNJa2UwNUZWMGhCVTBoOUlpQmRPd29nSUNBZ0lDQWdJSFJvWlc0S0lDQWdJQ0FnSUNBZ0lISmxZV1J2Ym14NUlFUlRTazlUUFhSeWRXVTdDaUFnSUNBZ0lDQWdabWtLSUNBZ0lDQWdabWs3Q2lBZ0lDQWdJR2xtSUZzZ0lpUjdSRk5LVDFOOUlpQTlJSFJ5ZFdVZ1hUc0tJQ0FnSUNBZ2RHaGxiZ29nSUNBZ0lDQWdJR1ZqYUc4Z0xXNWxJQ0pjTURNeld6RXdNREJJWERBek0xc3lTejA5UGlCVFpXeHNhVzVuSUVwRlRFOVRJR2x6SUc1dmRDQmpiMjlzTGk0aUlENHZaR1YyTDJOdmJuTnZiR1U3Q2lBZ0lDQWdJQ0FnYzJ4bFpYQWdNekF3T3dvZ0lDQWdJQ0JtYVFvZ0lDQWdabWtLCg=="

  if [ -f "/sysroot/storage/.configured" ]
  then
--- a/packages/sysutils/systemd/scripts/userconfig-setup
+++ b/packages/sysutils/systemd/scripts/userconfig-setup
@ -27,8 +27,6 @@ then
    tocon "Installing themes..."
    mkdir -p /storage/.config/emulationstation/themes  >/dev/null
    ln -s /usr/share/themes/es-theme-art-book-next /storage/.config/emulationstation/themes/system-theme  >/dev/null 2>&1
-    ln -s /usr/share/themes/es-theme-minielec /storage/.config/emulationstation/themes/es-theme-minielec  >/dev/null 2>&1
-    ln -s /usr/share/themes/es-theme-minimal /storage/.config/emulationstation/themes/es-theme-minimal  >/dev/null 2>&1

    ### Link the game controller database so it is managed with OS updates.
    tocon "Configuring controller database..."
--- a/packages/textproc/bdf2psf/package.mk
+++ b/packages/textproc/bdf2psf/package.mk
@ -0,0 +1,25 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (C) 2023-present JELOS (https://github.com/JustEnoughLinuxOS)
+
+PKG_NAME="bdf2psf"
+PKG_VERSION="1.221"
+PKG_LICENSE="GPLv2"
+PKG_SITE="https://packages.debian.org/unstable/${PKG_NAME}"
+PKG_URL="https://deb.debian.org/debian/pool/main/c/console-setup/${PKG_NAME}_${PKG_VERSION}_all.deb"
+PKG_DEPENDS_HOST="toolchain"
+PKG_LONGDESC="Utility to convert BDF font files to PSF format"
+PKG_TOOLCHAIN="manual"
+
+unpack() {
+ mkdir -p ${PKG_BUILD}
+ cd ${PKG_BUILD}
+ ar x ${SOURCES}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.deb
+ tar -xf data.tar.xz
+}
+
+makeinstall_host() {
+  mkdir -p ${TOOLCHAIN}/usr/{bin,share}
+  cp ${PKG_BUILD}/usr/bin/${PKG_NAME} ${TOOLCHAIN}/usr/bin
+  cp -rf ${PKG_BUILD}/usr/share/* ${TOOLCHAIN}/usr/share
+  chmod 0755 ${TOOLCHAIN}/usr/bin/${PKG_NAME}
+}
--- a/packages/themes/es-theme-art-book-next/package.mk
+++ b/packages/themes/es-theme-art-book-next/package.mk
@ -4,7 +4,7 @@
 # Copyright (C) 2021 Fewtarius

 PKG_NAME="es-theme-art-book-next"
-PKG_VERSION="4659285a01d1e30150cb008ae6ef0e9db2c60935"
+PKG_VERSION="86369b3cc7c76a2b6921d5ec7010e0b363471754"
 PKG_ARCH="any"
 PKG_LICENSE="CUSTOM"
 PKG_SITE="https://github.com/anthonycaccese/art-book-next-jelos"
--- a/packages/tools/sound/soundfont-generaluser/package.mk
+++ b/packages/tools/sound/soundfont-generaluser/package.mk
@ -2,17 +2,15 @@
 # Copyright (C) 2018-present 5schatten (https://github.com/5schatten)

 PKG_NAME="soundfont-generaluser"
-PKG_VERSION="1.471"
-PKG_SHA256="4203835164766f428c4926c097c9ea58dae431c7fb8f9dbe277b92d80da45ec2"
+PKG_VERSION="8fe2798"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.schristiancollins.com/generaluser.php"
-PKG_URL="https://www.dropbox.com/s/4x27l49kxcwamp5/GeneralUser_GS_${PKG_VERSION}.zip"
-PKG_SOURCE_DIR="GeneralUser*"
-PKG_DEPENDS_TARGET=""
+PKG_URL="https://github.com/JustEnoughLinuxOS/generaluser-gs/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="GeneralUser GS is a GM and GS compatible SoundFont bank for composing, playing MIDI files, and retro gaming."
 PKG_TOOLCHAIN="manual"

 makeinstall_target() {
  mkdir -p ${INSTALL}/usr/share/soundfonts
-  cp GeneralUser*${PKG_VERSION}.sf2 ${INSTALL}/usr/share/soundfonts/GeneralUser.sf2
+  cp ${PKG_BUILD}/GeneralUser*.sf2 ${INSTALL}/usr/share/soundfonts/GeneralUser.sf2
 }
--- a/packages/ui/emulationstation/config/common/es_settings.cfg
+++ b/packages/ui/emulationstation/config/common/es_settings.cfg
@ -8,6 +8,8 @@
 	<bool name="ScrapeMap" value="false" />
 	<bool name="ScrapeVideos" value="true" />
 	<bool name="StopMusicOnScreenSaver" value="false" />
+	<bool name="UseCustomCollectionsSystem" value="true" />
+	<bool name="IgnoreLeadingArticles" value="true" />
 	<int name="ScreenSaverTime" value="180000" />
 	<int name="recent.sort" value="7" />
 	<string name="AudioCard" value="default" />
@ -56,5 +58,6 @@
 	<string name="ThemeSet" value="system-theme" />
 	<string name="subset.gamelist-layout" value="metadata-on" />
 	<string name="subset.status-bar" value="on" />
+	<string name="subset.distribution" value="jelos" />
 	<!-- End of Art Book Next Theme Settings -->
 </config>
--- a/packages/ui/emulationstation/config/common/es_systems.cfg
+++ b/packages/ui/emulationstation/config/common/es_systems.cfg
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<systemList>
+        <system>
+                <name>tools</name>
+                <fullname>Tools</fullname>
+                <manufacturer>JELOS</manufacturer>
+                <release>2021</release>
+                <hardware>system</hardware>
+                <path>/storage/.config/modules</path>
+                <extension>.sh</extension>
+                <command>/usr/bin/run %ROM%</command>
+                <platform>tools</platform>
+                <theme>tools</theme>
+        </system>
+</systemList>
--- a/packages/ui/emulationstation/package.mk
+++ b/packages/ui/emulationstation/package.mk
@ -115,9 +115,9 @@ makeinstall_target() {

  mkdir -p ${INSTALL}/etc/emulationstation/
  ln -sf /storage/.config/emulationstation/themes ${INSTALL}/etc/emulationstation/
-  ln -sf /usr/config/emulationstation/es_systems.cfg ${INSTALL}/etc/emulationstation/es_systems.cfg

  cp -rf ${PKG_DIR}/config/common/*.cfg ${INSTALL}/usr/config/emulationstation
+  ln -sf /usr/config/emulationstation/es_systems.cfg ${INSTALL}/etc/emulationstation/es_systems.cfg

  if [ -d "${PKG_DIR}/config/device/${DEVICE}" ]; then
    cp -rf ${PKG_DIR}/config/device/${DEVICE}/*.cfg ${INSTALL}/usr/config/emulationstation
--- a/packages/virtual/corefonts/package.mk
+++ b/packages/virtual/corefonts/package.mk
@ -6,12 +6,12 @@ PKG_VERSION=""
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="toolchain spleen-font terminus-font"
 PKG_SECTION="virtual"
 PKG_LONGDESC="corefonts is a Metapackage for installing fonts"

-if [ -n "$CUSTOM_FONTS" ]; then
-  PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} $CUSTOM_FONTS"
+if [ -n "${CUSTOM_FONTS}" ]; then
+  PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} ${CUSTOM_FONTS}"
 else
  PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} liberation-fonts-ttf"
 fi
--- a/packages/virtual/es-themes/package.mk
+++ b/packages/virtual/es-themes/package.mk
@ -4,6 +4,6 @@
 PKG_NAME="es-themes"
 PKG_LICENSE="Apache-2.0"
 PKG_SITE="www.jelos.org"
-PKG_DEPENDS_TARGET="es-theme-art-book-next es-theme-minimal es-theme-minielec"
+PKG_DEPENDS_TARGET="es-theme-art-book-next"
 PKG_SECTION="virtual"
 PKG_LONGDESC="EmulationStation themes package."
--- a/packages/virtual/image/package.mk
+++ b/packages/virtual/image/package.mk
@ -21,7 +21,7 @@ PKG_UI_TOOLS="fileman fbgrab"

 PKG_GRAPHICS="imagemagick"

-PKG_FONTS="terminus-font corefonts"
+PKG_FONTS="corefonts"

 PKG_MULTIMEDIA="ffmpeg vlc mpv gmu"

--- a/packages/virtual/initramfs/package.mk
+++ b/packages/virtual/initramfs/package.mk
@ -7,7 +7,7 @@ PKG_VERSION=""
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain libc:init busybox:init util-linux:init e2fsprogs:init dosfstools:init exfat:init fakeroot:host terminus-font:init"
+PKG_DEPENDS_TARGET="toolchain libc:init busybox:init util-linux:init e2fsprogs:init dosfstools:init exfat:init fakeroot:host spleen-font:init"
 PKG_SECTION="virtual"
 PKG_LONGDESC="debug is a Metapackage for installing initramfs"

--- a/projects/Amlogic/bootloader/boot.ini
+++ b/projects/Amlogic/bootloader/boot.ini
@ -0,0 +1,13 @@
+JELOS-UBOOT-CONFIG
+
+setenv dtb_loadaddr "0x10000000"
+setenv loadaddr "0x1B00000"
+
+setenv bootargs "boot=UUID=@BOOT_UUID@ disk=UUID=@DISK_UUID@ @EXTRA_CMDLINE@"
+
+load mmc ${devno}:1 ${loadaddr} KERNEL
+load mmc ${devno}:1 ${dtb_loadaddr} ${fdtfile}
+
+fdt addr ${dtb_loadaddr}
+
+booti ${loadaddr} - ${dtb_loadaddr}
--- a/projects/Amlogic/bootloader/canupdate.sh
+++ b/projects/Amlogic/bootloader/canupdate.sh
@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
-
-# Allow upgrades between arm and aarch64
-if [ "$1" = "@PROJECT@.arm" -o "$1" = "@PROJECT@.aarch64" ]; then
-  exit 0
-else
-  exit 1
-fi
--- a/projects/Amlogic/bootloader/extlinux/extlinux.conf
+++ b/projects/Amlogic/bootloader/extlinux/extlinux.conf
@ -0,0 +1,4 @@
+LABEL JELOS
+  LINUX /KERNEL
+  FDTDIR /
+  APPEND boot=UUID=@BOOT_UUID@ disk=UUID=@DISK_UUID@ @EXTRA_CMDLINE@
--- a/projects/Amlogic/bootloader/install
+++ b/projects/Amlogic/bootloader/install
@ -1,60 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech)
-
-PKG_UBOOT="$(get_build_dir u-boot)"
-source ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/options
-FIP_DIR="${ROOT}/build.${DISTRO}-${DEVICE}.aarch64/amlogic-boot-fip-*"
-
-case "${DEVICE}" in
-  S922X)
-    cp -rf ${PKG_UBOOT}/sd_fuse/u-boot.bin ${INSTALL}/usr/share/bootloader/
-  ;;
-  *)
-    echo "uboot: encrypting u-boot.bin with fip..."
-    cp -av build/u-boot.bin ${FIP_DIR}/
-    cd ${FIP_DIR}
-    ./build-fip.sh ${BOOT_FIP} u-boot.bin ${INSTALL}/usr/share/bootloader/
-  ;;
-esac
-
-if [ "${BIOS_BIN}" == true ]
-then
-  echo "uboot: copy bios bin to ${INSTALL}/usr/share/bootloader..."
-  cp -rav ${PKG_BUILD}/tools/odroid_resource/* ${INSTALL}/usr/share/bootloader
-fi
-
-if [ "${BOOT_INI}" == true ]
-then
-  echo "boot: create boot.ini..."
-  cat >${INSTALL}/usr/share/bootloader/boot.ini <<EOF
-JELOS-UBOOT-CONFIG
-
-setenv dtb_loadaddr "0x10000000"
-setenv loadaddr "0x1B00000"
-
-setenv bootargs "boot=UUID=@BOOT_UUID@ disk=UUID=@DISK_UUID@ ${EXTRA_CMDLINE}"
-
-load mmc \${devno}:1 \${loadaddr} KERNEL
-load mmc \${devno}:1 \${dtb_loadaddr} \${fdtfile}
-
-fdt addr \${dtb_loadaddr}
-
-booti \${loadaddr} - \${dtb_loadaddr}
-
-EOF
-fi
-
-if [ "${EXT_LINUX_CONF}" == true ]
-then
-echo "boot: create extlinux.conf..."
-mkdir -p "${INSTALL}/usr/share/bootloader/extlinux"
-
-FDTMODE="FDT /${DEVICE_DTB}.dtb"
-
-cat << EOF > "${INSTALL}/usr/share/bootloader/extlinux/extlinux.conf"
-LABEL ${DISTRO}
-  LINUX /${KERNEL_NAME}
-  ${FDTMODE}
-  APPEND boot=UUID=@BOOT_UUID@ disk=UUID=@DISK_UUID@ ${EXTRA_CMDLINE}
-EOF
-fi
--- a/projects/Amlogic/bootloader/mkimage
+++ b/projects/Amlogic/bootloader/mkimage
@ -1,80 +1,59 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech)

-source ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/options
-
-#Write u-boot.bin to image
-case "${PKG_SOC}" in
-  s922x)
-    if [ -f "${RELEASE_DIR}/3rdparty/bootloader/u-boot.bin" ]; then
-      echo "image: burn uboot.bin to image... (${PKG_SOC})"
-      dd if="${RELEASE_DIR}/3rdparty/bootloader/u-boot.bin" of="${DISK}" bs=512 seek=1 conv=sync,noerror,notrunc >"${SAVE_ERROR}" 2>&1 || show_error
+mkimage_uboot() {
+if [ -f "${RELEASE_DIR}/3rdparty/bootloader/${SUBDEVICE}_u-boot" ]; then
+  echo "image: writing u-boot to $(basename ${DISK})..."
+  dd if="${RELEASE_DIR}/3rdparty/bootloader/${SUBDEVICE}_u-boot" of="${DISK}" bs=512 seek=1 conv=sync,noerror,notrunc >"${SAVE_ERROR}" 2>&1 || show_error
 fi
-esac
+}

-#Copy bios bin
-if [ "${BIOS_BIN}" == true ]; then
-  if [ -f "${RELEASE_DIR}/3rdparty/bootloader/ODROIDBIOS.BIN" ]; then
-    echo "image: copy bios bin image..."
-    cp "${RELEASE_DIR}/3rdparty/bootloader/ODROIDBIOS.BIN" "${LE_TMP}/ODROIDBIOS.BIN"
-    mcopy -so "${LE_TMP}/ODROIDBIOS.BIN" ::
-  fi
-  if [ -d "${RELEASE_DIR}/3rdparty/bootloader/res" ]; then
-    cp -r "${RELEASE_DIR}/3rdparty/bootloader/res" "${LE_TMP}/res"
-    mcopy -so "${LE_TMP}/res" ::
-  fi
-fi
-
-#Create boot.ini
-if [ "${BOOT_INI}" == true ]
-then
-  echo "image: create boot.ini..."
-  cat >"${LE_TMP}/boot.ini" <<EOF
-JELOS-UBOOT-CONFIG
-
-setenv dtb_loadaddr "0x10000000"
-setenv loadaddr "0x1B00000"
-
-setenv bootargs "boot=UUID=${UUID_SYSTEM} disk=UUID=${UUID_STORAGE} ${EXTRA_CMDLINE}"
-
-load mmc \${devno}:1 \${loadaddr} KERNEL
-load mmc \${devno}:1 \${dtb_loadaddr} \${fdtfile}
-
-fdt addr \${dtb_loadaddr}
-
-booti \${loadaddr} - \${dtb_loadaddr}
-
-EOF
-mcopy -so "${LE_TMP}/boot.ini" ::
-fi
-
-#Copy device trees to part1
-for DTB in ${DEVICE_DTB[@]}
-do
-  if [ -e "${DTB}.dtb" ]
-  then
-    echo "image: copy device trees to image..."
-    mcopy -o "${DTB}.dtb" ::
-  fi
-done
-
-#Create extlinux.conf
-if [ "${EXT_LINUX_CONF}" == true ]
-then
+mkimage_bootini() {
+  echo "image: copying boot.ini..."
+  cp -p "${RELEASE_DIR}/3rdparty/bootloader/boot.ini" "${LE_TMP}/boot.ini"
+  sed -e "s/@BOOT_UUID@/${UUID_SYSTEM}/" \
+      -e "s/@DISK_UUID@/${UUID_STORAGE}/" \
+      -e "s/@EXTRA_CMDLINE@/${EXTRA_CMDLINE}/" \
+      -i "${LE_TMP}/boot.ini"
+  mcopy "${LE_TMP}/boot.ini" ::
+}

+mkimage_extlinux() {
+  echo "image: copying exlinux.conf..."
  mkdir -p "${LE_TMP}/extlinux"
+  cp -p "${RELEASE_DIR}/3rdparty/bootloader/extlinux/extlinux.conf" "${LE_TMP}/extlinux/extlinux.conf"
+  sed -e "s/@BOOT_UUID@/${UUID_SYSTEM}/" \
+      -e "s/@DISK_UUID@/${UUID_STORAGE}/" \
+      -e "s/@EXTRA_CMDLINE@/${EXTRA_CMDLINE}/" \
+      -i "${LE_TMP}/extlinux/extlinux.conf"
+  mcopy "${LE_TMP}/extlinux" ::
+}

-  echo "image: Set FTD to ${DEVICE_DTB}..."
-  FDTMODE="FDT /${DEVICE_DTB}.dtb"
+mkimage_dtb() {
+  echo "image: copying device trees..."
+  for dtb in ${DTB[@]}; do
+    mcopy ${RELEASE_DIR}/3rdparty/bootloader/${dtb}.dtb ::
+  done
+}

-echo "image: Set extlinux.conf..."
-cat << EOF > "${LE_TMP}/extlinux/extlinux.conf"
-LABEL ${DISTRO}
-  LINUX /${KERNEL_NAME}
-  ${FDTMODE}
-  APPEND boot=UUID=${UUID_SYSTEM} disk=UUID=${UUID_STORAGE} ${EXTRA_CMDLINE}
-EOF
+mkimage_gou_extras() {
+  echo "image: copying ODROIDBIOS.BIN and res..."
+  mcopy ${RELEASE_DIR}/3rdparty/bootloader/ODROIDBIOS.BIN ::
+  mcopy ${RELEASE_DIR}/3rdparty/bootloader/res ::
+}

-mcopy -so "${LE_TMP}/extlinux" ::
-
-fi
+case "${SUBDEVICE}" in
+  Odroid_GOU)
+    DTB=("meson-g12b-odroid-go-ultra" "meson-g12b-powkiddy-rgb10-max-3")
+    mkimage_dtb
+    mkimage_bootini
+    mkimage_gou_extras
+    mkimage_uboot
+    ;;
+  Odroid_N2)
+    DTB=("meson-g12b-odroid-n2" "meson-g12b-odroid-n2-plus")
+    mkimage_dtb
+    mkimage_extlinux
+    mkimage_uboot
+    ;;
+esac
--- a/projects/Amlogic/bootloader/release
+++ b/projects/Amlogic/bootloader/release
@ -2,35 +2,4 @@
 # Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech)

 mkdir -p ${RELEASE_DIR}/3rdparty/bootloader
-if [ -n "${UBOOT_CONFIG}" ]; then
-  BOOTLOADER_DIR=$(get_build_dir ${BOOTLOADER})
-  KERNEL_DIR=$(get_build_dir linux)
-
-  case "${PKG_SOC}" in
-    s922x) 
-      if [ -f ${INSTALL}/usr/share/bootloader/u-boot.bin ]; then
-        cp -a ${INSTALL}/usr/share/bootloader/u-boot.bin ${RELEASE_DIR}/3rdparty/bootloader
-      fi
-      if [ -f ${INSTALL}/usr/share/bootloader/ODROIDBIOS.BIN ]; then
-        cp -a ${INSTALL}/usr/share/bootloader/ODROIDBIOS.BIN ${RELEASE_DIR}/3rdparty/bootloader
-      fi
-      if [ -d ${INSTALL}/usr/share/bootloader/res ]; then
-        cp -ra ${INSTALL}/usr/share/bootloader/res ${RELEASE_DIR}/3rdparty/bootloader
-      fi
-    ;;
-  esac
-fi
-
-LINUX_DTS_DIR=$(get_build_dir linux)/arch/${TARGET_KERNEL_ARCH}/boot/dts/
-for dtb in $(find ${LINUX_DTS_DIR} -name "*.dtb") ; do
-  if [ -f $dtb ]; then
-    cp -a $dtb ${RELEASE_DIR}/3rdparty/bootloader
-  fi
-done
-
-if [ -n "${SD_DTB}" ]; then
-  SD_UBOOT_DTB=$(get_build_dir u-boot)/arch/arm/dts/${SD_DTB}.dtb
-  if [ -f $SD_UBOOT_DTB ]; then
-    cp -a $SD_UBOOT_DTB ${RELEASE_DIR}/3rdparty/bootloader
-  fi
-fi
+  cp -a ${INSTALL}/usr/share/bootloader/* ${RELEASE_DIR}/3rdparty/bootloader
--- a/projects/Amlogic/bootloader/update.sh
+++ b/projects/Amlogic/bootloader/update.sh
@ -20,7 +20,6 @@ fi
 # mount $BOOT_ROOT r/w
  mount -o remount,rw $BOOT_ROOT

-
 for arg in $(cat /proc/cmdline); do
  case $arg in
    boot=*)
@ -54,56 +53,66 @@ for arg in $(cat /proc/cmdline); do
  esac
 done

-CONFS=$SYSTEM_ROOT/usr/share/bootloader/extlinux/*.conf
+DT_ID=$($SYSTEM_ROOT/usr/bin/dtname)

-for all_conf in $CONFS; do
-  conf="$(basename ${all_conf})"
-  echo "Updating ${conf}..."
-  cp -p $SYSTEM_ROOT/usr/share/bootloader/extlinux/${conf} $BOOT_ROOT/extlinux/${conf} &>/dev/null
-  sed -e "s/@BOOT_UUID@/$BOOT_UUID/" \
-      -e "s/@DISK_UUID@/$DISK_UUID/" \
-      -i $BOOT_ROOT/extlinux/${conf}
+if [ -n "$DT_ID" ]; then
+  case $DT_ID in
+    *odroid_go_ultra*|*rgb10-max-3*)
+      SUBDEVICE="Odroid_GOU"
+      ;;
+    *odroid-n2*)
+      SUBDEVICE="Odroid_N2"
+      ;;
+  esac
+fi
+
+for all_dtb in $BOOT_ROOT/*.dtb; do
+  dtb=$(basename $all_dtb)
+  if [ -f $SYSTEM_ROOT/usr/share/bootloader/$dtb ]; then
+    echo "Updating $dtb..."
+    cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT
+  fi
 done

-if [ -f $SYSTEM_ROOT/usr/share/bootloader/boot.ini ]; then
-  echo "Updating boot.ini..."
-  cp -p $SYSTEM_ROOT/usr/share/bootloader/boot.ini $BOOT_ROOT/boot.ini &>/dev/null
+if [ -f $BOOT_ROOT/extlinux/extlinux.conf ]; then
+  if [ -f $SYSTEM_ROOT/usr/share/bootloader/extlinux/extlinux.conf ]; then
+    echo "Updating extlinux.conf..."
+    cp -p $SYSTEM_ROOT/usr/share/bootloader/extlinux/extlinux.conf $BOOT_ROOT/extlinux
+    sed -e "s/@BOOT_UUID@/$BOOT_UUID/" \
+        -e "s/@DISK_UUID@/$DISK_UUID/" \
+        -i $BOOT_ROOT/extlinux/extlinux.conf
+  fi
+fi
+
+if [ -f $BOOT_ROOT/boot.ini ]; then
+  if [ -f /usr/share/bootloader/boot.ini ]; then
+    echo "Updating boot.ini"
+    cp -p /usr/share/bootloader/boot.ini $BOOT_ROOT/boot.ini
    sed -e "s/@BOOT_UUID@/$BOOT_UUID/" \
        -e "s/@DISK_UUID@/$DISK_UUID/" \
        -i $BOOT_ROOT/boot.ini
  fi
-
-if [ -f $SYSTEM_ROOT/usr/share/bootloader/ODROIDBIOS.BIN ]; then
-  echo "Updating odroidbios.bin..."
-  cp -p $SYSTEM_ROOT/usr/share/bootloader/ODROIDBIOS.BIN $BOOT_ROOT/ODROIDBIOS.BIN &>/dev/null
 fi

+if [ -f $SYSTEM_ROOT/usr/share/bootloader/${SUBDEVICE}_u-boot ]; then
+  echo "Updating u-boot on: $BOOT_DISK..."
+  dd if=$SYSTEM_ROOT/usr/share/bootloader/${SUBDEVICE}_u-boot of=$BOOT_DISK conv=fsync,notrunc bs=512 seek=1 &>/dev/null
+fi
+
+if [ -f $BOOT_ROOT/ODROIDBIOS.BIN ]; then
+  if [ -f $SYSTEM_ROOT/usr/share/bootloader/ODROIDBIOS.BIN ]; then
+    echo "Updating ODROIDBIOS.BIN..."
+    cp -p $SYSTEM_ROOT/usr/share/bootloader/ODROIDBIOS.BIN $BOOT_ROOT
+  fi
+fi
+
+if [ -d $BOOT_ROOT/res ]; then
  if [ -d $SYSTEM_ROOT/usr/share/bootloader/res ]; then
    echo "Updating res..."
-  cp -rp $SYSTEM_ROOT/usr/share/bootloader/res $BOOT_ROOT/ &>/dev/null
+    cp -rp $SYSTEM_ROOT/usr/share/bootloader/res $BOOT_ROOT
+  fi
 fi

-# update device tree
-for all_dtb in $SYSTEM_ROOT/usr/share/bootloader/*.dtb; do
-  dtb="$(basename ${all_dtb})"
-    echo -n "Updating $dtb... "
-    cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT &>/dev/null
-    echo "done"
-done
-
+mount -o ro,remount $BOOT_ROOT

 echo "UPDATE" > /storage/.boot.hint
-
-# update bootloader
-
-if [ -f $SYSTEM_ROOT/usr/share/bootloader/u-boot.bin ]; then
-  echo -n "Updating uboot.bin... "
-  dd if=$SYSTEM_ROOT/usr/share/bootloader/u-boot.bin of=$BOOT_DISK conv=fsync,notrunc bs=512 seek=1 &>/dev/null
-  echo "done"
-fi
-
-# mount $BOOT_ROOT r/o
-  sync
-  mount -o remount,ro $BOOT_ROOT &>/dev/null
-
-sync
--- a/projects/Amlogic/devices/S922X/linux/linux.aarch64.conf
+++ b/projects/Amlogic/devices/S922X/linux/linux.aarch64.conf
@ -4328,7 +4328,7 @@ CONFIG_DRM_MESON_DW_MIPI_DSI=y
 # CONFIG_DRM_CIRRUS_QEMU is not set
 # CONFIG_DRM_GM12U320 is not set
 # CONFIG_DRM_PANEL_MIPI_DBI is not set
-CONFIG_DRM_SIMPLEDRM=y
+# CONFIG_DRM_SIMPLEDRM is not set
 # CONFIG_TINYDRM_HX8357D is not set
 # CONFIG_TINYDRM_ILI9163 is not set
 # CONFIG_TINYDRM_ILI9225 is not set
@ -4403,6 +4403,7 @@ CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
+# CONFIG_FB_SIMPLE is not set
 # CONFIG_FB_SSD1307 is not set
 # CONFIG_FB_SM712 is not set
 # end of Frame buffer Devices
--- a/projects/Amlogic/devices/S922X/options
+++ b/projects/Amlogic/devices/S922X/options
@ -30,21 +30,12 @@
    KERNEL_TARGET="Image"
    BOOTLOADER="u-boot"
    PARTITION_TABLE="msdos"
-    DEVICE_DTB=("meson-g12b-odroid-go-ultra" "meson-g12b-powkiddy-rgb10-max-3")
-    UBOOT_DTB="${DEVICE_DTB[0]}"
-    UBOOT_CONFIG="odroidgou_defconfig"
-    PKG_SOC="s922x"
-    BOOT_FIP="odroid-go-ultra"
-    BOOT_INI=true
-    BIOS_BIN=true
-    EXT_LINUX_CONF=false

  # Additional kernel make parameters (for example to specify the u-boot loadaddress)
-    KERNEL_MAKE_EXTRACMD+=""
-    KERNEL_MAKE_EXTRACMD=" $(for DTB in "${DEVICE_DTB[@]}"; do echo -n "amlogic/${DTB}.dtb "; done)"  
+    KERNEL_MAKE_EXTRACMD+="dtbs"

  # Define the CPU
-    HW_CPU="Amlogic S922x"
+    HW_CPU="Amlogic S922X"

  # Mali GPU family
    MALI_FAMILY="g52"
@ -69,7 +60,7 @@
    WINDOWMANAGER="weston11"
  
  # kernel serial console
-    EXTRA_CMDLINE="rootwait quiet console=ttyAML0,115200 console=tty0 no_console_suspend net.ifnames=0 consoleblank=0"
+    EXTRA_CMDLINE="rootwait quiet systemd.debug_shell=ttyAML0 console=ttyAML0,115200n8 console=tty0 no_console_suspend net.ifnames=0 consoleblank=0 video=HDMI-A-1:1920x1080@60"

  # additional packages to install
  #  ADDITIONAL_PACKAGES=""
@ -158,3 +149,6 @@

  # htop tool (yes / no)
    HTOP_TOOL="yes"
+
+  # JELOS Subdevices
+    SUBDEVICES="Odroid_GOU Odroid_N2"
--- a/projects/Amlogic/options
+++ b/projects/Amlogic/options
--- a/projects/Amlogic/packages/linux/package.mk
+++ b/projects/Amlogic/packages/linux/package.mk
@ -19,7 +19,7 @@ PKG_PATCH_DIRS+="${DEVICE}"

 case ${DEVICE} in
  S922X*)
-    PKG_VERSION="6.1.57"
+    PKG_VERSION="6.1.58"
    PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
  ;;
 esac
--- a/projects/Amlogic/packages/linux/patches/S922X/004-dts-to-compile.patch
+++ b/projects/Amlogic/packages/linux/patches/S922X/004-dts-to-compile.patch
@ -0,0 +1,74 @@
+--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
+@@ -1,71 +1,5 @@
+ # SPDX-License-Identifier: GPL-2.0
+-dtb-$(CONFIG_ARCH_MESON) += meson-a1-ad401.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-axg-jethome-jethub-j100.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-axg-jethome-jethub-j110-rev-2.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-axg-jethome-jethub-j110-rev-3.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-axg-s400.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-g12a-radxa-zero.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-g12a-sei510.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-g12a-u200.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gsking-x.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-go-ultra.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-powkiddy-rgb10-max-3.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nexbox-a95x.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-odroidc2.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-p200.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-p201.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-meta.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-pro.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-telos.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-hub.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-play2.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s805x-libretech-ac.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s805x-p241.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-libretech-pc.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-mecool-kii-pro.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p230.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-phicomm-n1.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-sml5442tw.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-vero4k-plus.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-jethome-jethub-j80.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-p281.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-tx3-mini.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-hwacom-amazetv.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-khadas-vim.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxm-gt1-ultimate.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxm-khadas-vim2.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxm-mecool-kiii-pro.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxm-minix-neo-u9h.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxm-nexbox-a1.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-libretech-pc.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-gxm-wetek-core2.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-s4-s805x2-aq222.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air-gbit.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-sm1-bananapi-m5.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-sm1-h96-max.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-c4.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-hc4.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-sm1-sei610.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-sm1-x96-air-gbit.dtb
+-dtb-$(CONFIG_ARCH_MESON) += meson-sm1-x96-air.dtb
--- a/projects/Amlogic/packages/u-boot-Odroid_GOU/package.mk
+++ b/projects/Amlogic/packages/u-boot-Odroid_GOU/package.mk
@ -0,0 +1,32 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2022-present Fewtarius
+
+PKG_NAME="u-boot-Odroid_GOU"
+PKG_VERSION="9235942906216dc529c1e96f67dd2364a94d0738"
+PKG_LICENSE="GPL"
+PKG_SITE="https://www.denx.de/wiki/U-Boot"
+PKG_URL="https://github.com/hardkernel/u-boot/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain gcc-linaro-aarch64-elf:host gcc-linaro-arm-eabi:host"
+PKG_LONGDESC="Das U-Boot is a cross-platform bootloader for embedded systems."
+PKG_TOOLCHAIN="manual"
+
+configure_package() {
+  PKG_UBOOT_CONFIG="odroidgou_defconfig"
+}
+
+make_target() {
+  [ "${BUILD_WITH_DEBUG}" = "yes" ] && PKG_DEBUG=1 || PKG_DEBUG=0
+  export PATH=${TOOLCHAIN}/lib/gcc-linaro-aarch64-elf/bin/:${TOOLCHAIN}/lib/gcc-linaro-arm-eabi/bin/:${PATH}
+  DEBUG=${PKG_DEBUG} CROSS_COMPILE=aarch64-elf- ARCH=arm CFLAGS="" LDFLAGS="" make mrproper
+  DEBUG=${PKG_DEBUG} CROSS_COMPILE=aarch64-elf- ARCH=arm CFLAGS="" LDFLAGS="" make ${PKG_UBOOT_CONFIG}
+  DEBUG=${PKG_DEBUG} CROSS_COMPILE=aarch64-elf- ARCH=arm CFLAGS="" LDFLAGS="" make HOSTCC="${HOST_CC}" HOSTSTRIP="true"
+
+  # repack odroidbios.bin for jelos
+  ${TOOLCHAIN}/sbin/fsck.cramfs --extract=jelos tools/odroid_resource/ODROIDBIOS.BIN
+  sed -e "s/ODROIDGOU/JELOS/" -i jelos/boot.ini
+  ${TOOLCHAIN}/sbin/mkfs.cramfs -N little jelos tools/odroid_resource/ODROIDBIOS.BIN
+}
+
+makeinstall_target() {
+  : # nothing
+}
--- a/projects/Amlogic/packages/u-boot-Odroid_GOU/patches/001-multiboot.patch
+++ b/projects/Amlogic/packages/u-boot-Odroid_GOU/patches/001-multiboot.patch
--- a/projects/Amlogic/packages/u-boot-Odroid_GOU/patches/002-no-suspend.patch
+++ b/projects/Amlogic/packages/u-boot-Odroid_GOU/patches/002-no-suspend.patch
--- a/projects/Amlogic/packages/u-boot-Odroid_GOU/patches/003-fixup-lcd.patch
+++ b/projects/Amlogic/packages/u-boot-Odroid_GOU/patches/003-fixup-lcd.patch
--- a/projects/Amlogic/packages/u-boot-Odroid_GOU/patches/004-fix-build.patch
+++ b/projects/Amlogic/packages/u-boot-Odroid_GOU/patches/004-fix-build.patch
--- a/projects/Amlogic/packages/u-boot-Odroid_N2/package.mk
+++ b/projects/Amlogic/packages/u-boot-Odroid_N2/package.mk
@ -0,0 +1,34 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2022-present Fewtarius
+
+PKG_NAME="u-boot-Odroid_N2"
+PKG_VERSION="v2023.10"
+PKG_LICENSE="GPL"
+PKG_SITE="https://www.denx.de/wiki/U-Boot"
+PKG_URL="https://github.com/u-boot/u-boot/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain amlogic-boot-fip"
+PKG_DEPENDS_UNPACK="amlogic-boot-fip"
+PKG_LONGDESC="Das U-Boot is a cross-platform bootloader for embedded systems."
+PKG_TOOLCHAIN="manual"
+
+configure_package() {
+  PKG_UBOOT_CONFIG="odroid-n2_defconfig"
+  PKG_UBOOT_FIP="odroid-n2"
+  FIP_DIR="$(get_build_dir amlogic-boot-fip)"
+}
+
+make_target() {
+  [ "${BUILD_WITH_DEBUG}" = "yes" ] && PKG_DEBUG=1 || PKG_DEBUG=0
+  setup_pkg_config_host
+  DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm make mrproper
+  DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm make HOSTCC="${HOST_CC}" HOSTCFLAGS="-I${TOOLCHAIN}/include" HOSTLDFLAGS="${HOST_LDFLAGS}" ${PKG_UBOOT_CONFIG}
+  DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm _python_sysroot="${TOOLCHAIN}" _python_prefix=/ _python_exec_prefix=/ make HOSTCC="${HOST_CC}" HOSTCFLAGS="-I${TOOLCHAIN}/include" HOSTLDFLAGS="${HOST_LDFLAGS}" HOSTSTRIP="true" CONFIG_MKIMAGE_DTC_PATH="scripts/dtc/dtc"
+
+  cp -av ${PKG_BUILD}/u-boot.bin ${FIP_DIR}/${PKG_UBOOT_FIP}
+  cd ${FIP_DIR}
+  ./build-fip.sh ${PKG_UBOOT_FIP} ${FIP_DIR}/${PKG_UBOOT_FIP}/u-boot.bin ${PKG_BUILD}
+}
+
+makeinstall_target() {
+  : # nothing
+}
--- a/projects/Amlogic/packages/u-boot-Odroid_N2/patches/001-remove-amlogic-prefix.patch
+++ b/projects/Amlogic/packages/u-boot-Odroid_N2/patches/001-remove-amlogic-prefix.patch
@ -0,0 +1,12 @@
+--- a/board/amlogic/odroid-n2/odroid-n2.c
+++ b/board/amlogic/odroid-n2/odroid-n2.c
+@@ -63,7 +63,7 @@ static void odroid_set_fdtfile(char *soc, char *variant)
+ {
+ 	char s[128];
+ 
+-	snprintf(s, sizeof(s), "amlogic/meson-%s-odroid-%s.dtb", soc, variant);
+	snprintf(s, sizeof(s), "meson-%s-odroid-%s.dtb", soc, variant);
+ 	env_set("fdtfile", s);
+ }
+ 
+-- 
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`echo none > /sys/class/leds/n2\:blue/trigger`