diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc
index ce0e09ce4..74852284f 100644
--- a/config/sources/families/include/rockchip64_common.inc
+++ b/config/sources/families/include/rockchip64_common.inc
@@ -166,7 +166,7 @@ prepare_boot_configuration() {
 			ATFSOURCE='https://github.com/ARM-software/arm-trusted-firmware'
 			ATF_COMPILER='aarch64-linux-gnu-'
 			ATFDIR='arm-trusted-firmware'
-			ATFBRANCH='tag:v2.12.0'
+			ATFBRANCH='tag:v2.13.0'
 			ATF_USE_GCC='> 6.3'
 			ATF_TARGET_MAP="M0_CROSS_COMPILE=arm-linux-gnueabi- PLAT=$BOOT_SOC bl31;;build/$BOOT_SOC/release/bl31/bl31.elf:bl31.elf"
 			ATF_TOOLCHAIN2="arm-linux-gnueabi-:< 10.0"
diff --git a/patch/atf/atf-rockchip64/enable-logging.patch b/patch/atf/atf-rockchip64/enable-logging.patch
deleted file mode 100644
index f327c1d3a..000000000
--- a/patch/atf/atf-rockchip64/enable-logging.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/plat/rockchip/rk3399/rk3399_def.h b/plat/rockchip/rk3399/rk3399_def.h
-index ba83242..8d6ecfb 100644
---- a/plat/rockchip/rk3399/rk3399_def.h
-+++ b/plat/rockchip/rk3399/rk3399_def.h
-@@ -17,7 +17,7 @@
- /**************************************************************************
-  * UART related constants
-  **************************************************************************/
--#define RK3399_BAUDRATE			115200
-+#define RK3399_BAUDRATE			1500000
- #define RK3399_UART_CLOCK		24000000
-
- /******************************************************************************
-diff --git a/plat/rockchip/common/bl31_plat_setup.c b/plat/rockchip/common/bl31_plat_setup.c
-index c4a0359..22d07e0 100644
---- a/plat/rockchip/common/bl31_plat_setup.c
-+++ b/plat/rockchip/common/bl31_plat_setup.c
-@@ -61,10 +61,13 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
-
- 	params_early_setup(arg1);
-
--	if (rockchip_get_uart_base() != 0)
-+	if (rockchip_get_uart_base() != 0) {
- 		console_16550_register(rockchip_get_uart_base(),
- 				       rockchip_get_uart_clock(),
- 				       rockchip_get_uart_baudrate(), &console);
-+		console_set_scope(&console,
-+				  CONSOLE_FLAG_BOOT | CONSOLE_FLAG_RUNTIME | CONSOLE_FLAG_CRASH);
-+	}
-
- 	VERBOSE("bl31_setup\n");