diff --git a/projects/Amlogic/bootloader/release b/projects/Amlogic/bootloader/release
index ace32142e2..5dcec383c9 100644
--- a/projects/Amlogic/bootloader/release
+++ b/projects/Amlogic/bootloader/release
@@ -14,16 +14,6 @@ mkdir -p "$DSTDIR"
 mkdir -p "$DSTDIR/dtb"
   case ${DEVICE:-$PROJECT} in
     AMLGX)
-      cp -a "$SRCDIR"/*gxbb*.dtb "$DSTDIR/dtb"
-      cp -a "$SRCDIR"/*gxl*.dtb "$DSTDIR/dtb"
-      cp -a "$SRCDIR"/*gxm*.dtb "$DSTDIR/dtb"
-      ;;
-    AMLG12)
-      cp -a "$SRCDIR"/*g12a*.dtb "$DSTDIR/dtb"
-      cp -a "$SRCDIR"/*g12b*.dtb "$DSTDIR/dtb"
-      cp -a "$SRCDIR"/*sm1*.dtb "$DSTDIR/dtb"
-      ;;
-    *)
       cp -a "$SRCDIR"/*gxbb*.dtb "$DSTDIR/dtb"
       cp -a "$SRCDIR"/*gxl*.dtb "$DSTDIR/dtb"
       cp -a "$SRCDIR"/*gxm*.dtb "$DSTDIR/dtb"
diff --git a/projects/Amlogic/devices/AMLG12/options b/projects/Amlogic/devices/AMLG12/options
deleted file mode 100644
index 4cd6e61b58..0000000000
--- a/projects/Amlogic/devices/AMLG12/options
+++ /dev/null
@@ -1,37 +0,0 @@
-################################################################################
-# setup device defaults
-################################################################################
-
-  # The TARGET_CPU variable controls which processor should be targeted for
-  # generated code.
-    case $TARGET_ARCH in
-      aarch64)
-        TARGET_CPU="cortex-a53"
-        TARGET_CPU_FLAGS="+crc+fp+simd"
-        TARGET_FEATURES="64bit"
-        ;;
-      arm)
-        TARGET_KERNEL_ARCH="arm64"
-        TARGET_PATCH_ARCH="aarch64"
-        TARGET_FLOAT=hard
-        TARGET_CPU="cortex-a53"
-        TARGET_CPU_FLAGS="+crc"
-        TARGET_FPU="neon-fp-armv8"
-        TARGET_FEATURES="32bit"
-        ;;
-    esac
-
-  # OpenGL-ES implementation to use
-    OPENGLES="libmali"
-
-  # Graphic drivers to use
-    GRAPHIC_DRIVERS="mali"
-
-  # KODI Player implementation to use
-    KODIPLAYER_DRIVER="$OPENGLES"
-
-  # Mali GPU family
-    MALI_FAMILY="g31 g52"
-
-  # Set the addon project
-    ADDON_PROJECT="ARMv8"
diff --git a/projects/Amlogic/devices/AMLGX/options b/projects/Amlogic/devices/AMLGX/options
index 73cb53894b..279205de0e 100644
--- a/projects/Amlogic/devices/AMLGX/options
+++ b/projects/Amlogic/devices/AMLGX/options
@@ -31,7 +31,7 @@
     KODIPLAYER_DRIVER="$OPENGLES"
 
   # Mali GPU family
-    MALI_FAMILY="450 t820"
+    MALI_FAMILY="450 t820 g31 g52"
 
   # Set the addon project
     ADDON_PROJECT="ARMv8"
diff --git a/scripts/uboot_helper b/scripts/uboot_helper
index c2b3edfbee..ed275697c6 100755
--- a/scripts/uboot_helper
+++ b/scripts/uboot_helper
@@ -158,6 +158,14 @@ devices = \
         'dtb': 'meson-gxm-khadas-vim2.dtb',
         'config': 'khadas-vim2_defconfig'
       },
+      'khadas-vim3': {
+        'dtb': 'meson-g12b-a311d-khadas-vim3.dtb',
+        'config': 'khadas-vim3_defconfig'
+      },
+      'khadas-vim3l': {
+        'dtb': 'meson-sm1-khadas-vim3l.dtb',
+        'config': 'khadas-vim3l_defconfig'
+      },
       'lafrite': {
         'dtb': 'meson-gxl-s805x-libretech-ac.dtb',
         'config': 'libretech-ac_defconfig'
@@ -174,20 +182,6 @@ devices = \
         'dtb': 'meson-gxbb-odroidc2.dtb',
         'config': 'odroid-c2_defconfig'
       },
-    },
-    'AMLG12': {
-      'box': {
-        'dtb': '',
-        'config': 'p212_defconfig'
-      },
-      'khadas-vim3': {
-        'dtb': 'meson-g12b-a311d-khadas-vim3.dtb',
-        'config': 'khadas-vim3_defconfig'
-      },
-      'khadas-vim3l': {
-        'dtb': 'meson-sm1-khadas-vim3l.dtb',
-        'config': 'khadas-vim3l_defconfig'
-      },
       'odroid-c4': {
         'dtb': 'meson-sm1-odroid-c4.dtb',
         'config': 'odroid-c4_defconfig'