Commit Graph

49506 Commits

Author SHA1 Message Date
YouMin Chen 451da917c9 driver: ram: rk3288: rename sdram.h to sdram_rk3288.h
Change-Id: Ie7a7820d78397250f37917947b91cb940ffd5bda
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2019-10-09 18:10:19 +08:00
Jason Zhu 01fc0bcda6 spl: mtd_blk: correct the error parameter
The mmc is not passed in spl_mtd_load_rkfw, use desc.

Change-Id: I68a577487dc8a4f2a82c4b80095f10cd6319b508
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-10-09 15:40:27 +08:00
Jon Lin 9873075571 spi: rockchip sfc: supporting less 16MB SPI Nor
Address should not be packet with dummy bit.

Change-Id: I70708d7025a5f135e18378c59e9598031cb44d6c
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2019-10-09 15:37:19 +08:00
Jon Lin 9bf43d0b78 mtd: spi-nor-ids: Add Gigadevice gd25q128 ID
Change-Id: I73e7aa7e06c8d6b86110485a701b67300607949a
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2019-10-09 10:05:47 +08:00
Jon Lin 6e1213715c spi: rockchip_sfc support SPI Nor which's capacity is larger than 16MB
Change-Id: I2e76abae6d84d8e393395458bb1cf801a30e9fb8
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2019-10-09 10:05:47 +08:00
Jason Zhu 5a9f9698ff rockchip: spl-boot-order: support scan spi nor device
Change-Id: I185a833cec0f52df2357a6308bd5de19a9576134
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-10-09 09:13:39 +08:00
Jason Zhu e1c38c9f84 rockchip: common: add mtd_blk spi nor scan support
Change-Id: I74b2c02bf9d23ffe8a3eada92f90132d0742fbea
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-10-09 09:13:32 +08:00
Jason Zhu 82ee425415 dm: blk: fix spi flash uclass different error when use mtd block
The normal mtd block attachment steps are UCLASS_BLK -> UCLASS_MTD ->
UCLASS_(SPI or NAND). Since the spi flash frame is attached to
UCLASS_SPI_FLASH, this make mistake to find the UCLASS_MTD when
find the mtd block device. Fix it here when enable CONFIG_MTD_BLK.

Change-Id: I815f85a3bc51aa31e0896d9809a0b5a90f186a18
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-10-09 09:13:21 +08:00
Jason Zhu 0dccd0d87e mtd: mtd_blk: support spi nor read
Change-Id: Id2b60f1e08441504b2feb16b5df8d24acdeefa45
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-10-09 08:47:13 +08:00
Jason Zhu a5ce032fe1 mtd: spi flash: bind spi flash device to mtd block
Change-Id: I8252304b984e18e15c2c0a5f1efa0d336baf53b2
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-10-09 08:46:52 +08:00
Elaine Zhang e57a08e58f clk: rk3399: fix up the i2c clk error
I2c MUx is in cpll by default, but cpll is for dclk_vop exclusive.
If dclk_vop set rate after i2c init, the CPLL changed,
but the i2c not perception, it will resulting the wrong frequency
of the i2c.
So set the i2c frequency according to the kernel configuration.
and Hang I2C on the GPLL.

Change-Id: I91f891e9033e9d4648027ea253998a54011f4863
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-09-27 15:01:34 +08:00
Jason Zhu 39e38ab370 mtd: mtd_blk: distinguish the nand driver with spl build and uboot build
Since func nand_read_skip_bad is used in uboot, so just build it in
uboot build. And use func mtd_read to replace it.

Change-Id: Ic5e161f7f03cd2da0099891812360af67a2b9db8
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-09-27 10:27:16 +08:00
Jason Zhu 8f5984c080 dts: rk3308: add sfc node in spl boot order
Change-Id: Id03caaf715de626b1227a80e144877f9f522a1d2
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-09-27 10:26:11 +08:00
Jason Zhu b2ee20d32b mtd: spinand: fix missing select target info
Change-Id: Iee5048f9ffabc9a4b7a3f6ef2dc1e3f2d819eda9
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-09-26 17:23:27 +08:00
Andy Yan f84e81c7ce rockchip: configs: enable usb host for rk3308 evb
Enable usb host and ums cmd.

Change-Id: Iaed75bffc7156620b1b523ebf4ffc077c1bdf939
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2019-09-26 14:13:57 +08:00
Andy Yan 374b844464 rockchip: rk3308-evb: Add usb host vbus regulator
RK3308 EVB use GPIO0_C5 control 5V power supply for
usb host.

Change-Id: Iafdffc7aa5114eb4909b083e2e2a98088d792b14
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2019-09-26 14:13:57 +08:00
Yifeng Zhao 8172425635 drivers: rknand: add support Micron B05A and B16A
Change-Id: Ib908242be9ea9d31d007deaabba66e1537d0a1d6
Signed-off-by: Yifeng Zhao <zyf@rock-chips.com>
2019-09-26 14:13:14 +08:00
Kever Yang 9c7862b8bf test: storage: Fix board may not have devnum env
If the board do not have the 'devnum', the env_get() returns NULL
and strcmp will lead to "data abort".

Change-Id: I329237b61fc96bc90e7a07653b665192d6a9d7b8
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-09-24 14:27:38 +08:00
Kever Yang d0ff3d4548 rockchip: test: set argc to 1 for rktest all cmd
The 'rktest all v2/3' do not really pass arg to sub cmd, always set argc
for 'rktest all *' cmd to 1 for sub commands.

Change-Id: I2d69ad25aaca074f52bfd2e69be4c33bc41186df
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-09-24 14:27:38 +08:00
Joseph Chen 7f1fb2f87a dm: i2c: add alias seq print
Change-Id: Ia4a415041389388e550057e476aa30daed696c86
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-09-20 15:54:43 +08:00
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