Revert "open display kernel log in uboot,just support lvds now"

This reverts commit ade9cca99e5c0ceeb32ae098214ded33d7000b18.

diff --git a/arch/arm/boot/.gitignore b/arch/arm/boot/.gitignore
old mode 100755 (executable)
new mode 100644 (file)
index ac74207..3c79f85
--- a/arch/arm/boot/.gitignore
+++ b/arch/arm/boot/.gitignore
@@ -4,5 +4,3 @@ xipImage
 bootpImage
 uImage
 *.dtb
 bootpImage
 uImage
 *.dtb

-\r
-linux_logo.dtsi
\ No newline at end of file

diff --git a/arch/arm/boot/dts/lcd-b101ew05.dtsi b/arch/arm/boot/dts/lcd-b101ew05.dtsi
index 001e9df473c57491a786ef4e9f9f252c2ae3f75e..2d79841e5abdd5ea3121e0354af5d099fe73fdd0 100644 (file)
--- a/arch/arm/boot/dts/lcd-b101ew05.dtsi
+++ b/arch/arm/boot/dts/lcd-b101ew05.dtsi
@@ -27,7 +27,6 @@
                                swap-rb = <0>;
                                swap-rg = <0>;
                                swap-gb = <0>;
                                swap-rb = <0>;
                                swap-rg = <0>;
                                swap-gb = <0>;

-                               uboot,logo-on = <1>;

                        };
                };
 };
                        };
                };
 };

diff --git a/arch/arm/boot/dts/rk3288-chrome.dts b/arch/arm/boot/dts/rk3288-chrome.dts
index a4cd0f32990ecb47e71f749da3c43eb1421e4071..5c7a5f9aec4f7a8cc568425a21bae2762a2f8ce1 100755 (executable)
--- a/arch/arm/boot/dts/rk3288-chrome.dts
+++ b/arch/arm/boot/dts/rk3288-chrome.dts
@@ -2,7 +2,7 @@
 
 #include "rk3288.dtsi"
 #include "lcd-b101ew05.dtsi"
 
 #include "rk3288.dtsi"
 #include "lcd-b101ew05.dtsi"

-#include "linux_logo.dtsi"
+

 / {
        fiq-debugger {
                status = "okay";
 / {
        fiq-debugger {
                status = "okay";

diff --git a/arch/arm/boot/dts/rk3288-tb.dts b/arch/arm/boot/dts/rk3288-tb.dts
index b39f9201481b7d4e15d1a42f5097ce79385ee943..2f92b7ec099bd973bd90bc9c316a9f7011d0c839 100755 (executable)
--- a/arch/arm/boot/dts/rk3288-tb.dts
+++ b/arch/arm/boot/dts/rk3288-tb.dts
@@ -2,7 +2,7 @@
 
 #include "rk3288.dtsi"
 #include "lcd-b101ew05.dtsi"
 
 #include "rk3288.dtsi"
 #include "lcd-b101ew05.dtsi"

-#include "linux_logo.dtsi"
+

 / {
        fiq-debugger {
                status = "okay";
 / {
        fiq-debugger {
                status = "okay";


@@ -571,15 +571,15 @@ rockchip,power_type = <GPIO>;
 &clk_core_dvfs_table {
        operating-points = <
                /* KHz    uV */
 &clk_core_dvfs_table {
        operating-points = <
                /* KHz    uV */

-       //      126000 1050000
-       //      216000 1050000
-       //      312000 1050000
-       //      408000 1050000
-       //      600000 1050000
-       //      696000 1050000
-               816000 1050000
-               1008000 1050000
-               1200000 1100000
+               126000 850000
+               216000 850000
+               312000 850000
+               408000 850000
+               600000 850000
+               696000 900000
+               816000 950000
+               1008000 1000000
+               1200000 1050000

                1416000 1150000
                >;
        status="okay";
                1416000 1150000
                >;
        status="okay";


@@ -588,10 +588,10 @@ rockchip,power_type = <GPIO>;
 &clk_gpu_dvfs_table {
        operating-points = <
                /* KHz    uV */
 &clk_gpu_dvfs_table {
        operating-points = <
                /* KHz    uV */

-       //      100000 1100000
-       //      200000 1100000
-               300000 1100000
-               400000 1100000
+               100000 850000
+               200000 850000
+               300000 900000
+               400000 1000000

                500000 1100000
                600000 1250000
                >;
                500000 1100000
                600000 1250000
                >;

diff --git a/scripts/.gitignore b/scripts/.gitignore
index c38ef38342ff774ce9928eb46b7107485507fbef..fb070fa1038feb51e47db9c4ec807ee328fe6364 100644 (file)
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -11,4 +11,3 @@ recordmcount
 docproc
 sortextable
 asn1_compiler
 docproc
 sortextable
 asn1_compiler

-pnmtodtsi