diff --git a/config/boards/rockpi-s.conf b/config/boards/rockpi-s.csc
similarity index 100%
rename from config/boards/rockpi-s.conf
rename to config/boards/rockpi-s.csc
diff --git a/config/sources/families/rockpis.conf b/config/sources/families/rockpis.conf
index bd941c1fdb..e9efbc239a 100644
--- a/config/sources/families/rockpis.conf
+++ b/config/sources/families/rockpis.conf
@@ -1,5 +1,4 @@
 source "${BASH_SOURCE%/*}/include/rockchip64_common.inc"
-BOOTBRANCH='tag:v2020.10'
 BOOTPATCHDIR="u-boot-rockchip64"
 BOOTENV_FILE='rockpis.txt'
 OVERLAY_PREFIX='rk3308'
diff --git a/config/targets.conf b/config/targets.conf
index f80d45e91e..3a9215b18d 100644
--- a/config/targets.conf
+++ b/config/targets.conf
@@ -908,14 +908,6 @@ rockpi-4c                 edge            hirsute     desktop                  s
 rockpi-4c                 edge            hirsute     cli                      stable         yes
 
 
-# Rockpi S
-rockpi-s                  current         buster      minimal                  stable         yes
-rockpi-s                  current         bullseye    minimal                  stable         yes
-rockpi-s                  current         focal       minimal                  stable         yes
-rockpi-s                  edge            buster      minimal                  stable         yes
-rockpi-s                  edge            focal       minimal                  stable         yes
-
-
 # Rockpi E
 rockpi-e                  current         focal       minimal                  stable         yes
 rockpi-e                  current         buster      cli                      stable         yes
diff --git a/patch/u-boot/u-boot-rockpis/0001-fixing-dtc-error.patch b/patch/u-boot/u-boot-rockpis/0001-fixing-dtc-error.patch
new file mode 100644
index 0000000000..5d8f468049
--- /dev/null
+++ b/patch/u-boot/u-boot-rockpis/0001-fixing-dtc-error.patch
@@ -0,0 +1,37 @@
+From 97bca7b4cec321501a710cb0ce8b598a9e746a19 Mon Sep 17 00:00:00 2001
+From: Igor Pecovnik <igor.pecovnik@gmail.com>
+Date: Mon, 8 Mar 2021 13:12:41 +0000
+Subject: [PATCH] ;spi;u-boot-spl.kwb:u-boot.flash
+
+Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
+---
+ scripts/dtc/dtc-lexer.l | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
+index fd825eb..f57c9a7 100644
+--- a/scripts/dtc/dtc-lexer.l
++++ b/scripts/dtc/dtc-lexer.l
+@@ -38,7 +38,7 @@ LINECOMMENT	"//".*\n
+ #include "srcpos.h"
+ #include "dtc-parser.tab.h"
+ 
+-YYLTYPE yylloc;
++extern YYLTYPE yylloc;
+ extern bool treesource_error;
+ 
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
+--- a/scripts/dtc/dtc-lexer.lex.c_shipped
++++ b/scripts/dtc/dtc-lexer.lex.c_shipped
+@@ -637,7 +637,6 @@ char *yytext;
+ #include "srcpos.h"
+ #include "dtc-parser.tab.h"
+ 
+-YYLTYPE yylloc;
+ extern bool treesource_error;
+ 
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
+
+-- 
+Created with Armbian build tools https://github.com/armbian/build
+
diff --git a/patch/u-boot/u-boot-rockpis/add-trust-ini.patch b/patch/u-boot/u-boot-rockpis/add-trust-ini.patch
new file mode 100644
index 0000000000..793f34dd12
--- /dev/null
+++ b/patch/u-boot/u-boot-rockpis/add-trust-ini.patch
@@ -0,0 +1,21 @@
+diff --git a/trust.ini b/trust.ini
+new file mode 100644
+index 0000000..4af021a
+--- /dev/null
++++ b/trust.ini
+@@ -0,0 +1,15 @@
++[VERSION]
++MAJOR=1
++MINOR=0
++[BL30_OPTION]
++SEC=0
++[BL31_OPTION]
++SEC=1
++PATH=bl31.elf
++ADDR=0x10000
++[BL32_OPTION]
++SEC=0
++[BL33_OPTION]
++SEC=0
++[OUTPUT]
++PATH=trust.bin