my355 (Miyoo Flip)

.github/workflows/ci.yaml

@@ -42,6 +42,7 @@ jobs:
         toolchain:
           - tg5040
           - tg5050
+          - my355
 
     steps:
       - name: Checkout
@@ -64,6 +65,7 @@ jobs:
         toolchain:
           - tg5040
           - tg5050
+          - my355
         core: ${{ fromJson(needs.core-matrix.outputs.cores) }}
     steps:
       - name: Checkout
@@ -124,6 +126,18 @@ jobs:
         env:
           PLATFORM: tg5050
 
+      - name: Download Cores (my355)
+        uses: actions/[email protected]
+        with:
+          path: workspace/my355/cores/output/
+          pattern: core-my355-*
+          merge-multiple: true
+
+      - name: Build (my355)
+        run: make my355
+        env:
+          PLATFORM: my355
+
       - name: Special
         run: make special
 

makefile

@@ -12,7 +12,7 @@ endif
 
 ifeq (,$(PLATFORMS))
 #PLATFORMS = miyoomini trimuismart rg35xx rg35xxplus my355 tg5040 zero28 rgb30 m17 gkdpixel my282 magicmini
-PLATFORMS = tg5050 tg5040
+PLATFORMS = tg5050 tg5040 my355
 endif
 
 ###########################################################
@@ -51,11 +51,11 @@ deploy: setup $(PLATFORMS) special package
 	adb push ./build/BASE/MinUI.zip /mnt/SDCARD && adb shell reboot
 
 all: setup $(PLATFORMS) special package done
-	
+
 shell:
 	make -f $(TOOLCHAIN_FILE) PLATFORM=$(PLATFORM)
 
-name: 
+name:
 	@echo $(RELEASE_NAME)
 
 build:
@@ -78,7 +78,7 @@ endif
 
 system:
 	make -f ./workspace/$(PLATFORM)/platform/makefile.copy PLATFORM=$(PLATFORM)
-	
+
 	# populate system
 ifneq ($(PLATFORM), desktop)
 	cp ./workspace/$(PLATFORM)/keymon/keymon.elf ./build/SYSTEM/$(PLATFORM)/bin/
@@ -128,7 +128,18 @@ ifeq ($(PLATFORM), tg5050)
 	cp ./workspace/all/minarch/build/$(PLATFORM)/liblzma.* ./build/SYSTEM/$(PLATFORM)/lib/
 	cp ./workspace/all/minarch/build/$(PLATFORM)/libzstd.* ./build/SYSTEM/$(PLATFORM)/lib/
 endif
-
+ifeq ($(PLATFORM), my355)
+	cp ./workspace/all/bootlogo/build/$(PLATFORM)/bootlogo.elf ./build/EXTRAS/Tools/$(PLATFORM)/Bootlogo.pak/
+
+	# lib dependencies
+	cp ./workspace/all/minarch/build/$(PLATFORM)/libcrypto.* ./build/SYSTEM/$(PLATFORM)/lib/
+	cp ./workspace/all/minarch/build/$(PLATFORM)/libsamplerate.* ./build/SYSTEM/$(PLATFORM)/lib/
+	# This is a bandaid fix, needs to be cleaned up if/when we expand to other platforms.
+	cp ./workspace/all/minarch/build/$(PLATFORM)/libzip.* ./build/SYSTEM/$(PLATFORM)/lib/
+	cp ./workspace/all/minarch/build/$(PLATFORM)/libbz2.* ./build/SYSTEM/$(PLATFORM)/lib/
+	cp ./workspace/all/minarch/build/$(PLATFORM)/liblzma.* ./build/SYSTEM/$(PLATFORM)/lib/
+	cp ./workspace/all/minarch/build/$(PLATFORM)/libzstd.* ./build/SYSTEM/$(PLATFORM)/lib/
+endif
 
 ifeq ($(PLATFORM), desktop)
 cores:
@@ -145,30 +156,21 @@ cores: # TODO: can't assume every platform will have the same stock cores (platf
 	cp ./workspace/$(PLATFORM)/cores/output/picodrive_libretro.so ./build/SYSTEM/$(PLATFORM)/cores
 	cp ./workspace/$(PLATFORM)/cores/output/snes9x_libretro.so ./build/SYSTEM/$(PLATFORM)/cores
 	cp ./workspace/$(PLATFORM)/cores/output/pcsx_rearmed_libretro.so ./build/SYSTEM/$(PLATFORM)/cores
-
 	# extras
 	cp ./workspace/$(PLATFORM)/cores/output/a5200_libretro.so ./build/EXTRAS/Emus/$(PLATFORM)/A5200.pak
 	cp ./workspace/$(PLATFORM)/cores/output/prosystem_libretro.so ./build/EXTRAS/Emus/$(PLATFORM)/A7800.pak
 	cp ./workspace/$(PLATFORM)/cores/output/stella2014_libretro.so ./build/EXTRAS/Emus/$(PLATFORM)/A2600.pak
 	cp ./workspace/$(PLATFORM)/cores/output/handy_libretro.so ./build/EXTRAS/Emus/$(PLATFORM)/LYNX.pak
-ifeq ($(PLATFORM), trimuismart)
-	cp ./workspace/miyoomini/cores/output/fake08_libretro.so ./build/EXTRAS/Emus/$(PLATFORM)/P8.pak
-else ifeq ($(PLATFORM), m17)
-	cp ./workspace/miyoomini/cores/output/fake08_libretro.so ./build/EXTRAS/Emus/$(PLATFORM)/P8.pak
-else ifneq ($(PLATFORM),gkdpixel)
 	cp ./workspace/$(PLATFORM)/cores/output/fake08_libretro.so ./build/EXTRAS/Emus/$(PLATFORM)/P8.pak
-endif
 	cp ./workspace/$(PLATFORM)/cores/output/mgba_libretro.so ./build/EXTRAS/Emus/$(PLATFORM)/MGBA.pak
 	cp ./workspace/$(PLATFORM)/cores/output/mgba_libretro.so ./build/EXTRAS/Emus/$(PLATFORM)/SGB.pak
 	cp ./workspace/$(PLATFORM)/cores/output/mednafen_pce_fast_libretro.so ./build/EXTRAS/Emus/$(PLATFORM)/PCE.pak
 	cp ./workspace/$(PLATFORM)/cores/output/pokemini_libretro.so ./build/EXTRAS/Emus/$(PLATFORM)/PKM.pak
 	cp ./workspace/$(PLATFORM)/cores/output/race_libretro.so ./build/EXTRAS/Emus/$(PLATFORM)/NGP.pak
 	cp ./workspace/$(PLATFORM)/cores/output/race_libretro.so ./build/EXTRAS/Emus/$(PLATFORM)/NGPC.pak
 	cp ./workspace/$(PLATFORM)/cores/output/fbneo_libretro.so ./build/EXTRAS/Emus/$(PLATFORM)/FBN.pak
-ifneq ($(PLATFORM),gkdpixel)
 	cp ./workspace/$(PLATFORM)/cores/output/mednafen_supafaust_libretro.so ./build/EXTRAS/Emus/$(PLATFORM)/SUPA.pak
 	cp ./workspace/$(PLATFORM)/cores/output/mednafen_vb_libretro.so ./build/EXTRAS/Emus/$(PLATFORM)/VB.pak
-endif
 	cp ./workspace/$(PLATFORM)/cores/output/cap32_libretro.so ./build/EXTRAS/Emus/$(PLATFORM)/CPC.pak
 	cp ./workspace/$(PLATFORM)/cores/output/puae2021_libretro.so ./build/EXTRAS/Emus/$(PLATFORM)/PUAE.pak
 	cp ./workspace/$(PLATFORM)/cores/output/prboom_libretro.so ./build/EXTRAS/Emus/$(PLATFORM)/PRBOOM.pak
@@ -182,7 +184,7 @@ endif
 endif
 
 common: build system cores
-	
+
 clean:
 	rm -rf ./build
 	make clean -f $(TOOLCHAIN_FILE) PLATFORM=$(PLATFORM) COMPILE_CORES=$(COMPILE_CORES)
@@ -191,43 +193,43 @@ setup: name
 	# ----------------------------------------------------
 	# make sure we're running in an input device
 	tty -s || echo "No tty detected"
-	
+
 	# ready fresh build
 	rm -rf ./build
 	mkdir -p ./releases
 	cp -R ./skeleton ./build
-	
+
 	# remove authoring detritus
 	cd ./build && find . -type f -name '.keep' -delete
 	cd ./build && find . -type f -name '*.meta' -delete
 	echo $(BUILD_HASH) > ./workspace/hash.txt
-	
+
 	# copy readmes to workspace so we can use Linux fmt instead of host's
 	mkdir -p ./workspace/readmes
 	cp ./skeleton/BASE/README.txt ./workspace/readmes/BASE-in.txt
 	cp ./skeleton/EXTRAS/README.txt ./workspace/readmes/EXTRAS-in.txt
-	
+
 done:
 	# say "done" 2>/dev/null || true
 
 special:
 	# setup miyoomini/trimui/magicx family .tmp_update in BOOT
 	mv ./build/BOOT/common ./build/BOOT/.tmp_update
-#	mv ./build/BOOT/miyoo ./build/BASE/
+	mv ./build/BOOT/miyoo ./build/BASE/
 	mv ./build/BOOT/trimui ./build/BASE/
 #	mv ./build/BOOT/magicx ./build/BASE/
-#	cp -R ./build/BOOT/.tmp_update ./build/BASE/miyoo/app/
+	cp -R ./build/BOOT/.tmp_update ./build/BASE/miyoo/app/
 	cp -R ./build/BOOT/.tmp_update ./build/BASE/trimui/app/
 #	cp -R ./build/BOOT/.tmp_update ./build/BASE/magicx/
 #	cp -R ./build/BASE/miyoo ./build/BASE/miyoo354
-#	cp -R ./build/BASE/miyoo ./build/BASE/miyoo355
-#ifneq (,$(findstring my355, $(PLATFORMS)))
-#	cp -R ./workspace/my355/init ./build/BASE/miyoo355/app/my355
-#	cp -r ./workspace/my355/other/squashfs/output/* ./build/BASE/miyoo355/app/my355/payload/
-#endif
+	cp -R ./build/BASE/miyoo ./build/BASE/miyoo355
+ifneq (,$(findstring my355, $(PLATFORMS)))
+	cp -R ./workspace/my355/init ./build/BASE/miyoo355/app/my355
+	cp -r ./workspace/my355/other/squashfs/output/* ./build/BASE/miyoo355/app/my355/payload/
+endif
 
 tidy:
-	rm -f releases/$(RELEASE_NAME)-base.zip 
+	rm -f releases/$(RELEASE_NAME)-base.zip
 	rm -f releases/$(RELEASE_NAME)-extras.zip
 	rm -f releases/$(RELEASE_NAME)-all.zip
 	# ----------------------------------------------------
@@ -240,20 +242,20 @@ tidy:
 package: tidy
 	# ----------------------------------------------------
 	# zip up build
-		
+
 	# move formatted readmes from workspace to build
 	cp ./workspace/readmes/BASE-out.txt ./build/BASE/README.txt
 	cp ./workspace/readmes/EXTRAS-out.txt ./build/EXTRAS/README.txt
 	rm -rf ./workspace/readmes
-	
+
 	cd ./build/SYSTEM && echo "$(RELEASE_NAME)\n$(BUILD_HASH)" > version.txt
 	./commits.sh > ./build/SYSTEM/commits.txt
 	cd ./build && find . -type f -name '.DS_Store' -delete
 	mkdir -p ./build/PAYLOAD
 	mv ./build/SYSTEM ./build/PAYLOAD/.system
 	cp -R ./build/BOOT/.tmp_update ./build/PAYLOAD/
 	cp -R ./build/EXTRAS/Tools ./build/PAYLOAD/
-	
+
 	cd ./build/PAYLOAD && zip -r MinUI.zip .system .tmp_update Tools
 	mv ./build/PAYLOAD/MinUI.zip ./build/BASE
 
@@ -269,20 +271,19 @@ package: tidy
 	# Move renamed .pakz files into base folder
 	mkdir -p ./build/BASE
 	mv $(VENDOR_DEST)/* ./build/BASE/
-	
+
 	# TODO: can I just add everything in BASE to zip?
 	# cd ./build/BASE && zip -r ../../releases/$(RELEASE_NAME)-base.zip Bios Roms Saves miyoo miyoo354 trimui rg35xx rg35xxplus gkdpixel miyoo355 magicx em_ui.sh MinUI.zip README.txt
-	cd ./build/BASE && zip -r ../../releases/$(RELEASE_NAME)-base.zip Bios Roms Saves Shaders Overlays trimui em_ui.sh MinUI.zip *.pakz README.txt
+	cd ./build/BASE && zip -r ../../releases/$(RELEASE_NAME)-base.zip Bios Roms Saves Shaders Overlays trimui miyoo miyoo355 em_ui.sh MinUI.zip *.pakz README.txt
 	cd ./build/EXTRAS && zip -r ../../releases/$(RELEASE_NAME)-extras.zip Bios Emus Roms Saves Shaders Overlays Tools README.txt
 	echo "$(RELEASE_VERSION)" > ./build/latest.txt
 
-	# compound zip (brew install libzip needed) 
+	# compound zip (brew install libzip needed)
 	cd ./releases && zipmerge $(RELEASE_NAME)-all.zip $(RELEASE_NAME)-base.zip  && zipmerge $(RELEASE_NAME)-all.zip $(RELEASE_NAME)-extras.zip
-	
+
 ###########################################################
 
 .DEFAULT:
 	# ----------------------------------------------------
 	# $@
 	@echo "$(PLATFORMS)" | grep -q "\b$@\b" && (make common PLATFORM=$@) || (exit 1)
-

skeleton/BOOT/common/updater

@@ -36,7 +36,7 @@ if [ -z "$PLATFORM" ] && [ -f /usr/trimui/bin/runtrimui.sh ]; then
 	PLATFORM="tg5040"
 fi
 
-/mnt/SDCARD/.tmp_update/$PLATFORM.sh # &> /mnt/SDCARD/boot.txt
+/mnt/SDCARD/.tmp_update/$PLATFORM.sh &> /mnt/SDCARD/boot.txt
 
 # force shutdown so nothing can modify the SD card
 echo s > /proc/sysrq-trigger

skeleton/BOOT/miyoo/app/MainUI

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+cd $(dirname "$0")
+
+INFO=`cat /proc/cpuinfo 2> /dev/null`
+case $INFO in
+*"0xd05"*)
+	./my355.sh
+	;;
+*"sun8i"*)
+	./my282.sh
+	;;
+*"SStar"*)
+	./miyoomini.sh
+	;;
+esac

skeleton/BOOT/miyoo/app/keymon

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exit 0

skeleton/BOOT/miyoo/app/my355.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+cd $(dirname "$0")
+
+SDCARD_PATH=/mnt/SDCARD
+MIYOO_DIR=miyoo355
+
+if [ ! -f /usr/miyoo/bin/runmiyoo-original.sh ]; then
+	if [ -d $SDCARD_PATH/.tmp_update/ ]; then
+		rm -rf $SDCARD_PATH/.tmp_update/
+	fi
+	my355/init.sh
+fi
+
+export PATH=/usr/miyoo/bin:/usr/miyoo/sbin:/usr/bin:/usr/sbin:/bin:/sbin
+export LD_LIBRARY_PATH=/usr/miyoo/lib:/usr/lib:/lib
+
+
+# .tmp_update/updater does the actual installation (and later, updating)
+cp -rf .tmp_update $SDCARD_PATH/
+rm -rf "$SDCARD_PATH/$MIYOO_DIR"
+sync
+$SDCARD_PATH/.tmp_update/updater
+
+# under no circumstances should stock be allowed to touch this card
+poweroff

skeleton/EXTRAS/Emus/my355/FBN.pak/default.cfg

@@ -0,0 +1,15 @@
+-fbneo-vertical-mode = disabled
+bind Up = UP
+bind Down = DOWN
+bind Left = LEFT
+bind Right = RIGHT
+bind Select = SELECT
+bind Start = START
+bind X Button = X
+bind Y Button = Y
+bind B Button = B
+bind A Button = A
+bind L1 Button = L1
+bind L2 Button = L2
+bind R1 Button = R1
+bind R2 Button = R2

skeleton/EXTRAS/Emus/my355/FBN.pak/launch.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+EMU_EXE=fbneo
+CORES_PATH=$(dirname "$0")
+###############################
+
+EMU_TAG=$(basename "$(dirname "$0")" .pak)
+ROM="$1"
+mkdir -p "$BIOS_PATH/$EMU_TAG"
+mkdir -p "$SAVES_PATH/$EMU_TAG"
+mkdir -p "$CHEATS_PATH/$EMU_TAG"
+HOME="$USERDATA_PATH"
+cd "$HOME"
+minarch.elf "$CORES_PATH/${EMU_EXE}_libretro.so" "$ROM" &> "$LOGS_PATH/$EMU_TAG.txt"

skeleton/EXTRAS/Emus/my355/GG.pak/default.cfg

@@ -0,0 +1,18 @@
+-picodrive_smstype = Game Gear
+-picodrive_smsmapper = Auto
+-picodrive_sound_rate = 44100
+-picodrive_ramcart = disabled
+-picodrive_dacnoise = disabled
+-picodrive_input1 = 3 button pad
+-picodrive_input2 = 3 button pad
+-picodrive_fm_filter = off
+-picodrive_audio_filter = disabled
+-picodrive_overclk68k = disabled
+
+bind Up = UP
+bind Down = DOWN
+bind Left = LEFT
+bind Right = RIGHT
+bind Button 1 = B
+bind Button 2 = A
+bind Pause = START

skeleton/EXTRAS/Emus/my355/GG.pak/launch.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+EMU_EXE=picodrive
+
+###############################
+
+EMU_TAG=$(basename "$(dirname "$0")" .pak)
+ROM="$1"
+mkdir -p "$BIOS_PATH/$EMU_TAG"
+mkdir -p "$SAVES_PATH/$EMU_TAG"
+HOME="$USERDATA_PATH"
+cd "$HOME"
+minarch.elf "$CORES_PATH/${EMU_EXE}_libretro.so" "$ROM" > "$LOGS_PATH/$EMU_TAG.txt" 2>&1

skeleton/EXTRAS/Emus/my355/MGBA.pak/default.cfg

@@ -0,0 +1,18 @@
+mgba_skip_bios = ON
+
+bind Up = UP
+bind Down = DOWN
+bind Left = LEFT
+bind Right = RIGHT
+bind Select = SELECT
+bind Start = START
+bind A Button = A
+bind B Button = B
+bind A Turbo = NONE:X
+bind B Turbo = NONE:Y
+bind L Button = L1
+bind R Button = R1
+bind L Turbo = NONE:L2
+bind R Turbo = NONE:R2
+bind More Sun = NONE:L3
+bind Less Sun = NONE:R3

skeleton/EXTRAS/Emus/my355/MGBA.pak/launch.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+EMU_EXE=mgba
+CORES_PATH=$(dirname "$0")
+
+###############################
+
+EMU_TAG=$(basename "$(dirname "$0")" .pak)
+ROM="$1"
+mkdir -p "$BIOS_PATH/$EMU_TAG"
+mkdir -p "$SAVES_PATH/$EMU_TAG"
+HOME="$USERDATA_PATH"
+cd "$HOME"
+minarch.elf "$CORES_PATH/${EMU_EXE}_libretro.so" "$ROM" > "$LOGS_PATH/$EMU_TAG.txt" 2>&1