Pyohwan · Pyohwan · Aug 29, 2026 · Aug 10, 2026 · Aug 10, 2026 · Aug 11, 2026
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 /output
+/output-*
 /dl
 /configs/batocera-*_defconfig
 /configs/batocera-board.local.common

diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "buildroot"]
 	path = buildroot
-	url = https://github.com/batocera-linux/buildroot.git
+	url = https://github.com/Pyohwan/buildroot.git
diff --git a/Config.in b/Config.in
@@ -56,6 +56,12 @@ menu "System"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-rk3326/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/rocknix-abl/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-odroid-m2/Config.in"
+    # Pre-dates upstream's "rework uboot for rk356x devices" (01273a1f5f),
+    # which deleted uboot-odroid-m1 in favor of the unified uboot-rk356x
+    # below. Our board still uses this standalone package (known-working,
+    # matches this board's actual VU8M/SPI boot flow) - migrating to
+    # uboot-rk356x is a separate, deliberate follow-up, not a merge fix.
+    source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-odroid-m1/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-rk356x/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-rk3576/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-gameforce-ace/Config.in"
@@ -92,6 +98,7 @@ menu "System"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/mesa-panfork/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/mali-G610/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/mali-G52/Config.in"
+    source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/mali-g52-odroidm1/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/mali-G31/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/mali-g31-gbm/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/mali-mp400-wayland/Config.in"
@@ -110,6 +117,7 @@ menu "System"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/vulkan/spirv-cross/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/vulkan/vulkan-utility-libraries/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/vulkan/vulkan-validationlayers/Config.in"
+    source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/vulkan/vulkan-wsi-layer/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/gtk-layer-shell/Config.in"
   endmenu
 
@@ -253,6 +261,7 @@ menu "Emulators"
       source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-gp32emu/Config.in"
       source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-fbalpha/Config.in"
       source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-fbneo/Config.in"
+      source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-fbneo-korean/Config.in"
       source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-gw/Config.in"
       source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-prboom/Config.in"
       source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-mrboom/Config.in"
@@ -370,6 +379,7 @@ menu "Emulators"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/xenia-canary/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/xenia-edge/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/pcsx2/Config.in"
+    source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/aethersx2/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/rpcs3/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/ppsspp/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/flycast/Config.in"

diff --git a/README-odroidm1.en.md b/README-odroidm1.en.md
@@ -0,0 +1,97 @@
+# ODROID-M1 (bsp-odroidm1)
+
+*English | [한국어](README-odroidm1.ko.md)*
+
+## Features added on top of vanilla Batocera
+
+- Uses Hardkernel's own BSP kernel (**Linux 6.1.141**) instead of mainline
+  - Required for VU8M, mono audio, and USB3.0 support
+- VU8M (Hardkernel's 8" DSI touchscreen) support
+- Uses the vendor Mali G52 blob (g29p1 generation) - GLES + Vulkan
+- Wayland (labwc) compositor support - enables standalone Qt-based emulators (PCSX2/Dolphin/AetherSX2, etc.) to actually run
+- Fixed mono speaker volume/output routing (default volume was far too quiet)
+- FBNeo Korean-patched core (`fbneo_korean`) set as default - includes DsNo's patch, which fixes a CRC32 mismatch that caused Korean-patched ROMs to be rejected
+- AetherSX2 (PS2) set as default - an alternative core that avoids a Mali GPU fault that mainline PCSX2-family cores hit
+- Vulkan rendering support for PS2/GameCube/Dreamcast/PSP and other major systems
+- Re-tuned per-system "auto" core/API defaults to match actual measured best performance
+
+## Setup
+
+### Display (HDMI / VU8M)
+
+- **HDMI**: enabled by default, no configuration needed (tested up to 1080p).
+- **VU8M**: disabled by default. Enable it in `config.ini` on the **BATOCERA** partition (the drive that shows up when you plug the SD card into a PC):
+  ```
+  overlays="display_vu8m"
+  ```
+  Set it back to `overlays=""` to disable. The DSI panel has no hotplug detection, so once the overlay is enabled it's always reported as "connected" whether the panel is physically attached or not - turn it off when not in use.
+
+### Backglass / screen rotation
+
+Everything below assumes VU8M is already enabled via `overlays="display_vu8m"` in `config.ini` above.
+
+**Note**: the settings below are stored in `system/batocera.conf`, which only exists after the board has **booted at least once** and initialized the SHARE partition - a freshly flashed SD card has neither this file nor the `system` folder at all (Batocera creates the whole default directory structure - `roms`/`bios`/`saves`/`system`, etc. - on first boot). Do this after the first boot.
+
+**Using it as a backglass**: to use VU8M as a secondary screen showing box art/game info while playing on the main screen (HDMI), go to **MAIN MENU → SYSTEM SETTINGS → HARDWARE → MULTISCREENS → BACKGLASS / INFORMATION SCREEN** and set VIDEO OUTPUT to VU8M (`DSI-1`). **This must be set** for ES to actually configure that output (resolution/rotation) - leaving it blank just gets you an unused extended screen tacked onto HDMI with nothing rendered on it.
+
+**Exception - NDS dual-screen**: NDS naturally has two screens (top/bottom). Enabling both HDMI and VU8M together with the `melonDS` core lets you output NDS's top and bottom screens to the two physical displays separately. However, melonDS performs poorly on this board (much slower than the default `drastic` core even with GPU acceleration on), making it **impractical for regular use** - stick with the default `drastic` (single screen) unless you specifically need the dual-screen setup.
+
+**Rotation**: best done from the ES menu - note that both options are labeled "SCREEN ROTATION", so you have to go by location:
+- **MAIN MENU → SYSTEM SETTINGS → HARDWARE → SCREEN ROTATION**: rotates the main screen (HDMI).
+- **MAIN MENU → SYSTEM SETTINGS → HARDWARE → MULTISCREENS → BACKGLASS / INFORMATION SCREEN → SCREEN ROTATION**: rotates VU8M (the backglass). (Saved together with the VIDEO OUTPUT setting above.)
+
+These values are stored in `system/batocera.conf` on the **SHARE partition** (the second drive that shows up when you plug the SD card into a PC). Mount that partition and edit the file directly, or over SSH:
+```
+batocera-settings-set global.videooutput2 DSI-1   # assign VU8M as the 2nd screen (backglass)
+batocera-settings-set display.rotate2.DSI-1 3      # rotation value for that screen
+```
+A **reboot** is needed for this to take effect (EmulationStation only sets up outputs/rotation at startup):
+```
+reboot
+```
+Main-screen rotation uses `display.rotate.<connector-name>=<N>` per connector (e.g. `display.rotate.HDMI-A-1`), falling back to the global `display.rotate=<N>` if unset. `<N>` is `0` (normal), `1` (90°), `2` (180°), `3` (270°) - main-screen rotation is also automatically picked up by the boot splash on the next reboot (vanilla mechanism, no extra setup needed). `display.rotate2` (backglass) doesn't apply here - the splash never draws anything to the 2nd screen.
+
+## Per-system performance results and recommended core/API
+
+Measured on **`batocera44-odroidm1-v1.0.0`** (this doc always tracks the latest version - re-verify if the relevant core/kernel/blob changes in a later release), Power Mode fixed to High Performance, Avg FPS / 1% low (frametime-based, an industry-standard metric). **The core/API actually selected by "auto" is bolded.**
+
+| System | Game | Core | API | Avg FPS | 1% Low |
+| --- | --- | --- | --- | --- | --- |
+| Genesis/Mega Drive | Altered Beast | **genesisplusgx** | — | **60.0** | 50.3 |
+| | | genesisplusgx-expanded | — | 60.0 | 47.6 |
+| | | picodrive | — | 60.0 | 48.5 |
+| FBNeo | Ninja Baseball Bat Man | **fbneo_korean** | — | **60.0** | 41.0 |
+| Saturn | Strikers 1945 | **yabasanshiro** | GLES | **59.3** | 24.3 |
+| | | beetle-saturn | GLES | 22.5 | 16.8 |
+| | | beetle-saturn | Vulkan | 22.8 | 16.4 |
+| PSX | Soul Blade | **pcsx_rearmed** | GLES | **60.0** | 38.9 |
+| | | pcsx_rearmed | Vulkan | 60.0 | 42.0 |
+| | | swanstation | GLES | 58.5 | 32.1 |
+| | | swanstation | Vulkan | 59.3 | 34.5 |
+| | | mednafen_psx | GLES | 29.0 | 19.6 |
+| | | mednafen_psx | Vulkan | 31.3 | 20.7 |
+| N64 | Yoshi's Story | standalone mupen64plus(**rice**) | GLES | **59.6** | 30.3 |
+| | | standalone mupen64plus(glide64mk2) | GLES | 54.9 | 13.0 |
+| | | standalone mupen64plus(gliden64) | GLES | 10.3 | 3.6 |
+| | | libretro mupen64plus-next | GLES | 59.5 | 24.5 |
+| | | libretro parallel_n64 | GLES | 56.2 | 17.9 |
+| Dreamcast | Soulcalibur | **standalone flycast** | **Vulkan** | **55.5** | 11.7 |
+| | | standalone flycast | GLES | 56.4 | 13.0 |
+| | | libretro flycast | GLES | 55.9 | 10.1 |
+| | | libretro flycast | Vulkan | 56.0 | 13.1 |
+| PS2 | 2002 FIFA World Cup (Korea) | **AetherSX2** | **Vulkan** | **23.8** | 4.2 |
+| GameCube | Pikmin | **standalone Dolphin** | **Vulkan** | **29.7** | 8.4 |
+| PSP | Tekken 6 | **standalone PPSSPP** | **Vulkan** | **58.9** | 27.0 |
+| | | standalone PPSSPP | GLES | 54.0 | 17.7 |
+| | | libretro ppsspp | GLES | 54.2 | 16.1 |
+| | | libretro ppsspp | Vulkan | 54.1 | 27.0 |
+| NDS | (excluded from the matrix - all 3 tracks cleared 60fps with 99%+ headroom, so a full sweep wasn't needed) | **drastic** | — | — | — |
+
+**Notes**:
+- Genesis/FBNeo use software 2D rendering, so the GLES/Vulkan API distinction doesn't apply.
+- The libretro Vulkan cores for N64/Dreamcast (mupen64plus-next, parallel_n64) have a known issue where audio plays but no video appears, so they're excluded above (GLES-only comparison).
+- Wii isn't benchmarked separately but is expected to behave the same as GameCube (standalone Dolphin + Vulkan), so the same recommendation applies.
+
+## Known limitations
+
+- **PS2 `pcsx2` core** (mainline PCSX2 family): the newer GS command patterns these cores use trigger a genuine Mali G52 GPU hardware fault (`DATA_INVALID_FAULT`) - confirmed via dmesg logs and actual game hangs. AetherSX2 (a PCSX2-family fork using older GS command patterns) avoids this fault and is used as the default. `pcsx2` is left installed and selectable in EmulationStation for anyone who wants to experiment with it.
diff --git a/README-odroidm1.ko.md b/README-odroidm1.ko.md
@@ -0,0 +1,97 @@
+# ODROID-M1 (bsp-odroidm1)
+
+*[English](README-odroidm1.en.md) | 한국어*
+
+## Vanilla Batocera 대비 추가된 기능
+
+- 하드커널 자체 BSP 커널(**Linux 6.1.141**)을 씀 — 메인라인 대신 사용
+  - VU8M, 모노 오디오, USB3.0 지원에 필요
+- VU8M(하드커널 8인치 DSI 터치스크린) 지원
+- 벤더 Mali G52 blob(g29p1 세대)을 씀 — GLES + Vulkan
+- Wayland(labwc) 컴포지터 지원 — PCSX2/Dolphin/AetherSX2 등 standalone Qt 기반 에뮬레이터 실사용 가능
+- 모노 스피커 볼륨/출력 라우팅 수정(기본 볼륨이 너무 작던 문제 해결)
+- FBNeo 한국어 패치 코어(`fbneo_korean`)를 기본값으로 씀 — 한국어 패치 롬의 CRC32 불일치 현상을 해결한 DsNo님의 패치를 넣은 것
+- AetherSX2(PS2)를 기본값으로 넣음 — mainline PCSX2 계열이 겪는 Mali GPU 폴트를 피하는 대안 코어
+- PS2/GameCube/Dreamcast/PSP 등 주요 시스템 Vulkan 렌더링 지원
+- 시스템별 자동(auto) 코어/API 선택을 실측 최고 성능 기준으로 다시 맞춤
+
+## 설정
+
+### 디스플레이 (HDMI / VU8M)
+
+- **HDMI**: 기본 활성화, 별도 설정 불필요(1080p까지 테스트 완료).
+- **VU8M**: 기본 비활성화. **BATOCERA** 파티션(SD카드를 컴퓨터에 꽂으면 보이는 드라이브)의 `config.ini`에서 켤 것:
+  ```
+  overlays="display_vu8m"
+  ```
+  끄려면 다시 `overlays=""`. DSI 패널은 핫플러그 감지가 안 되므로, 켜두면 실제로 패널이 꽂혀있지 않아도 항상 "연결됨"으로 잡힘 — 안 쓸 땐 꺼둘 것.
+
+### 백글래스 / 화면 회전
+
+아래 내용은 모두 위 `config.ini`에서 `overlays="display_vu8m"`로 VU8M을 켠 상태를 전제로 함.
+
+**주의**: 아래 설정이 저장되는 `system/batocera.conf`는 기기가 **최초 1회 부팅**해서 SHARE 파티션을 초기화해야 생김 — 갓 구운 SD카드를 PC에 바로 꽂으면 이 파일도, `system` 폴더 자체도 없음(최초 부팅 시 Batocera가 SHARE 파티션에 `roms`/`bios`/`saves`/`system` 등 전체 기본 디렉토리 구조를 만듦). 기기를 한 번 부팅시킨 뒤에 설정할 것.
+
+**백글래스로 쓰기**: VU8M을 메인 화면(HDMI) 게임 중 박스아트/게임 정보를 보여주는 보조 화면으로 쓰려면, ES 메뉴 **MAIN MENU → SYSTEM SETTINGS → HARDWARE → MULTISCREENS → BACKGLASS / INFORMATION SCREEN**에서 VIDEO OUTPUT을 VU8M(`DSI-1`)으로 지정. **이 지정을 해야만** ES가 그 출력을 실제로 구성(해상도/회전 적용)함 — 비워두면 HDMI 옆에 이어붙는 미사용 확장 화면으로만 잡히고 아무것도 제대로 안 나옴.
+
+**예외 — NDS 듀얼스크린**: NDS는 원래 화면이 위/아래 두 개라, HDMI+VU8M을 동시에 켜고 `melonDS` 코어를 쓰면 실제 물리 화면 두 개에 NDS의 위/아래 화면을 각각 나눠 출력할 수 있음. 다만 melonDS는 이 보드에서 성능이 안 좋아서(GPU가속 켜도 기본 권장 코어 drastic 대비 훨씬 느림) **사실상 실사용은 힘듦** — 듀얼스크린이 정말 꼭 필요한 경우가 아니면 기본값인 drastic(단일 화면)을 쓸 것.
+
+**회전 설정**: ES 메뉴에서 하는 게 정석 — 단, 라벨이 둘 다 "SCREEN ROTATION"이라 위치로 구분해야 함:
+- **MAIN MENU → SYSTEM SETTINGS → HARDWARE → SCREEN ROTATION**: 메인 화면(HDMI) 회전.
+- **MAIN MENU → SYSTEM SETTINGS → HARDWARE → MULTISCREENS → BACKGLASS / INFORMATION SCREEN → SCREEN ROTATION**: VU8M(백글래스) 회전. (여기서 고른 값이 위 VIDEO OUTPUT과 함께 저장됨)
+
+이 값들은 **SHARE 파티션**(SD카드를 컴퓨터에 꽂으면 보이는 두 번째 드라이브)의 `system/batocera.conf`에 저장됨. 이 파티션을 마운트해서 직접 편집하거나, SSH로:
+```
+batocera-settings-set global.videooutput2 DSI-1   # VU8M을 2번째 화면(백글래스)으로 지정
+batocera-settings-set display.rotate2.DSI-1 3      # 그 화면의 회전값
+```
+설정 후 **재부팅**해야 적용됨(EmulationStation이 시작 시점에만 출력/회전을 구성함):
+```
+reboot
+```
+메인 화면 회전은 커넥터별로 `display.rotate.<커넥터이름>=<N>`(예: `display.rotate.HDMI-A-1`), 없으면 전역 `display.rotate=<N>`. `<N>`은 `0`(정상), `1`(90도), `2`(180도), `3`(270도) — 메인 화면 회전은 부팅 스플래시에도 재부팅 시점에 자동 반영됨(vanilla 메커니즘, 별도 설정 불필요). `display.rotate2`(백글래스)는 여기 해당 안 됨 — 스플래시는 2번째 화면엔 아무것도 안 그림.
+
+## 시스템별 성능 측정 결과 및 권장 코어/API
+
+측정 기준 버전: **`batocera44-odroidm1-v1.0.0`**(이 문서는 릴리스마다 최신 상태로 유지 — 이후 버전에서 관련 코어/커널/blob이 바뀌면 재검증 필요), Power Mode = High Performance 고정, Avg FPS/1% Low 기준(프레임타임 기반, 업계 표준 지표). **auto로 실제 적용되는 코어/API는 굵게 표시.**
+
+| 시스템 | 게임 | 코어 | API | Avg FPS | 1% Low |
+| --- | --- | --- | --- | --- | --- |
+| Genesis/Mega Drive | Altered Beast | **genesisplusgx** | — | **60.0** | 50.3 |
+| | | genesisplusgx-expanded | — | 60.0 | 47.6 |
+| | | picodrive | — | 60.0 | 48.5 |
+| FBNeo | 야구격투 리그맨 | **fbneo_korean** | — | **60.0** | 41.0 |
+| Saturn | Strikers 1945 | **yabasanshiro** | GLES | **59.3** | 24.3 |
+| | | beetle-saturn | GLES | 22.5 | 16.8 |
+| | | beetle-saturn | Vulkan | 22.8 | 16.4 |
+| PSX | Soul Blade | **pcsx_rearmed** | GLES | **60.0** | 38.9 |
+| | | pcsx_rearmed | Vulkan | 60.0 | 42.0 |
+| | | swanstation | GLES | 58.5 | 32.1 |
+| | | swanstation | Vulkan | 59.3 | 34.5 |
+| | | mednafen_psx | GLES | 29.0 | 19.6 |
+| | | mednafen_psx | Vulkan | 31.3 | 20.7 |
+| N64 | 요시스토리 | standalone mupen64plus(**rice**) | GLES | **59.6** | 30.3 |
+| | | standalone mupen64plus(glide64mk2) | GLES | 54.9 | 13.0 |
+| | | standalone mupen64plus(gliden64) | GLES | 10.3 | 3.6 |
+| | | libretro mupen64plus-next | GLES | 59.5 | 24.5 |
+| | | libretro parallel_n64 | GLES | 56.2 | 17.9 |
+| Dreamcast | Soulcalibur | **standalone flycast** | **Vulkan** | **55.5** | 11.7 |
+| | | standalone flycast | GLES | 56.4 | 13.0 |
+| | | libretro flycast | GLES | 55.9 | 10.1 |
+| | | libretro flycast | Vulkan | 56.0 | 13.1 |
+| PS2 | 2002 FIFA World Cup(Korea) | **AetherSX2** | **Vulkan** | **23.8** | 4.2 |
+| GameCube | Pikmin | **standalone Dolphin** | **Vulkan** | **29.7** | 8.4 |
+| PSP | Tekken 6 | **standalone PPSSPP** | **Vulkan** | **58.9** | 27.0 |
+| | | standalone PPSSPP | GLES | 54.0 | 17.7 |
+| | | libretro ppsspp | GLES | 54.2 | 16.1 |
+| | | libretro ppsspp | Vulkan | 54.1 | 27.0 |
+| NDS | (매트릭스 측정 제외 — 3트랙 모두 99%+ 여유로 일찌감치 결론남) | **drastic** | — | — | — |
+
+**참고**:
+- Genesis/FBNeo는 소프트웨어 2D 렌더링이라 API(GLES/Vulkan) 구분 자체가 의미 없음.
+- N64/Dreamcast의 libretro Vulkan 코어(mupen64plus-next, parallel_n64)는 소리만 나오고 화면이 안 뜨는 알려진 문제가 있어 위 표에서 제외함(GLES만 비교 가능).
+- Wii는 GameCube와 같은 원리(standalone Dolphin + Vulkan)로 별도 성능 측정은 안 했지만 동일하게 권장.
+
+## 알려진 제약
+
+- **PS2 `pcsx2` 코어**(mainline PCSX2 계열): 이 코어들이 쓰는 신형 GS 커맨드 패턴이 Mali G52 GPU의 진짜 하드웨어 폴트(`DATA_INVALID_FAULT`)를 유발함 — dmesg 로그와 실제 게임 멈춤으로 확인됨. AetherSX2(구형 GS 커맨드 패턴을 쓰는 PCSX2 계열 포크)는 이 폴트를 회피해서 기본값으로 씀. `pcsx2`도 EmulationStation에 설치+선택 가능한 상태로 남겨뒀음(실험해보고 싶은 사람용).