Skip to content

Commit 430833c

Browse files
r3claimerr3claimer
authored
Merge pull request #443 from ROCKNIX/dev
PR to dev into main for release.
2 parents 74e0aa3 + d6fde53 commit 430833c

File tree

358 files changed

+7568
-194308
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

358 files changed

+7568
-194308
lines changed

‎Makefile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ docker-%: GLOBAL_SETTINGS := $(shell if [ -f "${HOME}/.ROCKNIX/options" ]; then
101101
# LOCAL_SSH_KEYS_FILE is a variable that contains the location of the authorized keys file for development build use. It will be mounted into the container if it exists.
102102
docker-%: LOCAL_SSH_KEYS_FILE := $(shell if [ -n "${LOCAL_SSH_KEYS_FILE}" ]; then echo "-v \"${LOCAL_SSH_KEYS_FILE}:${LOCAL_SSH_KEYS_FILE}\""; else echo ""; fi)
103103

104+
# EMULATIONSTATION_SRC is a variable that contains the location of local emulationstation source code. It will be mounted into the container if it exists.
105+
docker-%: EMULATIONSTATION_SRC := $(shell if [ -n "${EMULATIONSTATION_SRC}" ]; then echo "-v \"${EMULATIONSTATION_SRC}:${EMULATIONSTATION_SRC}\""; else echo ""; fi)
106+
104107
# UID is the user ID of current user - ensures docker sets file permissions properly
105108
docker-%: UID := $(shell id -u)
106109

@@ -141,5 +144,4 @@ docker-image-pull:
141144

142145
# Wire up docker to call equivalent make files using % to match and $* to pass the value matched by %
143146
docker-%:
144-
BUILD_DIR=$(DOCKER_WORK_DIR) $(DOCKER_CMD) run $(PODMAN_ARGS) $(INTERACTIVE) --init --env-file .env --rm --user $(UID):$(GID) $(GLOBAL_SETTINGS) $(LOCAL_SSH_KEYS_FILE) -v $(PWD):$(DOCKER_WORK_DIR) -w $(DOCKER_WORK_DIR) $(DOCKER_EXTRA_OPTS) $(DOCKER_IMAGE) $(COMMAND)
145-
147+
BUILD_DIR=$(DOCKER_WORK_DIR) $(DOCKER_CMD) run $(PODMAN_ARGS) $(INTERACTIVE) --init --env-file .env --rm --user $(UID):$(GID) $(GLOBAL_SETTINGS) $(LOCAL_SSH_KEYS_FILE) $(EMULATIONSTATION_SRC) -v $(PWD):$(DOCKER_WORK_DIR) -w $(DOCKER_WORK_DIR) $(DOCKER_EXTRA_OPTS) $(DOCKER_IMAGE) $(COMMAND)

‎config/arch.aarch64‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,27 @@
1010

1111
# determine architecture's family
1212
case $TARGET_CPU in
13-
generic|cortex-a35|cortex-a53|cortex-a57|cortex-a72|exynos-m1|qdf24xx|thunderx|xgene1|cortex-a57.cortex-a53|cortex-a72.cortex-a53|cortex-a55|cortex-a76.cortex-a55|cortex-a73.cortex-a53)
13+
generic|cortex-a35|cortex-a53|cortex-a57|cortex-a72|exynos-m1|qdf24xx|thunderx|xgene1|cortex-a57.cortex-a53|cortex-a72.cortex-a53|cortex-a73.cortex-a53)
1414
TARGET_SUBARCH=aarch64
1515
TARGET_VARIANT=armv8-a
1616
TARGET_ABI=eabi
1717
TARGET_FEATURES+=" neon"
18+
# This only makes sense for 8.0-a, later revisions have LSE
19+
TARGET_CFLAGS=" -mno-outline-atomics"
1820
;;
21+
cortex-a55|cortex-a76.cortex-a55)
22+
TARGET_SUBARCH=aarch64
23+
TARGET_VARIANT=armv8.2-a
24+
TARGET_ABI=eabi
25+
TARGET_FEATURES+=" neon"
26+
;;
27+
1928
esac
2029

2130
TARGET_GCC_ARCH=${TARGET_SUBARCH/-}
2231
TARGET_KERNEL_ARCH=arm64
2332

2433
# setup ARCH specific *FLAGS
25-
TARGET_CFLAGS="-march=${TARGET_VARIANT}${TARGET_CPU_FLAGS} -mabi=lp64 -Wno-psabi -mtune=$TARGET_CPU"
26-
# Disable runtime checking support of ARMv8.0's optional LSE feature. Breaks gdb and mesa compile.
27-
TARGET_CFLAGS="${TARGET_CFLAGS} -mno-outline-atomics"
34+
TARGET_CFLAGS="${TARGET_CFLAGS} -march=${TARGET_VARIANT}${TARGET_CPU_FLAGS} -mabi=lp64 -Wno-psabi -mtune=$TARGET_CPU"
2835
TARGET_LDFLAGS="-march=${TARGET_VARIANT}${TARGET_CPU_FLAGS} -mtune=$TARGET_CPU"
2936
GCC_OPTS="--with-abi=lp64 --with-arch=$TARGET_VARIANT"

‎config/arch.arm‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,13 @@
4747
TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
4848
TARGET_FEATURES+=" neon"
4949
;;
50+
cortex-a55|cortex-a76.cortex-a55)
51+
TARGET_SUBARCH=armv8.2-a
52+
TARGET_ABI=eabi
53+
TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
54+
TARGET_FEATURES+=" neon"
55+
;;
56+
5057
esac
5158

5259
# if [ "${TARGET_FLOAT}" = "hard" ]; then

‎config/optimize‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ LDFLAGS_OPTIM_LINKER_GOLD="-fuse-ld=gold"
3434
LDFLAGS_OPTIM_LINKER_MOLD="-fuse-ld=mold"
3535

3636
# default compiler optimization
37-
CFLAGS_OPTIM_DEFAULT="-O3 -fomit-frame-pointer -DNDEBUG"
37+
CFLAGS_OPTIM_DEFAULT="-O3 -DNDEBUG"
3838
CXXFLAGS_OPTIM_DEFAULT="${CFLAGS_OPTIM_DEFAULT}"
3939
# speed flag
40-
CFLAGS_OPTIM_SPEED="-Ofast -fomit-frame-pointer -DNDEBUG"
40+
CFLAGS_OPTIM_SPEED="-Ofast -DNDEBUG"
4141
CXXFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED}"
4242
# size flag
43-
CFLAGS_OPTIM_SIZE="-Os -fomit-frame-pointer -DNDEBUG"
43+
CFLAGS_OPTIM_SIZE="-Os -DNDEBUG"
4444
CXXFLAGS_OPTIM_SIZE="${CFLAGS_OPTIM_SIZE}"
4545
# debug settings
4646
CFLAGS_OPTIM_DEBUG="-ggdb -Og"

‎distributions/ROCKNIX/options‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,16 @@
4242

4343
# Define package sets to clean based on the type of build being executed.
4444
# This should be updated to be more dynamic in the future.
45-
CLEAN_OS_BASE="emulators system-utils modules quirks autostart rocknix"
45+
CLEAN_OS_BASE="emulators system-utils modules quirks autostart rocknix kernel-firmware"
4646
CLEAN_NETWORK=""
4747
CLEAN_EMU_32BIT="lib32 box86 pcsx_rearmed-lr arm"
4848
# Sway depends on it, weston will use it if it's built but we don't want that.
4949
CLEAN_WESTON="libdisplay-info sway"
50-
# Packages to clean for S922X platform - all vary based on VULKAN_SUPPORT
51-
CLEAN_S922X="beetle-psx-lr dolphin-sa duckstation-sa fileman emulationstation flycast-lr flycast-sa"
52-
CLEAN_S922X+=" gmu gzdoom-sa libplacebo lime3ds-sa linux mali-bifrost mesa moonlight parallel-n64-lr"
53-
CLEAN_S922X+=" pipewire portmaster ppsspp-sa qt5 retroarch SDL2"
50+
# Packages to clean for S922X platform - all vary based on VULKAN_SUPPORT or USE_MALI
51+
CLEAN_S922X="beetle-psx-lr dolphin-sa drastic-sa duckstation-sa fileman emulationstation"
52+
CLEAN_S922X+=" flycast-lr flycast-sa gmu gzdoom-sa libplacebo lime3ds-sa linux mali-bifrost"
53+
CLEAN_S922X+=" mesa moonlight parallel-n64-lr pipewire portmaster ppsspp-sa qt5 retroarch"
54+
CLEAN_S922X+=" wayland SDL2"
5455

5556
# build and install rocknix joypad driver (yes / no)
5657
ROCKNIX_JOYPAD="no"

‎documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ This document describes all available systems emulators and cores available for
7373
|Nintendo|Game Boy Color (Hacks) (gbch)|1998|`gbch`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>**mednafen:** gb<br>|
7474
|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .iso .gcz .ciso .wbfs .rvz .dol|**dolphin:** dolphin-sa-gc (default)<br>**retroarch:** dolphin<br>|
7575
|Nintendo|NES (Hacks) (nesh)|1985|`nesh`|.nes .unif .unf .zip .7z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>**retroarch:** mesen<br>**mednafen:** nesh<br>|
76+
|Nintendo|Nintendo 3DS (3ds)|2010|`3ds`|.3ds .3dsx .elf .axf .cci .cxi .app|**lime3ds:** lime3ds-sa (default)<br>|
7677
|Nintendo|Nintendo 64 (n64)|1996|`n64`|.z64 .n64 .v64 .zip .7z|**retroarch:** mupen64plus_next (default)<br>**retroarch:** mupen64plus<br>**retroarch:** parallel_n64<br>**mupen64plus:** mupen64plus-sa<br>|
7778
|Nintendo|Nintendo DS (nds)|2005|`nds`|.nds .zip .7z|**retroarch:** melonds (default)<br>**retroarch:** desmume<br>**melonds:** melonds-sa<br>|
7879
|Nintendo|Nintendo Entertainment System (nes)|1985|`nes`|.nes .unif .unf .zip .7z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>**retroarch:** mesen<br>**mednafen:** nes<br>|
@@ -100,11 +101,11 @@ This document describes all available systems emulators and cores available for
100101
|Sega|Mega Drive (megadrive)|1990|`megadrive`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** genesis_plus_gx_wide<br>**retroarch:** picodrive<br>**mednafen:** md<br>|
101102
|Sega|Mega Drive (megadrive-japan)|1988|`megadrive-japan`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** genesis_plus_gx_wide<br>**retroarch:** picodrive<br>**mednafen:** md<br>|
102103
|Sega|Naomi (naomi)|1998|`naomi`|.lst .bin .dat .zip .7z|**retroarch:** flycast2021<br>**retroarch:** flycast (default)<br>**flycast:** flycast-sa<br>|
103-
|Sega|Saturn (saturn)|1994|`saturn`|.cue .chd .iso .zip|**kronos:** kronos-sa<br>**retroarch:** yabasanshiro (default)<br>**retroarch:** kronos<br>**retroarch:** beetle_saturn<br>**mednafen:** ss<br>**kronos:** kronos-sa (default)<br>|
104+
|Sega|Saturn (saturn)|1994|`saturn`|.cue .chd .iso .zip|**retroarch:** yabasanshiro (default)<br>**retroarch:** beetle_saturn<br>**mednafen:** ss<br>|
104105
|Sega|Sega 32X (sega32x)|1994|`sega32x`|.32x .smd .bin .md .zip .7z|**retroarch:** picodrive (default)<br>|
105106
|Sega|Sega CD (segacd)|1991|`segacd`|.chd .cue .iso .m3u|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** picodrive<br>|
106107
|Sega|SG-1000 (sg-1000)|1983|`sg-1000`|.bin .sg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>|
107-
|Sega|ST-V (st-v)|1995|`st-v`|.zip .ZIP|**retroarch:** kronos<br>**mednafen:** ss<br>|
108+
|Sega|ST-V (st-v)|1995|`st-v`|.zip .ZIP|**mednafen:** ss (default)<br>|
108109
|Sharp|X1 (x1)|1982|`x1`|.dx1 .2d .2hd .tfd .d88 .88d .hdm .xdf .dup .tap .cmd .zip .7z|**retroarch:** x1 (default)<br>|
109110
|Sharp|x68000 (x68000)|1987|`x68000`|.dim .img .d88 .hdm .dup .2hd .xdf .hdf .cmd .m3u .zip .7z|**retroarch:** px68k (default)<br>|
110111
|Sinclair|ZX Spectrum (zxspectrum)|1982|`zxspectrum`|.tzx .tap .z80 .rzx .scl .trd .dsk .zip .7z|**retroarch:** fuse<br>|
@@ -117,7 +118,7 @@ This document describes all available systems emulators and cores available for
117118
|Sony|PlayStation (psx)|1994|`psx`|.bin .cue .img .mdf .pbp .toc .cbn .m3u .ccd .chd .iso|**retroarch:** beetle_psx (default)<br>**mednafen:** psx<br>**duckstation:** duckstation-sa<br>**retroarch:** duckstation<br>**retroarch:** swanstation<br>|
118119
|Sony|PlayStation 2 (ps2)|2000|`ps2`|.iso .mdf .nrg .bin .img .dump .gz .cso .chd|**pcsx2:** pcsx2-sa (default)<br>**retroarch:** pcsx2<br>|
119120
|Sony|PlayStation 3 (ps3)|2006|`ps3`|.ps3 .psn|**rpcs3:** rpcs3-sa (default)<br>|
120-
|Sony|PlayStation Portable (psp)|2004|`psp`|.iso .cso .pbp .chd|**ppsspp:** ppsspp-sa (default)<br>**retroarch:** ppsspp<br>|
121+
|Sony|PlayStation Portable (psp)|2004|`psp`|.iso .cso .pbp .chd|**ppsspp:** ppsspp-sa (default)<br>|
121122
|Sony|PlayStation Vita (psvita)|2011|`launcher`|.sh .psvita|**vita3k:** vita3k-sa (default)<br>|
122123
|Sony|PSP Minis (pspminis)|2004|`pspminis`|.iso .cso .pbp|**ppsspp:** ppsspp-sa (default)<br>**retroarch:** ppsspp<br>|
123124
|Sun Microsystems|J2ME (j2me)|2002|`j2me`|.jar|**retroarch:** freej2me (default)<br>|

0 commit comments

Comments
 (0)