From 8902af43d75deeb9b6484d6a8e55578a4e17344f Mon Sep 17 00:00:00 2001 From: ajmandourah Date: Tue, 30 Jul 2024 14:01:45 +0300 Subject: [PATCH] rename to H --- .../libretro-parallel-n64/0001-gl-libmali.patch | 11 +++++++++++ .../h700/{rg35xx-plus => rg35xx-h}/S02resize | 0 .../{rg35xx-plus => rg35xx-h}/batocera-boot.conf | 0 .../{rg35xx-plus => rg35xx-h}/boot/bat/bat0.bmp | Bin .../{rg35xx-plus => rg35xx-h}/boot/bat/bat1.bmp | Bin .../{rg35xx-plus => rg35xx-h}/boot/bat/bat10.bmp | Bin .../{rg35xx-plus => rg35xx-h}/boot/bat/bat2.bmp | Bin .../{rg35xx-plus => rg35xx-h}/boot/bat/bat3.bmp | Bin .../{rg35xx-plus => rg35xx-h}/boot/bat/bat4.bmp | Bin .../{rg35xx-plus => rg35xx-h}/boot/bat/bat5.bmp | Bin .../{rg35xx-plus => rg35xx-h}/boot/bat/bat6.bmp | Bin .../{rg35xx-plus => rg35xx-h}/boot/bat/bat7.bmp | Bin .../{rg35xx-plus => rg35xx-h}/boot/bat/bat8.bmp | Bin .../{rg35xx-plus => rg35xx-h}/boot/bat/bat9.bmp | Bin .../boot/bat/bat_blank.bmp | Bin .../{rg35xx-plus => rg35xx-h}/boot/bat/bat_htmp.bmp | Bin .../{rg35xx-plus => rg35xx-h}/boot/bat/bat_ltmp.bmp | Bin .../{rg35xx-plus => rg35xx-h}/boot/bat/battery.bmp | Bin .../boot/bat/battery_charge.bmp | Bin .../{rg35xx-plus => rg35xx-h}/boot/bat/bempty.bmp | Bin .../{rg35xx-plus => rg35xx-h}/boot/bat/bootlogo.bmp | Bin .../{rg35xx-plus => rg35xx-h}/boot/bat/low_pwr.bmp | Bin .../h700/{rg35xx-plus => rg35xx-h}/boot/boot.cmd | 0 .../h700/{rg35xx-plus => rg35xx-h}/boot/boot.scr | Bin .../{rg35xx-plus => rg35xx-h}/boot/bootlogo.bmp | Bin .../{rg35xx-plus => rg35xx-h}/boot/extlinux.conf | 0 .../h700/{rg35xx-plus => rg35xx-h}/boot/font24.sft | Bin .../h700/{rg35xx-plus => rg35xx-h}/boot/font32.sft | Bin .../h700/{rg35xx-plus => rg35xx-h}/boot/magic.bin | 0 .../h700/{rg35xx-plus => rg35xx-h}/bootlogo.bmp | Bin .../{rg35xx-plus => rg35xx-h}/create-boot-script.sh | 0 .../fsoverlay/etc/connman/main.conf | 0 .../fsoverlay/etc/init.d/S02overclock | 0 .../fsoverlay/etc/init.d/S02resize | 0 .../fsoverlay/etc/init.d/S03modules | 0 .../fsoverlay/etc/init.d/S03pico8 | 0 .../fsoverlay/etc/init.d/S05udev | 0 .../fsoverlay/etc/init.d/S06audio | 0 .../fsoverlay/etc/init.d/S27audioconfig | 0 .../fsoverlay/etc/init.d/S27debugmount | 0 .../fsoverlay/etc/init.d/S31emulationstation | 0 .../fsoverlay/etc/init.d/S32bluetooth | 0 .../fsoverlay/etc/init.d/S50adb | 0 .../fsoverlay/etc/init.d/rcK | 0 .../fsoverlay/etc/init.d/rcS | 0 .../fsoverlay/etc/init.d/rcS.bak | 0 .../triggerhappy/triggers.d/multimedia_keys.conf | 0 .../fsoverlay/etc/udev/rules.d/60-hdmi.rules | 0 .../etc/udev/rules.d/80-disable-wlan0.rules | 0 .../fsoverlay/etc/udev/rules.d/80-headset.rules | 0 .../fsoverlay/lib/firmware/README.md | 0 .../fsoverlay/lib/firmware/regulatory.db | Bin .../fsoverlay/lib/firmware/regulatory.db.p7s | Bin .../lib/firmware/rtl_bt/rtl8723b_config.bin | Bin .../fsoverlay/lib/firmware/rtl_bt/rtl8723b_fw.bin | Bin .../fsoverlay/lib/firmware/rtl_bt/rtlbt_config | Bin .../fsoverlay/lib/firmware/rtl_bt/rtlbt_fw | Bin .../fsoverlay/lib/firmware/rtl_bt/rtlbt_fw_new | Bin .../fsoverlay/lib/firmware/rtlbt/rtl8821c_config | Bin .../fsoverlay/lib/firmware/rtlbt/rtl8821c_fw | Bin .../fsoverlay/lib/firmware/rtlwifi/rtl8188efw.bin | Bin .../fsoverlay/lib/firmware/rtlwifi/rtl8188eufw.bin | Bin .../fsoverlay/lib/firmware/rtlwifi/rtl8192cfw.bin | Bin .../fsoverlay/lib/firmware/rtlwifi/rtl8192cfwU.bin | Bin .../lib/firmware/rtlwifi/rtl8192cfwU_B.bin | Bin .../fsoverlay/lib/firmware/rtlwifi/rtl8192cufw.bin | Bin .../lib/firmware/rtlwifi/rtl8192cufw_A.bin | Bin .../lib/firmware/rtlwifi/rtl8192cufw_B.bin | Bin .../lib/firmware/rtlwifi/rtl8192cufw_TMSC.bin | Bin .../fsoverlay/lib/firmware/rtlwifi/rtl8192defw.bin | Bin .../fsoverlay/lib/firmware/rtlwifi/rtl8192eefw.bin | Bin .../lib/firmware/rtlwifi/rtl8192eu_ap_wowlan.bin | Bin .../lib/firmware/rtlwifi/rtl8192eu_nic.bin | Bin .../lib/firmware/rtlwifi/rtl8192eu_wowlan.bin | Bin .../fsoverlay/lib/firmware/rtlwifi/rtl8192sefw.bin | Bin .../fsoverlay/lib/firmware/rtlwifi/rtl8712u.bin | Bin .../lib/firmware/rtlwifi/rtl8723aufw_A.bin | Bin .../lib/firmware/rtlwifi/rtl8723aufw_B.bin | Bin .../lib/firmware/rtlwifi/rtl8723aufw_B_NoBT.bin | Bin .../fsoverlay/lib/firmware/rtlwifi/rtl8723befw.bin | Bin .../lib/firmware/rtlwifi/rtl8723bs_ap_wowlan.bin | Bin .../lib/firmware/rtlwifi/rtl8723bs_nic.bin | Bin .../lib/firmware/rtlwifi/rtl8723bs_wowlan.bin | Bin .../lib/firmware/rtlwifi/rtl8723bu_ap_wowlan.bin | Bin .../lib/firmware/rtlwifi/rtl8723bu_nic.bin | Bin .../lib/firmware/rtlwifi/rtl8723bu_wowlan.bin | Bin .../fsoverlay/lib/firmware/rtlwifi/rtl8723fw.bin | Bin .../fsoverlay/lib/firmware/rtlwifi/rtl8723fw_B.bin | Bin .../fsoverlay/lib/firmware/rtlwifi/rtl8821aefw.bin | Bin .../lib/firmware/rtlwifi/rtl8821aefw_wowlan.bin | Bin .../fsoverlay/lib/modules/4.9.170/build | 0 .../4.9.170/kernel/drivers/bluetooth/bcm_btlpm.ko | Bin .../4.9.170/kernel/drivers/bluetooth/rtl_btlpm.ko | Bin .../sunxi-vin/modules/sensor/gc030a_mipi.ko | Bin .../sunxi-vin/modules/sensor/gc0310_mipi.ko | Bin .../sunxi-vin/modules/sensor/gc2355_mipi.ko | Bin .../sunxi-vin/modules/sensor/gc2385_mipi.ko | Bin .../sunxi-vin/modules/sensor/gc5024_mipi.ko | Bin .../sunxi-vin/modules/sensor/imx317_mipi.ko | Bin .../platform/sunxi-vin/modules/sensor/ov5640.ko | Bin .../kernel/drivers/media/usb/gspca/gspca_main.ko | Bin .../kernel/drivers/media/usb/uvc/uvcvideo.ko | Bin .../drivers/media/v4l2-core/videobuf2-vmalloc.ko | Bin .../4.9.170/kernel/drivers/net/wireless/8188eu.ko | Bin .../realtek/rtlwifi/rtl8192c/rtl8192c-common.ko | Bin .../wireless/realtek/rtlwifi/rtl8192cu/rtl8192cu.ko | Bin .../drivers/net/wireless/realtek/rtlwifi/rtl_usb.ko | Bin .../drivers/net/wireless/realtek/rtlwifi/rtlwifi.ko | Bin .../kernel/drivers/net/wireless/rtl8821cs/8821cs.ko | Bin .../kernel/drivers/video/backlight/backlight.ko | Bin .../kernel/drivers/video/backlight/generic_bl.ko | Bin .../4.9.170/kernel/drivers/video/backlight/lcd.ko | Bin .../fsoverlay/lib/modules/4.9.170/modules.alias | 0 .../fsoverlay/lib/modules/4.9.170/modules.alias.bin | Bin .../fsoverlay/lib/modules/4.9.170/modules.builtin | 0 .../lib/modules/4.9.170/modules.builtin.bin | Bin .../fsoverlay/lib/modules/4.9.170/modules.dep | 0 .../fsoverlay/lib/modules/4.9.170/modules.dep.bin | Bin .../fsoverlay/lib/modules/4.9.170/modules.devname | 0 .../fsoverlay/lib/modules/4.9.170/modules.order | 0 .../fsoverlay/lib/modules/4.9.170/modules.softdep | 0 .../fsoverlay/lib/modules/4.9.170/modules.symbols | 0 .../lib/modules/4.9.170/modules.symbols.bin | Bin .../fsoverlay/lib/modules/4.9.170/source | 0 .../fsoverlay/lib/modules/mali_kbase.ko | Bin .../fsoverlay/usr/bin/batocera-audio | 0 .../fsoverlay/usr/bin/batocera-brightness | 0 .../fsoverlay/usr/bin/batocera-overclock | 0 .../fsoverlay/usr/bin/batocera-resolution | 0 .../fsoverlay/usr/bin/brightness | Bin .../fsoverlay/usr/bin/charger | Bin .../fsoverlay/usr/bin/hdmi_audio_switch.sh | 0 .../fsoverlay/usr/bin/power-button-release.sh | 0 .../fsoverlay/usr/bin/power-button.sh | 0 .../fsoverlay/usr/bin/power-led.sh | 0 .../fsoverlay/usr/bin/poweroff.sh | 0 .../fsoverlay/usr/bin/progressbar | Bin .../fsoverlay/usr/bin/quit_game.sh | 0 .../fsoverlay/usr/bin/reboot.sh | 0 .../fsoverlay/usr/bin/rtk_hciattach | Bin .../fsoverlay/usr/bin/start_game.sh | 0 .../fsoverlay/usr/bin/store-brightness | 0 .../fsoverlay/usr/sbin/fbset | Bin .../batocera/configgen/scripts/power_led_hooks.sh | 0 .../share/batocera/datainit/system/batocera.conf | 0 .../system/configs/emulationstation/about.info | 0 .../system/configs/emulationstation/es_input.cfg | 0 .../system/configs/emulationstation/es_settings.cfg | 0 .../fsoverlay/usr/share/drastic/config/drastic.cfg | 0 .../usr/share/emulationstation/resources/logo.png | Bin .../fsoverlay/usr/share/extra/first.png | Bin .../fsoverlay/usr/share/extra/off.png | Bin .../fsoverlay/usr/share/extra/pico8.cfg | 0 .../fsoverlay/usr/share/extra/resume.png | Bin .../fsoverlay/usr/share/extra/save.png | Bin .../fsoverlay/usr/share/pipewire/pipewire.conf | 0 .../fsoverlay/usr/share/vulkan/icd.d/mali_icd.json | 0 .../share/wireplumber/main.lua.d/50-alsa-config.lua | 0 .../h700/{rg35xx-plus => rg35xx-h}/genimage.cfg | 0 .../linux-sunxi64-legacy.config | 0 .../{rg35xx-plus => rg35xx-h}/partitions/boot.img | Bin .../{rg35xx-plus => rg35xx-h}/partitions/boot0.img | Bin .../partitions/boot_package.fex | Bin .../partitions/boot_package_35xxH.img | Bin .../{rg35xx-plus => rg35xx-h}/partitions/env.img | Bin .../partitions/muos-H-boot.img | Bin .../partitions/rg35xxh-boot.img | Bin .../partitions/rg35xxh-noramdisk.img | Bin .../partitions/stock-H-boot.img | Bin .../partitions/stock-boot0.img | Bin .../partitions/stock-env.img | Bin .../001_fix_battery_path.patch | 0 .../002-add-custom-powerooff-reboot.patch | 0 .../mangohud/0015-libmali-no-x11-no-wayland.patch | 0 .../patches/sdl2/0001-add-video-malifb-driver.patch | 0 ...-Implemented-MALI-Zero-Copy-fbdev-rotation.patch | 0 .../0003-No-need-to-set-glClearColor-at-all.patch | 0 .../sdl2/0004-Rework-blitter-thread-sync.patch | 0 .../patches/sdl2/0005-additional-mali-fixes.patch | 0 .../patches/sdl2/0006-refactoring.patch | 0 .../patches/sdl2/0007-no-MSAA.patch | 0 .../patches/sdl2/0008-add-sRGB.patch | 0 .../patches/sdl2/0009-memleak-fix.patch | 0 .../{rg35xx-plus => rg35xx-h}/post-build-script.sh | 0 .../allwinner/h700/{rg35xx-plus => rg35xx-h}/uImage | Bin .../h700/{rg35xx-plus => rg35xx-h}/uInitrd | Bin config_device.sh | 1 + configs/batocera-h700.board | 8 ++++---- package/batocera/core/batocera-system/Config.in | 2 +- .../libretro-parallel-n64/libretro-parallel-n64.mk | 7 ++++++- 190 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 board/batocera/allwinner/h700/patches/libretro-parallel-n64/0001-gl-libmali.patch rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/S02resize (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/batocera-boot.conf (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/bat/bat0.bmp (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/bat/bat1.bmp (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/bat/bat10.bmp (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/bat/bat2.bmp (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/bat/bat3.bmp (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/bat/bat4.bmp (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/bat/bat5.bmp (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/bat/bat6.bmp (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/bat/bat7.bmp (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/bat/bat8.bmp (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/bat/bat9.bmp (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/bat/bat_blank.bmp (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/bat/bat_htmp.bmp (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/bat/bat_ltmp.bmp (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/bat/battery.bmp (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/bat/battery_charge.bmp (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/bat/bempty.bmp (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/bat/bootlogo.bmp (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/bat/low_pwr.bmp (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/boot.cmd (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/boot.scr (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/bootlogo.bmp (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/extlinux.conf (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/font24.sft (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/font32.sft (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/boot/magic.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/bootlogo.bmp (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/create-boot-script.sh (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/etc/connman/main.conf (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/etc/init.d/S02overclock (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/etc/init.d/S02resize (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/etc/init.d/S03modules (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/etc/init.d/S03pico8 (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/etc/init.d/S05udev (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/etc/init.d/S06audio (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/etc/init.d/S27audioconfig (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/etc/init.d/S27debugmount (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/etc/init.d/S31emulationstation (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/etc/init.d/S32bluetooth (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/etc/init.d/S50adb (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/etc/init.d/rcK (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/etc/init.d/rcS (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/etc/init.d/rcS.bak (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/etc/triggerhappy/triggers.d/multimedia_keys.conf (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/etc/udev/rules.d/60-hdmi.rules (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/etc/udev/rules.d/80-disable-wlan0.rules (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/etc/udev/rules.d/80-headset.rules (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/README.md (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/regulatory.db (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/regulatory.db.p7s (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtl_bt/rtl8723b_config.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtl_bt/rtl8723b_fw.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtl_bt/rtlbt_config (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtl_bt/rtlbt_fw (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtl_bt/rtlbt_fw_new (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlbt/rtl8821c_config (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlbt/rtl8821c_fw (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8188efw.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8188eufw.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8192cfw.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8192cfwU.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8192cfwU_B.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8192cufw.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8192cufw_A.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8192cufw_B.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8192cufw_TMSC.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8192defw.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8192eefw.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8192eu_ap_wowlan.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8192eu_nic.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8192eu_wowlan.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8192sefw.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8712u.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8723aufw_A.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8723aufw_B.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8723aufw_B_NoBT.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8723befw.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8723bs_ap_wowlan.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8723bs_nic.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8723bs_wowlan.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8723bu_ap_wowlan.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8723bu_nic.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8723bu_wowlan.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8723fw.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8723fw_B.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8821aefw.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/firmware/rtlwifi/rtl8821aefw_wowlan.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/build (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/kernel/drivers/bluetooth/bcm_btlpm.ko (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/kernel/drivers/bluetooth/rtl_btlpm.ko (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/gc030a_mipi.ko (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/gc0310_mipi.ko (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/gc2355_mipi.ko (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/gc2385_mipi.ko (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/gc5024_mipi.ko (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/imx317_mipi.ko (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/ov5640.ko (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/usb/gspca/gspca_main.ko (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/usb/uvc/uvcvideo.ko (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/v4l2-core/videobuf2-vmalloc.ko (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/8188eu.ko (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192c/rtl8192c-common.ko (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rtl8192cu.ko (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/realtek/rtlwifi/rtl_usb.ko (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/realtek/rtlwifi/rtlwifi.ko (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/rtl8821cs/8821cs.ko (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/kernel/drivers/video/backlight/backlight.ko (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/kernel/drivers/video/backlight/generic_bl.ko (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/kernel/drivers/video/backlight/lcd.ko (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/modules.alias (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/modules.alias.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/modules.builtin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/modules.builtin.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/modules.dep (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/modules.dep.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/modules.devname (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/modules.order (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/modules.softdep (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/modules.symbols (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/modules.symbols.bin (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/4.9.170/source (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/lib/modules/mali_kbase.ko (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/bin/batocera-audio (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/bin/batocera-brightness (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/bin/batocera-overclock (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/bin/batocera-resolution (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/bin/brightness (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/bin/charger (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/bin/hdmi_audio_switch.sh (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/bin/power-button-release.sh (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/bin/power-button.sh (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/bin/power-led.sh (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/bin/poweroff.sh (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/bin/progressbar (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/bin/quit_game.sh (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/bin/reboot.sh (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/bin/rtk_hciattach (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/bin/start_game.sh (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/bin/store-brightness (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/sbin/fbset (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/share/batocera/configgen/scripts/power_led_hooks.sh (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/share/batocera/datainit/system/batocera.conf (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/share/batocera/datainit/system/configs/emulationstation/about.info (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/share/batocera/datainit/system/configs/emulationstation/es_input.cfg (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/share/batocera/datainit/system/configs/emulationstation/es_settings.cfg (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/share/drastic/config/drastic.cfg (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/share/emulationstation/resources/logo.png (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/share/extra/first.png (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/share/extra/off.png (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/share/extra/pico8.cfg (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/share/extra/resume.png (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/share/extra/save.png (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/share/pipewire/pipewire.conf (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/share/vulkan/icd.d/mali_icd.json (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/fsoverlay/usr/share/wireplumber/main.lua.d/50-alsa-config.lua (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/genimage.cfg (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/linux-sunxi64-legacy.config (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/partitions/boot.img (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/partitions/boot0.img (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/partitions/boot_package.fex (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/partitions/boot_package_35xxH.img (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/partitions/env.img (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/partitions/muos-H-boot.img (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/partitions/rg35xxh-boot.img (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/partitions/rg35xxh-noramdisk.img (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/partitions/stock-H-boot.img (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/partitions/stock-boot0.img (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/partitions/stock-env.img (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/patches/batocera-emulationstation/001_fix_battery_path.patch (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/patches/batocera-emulationstation/002-add-custom-powerooff-reboot.patch (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/patches/mangohud/0015-libmali-no-x11-no-wayland.patch (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/patches/sdl2/0001-add-video-malifb-driver.patch (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/patches/sdl2/0002-mali-fbdev-Implemented-MALI-Zero-Copy-fbdev-rotation.patch (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/patches/sdl2/0003-No-need-to-set-glClearColor-at-all.patch (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/patches/sdl2/0004-Rework-blitter-thread-sync.patch (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/patches/sdl2/0005-additional-mali-fixes.patch (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/patches/sdl2/0006-refactoring.patch (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/patches/sdl2/0007-no-MSAA.patch (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/patches/sdl2/0008-add-sRGB.patch (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/patches/sdl2/0009-memleak-fix.patch (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/post-build-script.sh (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/uImage (100%) rename board/batocera/allwinner/h700/{rg35xx-plus => rg35xx-h}/uInitrd (100%) diff --git a/board/batocera/allwinner/h700/patches/libretro-parallel-n64/0001-gl-libmali.patch b/board/batocera/allwinner/h700/patches/libretro-parallel-n64/0001-gl-libmali.patch new file mode 100644 index 00000000000..6095bd75599 --- /dev/null +++ b/board/batocera/allwinner/h700/patches/libretro-parallel-n64/0001-gl-libmali.patch @@ -0,0 +1,11 @@ +--- a/Makefile 2024-07-08 13:39:51.236931472 -0400 ++++ b/Makefile 2024-07-08 13:39:57.552977195 -0400 +@@ -227,7 +227,7 @@ + # Allwinner H5 + ifneq (,$(findstring h5,$(platform))) + GLES = 1 +- GL_LIB := -lGLESv2 ++ GL_LIB := -lGLESv2 -lmali + CPUFLAGS += -DNO_ASM -DARM -DARM_ASM -DDONT_WANT_ARM_OPTIMIZATIONS -DARM_FIX -DCLASSIC -DARM64 + HAVE_NEON = 1 + WITH_DYNAREC=aarch64 diff --git a/board/batocera/allwinner/h700/rg35xx-plus/S02resize b/board/batocera/allwinner/h700/rg35xx-h/S02resize similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/S02resize rename to board/batocera/allwinner/h700/rg35xx-h/S02resize diff --git a/board/batocera/allwinner/h700/rg35xx-plus/batocera-boot.conf b/board/batocera/allwinner/h700/rg35xx-h/batocera-boot.conf similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/batocera-boot.conf rename to board/batocera/allwinner/h700/rg35xx-h/batocera-boot.conf diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat0.bmp b/board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat0.bmp similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat0.bmp rename to board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat0.bmp diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat1.bmp b/board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat1.bmp similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat1.bmp rename to board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat1.bmp diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat10.bmp b/board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat10.bmp similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat10.bmp rename to board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat10.bmp diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat2.bmp b/board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat2.bmp similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat2.bmp rename to board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat2.bmp diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat3.bmp b/board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat3.bmp similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat3.bmp rename to board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat3.bmp diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat4.bmp b/board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat4.bmp similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat4.bmp rename to board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat4.bmp diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat5.bmp b/board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat5.bmp similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat5.bmp rename to board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat5.bmp diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat6.bmp b/board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat6.bmp similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat6.bmp rename to board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat6.bmp diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat7.bmp b/board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat7.bmp similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat7.bmp rename to board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat7.bmp diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat8.bmp b/board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat8.bmp similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat8.bmp rename to board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat8.bmp diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat9.bmp b/board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat9.bmp similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat9.bmp rename to board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat9.bmp diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat_blank.bmp b/board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat_blank.bmp similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat_blank.bmp rename to board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat_blank.bmp diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat_htmp.bmp b/board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat_htmp.bmp similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat_htmp.bmp rename to board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat_htmp.bmp diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat_ltmp.bmp b/board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat_ltmp.bmp similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bat_ltmp.bmp rename to board/batocera/allwinner/h700/rg35xx-h/boot/bat/bat_ltmp.bmp diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/bat/battery.bmp b/board/batocera/allwinner/h700/rg35xx-h/boot/bat/battery.bmp similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/bat/battery.bmp rename to board/batocera/allwinner/h700/rg35xx-h/boot/bat/battery.bmp diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/bat/battery_charge.bmp b/board/batocera/allwinner/h700/rg35xx-h/boot/bat/battery_charge.bmp similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/bat/battery_charge.bmp rename to board/batocera/allwinner/h700/rg35xx-h/boot/bat/battery_charge.bmp diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bempty.bmp b/board/batocera/allwinner/h700/rg35xx-h/boot/bat/bempty.bmp similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bempty.bmp rename to board/batocera/allwinner/h700/rg35xx-h/boot/bat/bempty.bmp diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bootlogo.bmp b/board/batocera/allwinner/h700/rg35xx-h/boot/bat/bootlogo.bmp similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/bat/bootlogo.bmp rename to board/batocera/allwinner/h700/rg35xx-h/boot/bat/bootlogo.bmp diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/bat/low_pwr.bmp b/board/batocera/allwinner/h700/rg35xx-h/boot/bat/low_pwr.bmp similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/bat/low_pwr.bmp rename to board/batocera/allwinner/h700/rg35xx-h/boot/bat/low_pwr.bmp diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/boot.cmd b/board/batocera/allwinner/h700/rg35xx-h/boot/boot.cmd similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/boot.cmd rename to board/batocera/allwinner/h700/rg35xx-h/boot/boot.cmd diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/boot.scr b/board/batocera/allwinner/h700/rg35xx-h/boot/boot.scr similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/boot.scr rename to board/batocera/allwinner/h700/rg35xx-h/boot/boot.scr diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/bootlogo.bmp b/board/batocera/allwinner/h700/rg35xx-h/boot/bootlogo.bmp similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/bootlogo.bmp rename to board/batocera/allwinner/h700/rg35xx-h/boot/bootlogo.bmp diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/extlinux.conf b/board/batocera/allwinner/h700/rg35xx-h/boot/extlinux.conf similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/extlinux.conf rename to board/batocera/allwinner/h700/rg35xx-h/boot/extlinux.conf diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/font24.sft b/board/batocera/allwinner/h700/rg35xx-h/boot/font24.sft similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/font24.sft rename to board/batocera/allwinner/h700/rg35xx-h/boot/font24.sft diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/font32.sft b/board/batocera/allwinner/h700/rg35xx-h/boot/font32.sft similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/font32.sft rename to board/batocera/allwinner/h700/rg35xx-h/boot/font32.sft diff --git a/board/batocera/allwinner/h700/rg35xx-plus/boot/magic.bin b/board/batocera/allwinner/h700/rg35xx-h/boot/magic.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/boot/magic.bin rename to board/batocera/allwinner/h700/rg35xx-h/boot/magic.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/bootlogo.bmp b/board/batocera/allwinner/h700/rg35xx-h/bootlogo.bmp similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/bootlogo.bmp rename to board/batocera/allwinner/h700/rg35xx-h/bootlogo.bmp diff --git a/board/batocera/allwinner/h700/rg35xx-plus/create-boot-script.sh b/board/batocera/allwinner/h700/rg35xx-h/create-boot-script.sh similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/create-boot-script.sh rename to board/batocera/allwinner/h700/rg35xx-h/create-boot-script.sh diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/connman/main.conf b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/connman/main.conf similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/connman/main.conf rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/connman/main.conf diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/S02overclock b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/S02overclock similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/S02overclock rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/S02overclock diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/S02resize b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/S02resize similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/S02resize rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/S02resize diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/S03modules b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/S03modules similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/S03modules rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/S03modules diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/S03pico8 b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/S03pico8 similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/S03pico8 rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/S03pico8 diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/S05udev b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/S05udev similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/S05udev rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/S05udev diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/S06audio b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/S06audio similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/S06audio rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/S06audio diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/S27audioconfig b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/S27audioconfig similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/S27audioconfig rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/S27audioconfig diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/S27debugmount b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/S27debugmount similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/S27debugmount rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/S27debugmount diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/S31emulationstation b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/S31emulationstation similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/S31emulationstation rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/S31emulationstation diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/S32bluetooth b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/S32bluetooth similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/S32bluetooth rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/S32bluetooth diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/S50adb b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/S50adb similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/S50adb rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/S50adb diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/rcK b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/rcK similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/rcK rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/rcK diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/rcS b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/rcS similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/rcS rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/rcS diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/rcS.bak b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/rcS.bak similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/init.d/rcS.bak rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/init.d/rcS.bak diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/triggerhappy/triggers.d/multimedia_keys.conf b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/triggerhappy/triggers.d/multimedia_keys.conf similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/triggerhappy/triggers.d/multimedia_keys.conf rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/triggerhappy/triggers.d/multimedia_keys.conf diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/udev/rules.d/60-hdmi.rules b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/udev/rules.d/60-hdmi.rules similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/udev/rules.d/60-hdmi.rules rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/udev/rules.d/60-hdmi.rules diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/udev/rules.d/80-disable-wlan0.rules b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/udev/rules.d/80-disable-wlan0.rules similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/udev/rules.d/80-disable-wlan0.rules rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/udev/rules.d/80-disable-wlan0.rules diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/udev/rules.d/80-headset.rules b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/udev/rules.d/80-headset.rules similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/etc/udev/rules.d/80-headset.rules rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/etc/udev/rules.d/80-headset.rules diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/README.md b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/README.md similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/README.md rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/README.md diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/regulatory.db b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/regulatory.db similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/regulatory.db rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/regulatory.db diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/regulatory.db.p7s b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/regulatory.db.p7s similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/regulatory.db.p7s rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/regulatory.db.p7s diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtl_bt/rtl8723b_config.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtl_bt/rtl8723b_config.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtl_bt/rtl8723b_config.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtl_bt/rtl8723b_config.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtl_bt/rtl8723b_fw.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtl_bt/rtl8723b_fw.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtl_bt/rtl8723b_fw.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtl_bt/rtl8723b_fw.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtl_bt/rtlbt_config b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtl_bt/rtlbt_config similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtl_bt/rtlbt_config rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtl_bt/rtlbt_config diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtl_bt/rtlbt_fw b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtl_bt/rtlbt_fw similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtl_bt/rtlbt_fw rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtl_bt/rtlbt_fw diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtl_bt/rtlbt_fw_new b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtl_bt/rtlbt_fw_new similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtl_bt/rtlbt_fw_new rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtl_bt/rtlbt_fw_new diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlbt/rtl8821c_config b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlbt/rtl8821c_config similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlbt/rtl8821c_config rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlbt/rtl8821c_config diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlbt/rtl8821c_fw b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlbt/rtl8821c_fw similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlbt/rtl8821c_fw rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlbt/rtl8821c_fw diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8188efw.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8188efw.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8188efw.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8188efw.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8188eufw.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8188eufw.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8188eufw.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8188eufw.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192cfw.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192cfw.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192cfw.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192cfw.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192cfwU.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192cfwU.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192cfwU.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192cfwU.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192cfwU_B.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192cfwU_B.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192cfwU_B.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192cfwU_B.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192cufw.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192cufw.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192cufw.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192cufw.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192cufw_A.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192cufw_A.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192cufw_A.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192cufw_A.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192cufw_B.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192cufw_B.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192cufw_B.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192cufw_B.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192cufw_TMSC.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192cufw_TMSC.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192cufw_TMSC.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192cufw_TMSC.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192defw.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192defw.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192defw.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192defw.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192eefw.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192eefw.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192eefw.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192eefw.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192eu_ap_wowlan.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192eu_ap_wowlan.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192eu_ap_wowlan.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192eu_ap_wowlan.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192eu_nic.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192eu_nic.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192eu_nic.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192eu_nic.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192eu_wowlan.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192eu_wowlan.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192eu_wowlan.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192eu_wowlan.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192sefw.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192sefw.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8192sefw.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8192sefw.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8712u.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8712u.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8712u.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8712u.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8723aufw_A.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8723aufw_A.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8723aufw_A.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8723aufw_A.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8723aufw_B.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8723aufw_B.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8723aufw_B.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8723aufw_B.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8723aufw_B_NoBT.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8723aufw_B_NoBT.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8723aufw_B_NoBT.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8723aufw_B_NoBT.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8723befw.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8723befw.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8723befw.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8723befw.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8723bs_ap_wowlan.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8723bs_ap_wowlan.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8723bs_ap_wowlan.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8723bs_ap_wowlan.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8723bs_nic.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8723bs_nic.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8723bs_nic.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8723bs_nic.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8723bs_wowlan.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8723bs_wowlan.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8723bs_wowlan.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8723bs_wowlan.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8723bu_ap_wowlan.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8723bu_ap_wowlan.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8723bu_ap_wowlan.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8723bu_ap_wowlan.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8723bu_nic.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8723bu_nic.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8723bu_nic.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8723bu_nic.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8723bu_wowlan.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8723bu_wowlan.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8723bu_wowlan.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8723bu_wowlan.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8723fw.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8723fw.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8723fw.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8723fw.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8723fw_B.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8723fw_B.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8723fw_B.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8723fw_B.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8821aefw.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8821aefw.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8821aefw.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8821aefw.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8821aefw_wowlan.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8821aefw_wowlan.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/firmware/rtlwifi/rtl8821aefw_wowlan.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/firmware/rtlwifi/rtl8821aefw_wowlan.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/build b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/build similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/build rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/build diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/bluetooth/bcm_btlpm.ko b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/bluetooth/bcm_btlpm.ko similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/bluetooth/bcm_btlpm.ko rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/bluetooth/bcm_btlpm.ko diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/bluetooth/rtl_btlpm.ko b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/bluetooth/rtl_btlpm.ko similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/bluetooth/rtl_btlpm.ko rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/bluetooth/rtl_btlpm.ko diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/gc030a_mipi.ko b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/gc030a_mipi.ko similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/gc030a_mipi.ko rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/gc030a_mipi.ko diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/gc0310_mipi.ko b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/gc0310_mipi.ko similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/gc0310_mipi.ko rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/gc0310_mipi.ko diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/gc2355_mipi.ko b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/gc2355_mipi.ko similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/gc2355_mipi.ko rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/gc2355_mipi.ko diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/gc2385_mipi.ko b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/gc2385_mipi.ko similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/gc2385_mipi.ko rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/gc2385_mipi.ko diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/gc5024_mipi.ko b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/gc5024_mipi.ko similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/gc5024_mipi.ko rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/gc5024_mipi.ko diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/imx317_mipi.ko b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/imx317_mipi.ko similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/imx317_mipi.ko rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/imx317_mipi.ko diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/ov5640.ko b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/ov5640.ko similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/ov5640.ko rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/platform/sunxi-vin/modules/sensor/ov5640.ko diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/usb/gspca/gspca_main.ko b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/usb/gspca/gspca_main.ko similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/usb/gspca/gspca_main.ko rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/usb/gspca/gspca_main.ko diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/usb/uvc/uvcvideo.ko b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/usb/uvc/uvcvideo.ko similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/usb/uvc/uvcvideo.ko rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/usb/uvc/uvcvideo.ko diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/v4l2-core/videobuf2-vmalloc.ko b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/v4l2-core/videobuf2-vmalloc.ko similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/v4l2-core/videobuf2-vmalloc.ko rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/media/v4l2-core/videobuf2-vmalloc.ko diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/8188eu.ko b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/8188eu.ko similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/8188eu.ko rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/8188eu.ko diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192c/rtl8192c-common.ko b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192c/rtl8192c-common.ko similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192c/rtl8192c-common.ko rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192c/rtl8192c-common.ko diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rtl8192cu.ko b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rtl8192cu.ko similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rtl8192cu.ko rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rtl8192cu.ko diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/realtek/rtlwifi/rtl_usb.ko b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/realtek/rtlwifi/rtl_usb.ko similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/realtek/rtlwifi/rtl_usb.ko rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/realtek/rtlwifi/rtl_usb.ko diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/realtek/rtlwifi/rtlwifi.ko b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/realtek/rtlwifi/rtlwifi.ko similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/realtek/rtlwifi/rtlwifi.ko rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/realtek/rtlwifi/rtlwifi.ko diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/rtl8821cs/8821cs.ko b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/rtl8821cs/8821cs.ko similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/rtl8821cs/8821cs.ko rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/net/wireless/rtl8821cs/8821cs.ko diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/video/backlight/backlight.ko b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/video/backlight/backlight.ko similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/video/backlight/backlight.ko rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/video/backlight/backlight.ko diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/video/backlight/generic_bl.ko b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/video/backlight/generic_bl.ko similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/video/backlight/generic_bl.ko rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/video/backlight/generic_bl.ko diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/video/backlight/lcd.ko b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/video/backlight/lcd.ko similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/kernel/drivers/video/backlight/lcd.ko rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/kernel/drivers/video/backlight/lcd.ko diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/modules.alias b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/modules.alias similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/modules.alias rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/modules.alias diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/modules.alias.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/modules.alias.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/modules.alias.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/modules.alias.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/modules.builtin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/modules.builtin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/modules.builtin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/modules.builtin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/modules.builtin.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/modules.builtin.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/modules.builtin.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/modules.builtin.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/modules.dep b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/modules.dep similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/modules.dep rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/modules.dep diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/modules.dep.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/modules.dep.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/modules.dep.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/modules.dep.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/modules.devname b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/modules.devname similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/modules.devname rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/modules.devname diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/modules.order b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/modules.order similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/modules.order rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/modules.order diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/modules.softdep b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/modules.softdep similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/modules.softdep rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/modules.softdep diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/modules.symbols b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/modules.symbols similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/modules.symbols rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/modules.symbols diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/modules.symbols.bin b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/modules.symbols.bin similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/modules.symbols.bin rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/modules.symbols.bin diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/source b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/source similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/4.9.170/source rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/4.9.170/source diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/mali_kbase.ko b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/mali_kbase.ko similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/lib/modules/mali_kbase.ko rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/lib/modules/mali_kbase.ko diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/batocera-audio b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/batocera-audio similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/batocera-audio rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/batocera-audio diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/batocera-brightness b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/batocera-brightness similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/batocera-brightness rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/batocera-brightness diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/batocera-overclock b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/batocera-overclock similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/batocera-overclock rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/batocera-overclock diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/batocera-resolution b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/batocera-resolution similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/batocera-resolution rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/batocera-resolution diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/brightness b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/brightness similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/brightness rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/brightness diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/charger b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/charger similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/charger rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/charger diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/hdmi_audio_switch.sh b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/hdmi_audio_switch.sh similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/hdmi_audio_switch.sh rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/hdmi_audio_switch.sh diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/power-button-release.sh b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/power-button-release.sh similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/power-button-release.sh rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/power-button-release.sh diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/power-button.sh b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/power-button.sh similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/power-button.sh rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/power-button.sh diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/power-led.sh b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/power-led.sh similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/power-led.sh rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/power-led.sh diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/poweroff.sh b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/poweroff.sh similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/poweroff.sh rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/poweroff.sh diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/progressbar b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/progressbar similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/progressbar rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/progressbar diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/quit_game.sh b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/quit_game.sh similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/quit_game.sh rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/quit_game.sh diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/reboot.sh b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/reboot.sh similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/reboot.sh rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/reboot.sh diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/rtk_hciattach b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/rtk_hciattach similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/rtk_hciattach rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/rtk_hciattach diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/start_game.sh b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/start_game.sh similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/start_game.sh rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/start_game.sh diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/store-brightness b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/store-brightness similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/bin/store-brightness rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/bin/store-brightness diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/sbin/fbset b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/sbin/fbset similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/sbin/fbset rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/sbin/fbset diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/batocera/configgen/scripts/power_led_hooks.sh b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/batocera/configgen/scripts/power_led_hooks.sh similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/batocera/configgen/scripts/power_led_hooks.sh rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/batocera/configgen/scripts/power_led_hooks.sh diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/batocera/datainit/system/batocera.conf b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/batocera/datainit/system/batocera.conf similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/batocera/datainit/system/batocera.conf rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/batocera/datainit/system/batocera.conf diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/batocera/datainit/system/configs/emulationstation/about.info b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/batocera/datainit/system/configs/emulationstation/about.info similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/batocera/datainit/system/configs/emulationstation/about.info rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/batocera/datainit/system/configs/emulationstation/about.info diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/batocera/datainit/system/configs/emulationstation/es_input.cfg b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/batocera/datainit/system/configs/emulationstation/es_input.cfg similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/batocera/datainit/system/configs/emulationstation/es_input.cfg rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/batocera/datainit/system/configs/emulationstation/es_input.cfg diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/batocera/datainit/system/configs/emulationstation/es_settings.cfg b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/batocera/datainit/system/configs/emulationstation/es_settings.cfg similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/batocera/datainit/system/configs/emulationstation/es_settings.cfg rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/batocera/datainit/system/configs/emulationstation/es_settings.cfg diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/drastic/config/drastic.cfg b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/drastic/config/drastic.cfg similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/drastic/config/drastic.cfg rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/drastic/config/drastic.cfg diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/emulationstation/resources/logo.png b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/emulationstation/resources/logo.png similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/emulationstation/resources/logo.png rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/emulationstation/resources/logo.png diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/extra/first.png b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/extra/first.png similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/extra/first.png rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/extra/first.png diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/extra/off.png b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/extra/off.png similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/extra/off.png rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/extra/off.png diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/extra/pico8.cfg b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/extra/pico8.cfg similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/extra/pico8.cfg rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/extra/pico8.cfg diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/extra/resume.png b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/extra/resume.png similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/extra/resume.png rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/extra/resume.png diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/extra/save.png b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/extra/save.png similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/extra/save.png rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/extra/save.png diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/pipewire/pipewire.conf b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/pipewire/pipewire.conf similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/pipewire/pipewire.conf rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/pipewire/pipewire.conf diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/vulkan/icd.d/mali_icd.json b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/vulkan/icd.d/mali_icd.json similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/vulkan/icd.d/mali_icd.json rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/vulkan/icd.d/mali_icd.json diff --git a/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/wireplumber/main.lua.d/50-alsa-config.lua b/board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/wireplumber/main.lua.d/50-alsa-config.lua similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/wireplumber/main.lua.d/50-alsa-config.lua rename to board/batocera/allwinner/h700/rg35xx-h/fsoverlay/usr/share/wireplumber/main.lua.d/50-alsa-config.lua diff --git a/board/batocera/allwinner/h700/rg35xx-plus/genimage.cfg b/board/batocera/allwinner/h700/rg35xx-h/genimage.cfg similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/genimage.cfg rename to board/batocera/allwinner/h700/rg35xx-h/genimage.cfg diff --git a/board/batocera/allwinner/h700/rg35xx-plus/linux-sunxi64-legacy.config b/board/batocera/allwinner/h700/rg35xx-h/linux-sunxi64-legacy.config similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/linux-sunxi64-legacy.config rename to board/batocera/allwinner/h700/rg35xx-h/linux-sunxi64-legacy.config diff --git a/board/batocera/allwinner/h700/rg35xx-plus/partitions/boot.img b/board/batocera/allwinner/h700/rg35xx-h/partitions/boot.img similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/partitions/boot.img rename to board/batocera/allwinner/h700/rg35xx-h/partitions/boot.img diff --git a/board/batocera/allwinner/h700/rg35xx-plus/partitions/boot0.img b/board/batocera/allwinner/h700/rg35xx-h/partitions/boot0.img similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/partitions/boot0.img rename to board/batocera/allwinner/h700/rg35xx-h/partitions/boot0.img diff --git a/board/batocera/allwinner/h700/rg35xx-plus/partitions/boot_package.fex b/board/batocera/allwinner/h700/rg35xx-h/partitions/boot_package.fex similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/partitions/boot_package.fex rename to board/batocera/allwinner/h700/rg35xx-h/partitions/boot_package.fex diff --git a/board/batocera/allwinner/h700/rg35xx-plus/partitions/boot_package_35xxH.img b/board/batocera/allwinner/h700/rg35xx-h/partitions/boot_package_35xxH.img similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/partitions/boot_package_35xxH.img rename to board/batocera/allwinner/h700/rg35xx-h/partitions/boot_package_35xxH.img diff --git a/board/batocera/allwinner/h700/rg35xx-plus/partitions/env.img b/board/batocera/allwinner/h700/rg35xx-h/partitions/env.img similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/partitions/env.img rename to board/batocera/allwinner/h700/rg35xx-h/partitions/env.img diff --git a/board/batocera/allwinner/h700/rg35xx-plus/partitions/muos-H-boot.img b/board/batocera/allwinner/h700/rg35xx-h/partitions/muos-H-boot.img similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/partitions/muos-H-boot.img rename to board/batocera/allwinner/h700/rg35xx-h/partitions/muos-H-boot.img diff --git a/board/batocera/allwinner/h700/rg35xx-plus/partitions/rg35xxh-boot.img b/board/batocera/allwinner/h700/rg35xx-h/partitions/rg35xxh-boot.img similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/partitions/rg35xxh-boot.img rename to board/batocera/allwinner/h700/rg35xx-h/partitions/rg35xxh-boot.img diff --git a/board/batocera/allwinner/h700/rg35xx-plus/partitions/rg35xxh-noramdisk.img b/board/batocera/allwinner/h700/rg35xx-h/partitions/rg35xxh-noramdisk.img similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/partitions/rg35xxh-noramdisk.img rename to board/batocera/allwinner/h700/rg35xx-h/partitions/rg35xxh-noramdisk.img diff --git a/board/batocera/allwinner/h700/rg35xx-plus/partitions/stock-H-boot.img b/board/batocera/allwinner/h700/rg35xx-h/partitions/stock-H-boot.img similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/partitions/stock-H-boot.img rename to board/batocera/allwinner/h700/rg35xx-h/partitions/stock-H-boot.img diff --git a/board/batocera/allwinner/h700/rg35xx-plus/partitions/stock-boot0.img b/board/batocera/allwinner/h700/rg35xx-h/partitions/stock-boot0.img similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/partitions/stock-boot0.img rename to board/batocera/allwinner/h700/rg35xx-h/partitions/stock-boot0.img diff --git a/board/batocera/allwinner/h700/rg35xx-plus/partitions/stock-env.img b/board/batocera/allwinner/h700/rg35xx-h/partitions/stock-env.img similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/partitions/stock-env.img rename to board/batocera/allwinner/h700/rg35xx-h/partitions/stock-env.img diff --git a/board/batocera/allwinner/h700/rg35xx-plus/patches/batocera-emulationstation/001_fix_battery_path.patch b/board/batocera/allwinner/h700/rg35xx-h/patches/batocera-emulationstation/001_fix_battery_path.patch similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/patches/batocera-emulationstation/001_fix_battery_path.patch rename to board/batocera/allwinner/h700/rg35xx-h/patches/batocera-emulationstation/001_fix_battery_path.patch diff --git a/board/batocera/allwinner/h700/rg35xx-plus/patches/batocera-emulationstation/002-add-custom-powerooff-reboot.patch b/board/batocera/allwinner/h700/rg35xx-h/patches/batocera-emulationstation/002-add-custom-powerooff-reboot.patch similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/patches/batocera-emulationstation/002-add-custom-powerooff-reboot.patch rename to board/batocera/allwinner/h700/rg35xx-h/patches/batocera-emulationstation/002-add-custom-powerooff-reboot.patch diff --git a/board/batocera/allwinner/h700/rg35xx-plus/patches/mangohud/0015-libmali-no-x11-no-wayland.patch b/board/batocera/allwinner/h700/rg35xx-h/patches/mangohud/0015-libmali-no-x11-no-wayland.patch similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/patches/mangohud/0015-libmali-no-x11-no-wayland.patch rename to board/batocera/allwinner/h700/rg35xx-h/patches/mangohud/0015-libmali-no-x11-no-wayland.patch diff --git a/board/batocera/allwinner/h700/rg35xx-plus/patches/sdl2/0001-add-video-malifb-driver.patch b/board/batocera/allwinner/h700/rg35xx-h/patches/sdl2/0001-add-video-malifb-driver.patch similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/patches/sdl2/0001-add-video-malifb-driver.patch rename to board/batocera/allwinner/h700/rg35xx-h/patches/sdl2/0001-add-video-malifb-driver.patch diff --git a/board/batocera/allwinner/h700/rg35xx-plus/patches/sdl2/0002-mali-fbdev-Implemented-MALI-Zero-Copy-fbdev-rotation.patch b/board/batocera/allwinner/h700/rg35xx-h/patches/sdl2/0002-mali-fbdev-Implemented-MALI-Zero-Copy-fbdev-rotation.patch similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/patches/sdl2/0002-mali-fbdev-Implemented-MALI-Zero-Copy-fbdev-rotation.patch rename to board/batocera/allwinner/h700/rg35xx-h/patches/sdl2/0002-mali-fbdev-Implemented-MALI-Zero-Copy-fbdev-rotation.patch diff --git a/board/batocera/allwinner/h700/rg35xx-plus/patches/sdl2/0003-No-need-to-set-glClearColor-at-all.patch b/board/batocera/allwinner/h700/rg35xx-h/patches/sdl2/0003-No-need-to-set-glClearColor-at-all.patch similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/patches/sdl2/0003-No-need-to-set-glClearColor-at-all.patch rename to board/batocera/allwinner/h700/rg35xx-h/patches/sdl2/0003-No-need-to-set-glClearColor-at-all.patch diff --git a/board/batocera/allwinner/h700/rg35xx-plus/patches/sdl2/0004-Rework-blitter-thread-sync.patch b/board/batocera/allwinner/h700/rg35xx-h/patches/sdl2/0004-Rework-blitter-thread-sync.patch similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/patches/sdl2/0004-Rework-blitter-thread-sync.patch rename to board/batocera/allwinner/h700/rg35xx-h/patches/sdl2/0004-Rework-blitter-thread-sync.patch diff --git a/board/batocera/allwinner/h700/rg35xx-plus/patches/sdl2/0005-additional-mali-fixes.patch b/board/batocera/allwinner/h700/rg35xx-h/patches/sdl2/0005-additional-mali-fixes.patch similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/patches/sdl2/0005-additional-mali-fixes.patch rename to board/batocera/allwinner/h700/rg35xx-h/patches/sdl2/0005-additional-mali-fixes.patch diff --git a/board/batocera/allwinner/h700/rg35xx-plus/patches/sdl2/0006-refactoring.patch b/board/batocera/allwinner/h700/rg35xx-h/patches/sdl2/0006-refactoring.patch similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/patches/sdl2/0006-refactoring.patch rename to board/batocera/allwinner/h700/rg35xx-h/patches/sdl2/0006-refactoring.patch diff --git a/board/batocera/allwinner/h700/rg35xx-plus/patches/sdl2/0007-no-MSAA.patch b/board/batocera/allwinner/h700/rg35xx-h/patches/sdl2/0007-no-MSAA.patch similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/patches/sdl2/0007-no-MSAA.patch rename to board/batocera/allwinner/h700/rg35xx-h/patches/sdl2/0007-no-MSAA.patch diff --git a/board/batocera/allwinner/h700/rg35xx-plus/patches/sdl2/0008-add-sRGB.patch b/board/batocera/allwinner/h700/rg35xx-h/patches/sdl2/0008-add-sRGB.patch similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/patches/sdl2/0008-add-sRGB.patch rename to board/batocera/allwinner/h700/rg35xx-h/patches/sdl2/0008-add-sRGB.patch diff --git a/board/batocera/allwinner/h700/rg35xx-plus/patches/sdl2/0009-memleak-fix.patch b/board/batocera/allwinner/h700/rg35xx-h/patches/sdl2/0009-memleak-fix.patch similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/patches/sdl2/0009-memleak-fix.patch rename to board/batocera/allwinner/h700/rg35xx-h/patches/sdl2/0009-memleak-fix.patch diff --git a/board/batocera/allwinner/h700/rg35xx-plus/post-build-script.sh b/board/batocera/allwinner/h700/rg35xx-h/post-build-script.sh similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/post-build-script.sh rename to board/batocera/allwinner/h700/rg35xx-h/post-build-script.sh diff --git a/board/batocera/allwinner/h700/rg35xx-plus/uImage b/board/batocera/allwinner/h700/rg35xx-h/uImage similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/uImage rename to board/batocera/allwinner/h700/rg35xx-h/uImage diff --git a/board/batocera/allwinner/h700/rg35xx-plus/uInitrd b/board/batocera/allwinner/h700/rg35xx-h/uInitrd similarity index 100% rename from board/batocera/allwinner/h700/rg35xx-plus/uInitrd rename to board/batocera/allwinner/h700/rg35xx-h/uInitrd diff --git a/config_device.sh b/config_device.sh index 071f3af796d..ca50883c646 100755 --- a/config_device.sh +++ b/config_device.sh @@ -58,6 +58,7 @@ update_line_if_needed() { if [ -f "$CONFIG_FILE" ]; then update_line_if_needed "$CONFIG_FILE" 'BR2_GLOBAL_PATCH_DIR=' "BR2_GLOBAL_PATCH_DIR=\"\$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches \$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/patches \$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h700/patches \$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h700/$REPLACEMENT/patches \"" update_line_if_needed "$CONFIG_FILE" 'BR2_ROOTFS_OVERLAY=' "BR2_ROOTFS_OVERLAY=\"\$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay \$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h700/fsoverlay \$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h700/$REPLACEMENT/fsoverlay \"" + update_line_if_needed "$CONFIG_FILE" 'BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE=' "BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE=\"\$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h700/$REPLACEMENT/linux-sunxi64-legacy.config\"" else echo "File $CONFIG_FILE not found!" exit 1 diff --git a/configs/batocera-h700.board b/configs/batocera-h700.board index 4854cc0e04c..fec4ec9c67c 100644 --- a/configs/batocera-h700.board +++ b/configs/batocera-h700.board @@ -8,8 +8,8 @@ BR2_PACKAGE_BATOCERA_TARGET_H700=y BR2_TARGET_OPTIMIZATION="-O2 -pipe -fsigned-char -mcpu=cortex-a53 -mtune=cortex-a53" #BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h700/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h700/rg35xx-plus/patches " -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h700/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h700/rg35xx-plus/fsoverlay " +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h700/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h700/rg35xx-h/patches " +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h700/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h700/rg35xx-h/fsoverlay " #BR2_TOOLCHAIN_BUILDROOT_MUSL=y #BR2_STATIC_LIBS=y @@ -45,12 +45,12 @@ BR2_PACKAGE_BATOCERA_KODI20=n #BR2_PACKAGE_MTD=y ###### -#BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h700/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h700/rg35xx-plus/patches " +#BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h700/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h700/rg35xx-h/patches " # Linux headers same as kernel, a 4.9 series BR2_LINUX_KERNEL=y BR2_KERNEL_HEADERS_AS_KERNEL=y BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h700/rg35xx-plus/linux-sunxi64-legacy.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h700/rg35xx-h/linux-sunxi64-legacy.config" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.170" BR2_LINUX_KERNEL_VERSION="4.9.170" diff --git a/package/batocera/core/batocera-system/Config.in b/package/batocera/core/batocera-system/Config.in index de88648ec18..eae88746cd4 100644 --- a/package/batocera/core/batocera-system/Config.in +++ b/package/batocera/core/batocera-system/Config.in @@ -485,7 +485,7 @@ config BR2_TARGET_BATOCERA_IMAGES_DEFINITIONS default "allwinner/h5/tritium-h5 allwinner/h5/orangepi-pc2" if BR2_PACKAGE_BATOCERA_TARGET_H5 default "allwinner/h6/orangepi-3-lts allwinner/h6/orangepi-3 allwinner/h6/orangepi-one-plus" if BR2_PACKAGE_BATOCERA_TARGET_H6 default "allwinner/h616/orangepi-zero2 allwinner/h616/orangepi-zero3 allwinner/h616/x96-mate" if BR2_PACKAGE_BATOCERA_TARGET_H616 - default "allwinner/h700/rg35xx-plus" if BR2_PACKAGE_BATOCERA_TARGET_H700 + default "allwinner/h700/rg35xx-h" if BR2_PACKAGE_BATOCERA_TARGET_H700 default "allwinner/a133/trimui-smart-pro" if BR2_PACKAGE_BATOCERA_TARGET_A133 default "actions/atm7039/rg35xx" if BR2_PACKAGE_BATOCERA_TARGET_ATM7039 default "amlogic/s812" if BR2_PACKAGE_BATOCERA_TARGET_S812 diff --git a/package/batocera/emulators/retroarch/libretro/libretro-parallel-n64/libretro-parallel-n64.mk b/package/batocera/emulators/retroarch/libretro/libretro-parallel-n64/libretro-parallel-n64.mk index ca12bb5d6a8..03735b8b296 100755 --- a/package/batocera/emulators/retroarch/libretro/libretro-parallel-n64/libretro-parallel-n64.mk +++ b/package/batocera/emulators/retroarch/libretro/libretro-parallel-n64/libretro-parallel-n64.mk @@ -10,6 +10,7 @@ LIBRETRO_PARALLEL_N64_LICENSE = GPLv2 LIBRETRO_PARALLEL_N64_EXTRA_ARGS=FORCE_GLES=1 LIBRETRO_PARALLEL_N64_BOARD= +LIBRETRO_PARALLEL_N64_GL_LIB= ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) LIBRETRO_PARALLEL_N64_DEPENDENCIES += rpi-userland @@ -77,8 +78,12 @@ ifeq ($(BR2_PACKAGE_VULKAN_HEADERS)$(BR2_PACKAGE_VULKAN_LOADER),yy) endif endif +ifeq ($(BR2_PACKAGE_HAS_LIBMALI),6) + LIBRETRO_PARALLEL_N64_GL_LIB=GL_LIB="-L$(STAGING_DIR)/usr/lib -lmali" +endif + define LIBRETRO_PARALLEL_N64_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) CXX="$(TARGET_CXX)" CC="$(TARGET_CC)" -C $(@D)/ -f Makefile platform="$(LIBRETRO_PARALLEL_N64_PLATFORM)" \ + $(TARGET_CONFIGURE_OPTS) $(MAKE) CXX="$(TARGET_CXX)" CC="$(TARGET_CC)" $(LIBRETRO_PARALLEL_N64_GL_LIB) -C $(@D)/ -f Makefile platform="$(LIBRETRO_PARALLEL_N64_PLATFORM)" \ BOARD="$(LIBRETRO_PARALLEL_N64_BOARD)" $(LIBRETRO_PARALLEL_N64_EXTRA_ARGS) endef