From 24c100662e3a9b0e36e8179940f6a9f9ef3124b9 Mon Sep 17 00:00:00 2001 From: Shaun Inman Date: Fri, 3 Feb 2023 20:56:05 -0500 Subject: [PATCH] even more rejiggering also sketched out install/update logic in dmenu.bin --- skeleton/{SDCARD => BASE}/Bios/FC/.keep | 0 skeleton/{SDCARD => BASE}/Bios/GB/.keep | 0 skeleton/{SDCARD => BASE}/Bios/GBA/.keep | 0 skeleton/{SDCARD => BASE}/Bios/GBC/.keep | 0 skeleton/{SDCARD => BASE}/Bios/MD/.keep | 0 skeleton/{SDCARD => BASE}/Bios/PS/.keep | 0 skeleton/{SDCARD => BASE}/Bios/SFC/.keep | 0 skeleton/{SDCARD => BASE}/README.txt | 0 .../{SDCARD => BASE}/Roms/Game Boy (GB)/.keep | 0 .../Roms/Game Boy Advance (GBA)/.keep | 0 .../Roms/Game Boy Color (GBC)/.keep | 0 .../Nintendo Entertainment System (FC)/.keep | 0 .../Roms/Sega Genesis (MD)/.keep | 0 .../Roms/Sony PlayStation (PS)/.keep | 0 .../.keep | 0 skeleton/{SDCARD => BASE}/Saves/FC/.keep | 0 skeleton/{SDCARD => BASE}/Saves/GB/.keep | 0 skeleton/{SDCARD => BASE}/Saves/GBA/.keep | 0 skeleton/{SDCARD => BASE}/Saves/GBC/.keep | 0 skeleton/{SDCARD => BASE}/Saves/MD/.keep | 0 skeleton/{SDCARD => BASE}/Saves/PS/.keep | 0 skeleton/{SDCARD => BASE}/Saves/SFC/.keep | 0 skeleton/{BOOT/rg35xx => BASE}/dmenu.bin | 36 +++++++++++++----- skeleton/BOOT/miyoomini/tmp_update.txt | 1 - .../SYSTEM/rg35xx/dat/gpio_keys_polled.ko | Bin 0 -> 7928 bytes .../rg35xx/dat/gpio_keys_polled.ko.meta | 1 + 26 files changed, 27 insertions(+), 11 deletions(-) rename skeleton/{SDCARD => BASE}/Bios/FC/.keep (100%) rename skeleton/{SDCARD => BASE}/Bios/GB/.keep (100%) rename skeleton/{SDCARD => BASE}/Bios/GBA/.keep (100%) rename skeleton/{SDCARD => BASE}/Bios/GBC/.keep (100%) rename skeleton/{SDCARD => BASE}/Bios/MD/.keep (100%) rename skeleton/{SDCARD => BASE}/Bios/PS/.keep (100%) rename skeleton/{SDCARD => BASE}/Bios/SFC/.keep (100%) rename skeleton/{SDCARD => BASE}/README.txt (100%) rename skeleton/{SDCARD => BASE}/Roms/Game Boy (GB)/.keep (100%) rename skeleton/{SDCARD => BASE}/Roms/Game Boy Advance (GBA)/.keep (100%) rename skeleton/{SDCARD => BASE}/Roms/Game Boy Color (GBC)/.keep (100%) rename skeleton/{SDCARD => BASE}/Roms/Nintendo Entertainment System (FC)/.keep (100%) rename skeleton/{SDCARD => BASE}/Roms/Sega Genesis (MD)/.keep (100%) rename skeleton/{SDCARD => BASE}/Roms/Sony PlayStation (PS)/.keep (100%) rename skeleton/{SDCARD => BASE}/Roms/Super Nintendo Entertainment System (SFC)/.keep (100%) rename skeleton/{SDCARD => BASE}/Saves/FC/.keep (100%) rename skeleton/{SDCARD => BASE}/Saves/GB/.keep (100%) rename skeleton/{SDCARD => BASE}/Saves/GBA/.keep (100%) rename skeleton/{SDCARD => BASE}/Saves/GBC/.keep (100%) rename skeleton/{SDCARD => BASE}/Saves/MD/.keep (100%) rename skeleton/{SDCARD => BASE}/Saves/PS/.keep (100%) rename skeleton/{SDCARD => BASE}/Saves/SFC/.keep (100%) rename skeleton/{BOOT/rg35xx => BASE}/dmenu.bin (68%) delete mode 100644 skeleton/BOOT/miyoomini/tmp_update.txt create mode 100755 skeleton/SYSTEM/rg35xx/dat/gpio_keys_polled.ko create mode 100644 skeleton/SYSTEM/rg35xx/dat/gpio_keys_polled.ko.meta diff --git a/skeleton/SDCARD/Bios/FC/.keep b/skeleton/BASE/Bios/FC/.keep similarity index 100% rename from skeleton/SDCARD/Bios/FC/.keep rename to skeleton/BASE/Bios/FC/.keep diff --git a/skeleton/SDCARD/Bios/GB/.keep b/skeleton/BASE/Bios/GB/.keep similarity index 100% rename from skeleton/SDCARD/Bios/GB/.keep rename to skeleton/BASE/Bios/GB/.keep diff --git a/skeleton/SDCARD/Bios/GBA/.keep b/skeleton/BASE/Bios/GBA/.keep similarity index 100% rename from skeleton/SDCARD/Bios/GBA/.keep rename to skeleton/BASE/Bios/GBA/.keep diff --git a/skeleton/SDCARD/Bios/GBC/.keep b/skeleton/BASE/Bios/GBC/.keep similarity index 100% rename from skeleton/SDCARD/Bios/GBC/.keep rename to skeleton/BASE/Bios/GBC/.keep diff --git a/skeleton/SDCARD/Bios/MD/.keep b/skeleton/BASE/Bios/MD/.keep similarity index 100% rename from skeleton/SDCARD/Bios/MD/.keep rename to skeleton/BASE/Bios/MD/.keep diff --git a/skeleton/SDCARD/Bios/PS/.keep b/skeleton/BASE/Bios/PS/.keep similarity index 100% rename from skeleton/SDCARD/Bios/PS/.keep rename to skeleton/BASE/Bios/PS/.keep diff --git a/skeleton/SDCARD/Bios/SFC/.keep b/skeleton/BASE/Bios/SFC/.keep similarity index 100% rename from skeleton/SDCARD/Bios/SFC/.keep rename to skeleton/BASE/Bios/SFC/.keep diff --git a/skeleton/SDCARD/README.txt b/skeleton/BASE/README.txt similarity index 100% rename from skeleton/SDCARD/README.txt rename to skeleton/BASE/README.txt diff --git a/skeleton/SDCARD/Roms/Game Boy (GB)/.keep b/skeleton/BASE/Roms/Game Boy (GB)/.keep similarity index 100% rename from skeleton/SDCARD/Roms/Game Boy (GB)/.keep rename to skeleton/BASE/Roms/Game Boy (GB)/.keep diff --git a/skeleton/SDCARD/Roms/Game Boy Advance (GBA)/.keep b/skeleton/BASE/Roms/Game Boy Advance (GBA)/.keep similarity index 100% rename from skeleton/SDCARD/Roms/Game Boy Advance (GBA)/.keep rename to skeleton/BASE/Roms/Game Boy Advance (GBA)/.keep diff --git a/skeleton/SDCARD/Roms/Game Boy Color (GBC)/.keep b/skeleton/BASE/Roms/Game Boy Color (GBC)/.keep similarity index 100% rename from skeleton/SDCARD/Roms/Game Boy Color (GBC)/.keep rename to skeleton/BASE/Roms/Game Boy Color (GBC)/.keep diff --git a/skeleton/SDCARD/Roms/Nintendo Entertainment System (FC)/.keep b/skeleton/BASE/Roms/Nintendo Entertainment System (FC)/.keep similarity index 100% rename from skeleton/SDCARD/Roms/Nintendo Entertainment System (FC)/.keep rename to skeleton/BASE/Roms/Nintendo Entertainment System (FC)/.keep diff --git a/skeleton/SDCARD/Roms/Sega Genesis (MD)/.keep b/skeleton/BASE/Roms/Sega Genesis (MD)/.keep similarity index 100% rename from skeleton/SDCARD/Roms/Sega Genesis (MD)/.keep rename to skeleton/BASE/Roms/Sega Genesis (MD)/.keep diff --git a/skeleton/SDCARD/Roms/Sony PlayStation (PS)/.keep b/skeleton/BASE/Roms/Sony PlayStation (PS)/.keep similarity index 100% rename from skeleton/SDCARD/Roms/Sony PlayStation (PS)/.keep rename to skeleton/BASE/Roms/Sony PlayStation (PS)/.keep diff --git a/skeleton/SDCARD/Roms/Super Nintendo Entertainment System (SFC)/.keep b/skeleton/BASE/Roms/Super Nintendo Entertainment System (SFC)/.keep similarity index 100% rename from skeleton/SDCARD/Roms/Super Nintendo Entertainment System (SFC)/.keep rename to skeleton/BASE/Roms/Super Nintendo Entertainment System (SFC)/.keep diff --git a/skeleton/SDCARD/Saves/FC/.keep b/skeleton/BASE/Saves/FC/.keep similarity index 100% rename from skeleton/SDCARD/Saves/FC/.keep rename to skeleton/BASE/Saves/FC/.keep diff --git a/skeleton/SDCARD/Saves/GB/.keep b/skeleton/BASE/Saves/GB/.keep similarity index 100% rename from skeleton/SDCARD/Saves/GB/.keep rename to skeleton/BASE/Saves/GB/.keep diff --git a/skeleton/SDCARD/Saves/GBA/.keep b/skeleton/BASE/Saves/GBA/.keep similarity index 100% rename from skeleton/SDCARD/Saves/GBA/.keep rename to skeleton/BASE/Saves/GBA/.keep diff --git a/skeleton/SDCARD/Saves/GBC/.keep b/skeleton/BASE/Saves/GBC/.keep similarity index 100% rename from skeleton/SDCARD/Saves/GBC/.keep rename to skeleton/BASE/Saves/GBC/.keep diff --git a/skeleton/SDCARD/Saves/MD/.keep b/skeleton/BASE/Saves/MD/.keep similarity index 100% rename from skeleton/SDCARD/Saves/MD/.keep rename to skeleton/BASE/Saves/MD/.keep diff --git a/skeleton/SDCARD/Saves/PS/.keep b/skeleton/BASE/Saves/PS/.keep similarity index 100% rename from skeleton/SDCARD/Saves/PS/.keep rename to skeleton/BASE/Saves/PS/.keep diff --git a/skeleton/SDCARD/Saves/SFC/.keep b/skeleton/BASE/Saves/SFC/.keep similarity index 100% rename from skeleton/SDCARD/Saves/SFC/.keep rename to skeleton/BASE/Saves/SFC/.keep diff --git a/skeleton/BOOT/rg35xx/dmenu.bin b/skeleton/BASE/dmenu.bin similarity index 68% rename from skeleton/BOOT/rg35xx/dmenu.bin rename to skeleton/BASE/dmenu.bin index 61d5eb0..1e1c737 100755 --- a/skeleton/BOOT/rg35xx/dmenu.bin +++ b/skeleton/BASE/dmenu.bin @@ -2,7 +2,9 @@ /usbdbg.sh device -SDCARD_PATH=/mnt/mmc # TF1 +TF1_PATH=/mnt/mmc +TF2_PATH=/mnt/sdcard +SDCARD_PATH=$TF1_PATH SYSTEM_DIR=/.system SYSTEM_FRAG=$SYSTEM_DIR/rg35xx UPDATE_FRAG=/MinUI.zip @@ -24,23 +26,37 @@ fi if [ ! -d $SYSTEM_PATH ]; then # try TF2 - SDCARD_PATH=/mnt/sdcard + SDCARD_PATH=$TF2_PATH SYSTEM_PATH=${SDCARD_PATH}${SYSTEM_FRAG} UPDATE_PATH=${SDCARD_PATH}${UPDATE_FRAG} fi # is there an update available? if [ -f $UPDATE_PATH ]; then - if [ -d $SYSTEM_PATH ]; then - echo update > $SDCARD_PATH/log.txt - else - echo install > $SDCARD_PATH/log.txt - fi - # TODO: finish this logic - # busybox unzip + # TODO: TEST! + + # busybox unzip -o $UPDATE_PATH -d $SDCARD_PATH + # FLAG_PATH=/misc/.minstalled + # if [ ! -f $FLAG_PATH ]; then + # BAK_PATH=$TF1_PATH/bak + # mkdir -p $BAK_PATH + # cp /misc/modules/gpio_keys_polled.ko $BAK_PATH + # cp /misc/boot_logo.bmp.gz $BAK_PATH + # cp /misc/kernel.dtb $BAK_PATH + # cp /misc/uImage $BAK_PATH + # mount -o remount,rw /dev/block/actb /misc + # rm -f /misc/uImage + # cp $SYSTEM_PATH/dat/uImage /misc + # cp $SYSTEM_PATH/dat/boot_logo.bmp.gz /misc + # cp $SYSTEM_PATH/dat/kernel.dtb /misc + # cp $SYSTEM_PATH/dat/gpio_keys_polled.ko /misc/modules + # touch $FLAG_PATH + # fi + # rm -f $UPDATE_PATH + # sync && reboot fi -ROOTFS_IMAGE=$SYSTEM_PATH/rootfs.img +ROOTFS_IMAGE=$SYSTEM_PATH/rootfs.ext2 if [ ! -f $ROOTFS_IMAGE ]; then # fallback to stock demenu.bin, based on dmenu_ln ACT="/tmp/.next" diff --git a/skeleton/BOOT/miyoomini/tmp_update.txt b/skeleton/BOOT/miyoomini/tmp_update.txt deleted file mode 100644 index 25b805e..0000000 --- a/skeleton/BOOT/miyoomini/tmp_update.txt +++ /dev/null @@ -1 +0,0 @@ -.tmp_update/updater or the /miyoo/app/MainUI trick I forget which it uses... \ No newline at end of file diff --git a/skeleton/SYSTEM/rg35xx/dat/gpio_keys_polled.ko b/skeleton/SYSTEM/rg35xx/dat/gpio_keys_polled.ko new file mode 100755 index 0000000000000000000000000000000000000000..6aec3683401cb05eb7eb3aae0f33b9760cba2af3 GIT binary patch literal 7928 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 literal 0 HcmV?d00001 diff --git a/skeleton/SYSTEM/rg35xx/dat/gpio_keys_polled.ko.meta b/skeleton/SYSTEM/rg35xx/dat/gpio_keys_polled.ko.meta new file mode 100644 index 0000000..76db634 --- /dev/null +++ b/skeleton/SYSTEM/rg35xx/dat/gpio_keys_polled.ko.meta @@ -0,0 +1 @@ +stock kernel module (unmodified, required in case Garlic was installed before this) \ No newline at end of file