diff --git a/vendor/friendlyelec/apps/ADCDemo/libs/arm64-v8a/libfriendlyarm-things.so b/vendor/friendlyelec/apps/ADCDemo/libs/arm64-v8a/libfriendlyarm-things.so
index 9208455dbd5..23779c74aa8 100755
Binary files a/vendor/friendlyelec/apps/ADCDemo/libs/arm64-v8a/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/ADCDemo/libs/arm64-v8a/libfriendlyarm-things.so differ
diff --git a/vendor/friendlyelec/apps/ADCDemo/libs/armeabi/libfriendlyarm-things.so b/vendor/friendlyelec/apps/ADCDemo/libs/armeabi/libfriendlyarm-things.so
index ef4642a5317..37c1f8fdad5 100755
Binary files a/vendor/friendlyelec/apps/ADCDemo/libs/armeabi/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/ADCDemo/libs/armeabi/libfriendlyarm-things.so differ
diff --git a/vendor/friendlyelec/apps/ADCDemo/src/com/friendlyarm/FriendlyThings/BoardType.java b/vendor/friendlyelec/apps/ADCDemo/src/com/friendlyarm/FriendlyThings/BoardType.java
index fefab4b8867..49d1cd5b5b5 100644
--- a/vendor/friendlyelec/apps/ADCDemo/src/com/friendlyarm/FriendlyThings/BoardType.java
+++ b/vendor/friendlyelec/apps/ADCDemo/src/com/friendlyarm/FriendlyThings/BoardType.java
@@ -97,7 +97,7 @@ public class BoardType {
     public static final int NanoPi_R5S = RK3568_BASE+1;
     public static final int NanoPi_R5C = RK3568_BASE+2;
     public static final int NanoPi_R5S_LTS = RK3568_BASE+3;
-    public static final int RK3568_MAX = NanoPi_R5S_LTS;
+    public static final int RK3568_MAX = RK3568_BASE+5;
 
     //rk3588
     public static final int RK3588_BASE = 9700;
@@ -106,5 +106,7 @@ public class BoardType {
     public static final int NanoPi_R6C = RK3588_BASE+3;
     public static final int NanoPC_T6_LTS = RK3588_BASE+4;
     public static final int CM3588 = RK3588_BASE+5;
-    public static final int RK3588_MAX = CM3588;
+    public static final int NanoPi_M6 = RK3588_BASE+7;
+    public static final int CM3588_Plus = RK3588_BASE+8;
+    public static final int RK3588_MAX = CM3588_Plus;
 }
\ No newline at end of file
diff --git a/vendor/friendlyelec/apps/GPIO_LED_Demo/libs/arm64-v8a/libfriendlyarm-things.so b/vendor/friendlyelec/apps/GPIO_LED_Demo/libs/arm64-v8a/libfriendlyarm-things.so
index 9208455dbd5..23779c74aa8 100755
Binary files a/vendor/friendlyelec/apps/GPIO_LED_Demo/libs/arm64-v8a/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/GPIO_LED_Demo/libs/arm64-v8a/libfriendlyarm-things.so differ
diff --git a/vendor/friendlyelec/apps/GPIO_LED_Demo/libs/armeabi/libfriendlyarm-things.so b/vendor/friendlyelec/apps/GPIO_LED_Demo/libs/armeabi/libfriendlyarm-things.so
index ef4642a5317..37c1f8fdad5 100755
Binary files a/vendor/friendlyelec/apps/GPIO_LED_Demo/libs/armeabi/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/GPIO_LED_Demo/libs/armeabi/libfriendlyarm-things.so differ
diff --git a/vendor/friendlyelec/apps/GPIO_LED_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java b/vendor/friendlyelec/apps/GPIO_LED_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java
index fefab4b8867..49d1cd5b5b5 100644
--- a/vendor/friendlyelec/apps/GPIO_LED_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java
+++ b/vendor/friendlyelec/apps/GPIO_LED_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java
@@ -97,7 +97,7 @@ public class BoardType {
     public static final int NanoPi_R5S = RK3568_BASE+1;
     public static final int NanoPi_R5C = RK3568_BASE+2;
     public static final int NanoPi_R5S_LTS = RK3568_BASE+3;
-    public static final int RK3568_MAX = NanoPi_R5S_LTS;
+    public static final int RK3568_MAX = RK3568_BASE+5;
 
     //rk3588
     public static final int RK3588_BASE = 9700;
@@ -106,5 +106,7 @@ public class BoardType {
     public static final int NanoPi_R6C = RK3588_BASE+3;
     public static final int NanoPC_T6_LTS = RK3588_BASE+4;
     public static final int CM3588 = RK3588_BASE+5;
-    public static final int RK3588_MAX = CM3588;
+    public static final int NanoPi_M6 = RK3588_BASE+7;
+    public static final int CM3588_Plus = RK3588_BASE+8;
+    public static final int RK3588_MAX = CM3588_Plus;
 }
\ No newline at end of file
diff --git a/vendor/friendlyelec/apps/GPIO_LED_Demo/src/com/friendlyarm/GPIODemo/GPIODemoMainActivity.java b/vendor/friendlyelec/apps/GPIO_LED_Demo/src/com/friendlyarm/GPIODemo/GPIODemoMainActivity.java
index 9b54dfd5671..000adca2feb 100644
--- a/vendor/friendlyelec/apps/GPIO_LED_Demo/src/com/friendlyarm/GPIODemo/GPIODemoMainActivity.java
+++ b/vendor/friendlyelec/apps/GPIO_LED_Demo/src/com/friendlyarm/GPIODemo/GPIODemoMainActivity.java
@@ -204,6 +204,14 @@ public class GPIODemoMainActivity extends Activity {
             //uart5 (m1)
             //demoGPIOPins.put("Pin11", 116);  // GPIO3_C4
             //demoGPIOPins.put("Pin12", 117);  // GPIO3_C5
+        } else if (boardType == BoardType.NanoPi_M6) {
+            //uart0 (m0), uart8 (m0)
+            demoGPIOPins.put("Pin07", 136);  // GPIO4_B0
+            demoGPIOPins.put("Pin11", 137);  // GPIO4_B1
+            demoGPIOPins.put("Pin12", 139);  // GPIO4_B3
+            demoGPIOPins.put("Pin13", 131);  // GPIO4_A3
+            demoGPIOPins.put("Pin15", 132);  // GPIO4_A4
+            demoGPIOPins.put("Pin22", 138);  // GPIO4_B2
         } else if (boardType == BoardType.NanoPi_R5S || boardType == BoardType.NanoPi_R5S_LTS) {
             //spi1
             demoGPIOPins.put("Pin03", 115);  // GPIO3_C3
diff --git a/vendor/friendlyelec/apps/I2C_LCD1602_Demo/libs/arm64-v8a/libfriendlyarm-things.so b/vendor/friendlyelec/apps/I2C_LCD1602_Demo/libs/arm64-v8a/libfriendlyarm-things.so
index 9208455dbd5..23779c74aa8 100755
Binary files a/vendor/friendlyelec/apps/I2C_LCD1602_Demo/libs/arm64-v8a/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/I2C_LCD1602_Demo/libs/arm64-v8a/libfriendlyarm-things.so differ
diff --git a/vendor/friendlyelec/apps/I2C_LCD1602_Demo/libs/armeabi/libfriendlyarm-things.so b/vendor/friendlyelec/apps/I2C_LCD1602_Demo/libs/armeabi/libfriendlyarm-things.so
index ef4642a5317..37c1f8fdad5 100755
Binary files a/vendor/friendlyelec/apps/I2C_LCD1602_Demo/libs/armeabi/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/I2C_LCD1602_Demo/libs/armeabi/libfriendlyarm-things.so differ
diff --git a/vendor/friendlyelec/apps/I2C_LCD1602_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java b/vendor/friendlyelec/apps/I2C_LCD1602_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java
index fefab4b8867..49d1cd5b5b5 100644
--- a/vendor/friendlyelec/apps/I2C_LCD1602_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java
+++ b/vendor/friendlyelec/apps/I2C_LCD1602_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java
@@ -97,7 +97,7 @@ public class BoardType {
     public static final int NanoPi_R5S = RK3568_BASE+1;
     public static final int NanoPi_R5C = RK3568_BASE+2;
     public static final int NanoPi_R5S_LTS = RK3568_BASE+3;
-    public static final int RK3568_MAX = NanoPi_R5S_LTS;
+    public static final int RK3568_MAX = RK3568_BASE+5;
 
     //rk3588
     public static final int RK3588_BASE = 9700;
@@ -106,5 +106,7 @@ public class BoardType {
     public static final int NanoPi_R6C = RK3588_BASE+3;
     public static final int NanoPC_T6_LTS = RK3588_BASE+4;
     public static final int CM3588 = RK3588_BASE+5;
-    public static final int RK3588_MAX = CM3588;
+    public static final int NanoPi_M6 = RK3588_BASE+7;
+    public static final int CM3588_Plus = RK3588_BASE+8;
+    public static final int RK3588_MAX = CM3588_Plus;
 }
\ No newline at end of file
diff --git a/vendor/friendlyelec/apps/PWMDemo/libs/arm64-v8a/libfriendlyarm-things.so b/vendor/friendlyelec/apps/PWMDemo/libs/arm64-v8a/libfriendlyarm-things.so
index 9208455dbd5..23779c74aa8 100755
Binary files a/vendor/friendlyelec/apps/PWMDemo/libs/arm64-v8a/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/PWMDemo/libs/arm64-v8a/libfriendlyarm-things.so differ
diff --git a/vendor/friendlyelec/apps/PWMDemo/libs/armeabi/libfriendlyarm-things.so b/vendor/friendlyelec/apps/PWMDemo/libs/armeabi/libfriendlyarm-things.so
index ef4642a5317..37c1f8fdad5 100755
Binary files a/vendor/friendlyelec/apps/PWMDemo/libs/armeabi/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/PWMDemo/libs/armeabi/libfriendlyarm-things.so differ
diff --git a/vendor/friendlyelec/apps/PWMDemo/src/com/friendlyarm/FriendlyThings/BoardType.java b/vendor/friendlyelec/apps/PWMDemo/src/com/friendlyarm/FriendlyThings/BoardType.java
index fefab4b8867..49d1cd5b5b5 100644
--- a/vendor/friendlyelec/apps/PWMDemo/src/com/friendlyarm/FriendlyThings/BoardType.java
+++ b/vendor/friendlyelec/apps/PWMDemo/src/com/friendlyarm/FriendlyThings/BoardType.java
@@ -97,7 +97,7 @@ public class BoardType {
     public static final int NanoPi_R5S = RK3568_BASE+1;
     public static final int NanoPi_R5C = RK3568_BASE+2;
     public static final int NanoPi_R5S_LTS = RK3568_BASE+3;
-    public static final int RK3568_MAX = NanoPi_R5S_LTS;
+    public static final int RK3568_MAX = RK3568_BASE+5;
 
     //rk3588
     public static final int RK3588_BASE = 9700;
@@ -106,5 +106,7 @@ public class BoardType {
     public static final int NanoPi_R6C = RK3588_BASE+3;
     public static final int NanoPC_T6_LTS = RK3588_BASE+4;
     public static final int CM3588 = RK3588_BASE+5;
-    public static final int RK3588_MAX = CM3588;
+    public static final int NanoPi_M6 = RK3588_BASE+7;
+    public static final int CM3588_Plus = RK3588_BASE+8;
+    public static final int RK3588_MAX = CM3588_Plus;
 }
\ No newline at end of file
diff --git a/vendor/friendlyelec/apps/RTC_Demo/libs/arm64-v8a/libfriendlyarm-things.so b/vendor/friendlyelec/apps/RTC_Demo/libs/arm64-v8a/libfriendlyarm-things.so
index 9208455dbd5..23779c74aa8 100755
Binary files a/vendor/friendlyelec/apps/RTC_Demo/libs/arm64-v8a/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/RTC_Demo/libs/arm64-v8a/libfriendlyarm-things.so differ
diff --git a/vendor/friendlyelec/apps/RTC_Demo/libs/armeabi/libfriendlyarm-things.so b/vendor/friendlyelec/apps/RTC_Demo/libs/armeabi/libfriendlyarm-things.so
index ef4642a5317..37c1f8fdad5 100755
Binary files a/vendor/friendlyelec/apps/RTC_Demo/libs/armeabi/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/RTC_Demo/libs/armeabi/libfriendlyarm-things.so differ
diff --git a/vendor/friendlyelec/apps/RTC_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java b/vendor/friendlyelec/apps/RTC_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java
index fefab4b8867..49d1cd5b5b5 100644
--- a/vendor/friendlyelec/apps/RTC_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java
+++ b/vendor/friendlyelec/apps/RTC_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java
@@ -97,7 +97,7 @@ public class BoardType {
     public static final int NanoPi_R5S = RK3568_BASE+1;
     public static final int NanoPi_R5C = RK3568_BASE+2;
     public static final int NanoPi_R5S_LTS = RK3568_BASE+3;
-    public static final int RK3568_MAX = NanoPi_R5S_LTS;
+    public static final int RK3568_MAX = RK3568_BASE+5;
 
     //rk3588
     public static final int RK3588_BASE = 9700;
@@ -106,5 +106,7 @@ public class BoardType {
     public static final int NanoPi_R6C = RK3588_BASE+3;
     public static final int NanoPC_T6_LTS = RK3588_BASE+4;
     public static final int CM3588 = RK3588_BASE+5;
-    public static final int RK3588_MAX = CM3588;
+    public static final int NanoPi_M6 = RK3588_BASE+7;
+    public static final int CM3588_Plus = RK3588_BASE+8;
+    public static final int RK3588_MAX = CM3588_Plus;
 }
\ No newline at end of file
diff --git a/vendor/friendlyelec/apps/SPI_OLED_Demo/libs/arm64-v8a/libfriendlyarm-things.so b/vendor/friendlyelec/apps/SPI_OLED_Demo/libs/arm64-v8a/libfriendlyarm-things.so
index 9208455dbd5..23779c74aa8 100755
Binary files a/vendor/friendlyelec/apps/SPI_OLED_Demo/libs/arm64-v8a/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/SPI_OLED_Demo/libs/arm64-v8a/libfriendlyarm-things.so differ
diff --git a/vendor/friendlyelec/apps/SPI_OLED_Demo/libs/armeabi/libfriendlyarm-things.so b/vendor/friendlyelec/apps/SPI_OLED_Demo/libs/armeabi/libfriendlyarm-things.so
index ef4642a5317..37c1f8fdad5 100755
Binary files a/vendor/friendlyelec/apps/SPI_OLED_Demo/libs/armeabi/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/SPI_OLED_Demo/libs/armeabi/libfriendlyarm-things.so differ
diff --git a/vendor/friendlyelec/apps/SPI_OLED_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java b/vendor/friendlyelec/apps/SPI_OLED_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java
index fefab4b8867..49d1cd5b5b5 100644
--- a/vendor/friendlyelec/apps/SPI_OLED_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java
+++ b/vendor/friendlyelec/apps/SPI_OLED_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java
@@ -97,7 +97,7 @@ public class BoardType {
     public static final int NanoPi_R5S = RK3568_BASE+1;
     public static final int NanoPi_R5C = RK3568_BASE+2;
     public static final int NanoPi_R5S_LTS = RK3568_BASE+3;
-    public static final int RK3568_MAX = NanoPi_R5S_LTS;
+    public static final int RK3568_MAX = RK3568_BASE+5;
 
     //rk3588
     public static final int RK3588_BASE = 9700;
@@ -106,5 +106,7 @@ public class BoardType {
     public static final int NanoPi_R6C = RK3588_BASE+3;
     public static final int NanoPC_T6_LTS = RK3588_BASE+4;
     public static final int CM3588 = RK3588_BASE+5;
-    public static final int RK3588_MAX = CM3588;
+    public static final int NanoPi_M6 = RK3588_BASE+7;
+    public static final int CM3588_Plus = RK3588_BASE+8;
+    public static final int RK3588_MAX = CM3588_Plus;
 }
\ No newline at end of file
diff --git a/vendor/friendlyelec/apps/SerialPortDemo/libs/arm64-v8a/libfriendlyarm-things.so b/vendor/friendlyelec/apps/SerialPortDemo/libs/arm64-v8a/libfriendlyarm-things.so
index 9208455dbd5..23779c74aa8 100755
Binary files a/vendor/friendlyelec/apps/SerialPortDemo/libs/arm64-v8a/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/SerialPortDemo/libs/arm64-v8a/libfriendlyarm-things.so differ
diff --git a/vendor/friendlyelec/apps/SerialPortDemo/libs/armeabi/libfriendlyarm-things.so b/vendor/friendlyelec/apps/SerialPortDemo/libs/armeabi/libfriendlyarm-things.so
index ef4642a5317..37c1f8fdad5 100755
Binary files a/vendor/friendlyelec/apps/SerialPortDemo/libs/armeabi/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/SerialPortDemo/libs/armeabi/libfriendlyarm-things.so differ
diff --git a/vendor/friendlyelec/apps/SerialPortDemo/src/com/friendlyarm/FriendlyThings/BoardType.java b/vendor/friendlyelec/apps/SerialPortDemo/src/com/friendlyarm/FriendlyThings/BoardType.java
index fefab4b8867..49d1cd5b5b5 100644
--- a/vendor/friendlyelec/apps/SerialPortDemo/src/com/friendlyarm/FriendlyThings/BoardType.java
+++ b/vendor/friendlyelec/apps/SerialPortDemo/src/com/friendlyarm/FriendlyThings/BoardType.java
@@ -97,7 +97,7 @@ public class BoardType {
     public static final int NanoPi_R5S = RK3568_BASE+1;
     public static final int NanoPi_R5C = RK3568_BASE+2;
     public static final int NanoPi_R5S_LTS = RK3568_BASE+3;
-    public static final int RK3568_MAX = NanoPi_R5S_LTS;
+    public static final int RK3568_MAX = RK3568_BASE+5;
 
     //rk3588
     public static final int RK3588_BASE = 9700;
@@ -106,5 +106,7 @@ public class BoardType {
     public static final int NanoPi_R6C = RK3588_BASE+3;
     public static final int NanoPC_T6_LTS = RK3588_BASE+4;
     public static final int CM3588 = RK3588_BASE+5;
-    public static final int RK3588_MAX = CM3588;
+    public static final int NanoPi_M6 = RK3588_BASE+7;
+    public static final int CM3588_Plus = RK3588_BASE+8;
+    public static final int RK3588_MAX = CM3588_Plus;
 }
\ No newline at end of file
diff --git a/vendor/friendlyelec/apps/SerialPortDemo/src/com/friendlyarm/SerialPortDemo/SerialPortDataProcessView.java b/vendor/friendlyelec/apps/SerialPortDemo/src/com/friendlyarm/SerialPortDemo/SerialPortDataProcessView.java
index 89c2d42af04..b3c8fd09bc9 100644
--- a/vendor/friendlyelec/apps/SerialPortDemo/src/com/friendlyarm/SerialPortDemo/SerialPortDataProcessView.java
+++ b/vendor/friendlyelec/apps/SerialPortDemo/src/com/friendlyarm/SerialPortDemo/SerialPortDataProcessView.java
@@ -70,6 +70,7 @@ public class SerialPortDataProcessView extends Activity implements OnClickListen
         if (mBoardType > BoardType.RK3588_BASE && mBoardType <= BoardType.RK3588_MAX) {
             if (mBoardType == BoardType.NanoPC_T6 
                 || mBoardType == BoardType.NanoPC_T6_LTS
+                || mBoardType == BoardType.NanoPi_M6
                 || mBoardType == BoardType.CM3588) {
                 // NanoPC-T6 UART6
                 devName = "/dev/ttyS6";
diff --git a/vendor/friendlyelec/apps/WatchDogDemo/libs/arm64-v8a/libfriendlyarm-things.so b/vendor/friendlyelec/apps/WatchDogDemo/libs/arm64-v8a/libfriendlyarm-things.so
index 9208455dbd5..23779c74aa8 100755
Binary files a/vendor/friendlyelec/apps/WatchDogDemo/libs/arm64-v8a/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/WatchDogDemo/libs/arm64-v8a/libfriendlyarm-things.so differ
diff --git a/vendor/friendlyelec/apps/WatchDogDemo/libs/armeabi/libfriendlyarm-things.so b/vendor/friendlyelec/apps/WatchDogDemo/libs/armeabi/libfriendlyarm-things.so
index ef4642a5317..37c1f8fdad5 100755
Binary files a/vendor/friendlyelec/apps/WatchDogDemo/libs/armeabi/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/WatchDogDemo/libs/armeabi/libfriendlyarm-things.so differ
diff --git a/vendor/friendlyelec/apps/WatchDogDemo/src/com/friendlyarm/FriendlyThings/BoardType.java b/vendor/friendlyelec/apps/WatchDogDemo/src/com/friendlyarm/FriendlyThings/BoardType.java
index fefab4b8867..49d1cd5b5b5 100644
--- a/vendor/friendlyelec/apps/WatchDogDemo/src/com/friendlyarm/FriendlyThings/BoardType.java
+++ b/vendor/friendlyelec/apps/WatchDogDemo/src/com/friendlyarm/FriendlyThings/BoardType.java
@@ -97,7 +97,7 @@ public class BoardType {
     public static final int NanoPi_R5S = RK3568_BASE+1;
     public static final int NanoPi_R5C = RK3568_BASE+2;
     public static final int NanoPi_R5S_LTS = RK3568_BASE+3;
-    public static final int RK3568_MAX = NanoPi_R5S_LTS;
+    public static final int RK3568_MAX = RK3568_BASE+5;
 
     //rk3588
     public static final int RK3588_BASE = 9700;
@@ -106,5 +106,7 @@ public class BoardType {
     public static final int NanoPi_R6C = RK3588_BASE+3;
     public static final int NanoPC_T6_LTS = RK3588_BASE+4;
     public static final int CM3588 = RK3588_BASE+5;
-    public static final int RK3588_MAX = CM3588;
+    public static final int NanoPi_M6 = RK3588_BASE+7;
+    public static final int CM3588_Plus = RK3588_BASE+8;
+    public static final int RK3588_MAX = CM3588_Plus;
 }
\ No newline at end of file
diff --git a/vendor/friendlyelec/apps/prebuilt/libfriendlyarm-things.so b/vendor/friendlyelec/apps/prebuilt/libfriendlyarm-things.so
index 9208455dbd5..23779c74aa8 100755
Binary files a/vendor/friendlyelec/apps/prebuilt/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/prebuilt/libfriendlyarm-things.so differ