Commit Graph

50335 Commits

Author SHA1 Message Date
Joseph Chen ca6206136c scripts: fit: fixup "arch" property for arm64
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ie45b89215bd5ae636e4753fc47bfb60a3829b40f
2020-05-12 15:02:47 +08:00
Joseph Chen 5a157e97d5 Merge branch 'thunder-boot' into next-dev 2020-05-12 10:37:37 +08:00
Shunqing Chen 23858492ef power: charge animation: fix the issue that did not auto turn off screen
1.set auto_wakeup_screen_invert to 1 and set auto_off_screen_interval to 0.
2.set auto_screen_off_timeout to 1.
2.press power key to turn on screen.
3.screen will not be turned off at this time.

Change-Id: Ifc92f23a38d8ba0da4f6e37625b4114edb42f6a8
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
2020-05-11 16:33:49 +08:00
Jon Lin c9e94690ba mtd: mtd_blk: Optimize map table reinitialization
Change-Id: Ie27c8a215568755857cf67444637b1d89f55bd3a
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-05-11 11:34:22 +08:00
Jason Zhu 725378455f rockchip: dts: rv1126: add mmc-ecsd to emmc node
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Iddf35b82a9aed0e25a407a844949f932e2c26c17
2020-05-11 11:32:11 +08:00
Finley Xiao 2438a166f4 clk: rockchip: rv1126: Add support for gmac
Change-Id: I10ade6acbbfe5dd23e33a250ef601948606bc57e
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-05-11 11:31:56 +08:00
Hans Yang 2d2c232ae5 configs: rk3036: enable CONFIG_RKSFC_NAND
Change-Id: I24fc4806a4a70bcceadcda7ca79c6e0151416b00
Signed-off-by: Hans Yang <yhx@rock-chips.com>
2020-05-08 17:02:49 +08:00
Joseph Chen b0c9708366 Merge branch 'next-dev' into thunder-boot 2020-05-08 15:52:44 +08:00
Joseph Chen 311b6440bf rockchip: kernel_arm.its: update descriptions
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I329a361dabf320be9be658ebd832e0c06ec5666f
2020-05-08 15:35:07 +08:00
Joseph Chen 98a624f3ed rockchip: remove kernel_arm64.its
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I03215ddcba76564529c08147b68b2acaf745bc0c
2020-05-08 15:35:07 +08:00
Jason Zhu 2056aa9f86 drivers: mmc: pass the mmc ext_csd to kernel
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I95dbd0da5d8750e5b19f00a54596ca484f72ecb2
2020-05-06 22:12:30 +08:00
Joseph Chen ab6f8011c4 Merge branch 'next-dev' into thunder-boot 2020-05-06 18:29:50 +08:00
Jason Zhu e68ead627b disk: part: auto append android a/b slot suffix when query partition
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I13d6e46f362c0f2d50824fd6bc858521d2d35433
2020-05-06 12:02:32 +08:00
Jason Zhu 1e33e3cb7c common: spl: ab: update new function to support ab system
Add spl_ab_append_part_slot()
Delete spl_get_partitions_sector()

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I116d6d708604762203974dc66a39be1a0e7b6bbe
2020-05-06 11:59:29 +08:00
Jason Zhu 9561619343 common: spl: mmc: delete ab system support in rkfw process
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I9cafffa266fbbe2c18c4300fdddb89944430cc0c
2020-05-06 11:59:22 +08:00
Joseph Chen f78661739a configs: add rv1109 defconfig
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I1a6bd138ac3a205d54e5bcabeb9df0c7e493b0fb
2020-05-06 11:17:57 +08:00
Joseph Chen c0bb763bf0 rockchip: add RV1109 support
The Rockchip RV1109 is a ARM-based SoC with a dual-core Cortex-A7
and a risc-v core.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I4d60512dccf1c72b5c592afea6c5cfeb93ec628b
2020-05-06 11:17:57 +08:00
Joseph Chen 2d3e1fe464 Merge branch 'next-dev' into thunder-boot 2020-05-06 10:47:46 +08:00
Joseph Chen c495a36ee4 rockchip: resource: fix reading hw-id dtbs failed
- search order: hw-id dtbs => rk-kernel.dtb.
- initial resource list if empty.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I8f174aad96f1afc4b9792d2fe5cffb841a730233
2020-05-06 10:30:08 +08:00
Joseph Chen a79e8fe670 rockchip: fit: read kernel dtb from resource file firstly
In order to support reading hw-id dtbs from resource file.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I2a8e8f69ebb1dcba71375c67e08aea8ee68af9e2
2020-05-06 10:30:08 +08:00
Nickey Yang 69c44458d7 rockchip: dts: rv1126: fix saradc compatible
The saradc of rv1126 is 6-channel 10 bits like rk3399.

Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: I5b92d2995bfa15c0ce62c262a3d978cfeda863e5
2020-05-02 16:32:40 +08:00
Yifeng Zhao c64e256218 tools: add pack kernel tool for rv1108
Change-Id: I9a8e1b2884bcc26144162e3ca838750bef69907a
Signed-off-by: Yifeng Zhao <zyf@rock-chips.com>
Signed-off-by: Zhichao Yu <zhichao.yu@rock-chips.com>
2020-04-29 15:44:35 +08:00
Jason Zhu 28e73e3a8e configs: rv1126: enable system dcache
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I04f086f91ef719a6ea3afa25bf6138b6d412af00
2020-04-29 09:53:50 +08:00
Joseph Chen 9c00c79ad8 Merge branch 'next-dev' into thunder-boot 2020-04-29 09:52:58 +08:00
Jason Zhu db9b4c53f2 common: spl: change TLB memory base align to SZ_16K
According to armv7 spec, translation table base 0 address is align to
2^(14-n). The n is set by TTBCR and is set to zero in uboot.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I3d4c3f7165d3ef27bcc51d90471830f5e6dccae5
2020-04-29 09:07:43 +08:00
Joseph Chen 9b9964b191 make.sh: support pack loader with spl in rkbin
Use args: "--new-spl" to pack loader with current build one.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Idfb4ca4135194c4cfb9d42eb3af0aecfc31be108
2020-04-28 18:54:36 +08:00
Joseph Chen fe3372b265 scripts: fit: support pack loader with spl in rkbin
Use args: "--new-spl" to pack loader with current build one.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I194a7df4a258f473bfa94aa949a33ea7d06ffbde
2020-04-28 18:54:34 +08:00
Joseph Chen 7e0be77742 Merge branch 'next-dev' into thunder-boot 2020-04-27 18:03:41 +08:00
Joseph Chen e9e0746f31 Merge branch 'next-dev' into thunder-boot 2020-04-27 16:54:06 +08:00
Joseph Chen b768b9152f make.sh: refactor code
- Mainly for refactoring args parse logic to support args
  without args order and relation requirement.
- Unify trust and loader ini file parse and available for
  all functions.
- Clean coding style.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I9dae6b7e535bef8c5ca1c2542d89ee8e08cee715
2020-04-27 16:44:44 +08:00
Joseph Chen 83fcbb4dc7 scritps: fit: use default spl binary from rkbin for non-vboot
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I9c53e82567cf550ea5a897ad62c4815b69cd16c1
2020-04-27 16:43:59 +08:00
Joseph Chen 13b1806c20 scripts: fit: support ini file assignment
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Idc51bce6e1e292ddb6cf1ec88c74c7a3a8527b00
2020-04-27 15:23:01 +08:00
Jon Lin 88ea3acb7b spi: rockchip_sfc: Support setting SPI Nand write xbits address
Change-Id: I09d746191323c1e14d8993e71df6d1d5fd621910
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-04-27 14:59:44 +08:00
Jason Zhu db7f180f86 disk: part: fix compile error in spl
undefined reference to `rk_avb_append_part_slot'

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I21d44387affdc11708e4b091d51850eaaaa2d2dc
2020-04-27 14:32:51 +08:00
Jason Zhu f141910278 common: android: fix compile error if only enable ab system
error: ‘reset_cpu_if_android_ab’ defined but not used
[-Werror=unused-function]

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I724ea99df27f9f572aa0913491eddb2b5e248e38
2020-04-27 14:32:51 +08:00
Jason Zhu 4736384cd0 spl: Kconfig: add SPL_AB depends on SPL_EFI_PARTITION
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Id4500ae748f965235aac278baee07f278d88d70a
2020-04-27 14:32:51 +08:00
Jon Lin bdf7b34b60 mtd: nand: Fix memory allocation in nanddev_bbt_init()
Fix the size of the buffer allocated to store the in-memory BBT.
This bug was previously hidden by a different bug, that was fixed in
commit e4fd10db8b8 ("mtd: nand: Fix nanddev_neraseblocks()").

Fixes: ed99f7731 ("mtd: nand: Add core infrastructure to deal with NAND devices")
Change-Id: I365fdfe053ef352661a832b33a232cbb18e81be6
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-04-27 14:31:17 +08:00
Jon Lin 85c83705f8 mtd: nand: Fix nanddev_neraseblocks()
nanddev_neraseblocks() currently returns the number pages per LUN
instead of the total number of eraseblocks.

Change-Id: Id5ec7cd7170dae28acbfa568941ffea8e8907361
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-04-27 14:31:17 +08:00
Joseph Chen 9b31ae46e2 rockchip: dts: rk3399pro-npu: remove ramdisk-ro node
This device is decleared by U_BOOT_DEVICE().

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I3e4c64e8fa0baad7d3770b98a96d3c5c787ea6b2
2020-04-26 15:23:08 +08:00
Joseph Chen a527a681cb rk1808: remove rkimg_bootdev
It's defined in rockchip-common.h now.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I9e29b309f22a0a8d97a6b6111b59f594708280f8
2020-04-26 15:14:36 +08:00
Joseph Chen 8e2870c0cf rockchip: common: add rkimg_bootdev for dm ramdisk
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Iea6b8cdd7c629be136e83de8e9626394a85b410d
2020-04-26 15:14:36 +08:00
Joseph Chen 5d45852261 ram: ramdisk_ro: add u-boot device definition
In order not to add the device info in dts.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I334c2c99a71476545f311d26b32d7954ca8d8dfd
2020-04-26 15:14:11 +08:00
Joseph Chen aedeb70ba0 ram: Kconfig: RAMDISK_RO requires rkparam partition
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I166450ab0d406d2a452afb137c57511def54760c
2020-04-26 15:13:44 +08:00
Jason Zhu 00c95c4989 rockchip: spl: implement fit_board_verify_required_sigs()
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I5dbebf21a8c3ae76550fec7262bee66c256b5682
2020-04-26 09:15:15 +08:00
zain wang 4d06e4de74 tools: trust_merger: copy ImageSize from Component to ComponentData
rk3399_miniloader_v1.25 read ImageSize from ComponentData first now.
So copy ImageSize to ComponentData (named LoadSize).

For other chips, ComponentDate->LoadSize is reserved area, it no
inflence on other chips.

Signed-off-by: zain wang <wzz@rock-chips.com>
Change-Id: I51468aa3fad90d8999c1943ab9c720f7c90cefc1
2020-04-26 09:15:15 +08:00
Jon Lin 19a7802737 mtd: mtd_blk: skip bad block if mtd map isn't initiated
Change-Id: I3a2b5d311b43cc82135ecd84956e7a365c5910db
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-04-26 09:15:15 +08:00
Jason Zhu a5373663e8 rockchip: spl: implement fit_board_verify_required_sigs()
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I5dbebf21a8c3ae76550fec7262bee66c256b5682
2020-04-24 16:04:50 +08:00
zain wang 5033bc62fe tools: trust_merger: copy ImageSize from Component to ComponentData
rk3399_miniloader_v1.25 read ImageSize from ComponentData first now.
So copy ImageSize to ComponentData (named LoadSize).

For other chips, ComponentDate->LoadSize is reserved area, it no
inflence on other chips.

Signed-off-by: zain wang <wzz@rock-chips.com>
Change-Id: I51468aa3fad90d8999c1943ab9c720f7c90cefc1
2020-04-24 14:54:31 +08:00
Jon Lin d629023889 mtd: mtd_blk: skip bad block if mtd map isn't initiated
Change-Id: I3a2b5d311b43cc82135ecd84956e7a365c5910db
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-04-24 14:34:59 +08:00
Joseph Chen a46b05016b scripts: add uimage pack script
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Id1570789d84f8aba3a6b857e92cc2941e640aaa4
2020-04-24 10:23:26 +08:00