Commit Graph

49345 Commits

Author SHA1 Message Date
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
Joseph Chen e6bda4b2ed rockchip: resource: support parse dtb from second position
If the seconds position is not a resource file, maybe it's a
dtb file.

Change-Id: I819cb0ff9c702c306000bf30fb47891009e4ff32
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-08-29 13:02:58 +08:00
Joseph Chen 0905295234 rockchip: resource: clean up code
Change-Id: If133cba598752ce1a1eeed1e6432e7dffa2c5112
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-08-29 13:02:58 +08:00
Kever Yang 7c3af696fd rockchip: evb-rk3128: defconfig:set MALLOC_LEN_F to 0x1000
Or else system hang with:
"Calloc ddr memory failed"

Change-Id: I9e01b81a5ea6940a6bf05a58bbcbea38504ba195
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-08-29 11:54:18 +08:00
Kever Yang 7b6e880558 rockchip: evb-rk3128: add pmic node
Add pmic node so that the fireprime can enable the current limit at
board_early_init().

Change-Id: I64b308b47b437feb19acd8521f37687a4463186c
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-08-29 11:54:18 +08:00
Jason Zhu bbb83f5847 mtd: mtd_blk: use nand_read_skip_bad() to read in spi nand driver
Since mtd_read() can not skip bad block if meet bad block, so use
nand_read_skip_bad().

Change-Id: Ic2364b7f29de193412353fad36c86dc6e289e02d
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-08-29 11:48:02 +08:00
Jason Zhu 4dbf7962f3 rockchip: rk3308: add CONFIG_SYS_SPI_U_BOOT_OFFS
Change-Id: I300eb48b224adacab50121f8b3ad8ba469fc22ee
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-08-29 11:48:02 +08:00
Jason Zhu 23cf98fbdc spl: mtd_blk: support mtd block boot
Change-Id: Iaeaff1d25cb58929a2cc487ea6f3bb2f605938c8
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-08-29 11:48:02 +08:00
Jason Zhu ce39010b28 rockchip: spl-boot-order: support scan spi nand device
Change-Id: Ia057a4fddd31bc57cd613d6328cfc5b26753a0c1
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-08-29 11:48:02 +08:00
Jason Zhu 3e429466a7 spl: add some BOOT_DEVICE_MTD_BLK_XXX boot mode
Use the BOOT_DEVICE_MTD_BLK_XXX boot mode if the nand & spi nand & spi
nor driver are appended to MTD device.

New boot mode:
	BOOT_DEVICE_MTD_BLK_NAND
	BOOT_DEVICE_MTD_BLK_SPI_NAND
	BOOT_DEVICE_MTD_BLK_SPI_NOR

Change-Id: I27a63791455073ccdcb80c16bac4dfb635da07de
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-08-29 11:48:02 +08:00
Jason Zhu bf76714965 crypto: rockchip: support spl/tpl build
Change-Id: Ib100d7d46ea212257df5262a4fa42e485708e8fb
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-08-28 14:13:12 +08:00
Jason Zhu 638f562e2b dm: crypto: support spl/tpl build
Change-Id: I5af80d5de66edf7fc0c5e8449cd8b7ab9507c969
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-08-28 14:13:12 +08:00
Jon Lin 2ec0548944 mtd: spinand: add support for Winbond W25N01GV
Change-Id: I93371926314363014d9232d78827c42b18957424
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2019-08-27 11:15:39 +08:00
Jon Lin b0bc5ced0d dts: rk3308: add compatible rockchip,sfc to sfc
in order to support MTD SPI flash framwork

Change-Id: I251fcf343be029a7f2cff8632b0e80a62972291b
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2019-08-27 10:50:01 +08:00
Sandy Huang 38dab65807 drm/rockchip: vop: fix dclk invert register define error
Change-Id: Idba6590f6e3aea9893df7d7f72e2cf21fc5372e9
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-08-26 09:50:10 +08:00
Joseph Chen dba9c9e59f rockchip: board: show regulator initial state by hotkey
It's useful for debug.

Change-Id: Idae556cea02e05f240e3c680a1b02a7506946490
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-08-23 12:48:57 +08:00
Joseph Chen 665be4b0c2 rockchip: hotkey: enter cli on BOOTM_STATE_OS_PREP/GO
- BOOTM_STATE_OS_PREP: before fdt fixup and DM works normally;
- BOOTM_STATE_OS_GO: before jump to linux and DM can't work normally;

Change-Id: Ic377a426970acd4f600f654a4efd4bdde38c3a89
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-08-23 12:48:57 +08:00
Joseph Chen bd700d6b80 common: bootm: add bootm state param for arch_preboot_os()
- This makes arch_preboot_os() more flexsible;
- call arch_preboot_os() when BOOTM_STATE_OS_PREP;

Change-Id: Ia4ae3666b8180c993c761ef222acbcff5358ae97
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-08-23 12:48:57 +08:00
Joseph Chen 6281e7d505 rockchip: atags: enable atags cmd "dump_atags"
Remove atags test function, we don't need it any more since
we have applied atags to so many platforms and it works well.

Change-Id: Ideecdfb34141f848b81ef5441b61be54f72708ff
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-08-23 12:48:57 +08:00
Jason Zhu 6c98a58203 dts: rk3308: add secure_otp node for secure otp
Change-Id: If55ab22de9eaad19a75678a892e4ec24643af3c9
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-08-23 09:16:33 +08:00
Jason Zhu 52ed8851b8 misc: rockchip-otp: support read & write secure otp
support chip: rk3308

Change-Id: I7daeaab16495d17bd75994de94dc19ed18eca21e
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-08-23 09:16:14 +08:00
Jason Zhu bc94d10207 misc: add tpl misc compile support
Separate the tpl compile with spl compile.

Change-Id: I01e6005fbc9fc49cc0fe6b357a4f15b35f591944
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-08-23 09:15:36 +08:00
Jason Zhu 6c65ad505d mtd: nand: rockchip: avoid initializing nand driver twice
Change-Id: Id643cbdaf3df1b57ef16a52004c2192944d1f289
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-08-22 20:03:47 +08:00
Kever Yang 24c72b14cb rockchip: dmc: rk3368: update rank number for evb-px5
evb-px5 has only 1 CS, update for it.

Change-Id: I5393d21c88d44457a590cb31df31eb59d20bbf02
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Tested-by: Andy Yan <andy.yan@rock-chips.com>
2019-08-22 19:35:10 +08:00
Joseph Chen b35a113771 common: spl: rkfw: update available case for mmc dma
mmc dma can only access dram area, use DRAM base and
max size to make it work for all socs.

Change-Id: I6d65285c7e441b1c454460ad6897fcfd83fade45
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-08-22 12:53:26 +08:00
Kever Yang e4adbfc93d rockchip: rk3128: correct usb phy phandle
The phy phandle in usb node should be port instead of phy, or else the phy
driver not able to find the ops and abort at generic_phy_get_by_index().

Change-Id: I79161dc252cfa9e57b34290fb94d926476a3035d
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-08-21 16:04:29 +08:00
Jason Zhu cbe246677b rockchip: otp: add secure_conf_base & otp_mask_base to platdata
We add secure_conf_base & otp_mask_base to platdata to operate
the secure OTP.

Change-Id: Ie336b2cf61076aa82f7c1987cc3cec7166751452
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-08-21 12:58:49 +08:00
Jason Zhu 06536c203f misc: add spl misc support
Change-Id: I77de161aaaa6490aeb8a5a8c3f9dfdc5c65f3f71
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-08-21 12:58:49 +08:00
Jason Zhu 6e12c1dd66 rockchip: otp: move some definition to header file
Change-Id: I82b4afe1adbb5f91f3b3146c3cad14e2873b93c3
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-08-21 12:58:49 +08:00
Jason Zhu 2b4182c1ed cmd: rk_secure_storage: dump data which is written in OTP or efuse
Change-Id: I644add22f3aaed546d727de7727d3230ae1a6c01
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-08-21 12:58:49 +08:00
Jason Zhu 95e4d4078e misc: rockchip efuse & otp: remove the cmd code from driver file
Change-Id: I3c1f89a92770d69234cf0fdc6811b05fa275f262
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-08-21 12:58:49 +08:00
Kever Yang fb09b07158 test: rockchip: fix pointer for free()
free() is using pointer while sysmem_free() is not using pointer,
so they can not use the same parameter.

Change-Id: Ib68319bda2ba1a400f2436e21d5864a0e2511fad
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-08-21 09:55:21 +08:00
Kever Yang 21a92a158b rockchip: test: net: enable dhcp test with default value
1. add default dhcp cmd for test
2. fix the argc(has -1 in test-rockchip)
3. fix return value for FAIL case(return value is '1').

Change-Id: If55a3a8d29240be98febbf4649a23964a74452b6
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-08-20 20:45:34 +08:00
Kever Yang 54108d04ce rockchip: test: adapt for upstream U-Boot
Not test display and misc for upstream U-Boot, replace local APIs with
upstream APIs.
Use CONFIG_RKIMG_BOOTLOADER to identify the rockchip local U-Boot.

Change-Id: I65b69eca8262d8aa0cb621c90d4ff1f2756368ba
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-08-20 20:45:34 +08:00
Kever Yang bc18ede005 rockchip: test: use MACRO for module codes
Use module Macro for APIs from different module.

Change-Id: I765150f21bc9118e5ad0e661bb2b4ae12af77342
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-08-20 17:35:39 +08:00
zain wang d38ae1a6d6 fastboot: export CONFIG_RK_AVB_LIBAVB_ENABLE_ATH_UNLOCK
Relate to commit 46a8a26905
("fastboot: add RK_AVB_LIBAVB_ENABLE_ATH_UNLOCK config")
Export config can help us select it easily.

Change-Id: I43a210f1efb35ff679102c8686cbca219d2def97
Signed-off-by: zain wang <wzz@rock-chips.com>
2019-08-20 11:00:56 +08:00
Kever Yang e44966db5d rockchip: rk3326: defconfig: remove legacy and raw image support
We only support FIT and rockchip image in SPL.

Change-Id: Ib96cb86c2df40d554bbaf0534127f565d1f857fc
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-08-19 10:50:58 +08:00
Kever Yang 7f9390c983 rockchip: rk3308: defconfig: remove legacy and raw image support
We only support FIT and rockchip image in SPL.

Change-Id: I6a599367f8c63de844a58e6b53ef684bf8e3c3e0
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-08-19 10:50:58 +08:00
Kever Yang f2e3284f52 rockchip: rk3288: defconfig: remove legacy and raw image support
We only support FIT and rockchip image in SPL.

Change-Id: I1b9a5542a23b54f53a48d3ead77cc78dbf862de6
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-08-19 10:50:58 +08:00
Kever Yang ccfe72293c rockchip: rk3399: defconfig: remove legacy and raw image support
We only support FIT and rockchip image in SPL.

Change-Id: Ic2760b1ad237234fe13d11da6f220301a5610e34
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-08-19 10:50:58 +08:00
Kever Yang 0699ea8bfe rockchip: rk3328: defconfig: remove legacy and raw image support
We only support FIT and rockchip image in SPL.

Change-Id: Id994fa60f04bdd278d5e4e723ec03626d47037a5
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-08-19 10:50:58 +08:00
Kever Yang 85e6631018 rockchip: rk3328-evb: defconfig: remove legacy and raw image support
We only support FIT and rockchip image in SPL.

Change-Id: I2f51574d8a664909db84d0a013c7a1650038db6a
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-08-19 10:50:58 +08:00