From d189e01506ff7b125ea5d1631dae7311028ecbdb Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Wed, 9 Apr 2014 15:51:39 +0800 Subject: [PATCH] Revert "open display kernel log in uboot,just support lvds now" This reverts commit ade9cca99e5c0ceeb32ae098214ded33d7000b18. --- arch/arm/boot/.gitignore | 2 -- arch/arm/boot/dts/lcd-b101ew05.dtsi | 1 - arch/arm/boot/dts/rk3288-chrome.dts | 2 +- arch/arm/boot/dts/rk3288-tb.dts | 28 ++++++++++++++-------------- scripts/.gitignore | 1 - 5 files changed, 15 insertions(+), 19 deletions(-) mode change 100755 => 100644 arch/arm/boot/.gitignore diff --git a/arch/arm/boot/.gitignore b/arch/arm/boot/.gitignore old mode 100755 new mode 100644 index ac742074b994..3c79f85975aa --- a/arch/arm/boot/.gitignore +++ b/arch/arm/boot/.gitignore @@ -4,5 +4,3 @@ 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 001e9df473c5..2d79841e5abd 100644 --- 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>; - uboot,logo-on = <1>; }; }; }; diff --git a/arch/arm/boot/dts/rk3288-chrome.dts b/arch/arm/boot/dts/rk3288-chrome.dts index a4cd0f32990e..5c7a5f9aec4f 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 b39f9201481b..2f92b7ec099b 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 = ; &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"; @@ -588,10 +588,10 @@ rockchip,power_type = ; &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 >; diff --git a/scripts/.gitignore b/scripts/.gitignore index c38ef38342ff..fb070fa1038f 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -11,4 +11,3 @@ recordmcount docproc sortextable asn1_compiler -pnmtodtsi -- 2.34.1