Merge pull request #1199 from brooksytech/ogu

OGU work
2023-03-26 22:48:58 -07:00 · 2023-03-26 22:48:58 -07:00 · 3e7a5685b7
commit 3e7a5685b7
parent c76f3032c4 0232fad999
21 changed files with 6355 additions and 7 deletions
--- a/1
+++ b/1
@ -40,6 +40,7 @@ RK3566:
 	PROJECT=Rockchip DEVICE=RK3566 ARCH=aarch64 ./scripts/build_distro

 OGU:
+	PROJECT=Amlogic DEVICE=OGU ARCH=arm ./scripts/build_distro
 	PROJECT=Amlogic DEVICE=OGU ARCH=aarch64 ./scripts/build_distro

 update:
--- a/packages/emulators/libretro/parallel-n64-lr/package.mk
+++ b/packages/emulators/libretro/parallel-n64-lr/package.mk
@ -22,7 +22,7 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
 fi

 case ${DEVICE} in
-  RK35*)
+  RK35*|OGU)
    PKG_MAKE_OPTS_TARGET=" platform=${DEVICE}"
  ;;
 esac
--- a/packages/emulators/standalone/dolphin-sa/config/OGU/Dolphin.ini
+++ b/packages/emulators/standalone/dolphin-sa/config/OGU/Dolphin.ini
@ -0,0 +1,148 @@
+[General]
+LastFilename = 
+ShowLag = False
+ShowFrameCount = False
+ISOPaths = 1
+RecursiveISOPaths = False
+NANDRootPath = 
+WirelessMac = 
+[Interface]
+ConfirmStop = True
+UsePanicHandlers = True
+OnScreenDisplayMessages = True
+HideCursor = False
+AutoHideCursor = False
+MainWindowPosX = 403
+MainWindowPosY = 148
+MainWindowWidth = 800
+MainWindowHeight = 600
+Language = 0
+ShowToolbar = True
+ShowStatusbar = True
+ShowLogWindow = False
+ShowLogConfigWindow = False
+ExtendedFPSInfo = False
+ThemeName40 = Clean Blue
+PauseOnFocusLost = False
+[Display]
+FullscreenResolution = Auto
+Fullscreen = True
+RenderToMain = False
+RenderWindowXPos = -1
+RenderWindowYPos = -1
+RenderWindowWidth = 640
+RenderWindowHeight = 480
+RenderWindowAutoSize = False
+KeepWindowOnTop = False
+ProgressiveScan = False
+PAL60 = True
+DisableScreenSaver = True
+ForceNTSCJ = False
+[GameList]
+ListDrives = False
+ListWad = True
+ListElfDol = True
+ListWii = True
+ListGC = True
+ListJap = True
+ListPal = True
+ListUsa = True
+ListAustralia = True
+ListFrance = True
+ListGermany = True
+ListItaly = True
+ListKorea = True
+ListNetherlands = True
+ListRussia = True
+ListSpain = True
+ListTaiwan = True
+ListWorld = True
+ListUnknown = True
+ListSort = 3
+ListSortSecondary = 0
+ColorCompressed = True
+ColumnPlatform = True
+ColumnBanner = True
+ColumnNotes = True
+ColumnFileName = False
+ColumnID = False
+ColumnRegion = True
+ColumnSize = True
+ColumnState = True
+[Core]
+HLE_BS2 = False
+TimingVariance = 40
+CPUCore = 4
+Fastmem = True
+CPUThread = True
+DSPHLE = True
+SkipIdle = True
+SyncOnSkipIdle = True
+SyncGPU = False
+SyncGpuMaxDistance = 200000
+SyncGpuMinDistance = -200000
+SyncGpuOverclock = 1.00000000
+FPRF = False
+AccurateNaNs = False
+DefaultISO = 
+DVDRoot = 
+Apploader = 
+EnableCheats = True
+SelectedLanguage = 0
+OverrideGCLang = False
+DPL2Decoder = False
+Latency = 2
+MemcardAPath = 
+MemcardBPath = 
+AgpCartAPath = 
+AgpCartBPath = 
+SlotA = 1
+SlotB = 255
+SerialPort1 = 255
+BBA_MAC = 
+SIDevice0 = 6
+AdapterRumble0 = True
+SimulateKonga0 = False
+SIDevice1 = 6
+AdapterRumble1 = True
+SimulateKonga1 = False
+SIDevice2 = 0
+AdapterRumble2 = True
+SimulateKonga2 = False
+SIDevice3 = 0
+AdapterRumble3 = True
+SimulateKonga3 = False
+WiiSDCard = False
+WiiKeyboard = False
+WiimoteContinuousScanning = False
+WiimoteEnableSpeaker = False
+RunCompareServer = False
+RunCompareClient = False
+EmulationSpeed = 1.00000000
+FrameSkip = 0x00000003
+Overclock = 4.00000000
+OverclockEnable = False
+GFXBackend = Vulkan 
+GPUDeterminismMode = auto
+PerfMapDir = 
+[Movie]
+PauseMovie = False
+Author = 
+DumpFrames = False
+DumpFramesSilent = False
+ShowInputDisplay = False
+[DSP]
+EnableJIT = True
+DumpAudio = False
+DumpUCode = False
+Backend = ALSA
+Volume = 100
+CaptureLog = False
+[Input]
+BackgroundInput = False
+[FifoPlayer]
+LoopReplay = True
+[Analytics]
+ID = 5082f0c30a7e422b1220107f69d6c108
+Enabled = False
+PermissionAsked = True
--- a/packages/emulators/standalone/dolphin-sa/config/OGU/GCPadNew.ini
+++ b/packages/emulators/standalone/dolphin-sa/config/OGU/GCPadNew.ini
@ -0,0 +1,29 @@
+[GCPad1]
+Device = evdev/0/Microsoft X-Box 360 pad
+Buttons/A = Button 1
+Buttons/B = Button 0
+Buttons/Start = Button 6
+Buttons/X = Button 3
+Buttons/Y = Button 2
+Buttons/Z = Button 5
+Buttons/Hotkey = Button 7
+C-Stick/Dead Zone = 25.000000000000000
+C-Stick/Down = Axis 4+
+C-Stick/Left = Axis 3-
+C-Stick/Modifier = Control_L
+C-Stick/Modifier/Range = 50.000000000000000
+C-Stick/Right = Axis 3+
+C-Stick/Up = Axis 4-
+D-Pad/Down = Axis 7+
+D-Pad/Left = Axis 6-
+D-Pad/Right = Axis 6+
+D-Pad/Up = Axis 7-
+Main Stick/Dead Zone = 25.000000000000000
+Main Stick/Down = Axis 1+
+Main Stick/Left = Axis 0-
+Main Stick/Modifier = Shift_L
+Main Stick/Modifier/Range = 50.000000000000000
+Main Stick/Right = Axis 0+
+Main Stick/Up = Axis 1-
+Triggers/L = Axis 2+
+Triggers/R = Axis 5+
--- a/packages/emulators/standalone/dolphin-sa/config/OGU/GFX.ini
+++ b/packages/emulators/standalone/dolphin-sa/config/OGU/GFX.ini
@ -0,0 +1,55 @@
+[Hardware]
+VSync = False
+Adapter = 0
+[Settings]
+AspectRatio = 0
+Crop = False
+wideScreenHack = False
+UseXFB = False
+UseRealXFB = False
+SafeTextureCacheColorSamples = 128
+ShowFPS = False
+LogRenderTimeToFile = False
+OverlayStats = False
+OverlayProjStats = False
+DumpTextures = False
+HiresTextures = False
+ConvertHiresTextures = False
+CacheHiresTextures = False
+DumpEFBTarget = False
+FreeLook = False
+UseFFV1 = False
+EnablePixelLighting = False
+FastDepthCalc = True
+MSAA = 1
+SSAA = False
+EFBScale = 2
+TexFmtOverlayEnable = False
+TexFmtOverlayCenter = False
+Wireframe = False
+DisableFog = False
+EnableShaderDebugging = False
+BorderlessFullscreen = False
+SWZComploc = True
+SWZFreeze = True
+SWDumpObjects = False
+SWDumpTevStages = False
+SWDumpTevTexFetches = False
+SWDrawStart = 0
+SWDrawEnd = 100000
+[Enhancements]
+ForceFiltering = False
+MaxAnisotropy = 0
+PostProcessingShader = 
+[Stereoscopy]
+StereoMode = 0
+StereoDepth = 20
+StereoConvergencePercentage = 100
+StereoSwapEyes = False
+[Hacks]
+EFBAccessEnable = False
+BBoxEnable = False
+ForceProgressive = True
+EFBToTextureEnable = True
+EFBScaledCopy = False
+EFBEmulateFormatChanges = False
--- a/packages/emulators/standalone/dolphin-sa/config/OGU/WiiControllerProfiles/classic.ini
+++ b/packages/emulators/standalone/dolphin-sa/config/OGU/WiiControllerProfiles/classic.ini
@ -0,0 +1,27 @@
+[Wiimote1]
+Device = evdev/0/Microsoft X-Box 360 pad
+Extension = Classic
+Source = 1
+Classic/Buttons/A = Button 1
+Classic/Buttons/B = Button 0
+Classic/Buttons/X = Button 3
+Classic/Buttons/Y = Button 2
+Classic/Buttons/ZL = Axis 2+
+Classic/Buttons/ZR = Axis 5+
+Classic/Buttons/- = Button 6
+Classic/Buttons/+ = Button 7
+Classic/Buttons/Home = Button 8
+Classic/Left Stick/Up = Axis 1-
+Classic/Left Stick/Down = Axis 1+
+Classic/Left Stick/Left = Axis 0-
+Classic/Left Stick/Right = Axis 0+
+Classic/Right Stick/Up = Axis 4-
+Classic/Right Stick/Down = Axis 4+
+Classic/Right Stick/Left = Axis 3-
+Classic/Right Stick/Right = Axis 3+
+Classic/Triggers/L = Button 4
+Classic/Triggers/R = Button 5
+Classic/D-Pad/Up = Axis 7-
+Classic/D-Pad/Down = Axis 7+
+Classic/D-Pad/Left = Axis 6-
+Classic/D-Pad/Right = Axis 6+
--- a/packages/emulators/standalone/dolphin-sa/config/OGU/WiiControllerProfiles/nunchuck.ini
+++ b/packages/emulators/standalone/dolphin-sa/config/OGU/WiiControllerProfiles/nunchuck.ini
@ -0,0 +1,26 @@
+[Wiimote1]
+Device = evdev/0/Microsoft X-Box 360 pad
+Extension = Nunchuk
+Buttons/A = Button 0
+Buttons/B = Button 1
+Buttons/1 = Button 2
+Buttons/2 = Button 3
+Buttons/- = Button 6
+Buttons/+ = Button 7
+D-Pad/Up = Axis 7-
+D-Pad/Down = Axis 7+
+D-Pad/Left = Axis 6-
+D-Pad/Right = Axis 6+
+Buttons/Home = Button 8
+Shake/X = Button 4
+Shake/Y = Button 4
+Shake/Z = Button 4
+Nunchuk/Buttons/C = Button 5 
+Nunchuk/Buttons/Z = Axis 5+
+Nunchuk/Stick/Up = Axis 1-
+Nunchuk/Stick/Down = Axis 1+
+Nunchuk/Stick/Left = Axis 0-
+Nunchuk/Stick/Right = Axis 0+
+Nunchuk/Shake/X = Axis 2+
+Nunchuk/Shake/Y = Axis 2+
+Nunchuk/Shake/Z = Axis 2+
--- a/packages/emulators/standalone/dolphin-sa/config/OGU/WiiControllerProfiles/remote.ini
+++ b/packages/emulators/standalone/dolphin-sa/config/OGU/WiiControllerProfiles/remote.ini
@ -0,0 +1,16 @@
+[Wiimote1]
+Device = evdev/0/Microsoft X-Box 360 pad
+Buttons/A = Button 0
+Buttons/B = Button 1
+Buttons/1 = Button 2
+Buttons/2 = Button 3
+Buttons/- = Button 6
+Buttons/+ = Button 7
+Buttons/Home = Button 8
+Shake/X = Button 4
+Shake/Y = Button 4
+Shake/Z = Button 4
+D-Pad/Up = Axis 7-
+D-Pad/Down = Axis 7+
+D-Pad/Left = Axis 6-
+D-Pad/Right = Axis 6+
--- a/packages/emulators/standalone/dolphin-sa/config/OGU/WiimoteNew.ini
+++ b/packages/emulators/standalone/dolphin-sa/config/OGU/WiimoteNew.ini
@ -0,0 +1,27 @@
+[Wiimote1]
+Device = evdev/0/Microsoft X-Box 360 pad
+Extension = Classic
+Source = 1
+Classic/Buttons/A = Button 1
+Classic/Buttons/B = Button 0
+Classic/Buttons/X = Button 3
+Classic/Buttons/Y = Button 2
+Classic/Buttons/ZL = Axis 2+
+Classic/Buttons/ZR = Axis 5+
+Classic/Buttons/- = Button 6
+Classic/Buttons/+ = Button 7
+Classic/Buttons/Home = Button 8
+Classic/Left Stick/Up = Axis 1-
+Classic/Left Stick/Down = Axis 1+
+Classic/Left Stick/Left = Axis 0-
+Classic/Left Stick/Right = Axis 0+
+Classic/Right Stick/Up = Axis 4-
+Classic/Right Stick/Down = Axis 4+
+Classic/Right Stick/Left = Axis 3-
+Classic/Right Stick/Right = Axis 3+
+Classic/Triggers/L = Button 4
+Classic/Triggers/R = Button 5
+Classic/D-Pad/Up = Axis 7-
+Classic/D-Pad/Down = Axis 7+
+Classic/D-Pad/Left = Axis 6-
+Classic/D-Pad/Right = Axis 6+
--- a/packages/emulators/standalone/duckstation-sa/config/OGU/settings.ini
+++ b/packages/emulators/standalone/duckstation-sa/config/OGU/settings.ini
@ -0,0 +1,328 @@
+[Main]
+SettingsVersion = 3
+EmulationSpeed = 1.000000
+FastForwardSpeed = 0.000000
+TurboSpeed = 0.000000
+SyncToHostRefreshRate = false
+IncreaseTimerResolution = true
+InhibitScreensaver = true
+StartPaused = false
+StartFullscreen = true
+PauseOnFocusLoss = false
+PauseOnMenu = true
+SaveStateOnExit = true
+CreateSaveStateBackups = true
+CompressSaveStates = true
+ConfirmPowerOff = true
+LoadDevicesFromSaveStates = false
+ApplyCompatibilitySettings = true
+ApplyGameSettings = true
+AutoLoadCheats = true
+DisableAllEnhancements = false
+RewindEnable = false
+RewindFrequency = 10.000000
+RewindSaveSlots = 10
+RunaheadFrameCount = 0
+
+
+[Console]
+Region = Auto
+Enable8MBRAM = false
+
+
+[CPU]
+ExecutionMode = Recompiler
+OverclockEnable = false
+OverclockNumerator = 1
+OverclockDenominator = 1
+RecompilerMemoryExceptions = false
+RecompilerBlockLinking = true
+RecompilerICache = false
+FastmemMode = MMap
+
+
+[GPU]
+Renderer = Software
+Adapter = 
+ResolutionScale = 1
+Multisamples = 1
+UseDebugDevice = false
+PerSampleShading = false
+UseThread = true
+ThreadedPresentation = true
+UseSoftwareRendererForReadbacks = false
+TrueColor = true
+ScaledDithering = true
+TextureFilter = Nearest
+DownsampleMode = Disabled
+DisableInterlacing = true
+ForceNTSCTimings = false
+WidescreenHack = false
+ChromaSmoothing24Bit = false
+PGXPEnable = false
+PGXPCulling = true
+PGXPTextureCorrection = true
+PGXPVertexCache = false
+PGXPCPU = false
+PGXPPreserveProjFP = false
+PGXPTolerance = -1.000000
+PGXPDepthBuffer = false
+PGXPDepthClearThreshold = 1228800.000000
+FullscreenMode = 
+
+
+[Display]
+CropMode = Overscan
+ActiveStartOffset = 0
+ActiveEndOffset = 0
+LineStartOffset = 0
+LineEndOffset = 0
+Force4_3For24Bit = false
+AspectRatio = Auto (Game Native)
+CustomAspectRatioNumerator = 0
+LinearFiltering = true
+IntegerScaling = false
+Stretch = false
+PostProcessing = false
+ShowOSDMessages = true
+ShowFPS = false
+ShowSpeed = false
+ShowResolution = false
+ShowCPU = false
+ShowGPU = false
+ShowStatusIndicators = true
+ShowInputs = false
+ShowEnhancements = false
+DisplayAllFrames = false
+InternalResolutionScreenshots = false
+VSync = false
+MaxFPS = 0.000000
+OSDScale = 100.000000
+
+
+[CDROM]
+ReadaheadSectors = 8
+RegionCheck = false
+LoadImageToRAM = false
+LoadImagePatches = false
+MuteCDAudio = false
+ReadSpeedup = 1
+SeekSpeedup = 1
+
+
+[Audio]
+Backend = Cubeb
+Driver = 
+StretchMode = TimeStretch
+BufferMS = 50
+OutputLatencyMS = 20
+OutputVolume = 100
+FastForwardVolume = 100
+OutputMuted = false
+DumpOnBoot = false
+
+
+[Hacks]
+DMAMaxSliceTicks = 1000
+DMAHaltTicks = 100
+GPUFIFOSize = 16
+GPUMaxRunAhead = 128
+
+
+[BIOS]
+SearchDirectory = /storage/roms/bios
+PathNTSCU = 
+PathNTSCJ = 
+PathPAL = 
+PatchTTYEnable = false
+PatchFastBoot = true
+
+
+[Controller1]
+Type = AnalogController
+
+
+[Controller2]
+Type = None
+
+
+[Controller3]
+Type = None
+
+
+[Controller4]
+Type = None
+
+
+[Controller5]
+Type = None
+
+
+[Controller6]
+Type = None
+
+
+[Controller7]
+Type = None
+
+
+[Controller8]
+Type = None
+
+
+[MemoryCards]
+Card1Type = PerGameTitle
+Card2Type = None
+UsePlaylistTitle = true
+Directory = memcards
+
+
+[ControllerPorts]
+MultitapMode = Disabled
+PointerXScale = 8.000000
+PointerYScale = 8.000000
+PointerXInvert = false
+PointerYInvert = false
+
+
+[Cheevos]
+Enabled = false
+TestMode = false
+UnofficialTestMode = false
+UseFirstDiscFromPlaylist = true
+RichPresence = false
+ChallengeMode = false
+
+
+[Logging]
+LogLevel = Debug
+LogFilter = 
+LogToConsole = true
+LogToDebug = true
+LogToWindow = false
+LogToFile = true
+
+
+[Debug]
+ShowVRAM = false
+DumpCPUToVRAMCopies = false
+DumpVRAMToCPUCopies = false
+ShowGPUState = false
+ShowCDROMState = false
+ShowSPUState = false
+ShowTimersState = false
+ShowMDECState = false
+ShowDMAState = false
+
+
+[TextureReplacements]
+EnableVRAMWriteReplacements = false
+PreloadTextures = false
+DumpVRAMWrites = false
+DumpVRAMWriteForceAlphaChannel = true
+DumpVRAMWriteWidthThreshold = 128
+DumpVRAMWriteHeightThreshold = 128
+
+
+[Folders]
+Cache = cache
+Cheats = cheats
+Covers = covers
+Dumps = dump
+GameSettings = gamesettings
+InputProfiles = inputprofiles
+SaveStates = savestates
+Screenshots = screenshots
+Shaders = shaders
+Textures = textures
+
+
+[InputSources]
+SDL = true
+SDLControllerEnhancedMode = false
+Evdev = false
+XInput = false
+RawInput = false
+
+
+[Pad1]
+Type = AnalogController
+Up = SDL-0/DPadUp
+Right = SDL-0/DPadRight
+Down = SDL-0/DPadDown
+Left = SDL-0/DPadLeft
+Triangle = SDL-0/X
+Circle = SDL-0/A
+Cross = SDL-0/B
+Square = SDL-0/Y
+Select = SDL-0/Back
+Start = SDL-0/Start
+L1 = SDL-0/LeftShoulder
+R1 = SDL-0/RightShoulder
+L2 = SDL-0/+LeftTrigger
+R2 = SDL-0/+RightTrigger
+L3 = SDL-0/LeftStick & SDL-0/-LeftX
+R3 = SDL-0/RightStick
+LLeft = SDL-0/-LeftX
+LRight = SDL-0/+LeftX
+LDown = SDL-0/+LeftY
+LUp = SDL-0/-LeftY
+RLeft = SDL-0/-RightX
+RRight = SDL-0/+RightX
+RDown = SDL-0/+RightY
+RUp = SDL-0/-RightY
+
+
+[Pad2]
+Type = None
+
+
+[Pad3]
+Type = None
+
+
+[Pad4]
+Type = None
+
+
+[Pad5]
+Type = None
+
+
+[Pad6]
+Type = None
+
+
+[Pad7]
+Type = None
+
+
+[Pad8]
+Type = None
+
+
+[Hotkeys]
+Screenshot = SDL-0/Back & SDL-0/A
+ToggleWidescreen = SDL-0/Back & SDL-0/Y
+OpenPauseMenu = SDL-0/Back & SDL-0/X
+LoadSelectedSaveState = SDL-0/Back & SDL-0/LeftShoulder
+SaveSelectedSaveState = SDL-0/Back & SDL-0/RightShoulder
+SelectPreviousSaveStateSlot = SDL-0/Back & SDL-0/+RightY
+SelectNextSaveStateSlot = SDL-0/Back & SDL-0/-RightY
+ToggleFastForward = SDL-0/Back & SDL-0/+RightTrigger
+PowerOff = SDL-0/Back & SDL-0/Start
+Reset = SDL-0/Back & SDL-0/B
+ChangeDisc = SDL-0/Back & SDL-0/-RightX
+SwapMemoryCards = SDL-0/Back & SDL-0/+RightX
+Rewind = SDL-0/Back & SDL-0/+LeftTrigger
+
+
+[NoGUI]
+WindowX = 0
+WindowY = 0
+WindowWidth = 1920
+WindowHeight = 1152
+
+
+[GameList]
+RecursivePaths = /storage/roms/psx
--- a/packages/emulators/standalone/retroarch/package.mk
+++ b/packages/emulators/standalone/retroarch/package.mk
@ -88,9 +88,9 @@ makeinstall_target() {

  case ${ARCH} in
    aarch64)
-     cp -vP ${ROOT}/build.${DISTRO}-${DEVICE}.arm/retroarch-*/.install_pkg/usr/bin/retroarch ${INSTALL}/usr/bin/retroarch32
-     mkdir -p ${INSTALL}/usr/share/retroarch/filters/32bit/
-     cp -rvP ${ROOT}/build.${DISTRO}-${DEVICE}.arm/retroarch-*/.install_pkg/usr/share/retroarch/filters/64bit/* ${INSTALL}/usr/share/retroarch/filters/32bit/
+  #   cp -vP ${ROOT}/build.${DISTRO}-${DEVICE}.arm/retroarch-*/.install_pkg/usr/bin/retroarch ${INSTALL}/usr/bin/retroarch32
+#     mkdir -p ${INSTALL}/usr/share/retroarch/filters/32bit/
+ #    cp -rvP ${ROOT}/build.${DISTRO}-${DEVICE}.arm/retroarch-*/.install_pkg/usr/share/retroarch/filters/64bit/* ${INSTALL}/usr/share/retroarch/filters/32bit/
    ;;
  esac

--- a/packages/emulators/standalone/retroarch/sources/OGU/TATE-MAME
+++ b/packages/emulators/standalone/retroarch/sources/OGU/TATE-MAME
@ -0,0 +1,27 @@
+input_libretro_device_p1 = "1"
+input_libretro_device_p2 = "1"
+input_libretro_device_p3 = "1"
+input_libretro_device_p4 = "1"
+input_libretro_device_p5 = "1"
+input_player1_analog_dpad_mode = "1"
+input_player1_btn_down = "6"
+input_player1_btn_left = "4"
+input_player1_btn_right = "5"
+input_player1_btn_up = "7"
+input_player1_stk_l_x+ = "5"
+input_player1_stk_l_x- = "4"
+input_player1_stk_l_y+ = "6"
+input_player1_stk_l_y- = "7"
+input_player1_stk_r_x+ = "5"
+input_player1_stk_r_x- = "4"
+input_player1_stk_r_y+ = "6"
+input_player1_stk_r_y- = "7"
+input_player2_analog_dpad_mode = "0"
+input_player3_analog_dpad_mode = "0"
+input_player4_analog_dpad_mode = "0"
+input_player5_analog_dpad_mode = "0"
+input_remap_port_p1 = "0"
+input_remap_port_p2 = "1"
+input_remap_port_p3 = "2"
+input_remap_port_p4 = "3"
+input_remap_port_p5 = "4"
--- a/packages/emulators/standalone/retroarch/sources/OGU/retroarch-core-options.cfg
+++ b/packages/emulators/standalone/retroarch/sources/OGU/retroarch-core-options.cfg
@ -0,0 +1,154 @@
+mupen64plus-alt-map = "False"
+mupen64plus-aspect = "4:3"
+mupen64plus-astick-deadzone = "15"
+mupen64plus-astick-sensitivity = "100"
+mupen64plus-BackgroundMode = "Stripped"
+mupen64plus-BilinearMode = "standard"
+mupen64plus-CorrectTexrectCoords = "Auto"
+mupen64plus-CountPerOp = "0"
+mupen64plus-CountPerOpDenomPot = "0"
+mupen64plus-cpucore = "dynamic_recompiler"
+mupen64plus-d-cbutton = "C3"
+mupen64plus-DitheringPattern = "True"
+mupen64plus-DitheringQuantization = "True"
+mupen64plus-EnableCopyAuxToRDRAM = "True"
+mupen64plus-EnableCopyColorToRDRAM = "Async"
+mupen64plus-EnableCopyDepthToRDRAM = "Software"
+mupen64plus-EnableEnhancedHighResStorage = "False"
+mupen64plus-EnableEnhancedTextureStorage = "False"
+mupen64plus-EnableFBEmulation = "True"
+mupen64plus-EnableFragmentDepthWrite = "True"
+mupen64plus-EnableHiResAltCRC = "False"
+mupen64plus-EnableHWLighting = "False"
+mupen64plus-EnableInaccurateTextureCoordinates = "False"
+mupen64plus-EnableLegacyBlending = "False"
+mupen64plus-EnableLODEmulation = "True"
+mupen64plus-EnableNativeResFactor = "1"
+mupen64plus-EnableNativeResTexrects = "Optimized"
+mupen64plus-EnableOverscan = "Enabled"
+mupen64plus-EnableTexCoordBounds = "False"
+mupen64plus-EnableTextureCache = "True"
+mupen64plus-ForceDisableExtraMem = "False"
+mupen64plus-FrameDuping = "True"
+mupen64plus-Framerate = "Original"
+mupen64plus-FXAA = "0"
+mupen64plus-GLideN64IniBehaviour = "late"
+mupen64plus-HybridFilter = "True"
+mupen64plus-IgnoreTLBExceptions = "False"
+mupen64plus-l-cbutton = "C2"
+mupen64plus-MaxHiResTxVramLimit = "0"
+mupen64plus-MaxTxCacheSize = "8000"
+mupen64plus-MultiSampling = "0"
+mupen64plus-OverscanBottom = "0"
+mupen64plus-OverscanLeft = "0"
+mupen64plus-OverscanRight = "0"
+mupen64plus-OverscanTop = "0"
+mupen64plus-pak1 = "memory"
+mupen64plus-pak2 = "none"
+mupen64plus-pak3 = "none"
+mupen64plus-pak4 = "none"
+mupen64plus-r-cbutton = "C1"
+mupen64plus-rdp-plugin = "gliden64"
+mupen64plus-RDRAMImageDitheringMode = "BlueNoise"
+mupen64plus-rsp-plugin = "hle"
+mupen64plus-ThreadedRenderer = "True"
+mupen64plus-txCacheCompression = "True"
+mupen64plus-txEnhancementMode = "None"
+mupen64plus-txFilterIgnoreBG = "True"
+mupen64plus-txFilterMode = "None"
+mupen64plus-txHiresEnable = "False"
+mupen64plus-txHiresFullAlphaChannel = "False"
+mupen64plus-u-cbutton = "C4"
+mupen64plus-virefresh = "Auto"
+pcsx_rearmed_analog_axis_modifier = "circle"
+pcsx_rearmed_async_cd = "sync"
+pcsx_rearmed_bios = "auto"
+pcsx_rearmed_display_internal_fps = "disabled"
+pcsx_rearmed_dithering = "enabled"
+pcsx_rearmed_drc = "enabled"
+pcsx_rearmed_duping_enable = "enabled"
+pcsx_rearmed_frameskip_type = "disabled"
+pcsx_rearmed_gteregsunneeded = "disabled"
+pcsx_rearmed_gunconadjustratiox = "1"
+pcsx_rearmed_gunconadjustratioy = "1"
+pcsx_rearmed_gunconadjustx = "0"
+pcsx_rearmed_gunconadjusty = "0"
+pcsx_rearmed_idiablofix = "disabled"
+pcsx_rearmed_input_sensitivity = "1.00"
+pcsx_rearmed_inuyasha_fix = "disabled"
+pcsx_rearmed_memcard2 = "disabled"
+pcsx_rearmed_multitap1 = "auto"
+pcsx_rearmed_multitap2 = "auto"
+pcsx_rearmed_negcon_deadzone = "0"
+pcsx_rearmed_negcon_response = "linear"
+pcsx_rearmed_neon_enhancement_enable = "disabled"
+pcsx_rearmed_neon_enhancement_no_main = "disabled"
+pcsx_rearmed_neon_interlace_enable = "disabled"
+pcsx_rearmed_nocdaudio = "enabled"
+pcsx_rearmed_nogteflags = "disabled"
+pcsx_rearmed_nosmccheck = "disabled"
+pcsx_rearmed_noxadecoding = "enabled"
+pcsx_rearmed_pad1type = "standard"
+pcsx_rearmed_pad2type = "standard"
+pcsx_rearmed_pad3type = "none"
+pcsx_rearmed_pad4type = "none"
+pcsx_rearmed_pad5type = "none"
+pcsx_rearmed_pad6type = "none"
+pcsx_rearmed_pad7type = "none"
+pcsx_rearmed_pad8type = "none"
+pcsx_rearmed_pe2_fix = "disabled"
+pcsx_rearmed_psxclock = "57"
+pcsx_rearmed_region = "auto"
+pcsx_rearmed_show_bios_bootlogo = "disabled"
+pcsx_rearmed_show_other_input_settings = "disabled"
+pcsx_rearmed_spu_interpolation = "simple"
+pcsx_rearmed_spu_reverb = "enabled"
+pcsx_rearmed_spuirq = "disabled"
+pcsx_rearmed_vibration = "enabled"
+gambatte_gb_colorization = "disabled"
+gambatte_gb_internal_palette = ""
+mame2003-plus_analog = "digital"
+mame2003-plus_art_resolution = "1"
+mame2003-plus_brightness = "1.0"
+mame2003-plus_cheat_input_ports = "disabled"
+mame2003-plus_core_save_subfolder = "enabled"
+mame2003-plus_core_sys_subfolder = "enabled"
+mame2003-plus_dcs_speedhack = "enabled"
+mame2003-plus_deadzone = "20"
+mame2003-plus_digital_joy_centering = "enabled"
+mame2003-plus_display_artwork = "enabled"
+mame2003-plus_display_setup = "disabled"
+mame2003-plus_four_way_emulation = "disabled"
+mame2003-plus_frameskip = "0"
+mame2003-plus_gamma = "1.0"
+mame2003-plus_input_interface = "retropad"
+mame2003-plus_machine_timing = "enabled"
+mame2003-plus_mame_remapping = "enabled"
+mame2003-plus_mouse_device = "mouse"
+mame2003-plus_sample_rate = "48000"
+mame2003-plus_skip_disclaimer = "disabled"
+mame2003-plus_skip_warnings = "disabled"
+flycast_internal_resolution = "640x480"
+flycast_alpha_sorting = "per-strip (fast, least accurate)"
+flycast_enable_dsp = "disabled"
+flycast_threaded_rendering = "enabled"
+flycast_anisotropic_filtering = "off"
+flycast_synchronous_rendering = "enabled"
+flycast_enable_rtt = "disabled"
+flycast_enable_rttb = "disabled"
+flycast_delay_frame_swapping = "disabled"
+flycast_div_matching = "auto"
+flycast_texupscale = "off"
+flycast_auto_skip_frame = "normal"
+opera_swi_hle = "enabled"
+opera_dsp_threaded = "enabled"
+opera_madam_matrix_engine = "software"
+puae_deadzone = "25"
+melonds_screen_layout = "Left/Right"
+melonds_swapscreen_mode = "Toggle"
+melonds_threaded_renderer = "enabled"
+melonds_touch_mode = "Joystick"
+duckstation_GPU.Renderer = "Software"
+virtualjaguar_bios = "enabled"
+virtualjaguar_usefastblitter = "enabled"
+desmume_screens_layout = "left/right"
--- a/packages/emulators/standalone/retroarch/sources/OGU/retroarch.cfg
+++ b/packages/emulators/standalone/retroarch/sources/OGU/retroarch.cfg
--- a/packages/emulators/standalone/retroarch/sources/OGU/retroarch32bit-append.cfg
+++ b/packages/emulators/standalone/retroarch/sources/OGU/retroarch32bit-append.cfg
@ -0,0 +1,2 @@
+audio_filter_dir = "/usr/share/retroarch/filters/32bit/audio"
+video_filter_dir = "/usr/share/retroarch/filters/32bit/video"
--- a/packages/emulators/standalone/retroarch/sources/OGU/retroarch64bit-append.cfg
+++ b/packages/emulators/standalone/retroarch/sources/OGU/retroarch64bit-append.cfg
@ -0,0 +1,2 @@
+audio_filter_dir = "/usr/share/retroarch/filters/64bit/audio"
+video_filter_dir = "/usr/share/retroarch/filters/64bit/video"
--- a/packages/multimedia/gstreamer/gst-plugins-base/package.mk
+++ b/packages/multimedia/gstreamer/gst-plugins-base/package.mk
@ -21,7 +21,7 @@ pre_configure_target() {

  # Fix missing dispmanx
  case ${DEVICE} in
-    RK35*)
+    RK35*|OGU)
      PKG_MESON_OPTS_TARGET+=" -Dgl-graphene=disabled"
    ;;
  esac
--- a/packages/ui/emulationstation/config/device/OGU/es_systems.cfg
+++ b/packages/ui/emulationstation/config/device/OGU/es_systems.cfg
--- a/packages/virtual/emulators/package.mk
+++ b/packages/virtual/emulators/package.mk
@ -43,6 +43,9 @@ case "${DEVICE}" in
    PKG_DEPENDS_TARGET+=" common-shaders glsl-shaders pcsx_rearmed-lr box86 box64"
    PKG_EMUS+=" yabasanshiro-sa"
  ;;
+  OGU)
+    PKG_EMUS+=" aethersx2-sa dolphin-sa duckstation-sa"
+    LIBRETRO_CORES+=" beetle-psx-lr dolphin-lr"
 esac

 PKG_DEPENDS_TARGET+=" ${PKG_EMUS} ${PKG_RETROARCH} ${LIBRETRO_CORES}"
--- a/projects/Amlogic/devices/OGU/device.config
+++ b/projects/Amlogic/devices/OGU/device.config
@ -0,0 +1,13 @@
+# Device definition file for the Hardkernel Odroid Go Uptra Device
+
+# Device Features
+DEVICE_VOLUMECTL=true
+DEVICE_AUDIO_MIXER="PCM"
+DEVICE_PLAYBACK_PATH_SPK="SPK"
+DEVICE_PLAYBACK_PATH_HP="HP"
+UI_SERVICE="weston.service"
+DEVICE_BRIGHTNESS="128"
+SPLASH_LOADER="plymouth"
+
+# GPIOS
+DEVICE_TEMP_SENSOR="/sys/devices/virtual/thermal/thermal_zone*/temp"
--- a/projects/Amlogic/packages/linux/package.mk
+++ b/projects/Amlogic/packages/linux/package.mk
@ -20,9 +20,9 @@ PKG_PATCH_DIRS+="${DEVICE}"
 case ${DEVICE} in
  OGU)
    PKG_VERSION="5cdd0713d8735e16c85d45bce8e77747f8ba5deb"
-    PKG_URL="https://github.com/brooksytech/ogu-linux.git"
+    PKG_URL="https://github.com/mdrjr/linux.git"
    GET_HANDLER_SUPPORT="git"
-    PKG_GIT_CLONE_BRANCH="jello"
+    PKG_GIT_CLONE_BRANCH="odroidg12-6.1.y"
  ;;
 esac