Commit Graph

13610 Commits

Author SHA1 Message Date
Joseph Chen 216f7ce88f Kconfig: move CONFIG_BASE_DEFCONFIG to rockchip Kconfig
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ibae643de69aa59b8da048286fde2d736d570272d
2020-07-10 09:52:11 +08:00
Joseph Chen 36aa04d944 rockchip: boot_mode: add maskrom download for "reboot loader"
Fallback to maskrom download mode if rockusb command failed.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Iccfa8745aeac800b1e048e0301147424cd2e9478
2020-07-07 16:11:06 +08:00
Joseph Chen d5989feab2 rockchip: spl: ignore writing rollback index 0
Don't return failure to stop booting.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: If699019b588c400b1d37f1b77d02d5ccae4e68dc
2020-07-07 15:46:34 +08:00
Joseph Chen 8d26d4b38a rockchip: fit: panic if write rollback index failed
Call panic() here since there is not a return value
accepted in the top caller.

Reading rollback index failed is already not allowed.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ic5235f01dc7e9791d8ebe546724078dbab91f993
2020-07-06 19:17:42 +08:00
Joseph Chen 0d2e36b834 rockchip: fit: return whole fit totalsize
Only for debug.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I48f6577abbb22d15c7b4fc0ea6bc6409c39d9b63
2020-07-06 16:10:46 +08:00
Yifeng Zhao 1da937e728 rockchip: support vendor storage with mtd devices
support vendor storage with mtd devices, the mtd partition
name is "vnvm".

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I6a895140df8ba12ef093acf9805f44bb436f7b29
2020-07-03 10:27:22 +08:00
Joseph Chen 146289715c rockchip: make fit: add scritp to make boot.its
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I8432dabdaee9a1d5be182d504478516e7163a458
2020-07-03 08:58:06 +08:00
Joseph Chen eaeb6d442d rockchip: rv1126: make fit: add copyright
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ib1d2b650a5386f01c34030a86e6d33a133650572
2020-07-02 17:05:11 +08:00
Joseph Chen 3882551536 rockchip: rv1126: make fit: support compression assignment
- Call make_fit_args.sh script to process all args.
- Clean up code.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Icfa04c4fc2ab4f64dfd389f71309776d924e9ebd
2020-07-01 14:29:55 +08:00
Joseph Chen c012427467 rockchip: fit: add args process script
It's common for all rockchip platform to make its file.

Process args for all rockchip fit generator script, and
providing variables for it's caller.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: If9d741d16e397234d265f4ae32739514bfd7a5d1
2020-07-01 14:29:55 +08:00
Jason Zhu a79c31be17 rockchip: dts: rv1126: enlarge spi_nor's spi-max-frequency
The high speed spi nor's max frequency is about 133MHz and the
IO interface rate is about 100MHz, so enlarge spi-max-frequency
to 100MHz.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I9ef7e459dece5e70eefd72024264a94a672636d1
2020-07-01 10:21:26 +08:00
Joseph Chen cf13b78438 rockchip: spl: add rollback index check with otp
Add rollback index check with otp, support OTP V2 only.

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I640a44e55f00ac55215fa8aa3a3b63e0d75f6422
2020-06-30 13:05:49 +08:00
Joseph Chen c29dd8c434 rockchip: board: add rollback index check with trusty
None-zero gd->rollback_index value should be written into
trusty.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ib964c5883e5083a3f9828415ee05819960d20139
2020-06-30 13:05:49 +08:00
Joseph Chen 6192a90a8a rockchip: weak: implement fit_rollback_index_verify()
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I8156718ccd0e0b3d6ed470f45ff3d5f5c03715ef
2020-06-30 13:05:40 +08:00
Joseph Chen 8438d871e2 rockchip: add weak.c for SPL and U-Boot proper
Implement __weak functions in this file.
Move fit_board_verify_required_sigs() to here.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I4d748f7bfe4cbc9a8f2f96f30978d3e64b73b9aa
2020-06-30 12:38:36 +08:00
Joseph Chen ed5a55bae6 rockchip: spl: place spl_board_prepare_for_jump() at the bottom
Being convenient for other functions to be called.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ibfa3f30a50befa8773cc8729a5359f7a36e8180d
2020-06-30 12:24:31 +08:00
Joseph Chen d08e47d1cf rockchip: dts: rk3288: add volume up key
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: If1663a85ee0d594bf9a34506e40cb55ed7a4c30c
2020-06-30 11:33:11 +08:00
Joseph Chen c06873ff93 rockchip: dts: rk3368: add volume up key
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Iab8f867ed652d83c2dc07a1f6aacb755d533c4a6
2020-06-30 11:33:11 +08:00
Jason Zhu 313607e76a rockchip: rv1126: release and run mcu address depended on entry_point
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I040c92ed3e34ade2585966556d1ad3934c8b9cb0
2020-06-29 17:19:42 +08:00
Joseph Chen 189c0d68bd rockchip: board: place board_quiesce_devices() at the bottom
Being convenient for other functions to be called.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I1a02a150cf66ccf3dfc4be3621ad62829c3e6eb5
2020-06-24 11:21:14 +08:00
Tang Yun ping d3f5f12c3c rockchip: rv1126: tpl support thunder boot
If CONFIG_ROCKCHIP_THUNDER_BOOT=y, it will enable ddr fast boot.

Change-Id: Ia43039dd1247ebb937aaa8b6d9a9103df2dfe1f5
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2020-06-23 16:41:26 +08:00
Tang Yun ping 0b4032fdb0 rockchip: rv1126: delete some unused code for tpl
Change-Id: Iae5a157dacf8c189633ca73028b35b375688860d
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2020-06-23 16:41:26 +08:00
Liang Chen a96802b209 rockchip: px30: switch VCCIO6 voltage controlled by io_vsel6
According to the description of GRF_IO_VSEL, the voltage of
VCCIO6(which is the concern of emmc/flash/sfc controller) will
indicate by GPIO0_B6 or io_vsel6. The SOC defaults use GPIO0_B6
to indicate power supply voltage for VCCIO6 by hardware, then
we can switch to io_vsel6 after system power on, and release
GPIO0_B6 for other usage.

Change-Id: I9c8339e357a7328d9ffeb711ba5d0bdd41971101
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-06-23 10:53:51 +08:00
Joseph Chen ed9976b572 rockchip: dts: rv1126: delete unused property
The propery is brought by CONFIG_OF_U_BOOT_REMOVE_PROPS
required from GMAC.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ib85ec0678a0a0404eb4cda5974c52076bf0a1e37
2020-06-22 20:01:58 +08:00
Joseph Chen 3017074fb2 rockchip: rkimg: use menu key to enter bootrom download mode
It's possible that USB is disabled due to developer needs
a critial size of u-boot.bin.

Disabling USB makes vbus can't be detected any more, so that
we add menu key and the events trigger are changed:

- rockusb mode(fallback to bootrom mode):
	"recovery key pressed + vbus=1" => "menu key pressed"

- recovery mode:
	"recovery key pressed + vbus=0" => "recovery key pressed"

At the most time, USB is enabled and this feature is not applied.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I9da8f17987742cea3267dbb35ee88d57a00c578a
2020-06-22 19:59:50 +08:00
Joseph Chen 766120444d rockchip: dts: rv1126: add menu key
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ib3e24be7153cc94428e2d6dcdc5a43c6c2ce8501
2020-06-22 19:59:50 +08:00
Joseph Chen 982d40b6ae rockchip: rkimg: clean some code
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I8d54c5c8beb81bfab72885234a69d93f638081cf
2020-06-17 15:21:41 +08:00
Joseph Chen 1392e21877 rockchip: add depends for ROCKCHIP_FIT_IMAGE_PACK
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I1015bba4eddb6eec241956d867d637fd8649471b
2020-06-16 15:07:35 +08:00
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 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 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
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 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
YouMin Chen 9442a4b3bb driver: ram: rockchip: update the driver of sdram_pctl_px30
Change-Id: I586065b41a22bbee266fa234e6513ef1dac5b37b
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-06-05 15:11:34 +08:00
YouMin Chen 0e03287145 rockchip: rv1126: add the struct of rv1126_pmugrf
Change-Id: Idb6610023e52e3aa640b665f5a08ff142a660c6c
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-06-05 15:11:34 +08:00
Jason Zhu 747423edb6 rockchip: spl: bring up to kernel when CONFIG_ROCKCHIP_BOOT_MODE_REG is 0
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I3f576fa0527a42ebede6ec252586cf681974fa97
2020-06-03 20:04:17 +08:00
Joseph Chen 25047d3f40 rockchip: board: update cli message format
"Cmd interface" is easy to understand.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I0c74ad595f6c24abaf1b98bf7a09dc5060a4755d
2020-06-03 14:29:02 +08:00
Finley Xiao d0999afb2e clk: rockchip: rk3308: add support to set and get sfc clock
Change-Id: I322471da6e50b0bad328dde015d0d7d0466cc3a9
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-06-03 09:57:07 +08:00
Fabrice Gasnier 827e2ae92e UPSTREAM: clk: add clk_valid()
Add clk_valid() to check for optional clocks are valid.
Call clk_valid() in test/dm/clk.c and add relevant test routine to
sandbox clk tests.

Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I78b1edea1f8ef54d3aa3f7610d39d79dd994d1bf
2020-06-02 16:07:42 +08:00
Joseph Chen 1619e70322 rockchip: dts: rv1126: add gmac support
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I19edafc1fc9402d6f9a4123c935e8a0881071960
2020-06-02 16:05:02 +08:00
Jianqun Xu 012d0ecf96 rockchip: rv1126: disable force_jtag
Change-Id: I16b1c30495e68ac58845e9f45014319384a4d5a6
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-05-29 11:55:36 +08:00
Joseph Chen 7c7344b17a rockchip: rv1126: use imply for CONFIG_ROCKCHIP_GPIO_V2
Fixes warning from rv1126-usbplug_defconfig:
	......
	warning: (ROCKCHIP_RV1126) selects ROCKCHIP_GPIO_V2 which has unmet direct dependencies (ROCKCHIP_GPIO)
	warning: (ROCKCHIP_RV1126) selects ROCKCHIP_GPIO_V2 which has unmet direct dependencies (ROCKCHIP_GPIO)
	......

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I2c7d64e9cdd03f3e8dcbbb948d747a67d7dff4da
2020-05-29 09:25:06 +08:00
Jianqun Xu 1c0910cb6f rockchip: rv1126: select ROCKCHIP_GPIO_V2
Change-Id: Id6c97ee21e5692b873c5711340b3e85ead06e679
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-05-28 19:20:09 +08:00
Jianqun Xu d1aef94b5a gpio/rockchip: rk_gpio support v2 gpio controller
The v2 gpio controller add write enable bit for some register,
such as data register, data direction register and so on.

This patch support v2 gpio controller by redefine the read and
write operation functions.

Change-Id: I2adbcca06a37c48e6f494b89833cd034ba0dae29
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-05-28 19:20:09 +08:00