Commit Graph

49386 Commits

Author SHA1 Message Date
Jason Zhu df57b34bfa fastboot: remove 'default y' from RK_AVB_LIBAVB_ENABLE_ATH_UNLOCK
Open RK_AVB_LIBAVB_ENABLE_ATH_UNLOCK if need advanced security requirements.

Change-Id: Ie01c6342d379b672fe69e367262496d97b5890e9
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-09-20 11:17:38 +08:00
Jason Zhu 69fdc5969f lib: avb: update and modify the avb library
The commit point is updated to google external/avb/
which commit point is 868db2a514bbb02e166fb55b1592b27de8c9680c.

Change-Id: I10f7c0ac356a7666b518b62e59ccb62277668578
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-09-20 08:50:37 +08:00
Joseph Chen eca6f1ffbf irq: gicv2: fix GIC not response to USB OTG IRQ
It handles the issue when the bootflow without Miniloader,
i.e. Maskrom => Trust(optional) => U-Boot.

Change-Id: I445225d5cce9abd2117ef468f15774e3fa57e16d
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-09-19 15:36:45 +08:00
Joseph Chen b073251d9c include: irq-platform: add IRQ_USB_OTG definition
Change-Id: Id2a85c67b2f29bf97d19fdb50e7a59ded47b1606
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-09-19 15:30:13 +08:00
Kever Yang 2e7f9d3c94 rockchip: firefly-rk3399: remove SPL legacy raw image support
RK3399 SPL only supports FIT and rockchip image type.

Change-Id: Ibcfc6cf5bcdb6f8da4107ac10426f83aec9c010d
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-09-19 12:48:28 +08:00
Kever Yang f117ac95ec rockchip: px30: Update CONFIG_SPL_MAX_SIZE to 0x40000
We are going to update atf base to 0x40000, so that we can use space
0~0x40000 for SPL without relocate for support ATF.
0x40000 should be enough for SPL text, and we have separate BSS and
STACK.

Change-Id: I081d289f10a54d8a98e9f466e1730659f2c712a3
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-09-19 12:48:28 +08:00
Kever Yang 1024781f2d rockchip: px30: Enable SPL_SEPARATE_BSS
We are using separate BSS with CONFIG_SPL_BSS_START_ADDR.

Change-Id: I42f3f4a71db1460997a47491c8688fa8085bf594
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-09-19 12:48:28 +08:00
Kever Yang 0c3815df14 rockchip: px30: add spl boot order and update to use 'dm-spl'
Update for enable TPL/SPL.

Change-Id: Id2b7cbe4dfb6e683eb26a6457a8371b1afb39a99
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-09-19 12:48:28 +08:00
Kever Yang 7ce616e87a rockchip: px30: disable ddr secure region
Disable the ddr secure region so that emmc/sd controller can access
the DRAM, this reg should be override in ATF.

Change-Id: I30ed494bbe0ec93d162cc84a815ab591a00eb0e5
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-09-19 12:48:28 +08:00
Kever Yang 93db2afc1a rockchip: px30: set default sdram type to ddr3
Both px30 and px30mini are using ddr3, change the default
dram type to ddr3 to adapt it.

Change-Id: I177dc41cd2a5e6a1cac718c75fa5a2541050ee6d
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-09-19 12:48:28 +08:00
Jason Zhu c2bb0fd141 lib: avb: print the permanent attribute certificate is exist or not
Change-Id: I10775dd06a6fb1bfdddcfda37fe2e1178c3fde21
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-09-18 10:34:40 +08:00
Algea Cao 35cd2352c8 configs: rk3368: Enable rk1000
Change-Id: I17347c882f04b69282f1cdf9266488ccf7662130
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2019-09-17 10:37:51 +08:00
Algea Cao 9c9eff4383 video/drm: Support rk1000
Support rk1000 cvbs.

Change-Id: I9b8f2b7ebd829f6e9d1c83deb0a81e7f88808bac
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2019-09-17 10:37:51 +08:00
Algea Cao 75eb6fceb5 video/drm: Add bridge get_timing interface
Some bridge can't get tv edid such as rk1000 cvbs, but
at present bridge can't provide timing without edid. So
we add get_timing interface to provide timing.

Change-Id: Id74802a3bff8140e3677f6633788aacd021afc91
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2019-09-17 10:37:51 +08:00
Bian Jin chen a0614e0a98 rockchip: resource: fix dtb addr error in hdr_v2.
dtb addr should add the size of recovery_dtbo when
recover_dtbo is included.

Change-Id: I97f7bd6e248f61413b530972abe46c3236bd0b01
Signed-off-by: Bian Jin chen <kenjc.bian@rock-chips.com>
2019-09-17 10:40:39 +08:00
Jason Zhu 3bdef7e642 gpt: return 1 directly when test the mbr sector
In sd-update card, we use RKPARM partition in bootloader to load
firmware, and use MS-DOS partition in recovery to update system.
Now, we want to use gpt in bootloader and abandon the RKPARM
partition. So in new sd-update card, we write the MS-DOS partition
table and gpt to sd card. Then we must return 1 directly when test
the mbr sector otherwise the gpt is unavailable.

Change-Id: I994a0cb86e7829c6edadfe357cbf51ad00b65cec
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-09-16 15:30:38 +08:00
Sandy Huang 6383df2b7b video/drm: rgb: set lcdc data[15:12] output
lcdc data[15:12] is reuse with jtag, when use rgb output
set as rgb output.

Change-Id: Ia7f5006a0d61d94895fad519c622b6a85451cc1a
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-09-16 08:34:30 +08:00
Jason Zhu a3ded4d4a1 rockchip: mkimage: add support for RK1808
Reserve 8K sram for maskrom.

Change-Id: I890d93b6c9a8f4ca50a2c0b30de9b07816e68e8f
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-09-12 15:06:43 +08:00
Joseph Chen c9c9fba95e include: compat: remove dump_stack(...)
- We have implement dump_stack() for both ARM and ARM64;
- It was brought back by careless on commit: (28386b6 UPSTREAM: lib: Add hexdump)

Change-Id: I8ebbd46862475485963d2ac835ea4031207d2153
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-09-12 11:30:39 +08:00
Jason Zhu 01973d127b common: android: support boot-fastboot
In android Q, the bootloader must implement a new Boot Control
Block (BCB) command of boot-fastboot in order to support fastbootd.
Then the bootloader is expected to load and boot into the recovery
image upon seeing boot-fastboot in the BCB command. Recovery then
parses the BCB message and switches to fastbootd mode.

Change-Id: Ie868912071f6a371ec83caa8d591281fc063e6ae
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-09-10 14:33:10 +08:00
Joseph Chen f877a23945 configs: rknpu-lion: enable CONFIG_CMD_BOOTD
clean by make savedefconfig.

Change-Id: Ib68c35deb8768b9ad31fd5e1fdaca683c281fcdd
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-09-10 14:13:24 +08:00
Joseph Chen d9f1798458 configs: rk3036: enable CONFIG_CMD_BOOTD
clean by make savedefconfig.

Change-Id: Ic8a0ed6e156e36bdad4e318c8e79971e1652591f
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-09-10 14:13:24 +08:00
Joseph Chen 64c205a554 configs: rk3399pro: enable CONFIG_CMD_BOOTD
clean by make savedefconfig.

Change-Id: I3408dd723824e2b7c982f81059e8012b3e635d16
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-09-10 14:13:24 +08:00
Joseph Chen 25dc164ec0 configs: px30/rk3326: enable CONFIG_CMD_BOOTD
enable CONFIG_CMD_BOOTD

Change-Id: Ia13bc0a59939a4adc2484e44f4c3e0ee352bf0c3
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-09-10 14:13:24 +08:00
Joseph Chen 2bdcdc9a75 configs: rk3328: enable CONFIG_CMD_BOOTD
Change-Id: Ibd90f0c4df08a2bfd52a2575b1bd14070d4a7415
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-09-10 14:13:24 +08:00
Joseph Chen 1df55220ef configs: rk3288: enable CONFIG_CMD_BOOTD
clean by make savedefconfig.

Change-Id: I4de67445fe2071a55aae0ab09ae5fdf422d0c562
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-09-10 14:13:24 +08:00
Joseph Chen 7247a4878f configs: rk322x: enable CONFIG_CMD_BOOTD
clean by make savedefconfig.

Change-Id: I712d16e80d6e8324397322ce803f1d1cbb336995
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-09-10 14:13:24 +08:00
Joseph Chen 7af8cad4f5 configs: rk3128x: enable CONFIG_CMD_BOOTD
clean by make savedefconfig.

Change-Id: Ib79b44cb4b281fa61eef588eb0805853432179bb
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-09-10 14:13:24 +08:00
Joseph Chen a2897f891f configs: rk3126: enable CONFIG_CMD_BOOTD
Change-Id: I60b0753a21b377dd544513d37cb066d62c07bfac
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-09-10 14:13:24 +08:00
Joseph Chen 41fc63d696 configs: rk1808: enable CONFIG_CMD_BOOTD
clean by make savedefconfig.

Change-Id: I5f32b42ecebb71f209b7a25c3c69d4636f675f77
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-09-10 14:13:24 +08:00
Joseph Chen 855eeaea6b configs: rk3368: enable CONFIG_CMD_BOOTD
Change-Id: I2d6949f1e23db21b669834a32c45cadefeefa6e0
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-09-10 14:13:24 +08:00
Elaine Zhang 667b42a84d clk: rockchip: rk3368: improve DCLK signal quality
Improved PLL output jitter can support more types of 4K TV.

Change-Id: I40a81cc276abf6ca859ad91be6785ffd15747ee5
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-09-10 14:09:49 +08:00
Jason Zhu d901aece56 common: android: close optee client before jump to kernel
Change-Id: Icbcf65ecbb043b9119e6c65f9016390ef8f15935
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-09-10 14:09:15 +08:00
Joseph Chen d0f492c85c rockchip: resource: improve comment for init_resource_list()
Change-Id: Ic6ac812976b063c6991e33d128e5abe11832c78e
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-09-09 09:17:28 +08:00
Joseph Chen bbe32cd5bf rockchip: resource: support parse dtb from dtb position of android image
- the dtb position was added in boot_img_hdr_v2;
- required for Android Q or later.

Change-Id: Ia0536f0fd68a4cdfc55356c6371d1b781f655a9a
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-09-06 11:45:49 +08:00
Joseph Chen 4ebf6738fd rockchip: resource: add function replace_resource_entry()
Change-Id: I4c038c6812eab39fedab96942c4cf389bf9e668e
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-09-06 11:45:32 +08:00
Joseph Chen 4f74cb3014 rockchip: resource: add comments and header check
Change-Id: I49b47d8716767014987c5913826ee7217869ae99
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-09-06 11:45:32 +08:00
Joseph Chen 481590e871 common: android: print boot_img_hdr_v2 new members
Change-Id: I0d87d0ea71c1495c90d123ceaef13aed7af11d70
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-09-06 11:45:32 +08:00
Alex Deymo 43d520f312 UPSTREAM: Update include/android_image.h from AOSP
This takes the latest changes from AOSP from the file
include/bootimg/bootimg.h from the repository:
https://android.googlesource.com/platform/system/tools/mkbootimg
and update the U-Boot version with the latest changes.

This file keeps the changes from AOSP to a minimum:
 * Comments were converted from C++ to C style.
 * Code inside __cplusplus #ifdef blocks were removed.
 * C++11 struct extensions replaced with a single struct.

Change-Id: Ifdfa7cc365a28e45ab7f192c121b49f6da99af36
Signed-off-by: Alex Deymo <deymo@google.com>
Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org>
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
(cherry picked from commit 0b6febfdb3cf9b4a51fa65fbd94f9ab2d7738f32)
2019-09-06 11:45:32 +08:00
Joseph Chen df3ff3726e cmd: android: round up image header size
Change-Id: I79e1b31ae2d018c0a8da030482f2ac0be44cb177
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-09-03 08:53:08 +08:00
Sandy Huang 888e59c91d drm/rockchip: hdmi: init vmode picture_aspect_ratio
Change-Id: Id03a1409c5fe0d021c22e888c7d13b191dd1960e
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-08-29 18:10:41 +08:00
Sandy Huang 94d85f7bdd drm/rockchip: add picture aspect ratio define
Change-Id: Ie1d8313afe5f24596a989f7c8f290c734815f036
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-08-29 18:10:28 +08:00
Joseph Chen 7733bf1789 configs: rk3066: update malloc size to 32MB
Since AVB use sysmem alloc, we can decrease malloc size.

Change-Id: I1c81f13946b3f8e74b2400f9d12be882e4387b38
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-08-29 13:04:07 +08:00
Joseph Chen 90ba3aa2da configs: rk322x: update malloc size to 32MB
Since AVB use sysmem alloc, we can decrease malloc size.

Change-Id: Ie863ed0627dd8604c8dbc8b59ed8f4197c68bc93
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-08-29 13:04:07 +08:00
Joseph Chen 1982131941 configs: rk3288: update malloc size to 32MB
Since AVB use sysmem alloc, we can decrease malloc size.

Change-Id: Ic5a2df1fbfec0e6d94f9904042db8961aa0abf4d
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-08-29 13:04:07 +08:00
Joseph Chen 56a40692c3 configs: rk3328: update malloc size to 32MB
Since AVB use sysmem alloc, we can decrease malloc size.

Change-Id: If806c7736ada2852931f8e06d137658d8cf3c0db
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-08-29 13:04:07 +08:00
Joseph Chen 975da02e88 configs: rk3368: update malloc size to 32MB
Since AVB use sysmem alloc, we can decrease malloc size.

Change-Id: If88b142a81f5cd28f333b9dc901e70619b9ce12b
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-08-29 13:04:07 +08:00
Joseph Chen 99ae836464 configs: rk3399: update malloc size to 32MB
Since AVB use sysmem alloc, we can decrease malloc size.

Change-Id: I627ceab0440a1655524904a8c4b11905bcdc830d
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-08-29 13:04:07 +08:00
Joseph Chen 0cb72e53ea common: android: add image hash verify support
- mkbootimg tool always use SHA1 for images;
- make the the crypto higher priority;
- AVB images does not need this verify;

Change-Id: I543a3a53da61b920b83ba464a71959518437c436
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-08-29 13:03:17 +08:00
Joseph Chen 98c1299759 common: android: add android_image_memcpy_separate() interface
This is a encapsulation of android_image_load_separate(). It is used
for AVB boot/recovery.img which has been loaded to ram by AVB bootflow,
and we memcpy kernel/ramdisk/dtb to where we expect.

Change-Id: Iea4ea3404b84e9d3c091954ab27fb8c9d2ad84bc
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-08-29 13:03:08 +08:00