From: eddie <cf@rock-chips.com>
Date: Wed, 9 Apr 2014 07:20:02 +0000 (+0800)
Subject: open display kernel log in uboot,just support lvds now
X-Git-Tag: firefly_0821_release~5594
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ade9cca99e5c0ceeb32ae098214ded33d7000b18;p=firefly-linux-kernel-4.4.55.git

open display kernel log in uboot,just support lvds now
---

diff --git a/arch/arm/boot/.gitignore b/arch/arm/boot/.gitignore
old mode 100644
new mode 100755
index 3c79f85975aa..ac742074b994
--- a/arch/arm/boot/.gitignore
+++ b/arch/arm/boot/.gitignore
@@ -4,3 +4,5 @@ xipImage
 bootpImage
 uImage
 *.dtb
+
+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 2d79841e5abd..001e9df473c5 100644
--- a/arch/arm/boot/dts/lcd-b101ew05.dtsi
+++ b/arch/arm/boot/dts/lcd-b101ew05.dtsi
@@ -27,6 +27,7 @@
 				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 5c7a5f9aec4f..a4cd0f32990e 100755
--- 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 "linux_logo.dtsi"
 / {
 	fiq-debugger {
 		status = "okay";
diff --git a/arch/arm/boot/dts/rk3288-tb.dts b/arch/arm/boot/dts/rk3288-tb.dts
index 2f92b7ec099b..b39f9201481b 100755
--- 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 "linux_logo.dtsi"
 / {
 	fiq-debugger {
 		status = "okay";
@@ -571,15 +571,15 @@ rockchip,power_type = <GPIO>;
 &clk_core_dvfs_table {
 	operating-points = <
 		/* KHz    uV */
-		126000 850000
-		216000 850000
-		312000 850000
-		408000 850000
-		600000 850000
-		696000 900000
-		816000 950000
-		1008000 1000000
-		1200000 1050000
+	//	126000 1050000
+	//	216000 1050000
+	//	312000 1050000
+	//	408000 1050000
+	//	600000 1050000
+	//	696000 1050000
+		816000 1050000
+		1008000 1050000
+		1200000 1100000
 		1416000 1150000
 		>;
 	status="okay";
@@ -588,10 +588,10 @@ rockchip,power_type = <GPIO>;
 &clk_gpu_dvfs_table {
 	operating-points = <
 		/* KHz    uV */
-		100000 850000
-		200000 850000
-		300000 900000
-		400000 1000000
+	//	100000 1100000
+	//	200000 1100000
+		300000 1100000
+		400000 1100000
 		500000 1100000
 		600000 1250000
 		>;
diff --git a/scripts/.gitignore b/scripts/.gitignore
index fb070fa1038f..c38ef38342ff 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -11,3 +11,4 @@ recordmcount
 docproc
 sortextable
 asn1_compiler
+pnmtodtsi