debug: enable ftrace_ramoops [1/2]

PD#SWPL-6028 Problem: enable ftrce in ramoops Solution: enable ftrce in ramoops Verify: u200 Change-Id: I2403bf82c342416b7c34f2115b14dce623406997 Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com> Signed-off-by: Luan Yuan <luan.yuan@amlogic.com> dts: debug: enable ftrace_ramoops for new dts [1/1] PD#SWPL-6028 Problem: enable ftrce in ramoops for new dtbs Solution: enable ftrce in ramoops for new dtbs Verify: X301 Change-Id: I0643329a873a310d1078ebd898fec2d3cb75d43c Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com> Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2026-06-08 11:50:43 +09:00 · 2019-04-03 18:53:20 +08:00
parent b43124beb0
commit 28afc166d2
114 changed files with 142 additions and 226 deletions
--- a/arch/arm/boot/dts/amlogic/atom.dts
+++ b/arch/arm/boot/dts/amlogic/atom.dts
@@ -58,8 +58,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};
 		secmon_reserved:linux,secmon {
 			compatible = "shared-dma-pool";
--- a/arch/arm/boot/dts/amlogic/axg_a113d_skt.dts
+++ b/arch/arm/boot/dts/amlogic/axg_a113d_skt.dts
@@ -49,8 +49,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 };

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/axg_a113x_skt.dts
+++ b/arch/arm/boot/dts/amlogic/axg_a113x_skt.dts
@@ -47,8 +47,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/axg_s400.dts
+++ b/arch/arm/boot/dts/amlogic/axg_s400.dts
@@ -47,8 +47,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/axg_s400_v03.dts
+++ b/arch/arm/boot/dts/amlogic/axg_s400_v03.dts
@@ -47,8 +47,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/axg_s400_v03gva.dts
+++ b/arch/arm/boot/dts/amlogic/axg_s400_v03gva.dts
@@ -47,8 +47,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/axg_s400_v03sbr.dts
+++ b/arch/arm/boot/dts/amlogic/axg_s400_v03sbr.dts
@@ -47,8 +47,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/axg_s400emmc_512m.dts
+++ b/arch/arm/boot/dts/amlogic/axg_s400emmc_512m.dts
@@ -53,8 +53,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/axg_s420.dts
+++ b/arch/arm/boot/dts/amlogic/axg_s420.dts
@@ -47,8 +47,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/axg_s420_v03.dts
+++ b/arch/arm/boot/dts/amlogic/axg_s420_v03.dts
@@ -47,8 +47,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/axg_s420_v03gva.dts
+++ b/arch/arm/boot/dts/amlogic/axg_s420_v03gva.dts
@@ -47,8 +47,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/g12a_s905d2_skt.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_skt.dts
@@ -59,8 +59,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts
@@ -59,8 +59,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts
@@ -59,8 +59,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211.dts
@@ -58,8 +58,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_1g.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_1g.dts
@@ -59,8 +59,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_512m.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_512m.dts
@@ -57,8 +57,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts
@@ -58,8 +58,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
@@ -59,8 +59,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/g12a_s905y2_u220.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905y2_u220.dts
@@ -57,8 +57,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts
@@ -59,8 +59,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_skt_a.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_skt_a.dts
@@ -59,8 +59,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts
@@ -59,8 +59,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts
@@ -59,8 +59,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts
@@ -58,8 +58,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts
@@ -58,8 +58,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts
@@ -58,10 +58,8 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};
-
 		secmon_reserved:linux,secmon {
 			compatible = "shared-dma-pool";
 			reusable;
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts
@@ -58,8 +58,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts
@@ -56,9 +56,9 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};
+
 		secmon_reserved:linux,secmon {
 			compatible = "shared-dma-pool";
 			reusable;
--- a/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts
@@ -56,8 +56,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};
 		secmon_reserved:linux,secmon {
 			compatible = "shared-dma-pool";
--- a/arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts
@@ -56,10 +56,8 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};
-
 		secmon_reserved:linux,secmon {
 			compatible = "shared-dma-pool";
 			reusable;
--- a/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts
@@ -56,8 +56,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts
@@ -56,8 +56,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
@@ -53,8 +53,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts
@@ -55,8 +55,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
@@ -55,8 +55,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts
@@ -55,8 +55,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
@@ -55,8 +55,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts
@@ -51,8 +51,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts
@@ -51,8 +51,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts
@@ -56,8 +56,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};
 		secmon_reserved:linux,secmon {
 			compatible = "shared-dma-pool";
--- a/arch/arm/boot/dts/amlogic/gxm_q200_2g.dts
+++ b/arch/arm/boot/dts/amlogic/gxm_q200_2g.dts
@@ -55,8 +55,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};
 		secmon_reserved:linux,secmon {
 			compatible = "shared-dma-pool";
--- a/arch/arm/boot/dts/amlogic/gxm_q200_2g_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/gxm_q200_2g_buildroot.dts
@@ -54,8 +54,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts
+++ b/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts
@@ -55,9 +55,8 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
-};
+			ftrace-size = <0x20000>;
+		};

 		secmon_reserved:linux,secmon {
 			compatible = "shared-dma-pool";
--- a/arch/arm/boot/dts/amlogic/gxm_q201_2g.dts
+++ b/arch/arm/boot/dts/amlogic/gxm_q201_2g.dts
@@ -55,8 +55,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/gxm_skt.dts
+++ b/arch/arm/boot/dts/amlogic/gxm_skt.dts
@@ -55,8 +55,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts
@@ -59,8 +59,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts
@@ -59,8 +59,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts
+++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts
@@ -51,6 +51,14 @@
 		#size-cells = <1>;
 		ranges;
 		/* global autoconfigured region for contiguous allocations */
+		ramoops@0x07400000 {
+			compatible = "ramoops";
+			reg = <0x07400000 0x00100000>;
+			record-size = <0x8000>;
+			console-size = <0x8000>;
+			ftrace-size = <0x20000>;
+		};
+
 		secmon_reserved: linux,secmon {
 			compatible = "shared-dma-pool";
 			reusable;
--- a/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts
+++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts
@@ -52,6 +52,14 @@
 		#size-cells = <1>;
 		ranges;
 		/* global autoconfigured region for contiguous allocations */
+		ramoops@0x07400000 {
+			compatible = "ramoops";
+			reg = <0x07400000 0x00100000>;
+			record-size = <0x8000>;
+			console-size = <0x8000>;
+			ftrace-size = <0x20000>;
+		};
+
 		secmon_reserved: linux,secmon {
 			compatible = "shared-dma-pool";
 			reusable;
--- a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301.dts
+++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301.dts
@@ -51,6 +51,14 @@
 		#size-cells = <1>;
 		ranges;
 		/* global autoconfigured region for contiguous allocations */
+		ramoops@0x07400000 {
+			compatible = "ramoops";
+			reg = <0x07400000 0x00100000>;
+			record-size = <0x8000>;
+			console-size = <0x8000>;
+			ftrace-size = <0x20000>;
+		};
+
 		secmon_reserved: linux,secmon {
 			compatible = "shared-dma-pool";
 			reusable;
--- a/arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts
+++ b/arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts
@@ -58,8 +58,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};
 		secmon_reserved:linux,secmon {
 			compatible = "shared-dma-pool";
--- a/arch/arm/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts
@@ -57,8 +57,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts
+++ b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts
@@ -61,8 +61,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};
 		secmon_reserved:linux,secmon {
 			compatible = "shared-dma-pool";
--- a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_720p.dts
+++ b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_720p.dts
@@ -59,8 +59,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};
 		secmon_reserved:linux,secmon {
 			compatible = "shared-dma-pool";
--- a/arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts
+++ b/arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts
@@ -61,8 +61,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};
 		secmon_reserved:linux,secmon {
 			compatible = "shared-dma-pool";
--- a/arch/arm/configs/meson64_a32_defconfig
+++ b/arch/arm/configs/meson64_a32_defconfig
@@ -487,10 +487,10 @@ CONFIG_AMLOGIC_SND_CODEC_PCM2BT=y
 CONFIG_AMLOGIC_SND_CODEC_PDM_DUMMY_CODEC=y
 CONFIG_AMLOGIC_SND_CODEC_AMLT9015=y
 CONFIG_AMLOGIC_SND_CODEC_AMLT9015S=y
+CONFIG_AMLOGIC_SND_SOC_TAS5805=y
 CONFIG_AMLOGIC_SND_CODEC_TXLX_ACODEC=y
 CONFIG_AMLOGIC_SND_CODEC_TL1_ACODEC=y
 CONFIG_AMLOGIC_SND_SOC_TAS5707=y
-CONFIG_AMLOGIC_SND_SOC_TAS5805=y
 CONFIG_AMLOGIC_SND_SOC_TLV320ADC3101=y
 CONFIG_AMLOGIC_SND_SOC_PCM186X=y
 CONFIG_AMLOGIC_SND_SOC_SSM3525=y
@@ -595,6 +595,7 @@ CONFIG_SQUASHFS=y
 CONFIG_PSTORE=y
 CONFIG_PSTORE_CONSOLE=y
 CONFIG_PSTORE_PMSG=y
+CONFIG_PSTORE_FTRACE=y
 CONFIG_PSTORE_RAM=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
@@ -623,7 +624,6 @@ CONFIG_LSM_MMAP_MIN_ADDR=0
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SMACK=y
-CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_MICHAEL_MIC=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_TWOFISH=y
--- a/arch/arm64/boot/dts/amlogic/atom.dts
+++ b/arch/arm64/boot/dts/amlogic/atom.dts
@@ -58,8 +58,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};
 		secmon_reserved:linux,secmon {
 			compatible = "shared-dma-pool";
--- a/arch/arm64/boot/dts/amlogic/axg_a113d_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_a113d_skt.dts
@@ -49,9 +49,8 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
-};
+			ftrace-size = <0x20000>;
+		};

 		secmon_reserved:linux,secmon {
 			compatible = "shared-dma-pool";
--- a/arch/arm64/boot/dts/amlogic/axg_a113x_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_a113x_skt.dts
@@ -47,8 +47,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/axg_s400.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_s400.dts
@@ -47,8 +47,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts
@@ -47,8 +47,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/axg_s400_v03gva.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_s400_v03gva.dts
@@ -47,8 +47,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/axg_s400_v03sbr.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_s400_v03sbr.dts
@@ -47,8 +47,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/axg_s400emmc_512m.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_s400emmc_512m.dts
@@ -53,8 +53,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/axg_s420.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_s420.dts
@@ -47,8 +47,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts
@@ -47,8 +47,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/axg_s420_v03gva.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_s420_v03gva.dts
@@ -47,8 +47,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts
@@ -59,8 +59,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts
@@ -59,10 +59,10 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

+
 		secmon_reserved:linux,secmon {
 			compatible = "shared-dma-pool";
 			reusable;
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts
@@ -54,13 +54,12 @@
 		#size-cells = <2>;
 		ranges;
 		/* global autoconfigured region for contiguous allocations */
-                ramoops@0x07400000 {
+		ramoops@0x07400000 {
 			compatible = "ramoops";
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts
@@ -58,8 +58,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts
@@ -59,8 +59,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_512m.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_512m.dts
@@ -57,8 +57,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts
@@ -58,8 +58,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
@@ -59,8 +59,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts
@@ -57,8 +57,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
@@ -59,8 +59,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt_a.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt_a.dts
@@ -59,8 +59,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts
@@ -59,8 +59,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts
@@ -59,8 +59,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts
@@ -58,8 +58,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts
@@ -58,8 +58,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts
@@ -58,8 +58,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts
@@ -58,8 +58,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot.dts
@@ -57,8 +57,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot_a.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot_a.dts
@@ -57,8 +57,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts
@@ -56,8 +56,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};
 		secmon_reserved:linux,secmon {
 			compatible = "shared-dma-pool";
--- a/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts
@@ -56,8 +56,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};
 		secmon_reserved:linux,secmon {
 			compatible = "shared-dma-pool";
--- a/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts
@@ -56,8 +56,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts
@@ -56,8 +56,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts
@@ -56,8 +56,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
@@ -53,8 +53,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts
@@ -55,8 +55,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
@@ -55,8 +55,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts
@@ -56,8 +56,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
@@ -55,8 +55,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts
@@ -51,8 +51,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts
@@ -51,8 +51,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};

 		secmon_reserved:linux,secmon {
--- a/arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts
@@ -56,8 +56,7 @@
 			reg = <0x0 0x07400000 0x0 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};
 		secmon_reserved:linux,secmon {
 			compatible = "shared-dma-pool";
--- a/Show More
+++ b/Show More