Merge pull request #58 from sydarn/misc

\Misc
This commit is contained in:
sydarn 2024-04-05 18:21:24 +02:00 committed by GitHub
commit cb81ae5497
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 57 additions and 4 deletions

View file

@ -3,7 +3,7 @@ FROM ubuntu:jammy
ARG DEBIAN_FRONTEND=noninteractive
SHELL ["/usr/bin/bash", "-c"]
RUN apt-get update \
RUN apt-get update --fix-missing\
&& apt-get dist-upgrade -y \
&& apt-get install -y locales sudo
@ -20,7 +20,7 @@ RUN adduser --disabled-password --gecos '' docker \
RUN apt-get install -y \
bc default-jre file gawk gcc git golang-go gperf libjson-perl libncurses5-dev \
libparse-yapp-perl libxml-parser-perl lzop make patchutils python-is-python3 \
python3 parted unzip wget curl xfonts-utils xsltproc zip zstd
python3 parted unzip wget curl xfonts-utils xsltproc zip zstd rdfind
### Cross compiling on ARM
RUN if [ "$(uname -m)" = "aarch64" ]; then apt-get install -y --no-install-recommends qemu-user-binfmt libc6-dev-amd64-cross; fi

View file

@ -77,6 +77,13 @@ makeinstall_target() {
ln -s "rtl8723bs_config-OBDA8723.bin" "${FW_TARGET_DIR}/rtl_bt/rtl8723bs_config.bin"
fi
# Upstream doesn't name the files correctly so we need to symlink it
if [ -f "${FW_TARGET_DIR}/rtl_bt/rtl8723d_fw.bin" ]; then
ln -s "rtl8723d_fw.bin" "${FW_TARGET_DIR}/rtl_bt/rtl8723ds_fw.bin"
fi
if [ -f "${FW_TARGET_DIR}/rtl_bt/rtl8723d_config.bin" ]; then
ln -s "rtl8723d_config.bin" "${FW_TARGET_DIR}/rtl_bt/rtl8723ds_config.bin"
fi
# The BSP kernel for RK3588 reformats the vendor firmware path for Realtek BT devices,
# so symlink the firmware.
if [ ${DEVICE} = "RK3588" ]; then

View file

@ -3,7 +3,7 @@
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="emulationstation"
PKG_VERSION="10d84dfde9ff83d63a558f08625f0265dbf5d7de"
PKG_VERSION="be669d916e9a3f393cf63c57929daf796ddec80d"
PKG_GIT_CLONE_BRANCH="main"
PKG_REV="1"
PKG_ARCH="any"

View file

@ -32,7 +32,7 @@
PARTITION_TABLE="gpt"
UBOOT_LABEL="uboot"
TRUST_LABEL="trust"
DEVICE_DTB=("rk3566-anbernic-rg353ps" "rk3566-anbernic-rg353vs" "rk3566-anbernic-rg503" "rk3566-anbernic-rg353p" "rk3566-anbernic-rg353v" "rk3566-powkiddy-rk2023" "rk3566-powkiddy-rgb30" "rk3566-powkiddy-rgb10max3")
DEVICE_DTB=("rk3566-anbernic-rg353ps" "rk3566-anbernic-rg353vs" "rk3566-anbernic-rg503" "rk3566-anbernic-rg353p" "rk3566-anbernic-rg353v" "rk3566-powkiddy-rk2023" "rk3566-powkiddy-rgb30" "rk3566-powkiddy-rgb10max3" "rk3566-powkiddy-rgb30r2")
UBOOT_DTB="rk3566"
UBOOT_CONFIG="anbernic-rgxx3-rk3566_defconfig"
PKG_SOC="rk3568"

View file

@ -0,0 +1,46 @@
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index f906a868b71a..bc30125a6764 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -84,6 +84,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinetab2-v0.1.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinetab2-v2.0.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-powkiddy-rgb10max3.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-powkiddy-rgb30.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-powkiddy-rgb30r2.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-powkiddy-rk2023.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-powkiddy-x55.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rgb30r2.dts b/arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rgb30r2.dts
new file mode 100644
index 000000000000..f584474b3eb6
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rgb30r2.dts
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/linux-event-codes.h>
+#include <dt-bindings/pinctrl/rockchip.h>
+#include "rk3566-powkiddy-rgb30.dts"
+
+/delete-node/ &vdd_cpu;
+
+&i2c0 {
+ vdd_cpu: regulator@40 {
+ compatible = "fcs,fan53555";
+ reg = <0x40>;
+ fcs,suspend-voltage-selector = <1>;
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <712500>;
+ regulator-max-microvolt = <1390000>;
+ regulator-name = "vdd_cpu";
+ regulator-ramp-delay = <2300>;
+ vin-supply = <&vcc_sys>;
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ };
+ };
+};