wbrawner/distribution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3009 from sydarn/rk33xx

Browse source 
Rk33XX
This commit is contained in:
sydarn 2024-03-09 00:04:36 +01:00 committed by GitHub
commit 5d4d8ea638
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -83,6 +83,13 @@ RK3399:
PROJECT=Rockchip DEVICE=RK3399 ARCH=arm ./scripts/build_distro PROJECT=Rockchip DEVICE=RK3399 ARCH=arm ./scripts/build_distro
PROJECT=Rockchip DEVICE=RK3399 ARCH=aarch64 ./scripts/build_distro PROJECT=Rockchip DEVICE=RK3399 ARCH=aarch64 ./scripts/build_distro
RK33XX:
unset DEVICE_ROOT
unset BASE_DEVICE
$(MAKE) RK-ARMV8-A
BASE_DEVICE=RK-ARMV8-A $(MAKE) RK3326
BASE_DEVICE=RK-ARMV8-A $(MAKE) RK3399
update: update:
PROJECT=PC DEVICE=AMD64 ARCH=x86_64 ./scripts/update_packages PROJECT=PC DEVICE=AMD64 ARCH=x86_64 ./scripts/update_packages

2
packages/emulators/standalone/drastic-sa/config/RK3326/drastic.cfg.ogabe
View file

@ -50,7 +50,7 @@ controls_a[CONTROL_INDEX_TOUCH_CURSOR_UP] = 1217
controls_a[CONTROL_INDEX_TOUCH_CURSOR_DOWN] = 1153 controls_a[CONTROL_INDEX_TOUCH_CURSOR_DOWN] = 1153
controls_a[CONTROL_INDEX_TOUCH_CURSOR_LEFT] = 1216 controls_a[CONTROL_INDEX_TOUCH_CURSOR_LEFT] = 1216
controls_a[CONTROL_INDEX_TOUCH_CURSOR_RIGHT] = 1152 controls_a[CONTROL_INDEX_TOUCH_CURSOR_RIGHT] = 1152
controls_a[CONTROL_INDEX_TOUCH_CURSOR_PRESS] = 1037 controls_a[CONTROL_INDEX_TOUCH_CURSOR_PRESS] = 1035
controls_a[CONTROL_INDEX_MENU] = 1034 controls_a[CONTROL_INDEX_MENU] = 1034
controls_a[CONTROL_INDEX_SAVE_STATE] = 65535 controls_a[CONTROL_INDEX_SAVE_STATE] = 65535
controls_a[CONTROL_INDEX_LOAD_STATE] = 65535 controls_a[CONTROL_INDEX_LOAD_STATE] = 65535

2
packages/emulators/standalone/mednafen/package.mk
View file

@ -6,7 +6,7 @@ PKG_VERSION="1.32.0-UNSTABLE"
PKG_LICENSE="mixed" PKG_LICENSE="mixed"
PKG_SITE="https://mednafen.github.io/" PKG_SITE="https://mednafen.github.io/"
PKG_URL="${PKG_SITE}/releases/files/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_URL="${PKG_SITE}/releases/files/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_DEPENDS_TARGET="toolchain SDL2" PKG_DEPENDS_TARGET="toolchain SDL2 flac"
PKG_TOOLCHAIN="configure" PKG_TOOLCHAIN="configure"
if [ "${DEVICE}" = "S922X*" ]; then if [ "${DEVICE}" = "S922X*" ]; then

3
packages/graphics/mesa/package.mk
View file

@ -16,7 +16,8 @@ case ${DEVICE} in
PKG_URL="${PKG_SITE}.git" PKG_URL="${PKG_SITE}.git"
PKG_GIT_CLONE_BRANCH="csf" PKG_GIT_CLONE_BRANCH="csf"
;; ;;
RK33*|RK3566) #Using upstream dev for panfrost # keep RK3399 and RK-ARMV8-A on same version to maintain cross comaptibility
RK33*|RK-ARMV8-A|RK3566) #Using upstream dev for panfrost
PKG_VERSION="0b953bdbb81439c3d812631282429feeaf393db8" PKG_VERSION="0b953bdbb81439c3d812631282429feeaf393db8"
PKG_SITE="https://gitlab.freedesktop.org/mesa/mesa" PKG_SITE="https://gitlab.freedesktop.org/mesa/mesa"
PKG_URL="${PKG_SITE}.git" PKG_URL="${PKG_SITE}.git"

2
projects/Rockchip/devices/RK-ARMV8-A/options
View file

@ -155,7 +155,7 @@
HTOP_TOOL="yes" HTOP_TOOL="yes"
# Exclude packages that are device specific, etc. # Exclude packages that are device specific, etc.
EXCLUDE_PKGS="retroarch parallel-n64-lr yabasanshiro-lr " EXCLUDE_PKGS="retroarch parallel-n64-lr yabasanshiro-lr duckstation-sa "
EXCLUDE_PKGS+="flycast-sa flycast2021-lr mednafen drastic-sa" EXCLUDE_PKGS+="flycast-sa flycast2021-lr mednafen drastic-sa"
NO_IMAGE="yes" NO_IMAGE="yes"

26
scripts/build_distro
View file

@ -61,28 +61,32 @@ then
elif [ -n "$BASE_DEVICE" ] elif [ -n "$BASE_DEVICE" ]
then then
build_dir="build.${DISTRO}-${DEVICE}.${ARCH}" build_dir="build.${DISTRO}-${DEVICE}.${ARCH}"
# not the best check but the build gets created before this
if [ ! -d "${build_dir}/.threads" ]; then
build_dir_base="build.${DISTRO}-${BASE_DEVICE}.${ARCH}" build_dir_base="build.${DISTRO}-${BASE_DEVICE}.${ARCH}"
echo "$build_dir_base" echo "$build_dir_base"
if [ -d "$build_dir_base" ]; then if [ -d "$build_dir_base" ]; then
echo "Setting up ${DEVICE} build dir with ${BASE_DEVICE} as base" echo "Setting up ${DEVICE} build dir with ${BASE_DEVICE} as base"
mkdir -p ${build_dir} if [ ! -d "$build_dir" ]; then
mkdir -p ${build_dir}/.stamps mkdir -p ${build_dir}
ln -sr -t ${build_dir} ${build_dir_base}/*/ else
ln -sr -t ${build_dir}/.stamps ${build_dir_base}/.stamps/*/ find ${build_dir} -maxdepth 1 -type l -exec rm {} \;
fi
if [ ! -d "$build_dir/.stamps" ]; then
mkdir -p ${build_dir}/.stamps
else
find ${build_dir}/.stamps -maxdepth 1 -type l -exec rm {} \;
fi
# We allow ln to fail in case some linkpaths exists, because we should prioritize the end device
ln -sr -t ${build_dir} ${build_dir_base}/*/ || true
ln -sr -t ${build_dir}/.stamps ${build_dir_base}/.stamps/*/ || true
mkdir -p ${build_dir}/image mkdir -p ${build_dir}/image
rsync -a ${build_dir_base}/image/ ${build_dir}/image/ rsync -a ${build_dir_base}/image/ ${build_dir}/image/
rm -f ${build_dir}/linux* rm -rf ${build_dir}/linux*
rm -f ${build_dir}/.stamps/linux* rm -rf ${build_dir}/.stamps/linux*
rm -rf ${build_dir}/image/.stamps/linux* rm -rf ${build_dir}/image/.stamps/linux*
else else
echo "Base directory: $build_dir_base doesn't exists. Exiting..." echo "Base directory: $build_dir_base doesn't exists. Exiting..."
exit 1 exit 1
fi fi
else
echo "Build directory already exist, continue without setting up base device."
fi
fi fi
# Clean necessary packages. # Clean necessary packages.