Commit Graph

72 Commits

Author SHA1 Message Date
cjp
62ce99b5fa u-boot:add uboot file 2015-12-31 18:15:28 +08:00
djw
2b5f44213a Merge master branch.
Conflicts:
	frameworks/base/core/java/android/content/res/Configuration.java
	frameworks/base/core/java/android/provider/Settings.java
	frameworks/base/packages/SettingsProvider/res/values/defaults.xml
	frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/SystemBars.java
	frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	frameworks/base/services/core/java/com/android/server/wm/WindowManagerService.java
	hardware/rockchip/camera/CameraHal/CameraHal_board_xml_parse.cpp
	vendor/rockchip/common/apps/apps.mk
2015-12-31 17:54:05 +08:00
c601d0b3dc [u-boot] rk emmc: tunning and ddr mode api support.
1. emmc add tunning api.
    2. emmc support ddr mode and improve compatibily.
    3. emmc default disable ddr mode.

Signed-off-by: Firefly <service@t-firefly.com>
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 17:03:24 +08:00
7a12db25f4 [u-boot] rk boot: commandline logo information depend on logo on state from kernel dtb.
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 17:03:16 +08:00
5148b4e482 [u-boot] hdmi: 3288/3368: support parse phy setting from dts
We can configurate phy setting in dts node "rockchip,phy_table"
with following format:

<maxfreq pre-emphasis slopeboost clklevel data0level data1level data2level>

Phy setting table must list from low freq to high freq and cover
all supported frequency, for example:

&hdmi {
	status = "okay";
        rockchip,phy_table =
                <165000000 0 0 17 17 17 17>,
                <340000000 0 0 14 17 17 17>,
                <594000000 0 0 9 17 17 17>;
};

If dts node is not exist, we use default setting defined in code.

Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 17:03:08 +08:00
bf192201a5 [u-boot] rk charge: enter charge depend on reboot type and charge state. 2015-12-31 17:02:59 +08:00
726e3e2b09 [u-boot] video: lcdc: rk3036/rk312x: update grf config for lcdc0_hsync
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 17:02:51 +08:00
59d3576ae3 [u-boot] rk hdmi: paramer memory depend on CONFIG_RKHDMI_PARAM_ADDR, no need copy baseparameter.
Signed-off-by: Firefly <service@t-firefly.com>
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 17:02:43 +08:00
5654240fd5 [u-boot] hdmi: 3128: fix error of input/output color configuration
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 17:02:35 +08:00
80d0ca4cc1 [u-boot] hdmi: 312x: use same video paramter with 3288
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 17:02:27 +08:00
952cba6e63 [u-boot] hdmi: 3288: set ddc clk to 50KHz
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 17:02:19 +08:00
f08841c117 [u-boot] tve: 312x: set lcdc output mode
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 17:02:10 +08:00
1d01ce49ed [u-boot] lcdc: 312x: output color mode according input parameter
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 17:02:02 +08:00
87cb2b5b7e [u-boot] power: rk818 charger: fix ocv table size calloc error
Signed-off-by: Firefly <service@t-firefly.com>
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 17:01:53 +08:00
86c1a3e373 [u-boot] rk resource tool: sort resource when packing. 2015-12-31 17:01:45 +08:00
96528ae39b [u-boot] rk key: rkkey driver recoding. 2015-12-31 17:01:37 +08:00
4f1719665f [u-boot] Revert "fdt: add new fdt address parsing functions"
This reverts commit 456a1374eba0a0bbf4f3ee5065b1a6085112a686.
2015-12-31 17:01:29 +08:00
e75ab48309 [u-boot] Revert "libfdt: fdtdec_get_addr() api instead of fdtdec_get_reg."
This reverts commit d75425df4ec261f351febf841add3579ae5a2aad.
2015-12-31 17:01:21 +08:00
bfb9d71d41 [u-boot] libfdt: fdtdec_get_addr() api instead of fdtdec_get_reg.
fdtdec_get_addr for aarch64 error has been fixed by uboot master,
        so rkplat using fdtdec_get_addr instead of fdtdec_get_reg.

Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 17:01:13 +08:00
09e9d07478 [u-boot] fdt: add new fdt address parsing functions
fdtdec_get_addr_size() hard-codes the number of cells used to represent
an address or size in DT. This is incorrect in many cases depending on
the DT binding for a particular node or property (e.g. it is incorrect
for the "reg" property). In most cases, DT parsing code must use the
properties #address-cells and #size-cells to parse addres properties.

This change splits up the implementation of fdtdec_get_addr_size() so
that the core logic can be used for both hard-coded and non-hard-coded
cases. Various wrapper functions are implemented that support cases
where hard-coded cell counts should or should not be used, and where
the client does and doesn't know the parent node ID that contains the
properties #address-cells and #size-cells.

dev_get_addr() is updated to use the new functions.

Core functionality in fdtdec_get_addr_size_fixed() is widely tested via
fdtdec_get_addr_size(). I tested fdtdec_get_addr_size_auto_noparent() and
dev_get_addr() by manually modifying the Tegra I2C driver to invoke them.

Much of the core implementation of fdtdec_get_addr_size_fixed(),
fdtdec_get_addr_size_auto_parent(), and
fdtdec_get_addr_size_auto_noparent() comes from Thierry Reding's
previous commit "fdt: Fix fdtdec_get_addr_size() for 64-bit".

Based-on-work-by: Firefly <service@t-firefly.com>
Cc: Firefly <service@t-firefly.com>
Cc: Firefly <service@t-firefly.com>
Cc: Firefly <service@t-firefly.com>
Signed-off-by: Firefly <service@t-firefly.com>
Acked-by: Firefly <service@t-firefly.com>
Dropped #define DEBUG at the top of fdtdec.c:
Signed-off-by: Firefly <service@t-firefly.com>

Signed-off-by: Firefly <service@t-firefly.com>

Conflicts:
	drivers/core/device.c
2015-12-31 17:01:05 +08:00
9c8d9ef8c5 [u-boot] SecureBoot: fix gDrmKeyInfo.keyBoxEnable not set when RK secure mode enable. 2015-12-31 17:00:56 +08:00
b05cbfb8cb [u-boot] rk3368: trust bl30 v2.11. 2015-12-31 17:00:48 +08:00
73fde6e943 [u-boot] hdmi:rk3288/rk3388: add vic flag HDMI_UBOOT_NOT_INIT
Signed-off-by: Firefly <service@t-firefly.com>
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 17:00:40 +08:00
a570801a86 [u-boot] uboot: pmic: rk8x8: slover set voltage error.
slove set voltage error.
Syntax error in the codes.

Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 17:00:32 +08:00
c22aab6805 [u-boot] rk3368: Secureboot enable and check image when booting.
1. CONFIG_SECURE_RSA_KEY_IN_RAM config key get from ddr.
    2. CONFIG_SECURE_RSA_KEY_ADDR config key address.
    3. Secureboot change for support key in ddr.
    4. bl31 v1.6 for crypto module error.

Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 17:00:23 +08:00
2e9636078d [u-boot] hdmi:rk3288/rk3388: fix code style
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 17:00:15 +08:00
2ad2297d2f [u-boot] hdmi:rk3288/rk3368: 24bit color_depth should be COLOR_DEPTH_24BIT_DEFAULT according to HDMI CTS.
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 17:00:06 +08:00
8df5729e01 [u-boot] rk3368 lcdc: In advance 500us to trigger lineflag1 interrupt
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 16:59:58 +08:00
4078cdd80c [u-boot] rk3036 lcdc: fix uboot charge mode display error when close lcd
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 16:59:50 +08:00
191dee6bdf [u-boot] rk3368: trust bl31 v1.5 and bl30 2.10. 2015-12-31 16:59:42 +08:00
43084a4a6d [u-boot] usb: dwc_hcd: fix cache consistency issue 2015-12-31 16:59:34 +08:00
700a9879aa [u-boot] usb_storage:Fix USB storage capacity detection on 64 bit architectures
This patch fixes USB storage capacity detection breakage on 64-bit systems
which arises due to 'unsigned long' length difference. Old code assumes that
to be 32 bit and breaks because of inappropriate response buffer layout.
Also this fixes a number of build warnings and changes big-endian values
treatment style to be architecture-independent

Signed-off-by: Firefly <service@t-firefly.com>
Signed-off-by: Firefly <service@t-firefly.com>
Tested-by: Firefly <service@t-firefly.com>
2015-12-31 16:59:26 +08:00
c138999bb1 [u-boot] rk3368: add UMS boot configurations 2015-12-31 16:59:18 +08:00
9ea7145d44 [u-boot] rk plat: Storage rename uboot env read/write api. 2015-12-31 16:59:09 +08:00
fbb2713b5e [u-boot] rk plat: Storage rename vender read/write api. 2015-12-31 16:59:01 +08:00
4d49bf0b3d [u-boot] rk3368: fix SecureBoot error when uboot as first level.
1. fix crypto and efuse platform support for rk3368.
        2. fix crypto dma error when cache writeback enable.
        3. fix compile warnings when aarch64 platform.
2015-12-31 16:58:53 +08:00
85ed100bc5 [u-boot] rk3368: fix boot error when uboot as first level loader.
1. CONFIG_SYS_TEXT_BASE define = 0 when first level.
        2. just using arm general-regs-only fix boot error.
        3. disable mcu when first level.
2015-12-31 16:58:44 +08:00
819ef0f1bf [u-boot] Revert "fdt: Fix fdtdec_get_addr_size() for 64-bit"
This reverts commit 767c95e57b0c9ce820a51bab72b7c63ff3bfe7c7.
2015-12-31 16:58:36 +08:00
a657855dc2 [u-boot] Revert "libfdt: fdtdec_get_addr() api instead of fdtdec_get_reg."
This reverts commit 9ad52e6ce81d59a930fd0b9236754202677156bd.
2015-12-31 16:58:28 +08:00
090ee2c7e7 [u-boot] rk3368: trust bl31 v1.4. 2015-12-31 16:58:20 +08:00
2b708d5833 [u-boot] rk3368: trust bl30 v2.09. 2015-12-31 16:58:12 +08:00
6648b39f36 [u-boot] rk32: lvds/rgb: fix rgb output when have no lvds_format
If we don't add lvds_format on the display timing, the lvds_format
value may be -1, means 0xffffffff when do register write, that is
wrong and display not works.

Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 16:58:04 +08:00
a18f41c59a [u-boot] rk3288 lcdc : fix logo display offset.
Signed-off-by: Firefly <service@t-firefly.com>
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 16:57:56 +08:00
3e7649ec09 [u-boot] rk tve:according to different chip configure reg.
Signed-off-by: Firefly <service@t-firefly.com>
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 16:57:47 +08:00
17a6159d49 [u-boot] armv8/cache: Fix page table creation
While generating the page tables, a running integer index is shifted by
SECTION_SHIFT (29) and causes overflow for any integer bigger than 7.
The page tables therefore alias to the same 8 sections and cause U-Boot
to hang once the MMU is enabled.

Fix this by making the index a 64-bit unsigned integer and so avoid the
overflow.

swarren notes: currently "i" ranges from 0..8191 on all ARM64 boards, and
"j" varies depending on RAM size; from 4 to 11 for a board with 4GB at
physical address 2GB, as some Tegra boards have.

Signed-off-by: Firefly <service@t-firefly.com>
Signed-off-by: Firefly <service@t-firefly.com>
Signed-off-by: Firefly <service@t-firefly.com>
Reviewed-by: Firefly <service@t-firefly.com>
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 16:57:39 +08:00
9a0b7ef16f [u-boot] libfdt: fdtdec_get_addr() api instead of fdtdec_get_reg.
fdtdec_get_addr for aarch64 error has been fixed by uboot master,
        so rkplat using fdtdec_get_addr instead of fdtdec_get_reg.

Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 16:57:31 +08:00
e9dd250533 [u-boot] fdt: Fix fdtdec_get_addr_size() for 64-bit
Signed-off-by: Firefly <service@t-firefly.com>
Signed-off-by: Firefly <service@t-firefly.com>
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 16:57:23 +08:00
f06e19b746 [u-boot] fdt: Export fdtdec_get_number() for general use
This function is missing a prototype but is more widey useful. Add it.

Signed-off-by: Firefly <service@t-firefly.com>
Reviewed-by: Firefly <service@t-firefly.com>
2015-12-31 16:57:15 +08:00
1fbe07ca9c [u-boot] lib: Add function to extract a number from the end of a string
Split out the code in fdtdec which finds a number at the end of a string. It
can be useful in other situations.

Signed-off-by: Firefly <service@t-firefly.com>
Signed-off-by: Firefly <service@t-firefly.com>

Conflicts:
	include/vsprintf.h
2015-12-31 16:57:06 +08:00
fb39f4c345 [u-boot] libfdt: fix error code of fdt_count_strings()
Currently, this function returns a positive value on error,
so we never know whether this function has succeeded or failed.

For example, if the given property is not found, fdt_getprop()
returns -FDT_ERR_NOTFOUND, and then this function inverts it,
i.e., returns FDT_ERR_NOTFOUND (=1).

Signed-off-by: Firefly <service@t-firefly.com>
Fixes: bc4147ab2d69 ("fdt: Add a function to count strings")
Acked-by: Firefly <service@t-firefly.com>
2015-12-31 16:56:58 +08:00