diff --git a/BUILDING.md b/BUILDING.md index 24566cf91..74d3f9d7b 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -108,7 +108,9 @@ Building JELOS is easy, the fastest and most recommended method is to instruct t | ---- | ---- | ---- | |AMD64||```make docker-AMD64```| |RK3588||```make docker-RK3588```| +|RK3326||```make docker-RK3326```| |RK3566||```make docker-RK3566```| +|RK3566-X55||```make docker-RK3566-X55```| |S922X||```make docker-S922X```| |ALL DEVICES||```make docker-world```| diff --git a/Makefile b/Makefile index 4506d23f9..ba5993630 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ distclean: src-pkg: tar cvJf sources.tar.xz sources .stamps -world: AMD64 RK3588 RK3566 RK3566-X55 S922X +world: AMD64 RK3588 RK3326 RK3566 RK3566-X55 S922X AMD64: PROJECT=PC DEVICE=AMD64 ARCH=i686 ./scripts/build_distro diff --git a/packages/virtual/emulators/package.mk b/packages/virtual/emulators/package.mk index ea36517c7..71482efe4 100644 --- a/packages/virtual/emulators/package.mk +++ b/packages/virtual/emulators/package.mk @@ -57,8 +57,8 @@ case "${DEVICE}" in ;; RK3326*) [ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="flycast-lr pcsx_rearmed-lr" - PKG_DEPENDS_TARGET+=" common-shaders glsl-shaders mupen64plus-sa" - PKG_EMUS+=" drastic-sa yabasanshiro-sa" + PKG_DEPENDS_TARGET+=" common-shaders glsl-shaders mupen64plus-sa portmaster" + PKG_EMUS+=" drastic-sa mupen64plus-sa yabasanshiro-sa" LIBRETRO_CORES+=" flycast-lr" PKG_RETROARCH+=" retropie-shaders" ;; diff --git a/projects/Rockchip/devices/RK3326/options b/projects/Rockchip/devices/RK3326/options index 747c10904..c1018b64f 100644 --- a/projects/Rockchip/devices/RK3326/options +++ b/projects/Rockchip/devices/RK3326/options @@ -41,7 +41,6 @@ PKG_LOAD_ADDR="0x00200000" BOOT_INI=true BOOT_PART="1:1" - EXT_LINUX_CONF=false # Additional kernel make parameters (for example to specify the u-boot loadaddress) KERNEL_MAKE_EXTRACMD="" @@ -73,7 +72,7 @@ EXTRA_CMDLINE="quiet rootwait console=tty0 fbcon=rotate:3 ssh consoleblank=0 systemd.show_status=0 loglevel=0 panic=20" # additional packages to install - ADDITIONAL_PACKAGES="qt5" + ADDITIONAL_PACKAGES="" # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # Space separated list is supported,