diff --git a/projects/Rockchip/devices/RK3588/README.md b/projects/Rockchip/devices/RK3588/README.md
new file mode 100644
index 0000000000..305ff8a767
--- /dev/null
+++ b/projects/Rockchip/devices/RK3588/README.md
@@ -0,0 +1,20 @@
+# RK3588
+
+Support for the RK3588 SoC
+
+**Build**
+
+* `PROJECT=Rockchip DEVICE=RK3588 ARCH=aarch64 UBOOT_SYSTEM=armsom-sige7 make image`
+* `PROJECT=Rockchip DEVICE=RK3588 ARCH=aarch64 UBOOT_SYSTEM=cm3588-nas make image`
+* `PROJECT=Rockchip DEVICE=RK3588 ARCH=aarch64 UBOOT_SYSTEM=khadas-edge2 make image`
+* `PROJECT=Rockchip DEVICE=RK3588 ARCH=aarch64 UBOOT_SYSTEM=nanopc-t6 make image`
+* `PROJECT=Rockchip DEVICE=RK3588 ARCH=aarch64 UBOOT_SYSTEM=nanopi-r6c make image`
+* `PROJECT=Rockchip DEVICE=RK3588 ARCH=aarch64 UBOOT_SYSTEM=nanopi-r6s make image`
+* `PROJECT=Rockchip DEVICE=RK3588 ARCH=aarch64 UBOOT_SYSTEM=odroid-m2 make image`
+* `PROJECT=Rockchip DEVICE=RK3588 ARCH=aarch64 UBOOT_SYSTEM=orangepi-5 make image`
+* `PROJECT=Rockchip DEVICE=RK3588 ARCH=aarch64 UBOOT_SYSTEM=orangepi-5-max make image`
+* `PROJECT=Rockchip DEVICE=RK3588 ARCH=aarch64 UBOOT_SYSTEM=orangepi-5-plus make image`
+* `PROJECT=Rockchip DEVICE=RK3588 ARCH=aarch64 UBOOT_SYSTEM=quartzpro64 make image`
+* `PROJECT=Rockchip DEVICE=RK3588 ARCH=aarch64 UBOOT_SYSTEM=rock-5a make image`
+* `PROJECT=Rockchip DEVICE=RK3588 ARCH=aarch64 UBOOT_SYSTEM=rock-5b make image`
+* `PROJECT=Rockchip DEVICE=RK3588 ARCH=aarch64 UBOOT_SYSTEM=rock-5c make image`
diff --git a/projects/Rockchip/devices/RK3588/config/kernel-firmware-any.dat b/projects/Rockchip/devices/RK3588/config/kernel-firmware-any.dat
new file mode 100644
index 0000000000..10099a6e71
--- /dev/null
+++ b/projects/Rockchip/devices/RK3588/config/kernel-firmware-any.dat
@@ -0,0 +1 @@
+arm/mali/*
diff --git a/projects/Rockchip/devices/RK3588/options b/projects/Rockchip/devices/RK3588/options
new file mode 100644
index 0000000000..f328b8ae88
--- /dev/null
+++ b/projects/Rockchip/devices/RK3588/options
@@ -0,0 +1,37 @@
+################################################################################
+# setup device defaults
+################################################################################
+
+  # The TARGET_CPU variable controls which processor should be targeted for
+  # generated code.
+    case $TARGET_ARCH in
+      aarch64)
+        TARGET_CPU="cortex-a76.cortex-a55"
+        TARGET_CPU_FLAGS="+crc+crypto"
+        ;;
+      arm)
+        TARGET_KERNEL_ARCH="arm64"
+        TARGET_FLOAT="hard"
+        TARGET_CPU="cortex-a76.cortex-a55"
+        TARGET_CPU_FLAGS="+crc"
+        TARGET_FPU="crypto-neon-fp-armv8"
+        ;;
+    esac
+
+  # Kernel to use
+    LINUX="rockchip"
+
+  # Kernel target
+    KERNEL_TARGET="Image"
+
+  # Graphic drivers to use
+    GRAPHIC_DRIVERS="panfrost"
+
+  # kernel serial console
+    EXTRA_CMDLINE="earlycon console=uart8250,mmio32,0xfeb50000 console=tty0 coherent_pool=2M cec.debounce_ms=5000 mem=3838M systemd.debug_shell=ttyS2"
+
+  # set the addon project
+    ADDON_PROJECT="ARMv8"
+
+  # additional packages
+    ADDITIONAL_PACKAGES+=" pciutils"
diff --git a/projects/Rockchip/filesystem/usr/bin/cputemp b/projects/Rockchip/filesystem/usr/bin/cputemp
index 12f93fcd4c..b83b93dd04 100755
--- a/projects/Rockchip/filesystem/usr/bin/cputemp
+++ b/projects/Rockchip/filesystem/usr/bin/cputemp
@@ -7,7 +7,7 @@
 # try to find temperature of cpu
 for thermal_zone in /sys/devices/virtual/thermal/thermal_zone*; do
   [ -d "$thermal_zone" ] || continue
-  if [[ "$(cat $thermal_zone/type)" =~ '(cpu|soc)-thermal' ]]; then
+  if [[ "$(cat $thermal_zone/type)" =~ '(cpu|soc|package)-thermal' ]]; then
     TEMP="$(cat $thermal_zone/temp)"
     break
   fi
diff --git a/scripts/uboot_helper b/scripts/uboot_helper
index 49b23cf32d..d913c8c1d0 100755
--- a/scripts/uboot_helper
+++ b/scripts/uboot_helper
@@ -431,6 +431,64 @@ devices = \
         'soc': 'RK3566'
       },
     },
+    'RK3588': {
+      'armsom-sige7': {
+        'config': 'sige7-rk3588_defconfig',
+        'dtb': ''
+      },
+      'cm3588-nas': {
+        'config': 'cm3588-nas-rk3588_defconfig',
+        'dtb': 'rk3588-friendlyelec-cm3588-nas.dtb'
+      },
+      'khadas-edge2': {
+        'config': 'khadas-edge2-rk3588s_defconfig',
+        'dtb': ''
+      },
+      'nanopc-t6': {
+        'config': 'nanopc-t6-rk3588_defconfig',
+        'dtb': ''
+      },
+      'nanopi-r6c': {
+        'config': 'nanopi-r6c-rk3588s_defconfig',
+        'dtb': ''
+      },
+      'nanopi-r6s': {
+        'config': 'nanopi-r6s-rk3588s_defconfig',
+        'dtb': ''
+      },
+      'odroid-m2': {
+        'config': 'odroid-m2-rk3588s_defconfig',
+        'dtb': ''
+      },
+      'orangepi-5': {
+        'config': 'orangepi-5-rk3588s_defconfig',
+        'dtb': ''
+      },
+      'orangepi-5-max': {
+        'config': 'orangepi-5-max-rk3588_defconfig',
+        'dtb': ''
+      },
+      'orangepi-5-plus': {
+        'config': 'orangepi-5-plus-rk3588_defconfig',
+        'dtb': ''
+      },
+      'quartzpro64': {
+        'config': 'quartzpro64-rk3588_defconfig',
+        'dtb': ''
+      },
+      'rock-5a': {
+        'config': 'rock5a-rk3588s_defconfig',
+        'dtb': ''
+      },
+      'rock-5b': {
+        'config': 'rock5b-rk3588_defconfig',
+        'dtb': ''
+      },
+      'rock-5c': {
+        'config': 'rock-5c-rk3588s_defconfig',
+        'dtb': ''
+      },
+    },
   },
   'Samsung': {
     'Exynos': {