Commit Graph

13371 Commits

Author SHA1 Message Date
Joseph Chen f4c9b02d9e rockchip: dts: add rk1806-evb.dts
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ic0ef2210f190bb8e229c1d97eb3b78447335e56c
2019-12-30 10:24:03 +08:00
Joseph Chen 5d5f363eb9 rockchip: board: init debug uart if not use pre-loader serial
Pre-loader serial has higher priority.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Idd736b78454f7bc662abe61d25bbfa3a3e4c0d90
2019-12-20 13:09:06 +08:00
Jason Zhu 260e24d205 rockchip: dts: rk3326: support eMMC hs200
Change-Id: Ib0cf27fe1a1fc3bc53d3440ead2631b53fc9f8b2
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-12-20 12:32:14 +08:00
Jon Lin 164b2567a2 rockchip: rk3036: enable SFC
Change-Id: I7eab386c35495377249532b389f9819c9e5c8a79
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2019-12-20 10:06:47 +08:00
Jon Lin 52a8a1a43a rockchip: rk3036: add SFC node
Change-Id: If91914f86786014f0407fb1d0280545e00368faa
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2019-12-20 10:03:29 +08:00
Joseph Chen 0453d738ec rockchip: param: support parse 4GB+ memory size
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ifac53c5fd97e0708b0eeef8d455cdcb5c0dc8d4d
2019-12-16 21:01:55 +08:00
Joseph Chen 470c509241 board_f/arm: fixup 4GB+ memory size
- fixup gd->bd->bi_dram[] before update "/memory" node
- append 4GB+ memory size when announce dram

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I8908426c54d251e5cfa9216b0dc5470145e37cb5
2019-12-16 21:01:55 +08:00
Joseph Chen 9f8dc1751f rockchip: board: fixup gpio phandle for key nodes from U-Boot dtb
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I4a6af5334bf512d3713b9f32db903f85c818bfe7
2019-12-13 15:42:00 +08:00
Joseph Chen 6ba52d9f28 rockchip: update grf_px30.h according to latest TRM
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ie02f26d60cc75c82cf9098a15d3b913a890d3f7b
2019-12-10 15:33:38 +08:00
Joseph Chen 07f987d8d4 rockchip: resource: support parse logo_kernel.bmp from logo partition
"logo" partition layout, not change order:

|----------------------| 0x00
| raw logo.bmp         |
|----------------------| N*512-byte aligned
| raw logo_kernel.bmp  |
|----------------------|

N: the sector count of logo.bmp

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I2deba013d3963c99664c5bfd69693835a46ba48f
2019-12-10 12:47:52 +08:00
Lin Jinhan 1be69feab0 rockchip: dts: rk3368: add and enable crypto node
Change-Id: Icfffb1311388ff7de59b9c9da7d5f25c7eb35684
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2019-12-10 11:32:12 +08:00
Lin Jinhan 2b0e21e891 rockchip: dts: rk3328: add and enable crypto node
Change-Id: I93603c71fa04287529d49113c7d5728f57eb242f
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2019-12-10 08:39:35 +08:00
Lin Jinhan 7a92af6674 rockchip: dts: rk322x: add and enable crypto node
Change-Id: Ic8d398dc471672e0ddc50fafd7bf668bc6398fdc
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2019-12-10 08:39:34 +08:00
Lin Jinhan ed6f2c93bc rockchip: dts: rk3308-evb: enable crypto
Change-Id: I9cb50f7520973ffbd83cbada5555ca2aa4ec54c0
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2019-12-10 08:39:33 +08:00
Lin Jinhan 85dc87d14a rockchip: dts: px30-evb: enable crypto
Change-Id: Ieff0609a8310a0da6215e042905321928115e7b9
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2019-12-10 08:39:33 +08:00
Joseph Chen d625acc28e rockchip: board: fix cru phandle fixup failed
Fixes: (2a5ad8b rockchip: board: treat 'u-boot,dm-spl' as 'u-boot,dm-pre-reloc')

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ia0e9c875e0f341ef50d2c47911b166ebd1ebc369
2019-12-03 13:09:21 +08:00
Joseph Chen 8226ac627b rockchip: board: print DTB hash result
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Icc622b51b415f8aeaf1333dba1491426b906e806
2019-12-03 13:09:20 +08:00
Joseph Chen 83c9bd4bbe board: rockchip: pass fuse programmed state to kernel
This flag is passed from miniloader by atags.

Change-Id: Ib39a23f762d64e9326222d544db8aeca037b0b36
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-12-02 14:07:49 +08:00
Joseph Chen 7a6f40248d rockchip: board: fix always entering recovery on normal boot U-disk
As usual, entering recovery depends on Misc partition content.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ic3c2d13e4b087c0408989edf435ef27a44cac5d7
2019-12-02 14:07:49 +08:00
Jason Zhu f0aa8c5d41 rockchip: board: dump soc clk before use kernel dtb
When enable DEBUG, dump soc clk before use kernel dtb, so that
we can get the clock status in U-Boot before load and use
kernel dtb.

Change-Id: Iee4244bde4ddd8ec1207f1c7cf6942c5b4e8f876
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-12-02 11:26:18 +08:00
Joseph Chen 760b0468de rockchip: Kconfig: add RK1806 SoC
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I12bc82d47aa11afcececc7ce7b8f7d7cbecb8336
2019-11-29 17:05:34 +08:00
Joseph Chen ed7d08b837 rockchip: rk1806: add sip version smc call
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I833adf5cd86f45c0f2e9d98866d7c17adb3baaf0
2019-11-29 17:05:34 +08:00
Joseph Chen 94001eb016 rockchip: smccc: include arm-smccc.h in rockchip_smccc.h
So that the other drivers don't need to include arm-smccc.h

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: If6638ecf2d4a9e6b33a04215df40c19314a764cc
2019-11-28 14:48:43 +08:00
Zhihuan He 1f404b074d rockchip: atags: remove atags useless func when build tpl
Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
Change-Id: I496fde41388eee0d16d206d892c7b68945b36f56
2019-11-26 14:42:06 +08:00
YouMin Chen 8ccbf1ca60 rockchip: atags: the macro definition about memset/memcpy
If have define USE_ARCH_MEMSET/USE_ARCH_MEMCPY,it don't need
to realize memset/memcpy for rk_atags whit TPL.

Change-Id: I464f364edf711573dbad61302ff9e01f3a0edbf2
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2019-11-22 10:36:23 +08:00
Kever Yang 6de0075c5d rockchip: Kconfig: enable CONFIG_DEBUG_UART_BOARD_INIT for all SoC
Some SoC may missing this config, this is need by all the SoC, so set it
at higher level.

Change-Id: I16e935635cce61d02d6641992483baf98f9fe71b
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-11-19 17:22:04 +08:00
Kever Yang e82920f397 rockchip: px30: Enable support for UART5
Because the UART2 IOs are mux with SDcard, in order to use SDCard,
we need to use UART5(on evb RPi connector) instead of UART2M0

Change-Id: Ibeab51636eb748f389d9211193c0b5682c266c9e
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-11-19 16:52:42 +08:00
Andy Yan df7b19b0b1 rockchip: dts: rv1108-evb: enable sdmmc
Add sd card support, tested on rv1108 evb v11.

Change-Id: I61e25c78c23c4f774a314b9489f81dab1d990531
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2019-11-15 09:09:01 +08:00
Andy Yan 2bfd4c143b rockchip: dts: rv1108: increase sdmmc drive strength to 8ma
sync from linux kernel develop-3.10:
"ARM: dts: rk1108: increase sdmmc's drive strength to 8ma"
(sha1: 90ac5cb61aabf2e344c10b4c55954d6a3f41bd55)

Change-Id: Ifd38ced2b0a9cada25e9348f455454c9edbc7bd8
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2019-11-15 09:09:01 +08:00
Joseph Chen a84f21ebb8 rockchip: add misc BCB message offset compatibility
Rockchip platforms defines BCB message at the 16KB offset of
misc partition while the Google defines it at 0x0 offset.

From Android-Q, the 0x0 offset is mandary on Google VTS, so this
patch is a compatibility according to android image 'os_version'.

Android os version >= 10 is at 0x0 offset, otherwise at 16KB offset.

Change-Id: I54a7674e2dc2e0c29fc624f17b4453663c9ea462
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-11-14 11:08:45 +08:00
Kever Yang 0db1499c05 rockchip: rk3399: update SPL_STACK_R_ADDR
Use the same SPL_STACK_R_ADDR in Kconfig instead of each board config;
default to 0x4000000(64MB) instead of 0x80000(512KB) for this address
can support all the SoCs including those may have only 64MB memory, and
also reserve enough space for atf, kernel(in falcon mode) loading.

After the ATF entry move to 0x40000, the stack from 0x80000 may be override
when loading ATF bl31.

Change-Id: I9bb524ee0762e908bd390393168f30ca197e2a52
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-11-12 09:59:47 +08:00
Jon Lin ce7ac0aae2 rockchip: px30: add SFC node
Change-Id: I86828e529d30a018f38a61e6b669d8d3a5879f2e
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2019-11-11 18:32:03 +08:00
Jason Zhu a9bb1266c6 dts: rk3308: add sdmmc node to support sdmmc
Change-Id: Iebf8b4c800ceaea95530c553955e727e2d76345f
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-11-11 14:12:12 +08:00
Jason Zhu 224c13b893 rk3308: add node "sdmmc_pin"
So that we can add "u-boot,dm-pre-reloc" to node "sdmmc_pin"
in rk3308-u-boot.dtsi to control the sdmmc iomux in spl.

Change-Id: I867927c37dd20f1b586a62676a195dbf52dca44d
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-11-11 11:26:33 +08:00
Andy Yan d9ba2df1ad rockchip: dts: include rk3368-u-boot.dtsi for px5 evb
Let's rk3368-px5-evb-u-boot.dtsi include rk3368-u-boot.dtsi.

Note: px5 evb use uart4 as debug console.

Change-Id: Icca1fe00f95fb956abd41d34202af380b18f3c34
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2019-11-08 11:27:11 +08:00
Andy Yan e1f8eabf6c rockchip: dts: Enable sdmmc on px5 evb
Change-Id: Ib7cf9595e337d4179d79775deb0a126f6ccb4878
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2019-11-08 11:27:11 +08:00
Joseph Chen e0cee41234 rockchip: resource: add sha1/256 verify for kernel dtb
This is important and necessary for U-disk firmware upgrade to
avoid loading the bad kernel dtb to init USB driver.

Also helpful for normal boot.

Change-Id: I81629991547ccb2930312278295e9737f4827945
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-11-07 09:37:18 +08:00
Joseph Chen fcecee42b0 rockchip: resource: update print message
At this moment, we just load file entries but not really load file.

Change-Id: I550e6bd90bcdf81f866c0d5f5c6b71faa0ecde19
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-11-07 09:37:18 +08:00
Joseph Chen ca6fb2913f rockchip: Kconfig: add CONFIG_ROCKCHIP_HWID_DTB for hw-id dtb
Only a few developers need this feature, disable it by default.

Change-Id: I074594c8e47c34a05324e363d11613383f3528a7
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-11-07 09:03:38 +08:00
Joseph Chen a6926964ec rockchip: resource: clean rockchip_read_dtb_file()
Remove unused rockchip_get_resource_file_size().

Change-Id: I5fd24f68b226e9b3ae3a36e574f5efd8c8728e65
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-11-07 09:03:38 +08:00
Joseph Chen f2b98302da rockchip: resource: remove android a/b slot append
The partition disk layer takes over the responsibility of
slot suffix appending.

Change-Id: Ia02f5b8635676d49ec60eec7d3930740f2ba5ee4
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-11-04 15:43:46 +08:00
Joseph Chen 0ed06f16e2 rockchip: support boot from U-disk
- The U-disk boot is only supported from U-Boot, the earlier preloader
  doesn't support it;
- MMC1(SD) has higher priority than U-disk;
- Always boot into recovery mode and deliver "usbfwupdate" to cmdline;
- Usb driver may depend on clock/regulator init, so behind of them;
- Suggest to add ./dts/kern.dtb file to promise the kernel dtb always
  to be loaded successfully even the native images are all damaged.

Change-Id: Ibbb2a061a727752277ac1b80abf362de5d94cca2
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-11-04 14:53:45 +08:00
Joseph Chen 6069a2cc24 rockchip: resource: fix/optimise some code logic
- alloc sysmem after load kernel dtb successfully;
- allow distro kernel dtb to be loaded later than other
  resource file, that is not controlled by code condition
  "if (list_empty(&entrys_head))".

Change-Id: If1657289a4f8980ad7d7a5df7da0e061aab21504
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-11-04 14:53:45 +08:00
Joseph Chen 3ceae1099b rockchip: param: fix get usable size error
fixes: (ced10db rockchip: param: add SDRAM_MAX_SIZE as ram top limit)

Change-Id: I9b27570116d931be484548c440df30f5026de1bd
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-11-04 10:23:52 +08:00
Joseph Chen ced10dbe1c rockchip: param: add SDRAM_MAX_SIZE as ram top limit
This patch handles the boot fail for RK3288 4GB machine.

Change-Id: I2be6e532120595a6c10e9e99a779d9ec32f48fb5
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-10-31 16:39:42 +08:00
Jason Zhu 4bac908b8b rockchip: spl-boot-order: move rk_nand_init() to the function end
Since the nand driver is not standard dm driver in spl, so move
rk_nand_init() to the function end.

Change-Id: I075a309fa3d2d0b938863cdb1867b70d217f2ce3
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-10-30 11:56:18 +08:00
Joseph Chen 8b84e8b629 rockchip: rk3399: correct comment
Change-Id: I98046f1869504c0877e5e344ef121dfde7824227
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-10-28 09:18:07 +08:00
Joseph Chen 74ab8aa2e7 arm: lib: interrupt/stacktrace: remove unhelpful message
Update message dump format.

Change-Id: Ieea57283ba21d91ba5172a339450a7aaefa0d1b5
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-10-24 10:52:45 +08:00
Joseph Chen 2a5ad8b355 rockchip: board: treat 'u-boot,dm-spl' as 'u-boot,dm-pre-reloc'
It works when CONFIG_USING_KERNEL_DTB is enabled, because we can
set either 'u-boot,dm-spl' or 'u-boot,dm-pre-reloc' for the node
that we can to leave in the u-boot.dtb.

Change-Id: I682e3900b9bf479f998304737031525004538724
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-10-24 10:52:45 +08:00
Jason Zhu 3d95740a70 rockchip: rk1808: support spl & tpl build
Change-Id: I6588fcc592d4ce64b8f0f774c7bca4d0a633543d
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-10-15 08:49:07 +08:00