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>

diff --git a/arch/arm/boot/dts/amlogic/atom.dts b/arch/arm/boot/dts/amlogic/atom.dts
index b2a9b47..84357ef 100644 (file)
--- 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";

diff --git a/arch/arm/boot/dts/amlogic/axg_a113d_skt.dts b/arch/arm/boot/dts/amlogic/axg_a113d_skt.dts
index a431933..0b3b51c 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/axg_a113x_skt.dts b/arch/arm/boot/dts/amlogic/axg_a113x_skt.dts
index 1902ef3..5d7728f 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/axg_s400.dts b/arch/arm/boot/dts/amlogic/axg_s400.dts
index 3884ee3..06011db 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/axg_s400_v03.dts b/arch/arm/boot/dts/amlogic/axg_s400_v03.dts
index d8cf6fd..8fe15ed 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/axg_s400_v03gva.dts b/arch/arm/boot/dts/amlogic/axg_s400_v03gva.dts
index 6969131..8ebaddc 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/axg_s400_v03sbr.dts b/arch/arm/boot/dts/amlogic/axg_s400_v03sbr.dts
index b87fc56..cf9159c 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/axg_s400emmc_512m.dts b/arch/arm/boot/dts/amlogic/axg_s400emmc_512m.dts
index da16137..892b556 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/axg_s420.dts b/arch/arm/boot/dts/amlogic/axg_s420.dts
index 104e35f..fda588b 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/axg_s420_v03.dts b/arch/arm/boot/dts/amlogic/axg_s420_v03.dts
index f9da32c..05ab48d 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/axg_s420_v03gva.dts b/arch/arm/boot/dts/amlogic/axg_s420_v03gva.dts
index f49e3e4..83595b3 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_skt.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_skt.dts
index 5977307..78b941d 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts
index d9bf83b..ae12cd0 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts
index 24bcbcf..02c83f8 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211.dts
index 05e912f..80d517c 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_1g.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_1g.dts
index 5b83889..af3dc78 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_512m.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_512m.dts
index 35edc07..8be4b32 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts
index 13f1fb5..b72676f 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
index 44a8d10..a97d5b3 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905y2_u220.dts b/arch/arm/boot/dts/amlogic/g12a_s905y2_u220.dts
index ddbde88..546792e 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts
index a88a2dd..6982519 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_skt_a.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_skt_a.dts
index 17376a8..d6044c9 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts
index 5764374..06f66e2 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts
index 1178704..7fc68fd 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts
index d25d828..dacb916 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts
index 83510bc..c972c12 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts
index d093bb8..41d64e2 100644 (file)
--- 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;

diff --git 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
index 202c619..7edfad7 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts
index e3f4306..10b88c0 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.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 {

diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts
index c03256e..336df90 100644 (file)
--- 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;

diff --git a/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts
index c1944cc..fe328fc 100644 (file)
--- 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";

diff --git a/arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts
index bdb4675..535dd4e 100644 (file)
--- 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;

diff --git a/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts b/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts
index 5fdbc78..de8e236 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts
index 0a35a0d..396c759 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
index 2365af3..5fb51e8 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts b/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts
index feab09e..5aa26fa 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
index af46fd2..b3c37a7 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts b/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts
index aa85f76..9999105 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
index bd8fa63..102e110 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts
index 46a4b32..2e82adb 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts
index 2bb9708..8fa3a3f 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts b/arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts
index f68747e..e7468cd 100644 (file)
--- 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";

diff --git a/arch/arm/boot/dts/amlogic/gxm_q200_2g.dts b/arch/arm/boot/dts/amlogic/gxm_q200_2g.dts
index 722771f..78687fb 100644 (file)
--- 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";

diff --git a/arch/arm/boot/dts/amlogic/gxm_q200_2g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxm_q200_2g_buildroot.dts
index e695359..32725ad 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts b/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts
index c1ac394..46823dc 100644 (file)
--- 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";

diff --git a/arch/arm/boot/dts/amlogic/gxm_q201_2g.dts b/arch/arm/boot/dts/amlogic/gxm_q201_2g.dts
index b70073f..0b77e07 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/gxm_skt.dts b/arch/arm/boot/dts/amlogic/gxm_skt.dts
index b6ff2bb..4eba982 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts
index 8e419ea..ff4ada7 100644 (file)
--- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts
@@ -59,7 +59,7 @@
                        reg = <0x07400000 0x00100000>;
                        record-size = <0x8000>;
                        console-size = <0x8000>;
-                       ftrace-size = <0x0>;
+                       ftrace-size = <0x20000>;
                        pmsg-size = <0x8000>;
                };
 

diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts
index 62b8f52..17c4e7c 100644 (file)
--- a/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts
@@ -59,7 +59,7 @@
                        reg = <0x07400000 0x00100000>;
                        record-size = <0x8000>;
                        console-size = <0x8000>;
-                       ftrace-size = <0x0>;
+                       ftrace-size = <0x20000>;
                        pmsg-size = <0x8000>;
                };
 

diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts
index 55595d6..c4bbbe0 100644 (file)
--- a/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts
+++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.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 {

diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts
index bc370e2..f635279 100644 (file)
--- a/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts
+++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.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 {

diff --git a/arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts b/arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts
index 852b21a..64ab38c 100644 (file)
--- 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";

diff --git a/arch/arm/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts b/arch/arm/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts
index 7567223..5b98522 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts
index 2f6c3d6..72b29a7 100644 (file)
--- a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts
+++ b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.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";

diff --git a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts
index b550763..d000fef 100644 (file)
--- 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";

diff --git a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_720p.dts b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_720p.dts
index 14a3f55..12bd870 100644 (file)
--- 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";

diff --git a/arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts b/arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts
index f3827f4..806340c 100644 (file)
--- 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";

diff --git a/arch/arm/configs/meson64_a32_defconfig b/arch/arm/configs/meson64_a32_defconfig
index 3ec4c8c..9fce02d 100644 (file)
--- a/arch/arm/configs/meson64_a32_defconfig
+++ b/arch/arm/configs/meson64_a32_defconfig
@@ -489,10 +489,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
@@ -597,6 +597,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
@@ -625,7 +626,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

diff --git a/arch/arm64/boot/dts/amlogic/atom.dts b/arch/arm64/boot/dts/amlogic/atom.dts
index 647052c..4021f1d 100644 (file)
--- 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";

diff --git a/arch/arm64/boot/dts/amlogic/axg_a113d_skt.dts b/arch/arm64/boot/dts/amlogic/axg_a113d_skt.dts
index e9f8680..3e05261 100644 (file)
--- 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";

diff --git a/arch/arm64/boot/dts/amlogic/axg_a113x_skt.dts b/arch/arm64/boot/dts/amlogic/axg_a113x_skt.dts
index d3407d8..65a00e7 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/axg_s400.dts b/arch/arm64/boot/dts/amlogic/axg_s400.dts
index 4098f87..58383ab 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts b/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts
index 25d3941..ee09047 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/axg_s400_v03gva.dts b/arch/arm64/boot/dts/amlogic/axg_s400_v03gva.dts
index a2e2f41..63336e7 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/axg_s400_v03sbr.dts b/arch/arm64/boot/dts/amlogic/axg_s400_v03sbr.dts
index 6444806..79b4d42 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/axg_s400emmc_512m.dts b/arch/arm64/boot/dts/amlogic/axg_s400emmc_512m.dts
index 6b30d54..445b849 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/axg_s420.dts b/arch/arm64/boot/dts/amlogic/axg_s420.dts
index ddc988d..6f1c708 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts b/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts
index b2ce787..6033259 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/axg_s420_v03gva.dts b/arch/arm64/boot/dts/amlogic/axg_s420_v03gva.dts
index 08207f9..b01bb73 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts
index 6fe4f59..eb12c11 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts
index 3ff321d..24bdcde 100644 (file)
--- 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;

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts
index 8cf0bb5..af28751 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts
index 640f504..ab66147 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts
index 825e1b4..fe5fb98 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_512m.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_512m.dts
index ccf2218..eeb9357 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts
index 7ba8db6..86b6a81 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
index a65d603..7ff41b6 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts
index e9e85e7..5b06170 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
index 4e3d8fa..171aec3 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt_a.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt_a.dts
index c3d6219..f20a7b7 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts
index 5ef95cf..e1ce9af 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts
index 779b138..779fa5b 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts
index ce5f6ce..659d37e 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts
index b91028e..e86e010 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts
index 218714b..da0a054 100644 (file)
--- 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 {

diff --git 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
index 0c406a1..ac5ca36 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts
index 4c8d1de..f22c04a 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.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 {

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot.dts
index 47e9c78..63f6b0d 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot_a.dts b/arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot_a.dts
index d6851e8..a37936e 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts
index df862e1..302ea68 100644 (file)
--- 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";

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts
index 101ad78..6adc66f 100644 (file)
--- 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";

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts
index 5c38487..841f7da 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts
index 7d8d55a..66e5c18 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts
index ba85a85..9f90568 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
index 92f6e7d..b334aca 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts
index dadb59a..66db66c 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
index 2a7245a..8e93cb9 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts
index f569d07..f915038 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
index 6bfe499..ca8d72a 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts
index bb6cc47..41ce3a5 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts
index f316571..e8555c9 100644 (file)
--- 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 {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts
index 5140780..cf3440b 100644 (file)
--- 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";

diff --git a/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts b/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts
index d3bc6cd..6bddb2b 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxm_q200_2g.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 {
                        compatible = "shared-dma-pool";

diff --git a/arch/arm64/boot/dts/amlogic/gxm_q200_2g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxm_q200_2g_buildroot.dts
index e8dcafa..b5e51bc 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxm_q200_2g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxm_q200_2g_buildroot.dts
@@ -54,8 +54,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 {

diff --git a/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts b/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts
index a9043e8..5aad434 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts
@@ -55,9 +55,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";

diff --git a/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts b/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts
index 0b9e936..eac5133 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxm_q201_2g.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 {

diff --git a/arch/arm64/boot/dts/amlogic/gxm_skt.dts b/arch/arm64/boot/dts/amlogic/gxm_skt.dts
index 90dde40..148290c 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxm_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/gxm_skt.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 {

diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
index 158d938..ac26f3d 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
@@ -59,7 +59,7 @@
                        reg = <0x0 0x07400000 0x0 0x00100000>;
                        record-size = <0x8000>;
                        console-size = <0x8000>;
-                       ftrace-size = <0x0>;
+                       ftrace-size = <0x20000>;
                        pmsg-size = <0x8000>;
                };
 

diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts
index 756407c..57a2110 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts
@@ -59,7 +59,7 @@
                        reg = <0x0 0x07400000 0x0 0x00100000>;
                        record-size = <0x8000>;
                        console-size = <0x8000>;
-                       ftrace-size = <0x0>;
+                       ftrace-size = <0x20000>;
                        pmsg-size = <0x8000>;
                };
 

diff --git a/arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts b/arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts
index 1d818aa..1ced060 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts
+++ b/arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.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 {

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
index b9bad64..d281ce3 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.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";

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts
index 27d6b6f..c303055 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_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 {

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
index 2bb09c9..96cd511 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
@@ -61,8 +61,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";

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
index 7201861..c959197 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
@@ -61,8 +61,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";

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
index 16ff8e5..d5c56b9 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
@@ -61,8 +61,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";

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts
index 3c25f45..3b10587 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts
@@ -61,8 +61,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";

diff --git a/arch/arm64/configs/meson64_defconfig b/arch/arm64/configs/meson64_defconfig
index 4101d55..7bb1ca6 100644 (file)
--- a/arch/arm64/configs/meson64_defconfig
+++ b/arch/arm64/configs/meson64_defconfig
@@ -591,6 +591,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