Commit Graph

50556 Commits

Author SHA1 Message Date
Joseph Chen 1e83a6cbf7 rockchip: rv1126: use imply instead of select
In order to drop them in defconfig.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I438def3afb98021c8216e48eeaecc26165bfa18b
2020-06-16 15:07:35 +08:00
Jason Zhu 47f7fd3a52 blk/mmc: add function blk_dread_prepare
This function prepares to read data without confirming completed.
We can use it to prefetch data and run other process.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I76116c25dfdb7559b80a0216c414189e85409a3e
2020-06-16 11:34:02 +08:00
Jason Zhu 55eb094f8a rockchip: rv1126: update the spl stack address
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I891e9600cffd8fd9495ef13560314b6fc8809eb7
2020-06-16 09:58:42 +08:00
Jason Zhu 2f0354fcb2 configs: rv1126: update the defconfig
1.support GPT partition
2.support a/b system
3.enlarge the CONFIG_SYS_MALLOC_F_LEN for GPT partition

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I8ff0c0327c3f9e5ab68dc1b405503dcfc70ee0ec
2020-06-16 09:58:42 +08:00
Jon Lin 0f1dc4879a mtd: mtd_blk: Check map table block address overflow
1.Check map table block address overflow
2.Reinit map table original value

Change-Id: I4450b5a6856e38e2624da9db31d5eb98de7f5696
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-06-15 21:05:44 +08:00
Joseph Chen f9976ae435 make.sh/fit: support pack without U-Boot
command: ./make.sh --no-uboot.

Providing empty file for mcu or U-Boot image if it's
not required.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I48650f6cc0bbcc9ed111fee0354ccafe4f6c1773
2020-06-15 14:25:53 +08:00
Joseph Chen 359ed52cc2 spl: fit: check image length
Do not go further if it is 0.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I1d4c07303a4998a9c112986ee4efda39c1d55d63
2020-06-15 11:41:08 +08:00
Joseph Chen 0732900259 make.sh: update tpl+spl pack command
Legacy command:
	./make.sh spl     --- pack tpl+spl
	./make.sh spl-s   --- pack spl

New command:
	./make.sh tpl-spl --- pack tpl+spl
	./make.sh spl-s   --- pack spl
	./make.sh spl     --- pack spl

Note: legacy command "./make.sh spl" was not appied on any SDK.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ib0a96c94dd6e8fc90184e62ff495dda68ecf571f
2020-06-15 11:40:50 +08:00
Joseph Chen 5e23d42422 scripts: fit: add a macro for "data2sign.bin"
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ie36551e14f74c6c1a09012f02de5a48bd4dae888
2020-06-15 11:29:46 +08:00
Joseph Chen cc0b1aa3fe make.sh: fit: append "-itb" postfix for args
"--uboot" => "--uboot-itb";
"--boot" => "--boot-itb".

In order to distinguish with "--no-uboot".

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I4d1e1a3f88619fb728165764af52ca58665a5e89
2020-06-15 11:29:46 +08:00
Joseph Chen b42b4e1160 make.sh: clean up coding style
Not change any code logic.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: If63da35728028de638a701635425cfa1f195dfde
2020-06-15 10:57:34 +08:00
Joseph Chen 32ccc236e9 scripts: fit: update uboot.img packing message
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I60f573df2fe73bba7ca9941f3431a6bda020b490
2020-06-15 10:57:34 +08:00
Sandy Huang 48efbc7eef drm/rockchip: vop: rk312x use win1 to show logo
since kernel set rk312x win1 to show kernel logo, so here sync with
kernel config.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I3ed562526cd6f61359bef1567c7f2ea57149435d
2020-06-15 10:52:19 +08:00
Sandy Huang 695a88c4e9 drm/rockchip: win module base on rk3366 need to treats rgb888 as bgr888
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I83a28d0530db1d388176e2c249d6af8b9763f209
2020-06-15 10:52:19 +08:00
Jon Lin 2f0bb0e6b9 mtd: nand: Fix error in counting BITS_PER_LONG
Change-Id: I148a18733e055e5e43f7b259af05b3e0b36ac648
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-06-14 18:55:46 +08:00
Jason Zhu 6b5189e724 rockchip: rk1808: add nand flash definition
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Id7ab325059eeecb342af83cd7333cad55adb7dd6
2020-06-12 18:50:44 +08:00
Jason Zhu 88d49dd4d7 rockchip: dts: rk1808: support sfc device in spl
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I5a69ae076454339ee69ed5381884b9bce6173c61
2020-06-12 18:50:44 +08:00
Jon Lin 9dd9794e32 rkflash: Support new SPI Nor devices
1.Support FM25Q128A, MX25L3233FM2I
2.Change XT25F128A, GD25Q256B

Change-Id: I359bcb9fac25ae298c2e3c5ae22d61e9e5077c63
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-06-12 17:07:22 +08:00
Jon Lin b191872f34 mtd: spinand: Support GD5F2GQ4UBxxG
Change-Id: Ia3e340ae8b86c282953f94c16b801414218818bf
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-06-12 15:09:10 +08:00
Jason Zhu 602b8060f1 spl: mmc: support load image depend on parameter next_stage
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I215cc0095d875fe8f4d58b27d49e30cb615e8167
2020-06-12 09:22:40 +08:00
YouMin Chen 05431850c7 drivers: ram: rv1126: add support DDR3/LPDDR3 1056MHz
Change-Id: Ib24e263f1a58861a173b5b566718385b3f67eedc
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-06-11 13:21:52 +08:00
YouMin Chen 48c0a787fe drivers: ram: rv1126: fix DDR3 read training error
Change-Id: I0fef4eda1d14d1e46fdfdf474b6abfcc9577617d
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-06-11 09:33:02 +08:00
Jason Zhu 1258f25b98 spl: rkfw: fix decompress error when boot.img has no ramdisk
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I43066282cd8449b08b37d5ef68d57dd3046b956b
2020-06-10 09:30:47 +08:00
Joseph Chen 6b9455ac4c configs: rv1126: enable charge animation
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I23948ce2504703c6935ad770ae02ac1aa8ecea78
2020-06-09 19:54:11 +08:00
Jason Zhu f6c38d0b78 configs: rv1126: support thunder boot
1.support boot kernel by spl
2.rename the defconfig

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Ia2691e6ff612b10e6c68a67917163c0385ac0e13
2020-06-09 19:33:18 +08:00
Joseph Chen a6b23e8e97 configs: remove unused keybox and keymaster
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I16cc190edc40b4850f9259ef4f967fa296daa76b
2020-06-09 19:28:47 +08:00
Jason Zhu 44da3fa18e spl: mtd_blk: load rk firmware when load fit failed
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Ic8b0a397e9193e62f7349bbd2230d34b6485b58a
2020-06-09 11:01:59 +08:00
Jason Zhu 2206b10747 rockchip: rk3308: enlarge CONFIG_SPL_MAX_SIZE to 0x40000
We are using DRAM offset 0~0x40000 as SPL text size, Note that BSS,
STACK and MALLOC may using separate space.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I19b5f868e8a596a627011ad127a9d34837a6c1b6
2020-06-09 11:01:59 +08:00
Jason Zhu 2e93c98a37 spl: mmc: fix partition error
The part_get_info_by_name() return number that is greater than
zero when called successfully.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Ib3127f90368e7c2bfb9573c7d17e1e98dc67d9db
2020-06-09 10:09:06 +08:00
Jason Zhu dbf2974739 disk: fix compile error in tpl
error: disk/part.c:756: undefined reference to `sprintf'

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I41f10efe881783e2e426e70e8a79f585dce5bdf0
2020-06-09 10:08:50 +08:00
Joseph Chen 38b87fbc94 rv1126: configs: remove CONFIG_SUPPORT_USBPLUG wrap
Wrapping makes no sense.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I107fcb8a73438e10392511c43e17d03119b55fc0
2020-06-08 16:47:00 +08:00
Jon Lin 9ee38883a7 mtd: mtd_blk: Support mtd_map_write
Change-Id: Ifbd05736a48aa89a2e808ae4d4385bf59458d010
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-06-08 16:37:14 +08:00
Joseph Chen 85f134f569 spl: mmc: add partition name to load image
Thus, the a/b system can be supported.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I8bceb3d56f50e5bb10de3ec7d4f7768aa7d61fe1
2020-06-08 16:23:31 +08:00
Joseph Chen 54ac22e074 spl: mtd blk: clean rkfw code
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I9afc158744895ac73ad54251ed68b1f959c8e9e6
2020-06-08 16:23:21 +08:00
Joseph Chen 34f805b88f spl: nand: clean rkfw code
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Icc07b4d18f4de3faf5b9e92da117a90b3c48ea4e
2020-06-08 16:23:21 +08:00
Joseph Chen 5458123932 spl: mmc: clean rkfw from mmc_load_image_raw_sector()
Don't mix rkfw in the mmc_load_image_raw_sector(), it's
not flexsible to add more feature for rkfw.

Pass blk desc to load.dev that the same as spl_mtd_blk.c

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I87ff776362a667ea0e558749016ae3ba7049e053
2020-06-08 16:23:21 +08:00
Joseph Chen 8a5f71e473 spl: rkfw: get partition sector independ on outside
- clean and simplify the code.
- support a/b system and spl boot kernel.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I1adb2c1853e51a01e80d7453715ba2aabe0fc973
2020-06-08 16:23:21 +08:00
Jon Lin 759f94f55d dts: rv1126: Add label to SFC subdev SPI Nor
Change-Id: Ie23d7f0ce74a664ec2642e5ff86787b0a0217cb9
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-06-08 15:58:56 +08:00
Jon Lin 572e331b94 dts: rk3308: Add label to SFC subdev SPI Nor
Change-Id: Ibe05af4b4d764db9a0589e847c38f2b3c8ae1617
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-06-08 15:58:56 +08:00
Jon Lin 951aa503aa mtd: spi nor: Support parse dts node label property
Change-Id: Ib27976970e12f4e97fab2b3c84f6580a09f2c9c1
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-06-08 15:58:53 +08:00
Jon Lin 31e5d7a303 spi: rockchip_sfc: Make SPI host spi-max-frequency not configurable
Change-Id: I6184134ee423a8ffbead9cac739c6f0b5db91f6c
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-06-08 15:32:21 +08:00
Jon Lin be6c00c075 mtd: nand: Mark bbt start with spare offset 0 and ECC enabled
Change-Id: Ib388c6475003917da302f0535c18ac5fc51fb3e2
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-06-08 11:17:00 +08:00
YouMin Chen c2d71f78b8 rockchip: rv1126: enable TPL and select TPL_TINY_FRAMEWORK
Change-Id: I98b92a45f37653b93039ed63d955b12c8c5c94b0
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-06-08 10:30:05 +08:00
YouMin Chen 974a33f475 rockchip: rv1126: add tpl build support
Change-Id: I38badd98916d1ca03a1f0de6b293108063fe9bb6
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-06-05 19:01:11 +08:00
YouMin Chen f520bb22d7 drivers: ram: rockchip: add rv1126 sdram init code
Change-Id: I0c7ce7f274c396d077a4ae2fe29e382a8e295274
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-06-05 16:04:28 +08:00
YouMin Chen 78efceb66a rockchip: ram: add dram_spec_timing.h
Change-Id: I4691d46584b78ed47390ea39a90e449e4c9d0bed
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-06-05 15:11:35 +08:00
YouMin Chen 9994e22090 arm: rockchip: add CONFIG_ROCKCHIP_UART_MUX_SEL config
CONFIG_ROCKCHIP_UART_MUX_SEL is used for selecting uart multiplexer
in board_debug_uart_init.

Change-Id: I75fb8eab76e4db8cd171d8d6c4462abe52ed168e
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-06-05 15:11:34 +08:00
YouMin Chen 9ae0e26c7f rockchip: rv1126: configure UART iomux in board_debug_uart_init
Change-Id: I8820d87938209a83d493d16a0244874c75763c34
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-06-05 15:11:34 +08:00
YouMin Chen 8ab3f2621b rockchip: rv1126: not need syscon_rv1126.c when build TPL_TINY_FRAMEWORK
Change-Id: I5396b568129e2decfe64ad6c589f134034ffd4c4
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-06-05 15:11:34 +08:00
YouMin Chen 9b31f80a47 driver: ram: rockchip: add sdram_head_info_v2
Change-Id: I5715dbfb296fbc684cbd0f22270d3d3bc922bab1
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-06-05 15:11:34 +08:00