Commit Graph

46820 Commits

Author SHA1 Message Date
Joseph Chen 8fb96674f6 disk: part_rkparm: add initrd fixup for cmdline
remove unused "initrd=0x...,0x...", this for compatible
with legacy parameter.txt.

Change-Id: I7d9c5708a6b183479ac5980a90067cff8f0872de
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-01-24 18:17:14 +08:00
Kever Yang bf98386f4f rockchip: sdram: update dram_init_banksize for secure reserve
Reserve memory only when there is reserve mem info at TRUST_PARAMETER_OFFSET,
both ARM64 and ARM32 need to do this.

Change-Id: I14370b92a4f4446482d5c241b85d1588acea14b5
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 17:23:05 +08:00
Kever Yang bb1716ec8e rockchip: resource_img: remove compile warning
Change-Id: I1cb85231be68b67e6a339a46be00a6f592986a9b
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 16:19:19 +08:00
Frank Wang 22ae868202 rockchip: inno-phy-usb2: fix code logic error
Fix condition logic error in rockchip_usb2phy_parse().

Change-Id: I51d2e97d73f9fc81295d424f97737f00d0e846d7
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2018-01-23 09:35:13 +08:00
Frank Wang d015bf411a usb: gadget: correct the capacity value for upgrade tools
Correct the current capacity to support the different storage
devices upgrade.

Change-Id: I2c96183f317f42944887d02af097ff8a8d29cd4e
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2018-01-23 09:35:09 +08:00
Jason Zhu 2ab11bbe30 android: support the new android format mode
In the new android images, the ramdisk.img is packed in the
system.img. So transmit the "skip_initramfs" to cmdline to
ignore the ramdisk.img (if have) loaded from boot.img.

Change-Id: I1b2051d65078c903411f3ddcc0c7803cbd6892f4
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2018-01-23 09:34:04 +08:00
Kever Yang 3877199611 rockchip: add common board file for rockchip platform
We use common board/spl/tpl file for all rockchip SoCs,
- all the SoC spec setting should move into SoC file like rk3288.c;
- tpl is option and only purpose to init DRAM, clock, uart(option);
- spl do secure relate one time init, boot device select, boot into
  U-Boot or trust or OS in falcon mode;
- board do boot mode detect, enable regulator, usb init and so on.

Change-Id: I7b5fa1e3e6e5f4a30a382003215425530087a586
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:27 +08:00
Kever Yang 7a6ed8e85f rockchip: declear boot_devices in bootrom.h
boot_devices may defined in soc file, and used in board file,
we need to delear it in header file.

Change-Id: I621dac73d0e00379da49b78b3a9079e30642881a
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:27 +08:00
Kever Yang 09a3210f7f rockchip: spl-boot-order: do not enable with OF_PLATDATA
The "fdt_*" functions may not enable even if the OF_CONTROL is enabled.

Change-Id: I66760056f6f721e4d33f25468b46b1446ebbaf4a
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:27 +08:00
Kever Yang f10f1ffab4 rockchip: dts: rk3399-firefly: enable uart2 in spl
pre-loader console in SPL needs UART.

Change-Id: I2db396f00ec8a96452a53be1806ea0ef7aacd990
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:27 +08:00
Kever Yang 04623617ac rockchip: remove rk_timer
We do not use rk_timer.c now, remove it.

Change-Id: Ifd4863031cc782fd8d85b494046f346230087f9a
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:27 +08:00
Kever Yang 9d6b570b88 rockchip: lion-rk3368: remove rockchip timer
We use ARM generic timer.

Change-Id: Iafc3a71c87dd3f005134c3e6235ec5f8294a415d
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:27 +08:00
Kever Yang db48fc9697 rockchip: rk3399: use common board file
Use common board file and move SoC spec setting into rk3399.c

Change-Id: Ic674cef566b16c33978a1430eadfa9438b2de1db
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:27 +08:00
Kever Yang 9814e89b69 rockchip: rk3368: use common board file
Use common board file and move SoC spec setting into rk3368.c

Change-Id: I1d5a2b0bae03f89092cc0daf1c52622b3884cc43
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:26 +08:00
Kever Yang 73d952acc8 rockchip: rk3328: use common board file
Use common board file and move SoC spec setting into rk3328.c

Change-Id: Ia7cf43e0096da980d744260caa61456ddc6b24eb
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:26 +08:00
Kever Yang 27dbe19836 rockchip: rv1108: use common board file
Use common board file.

Change-Id: I5fefdfad9a2acdb837ffe15f93518dc26e08b9e7
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:26 +08:00
Kever Yang f4c952bc1f rockchip: rk1108: remove rockchip timer for sys timer
We use ARM arch timer instead.

Change-Id: I834da04f1c7dc6e38ee64b420c66d2ad7d1b65ac
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:26 +08:00
Kever Yang 26ceaeee5f rockchip: dts: rk3288: update spl-boot-order
Use "uboot,spl-boot-orde" instead of "uboot,boot0".

Change-Id: I647500193ab7cd89e7e409b75793a3eff4453d84
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:26 +08:00
Kever Yang fc9839356c rockchip: rk3288: use common board file
Use common board file and move SoC spec setting into rk3288.c

Change-Id: Ie17232dd60d2b185b635631ce9373eb59b11c89c
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:26 +08:00
Kever Yang bf9b2c649a rockchip: rk3288: remove rockchip timer for sys timer
Use ARM arch timer instead

Change-Id: Id14b484aa49ee98f741463adc510403f244fd187
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:26 +08:00
Kever Yang 17ee18bfa3 rockchip: rk3128: use common board file
move SoC spec setting into rk3128.c

Change-Id: Id3bb2680d7087140510a4b1a8d87e4322e109ca5
2018-01-23 08:45:26 +08:00
Kever Yang 0f04a90396 rockchip: rk3128: remove rockchip timer as systimer
We use ARM arch timer instead.

Change-Id: I4368b30eab5ae61c9dd7a9165859504607fbbfe3
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:26 +08:00
Kever Yang 085507de5a rockchip: rk3188: use common board file
Move SoC spec setting into rk3188.c

Change-Id: I689126cbf6fe2e5699c8776ea42a7acc6ac0f3fc
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:26 +08:00
Kever Yang 6c150631d0 rockchip: rk3188: remove rockchip timer as sys timer
We use ARM arch timer instead.

Change-Id: I22267fa4de69d3d9aab01c75d5b60355a79ce49b
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:26 +08:00
Kever Yang 8c07fb99d9 rockchip: rk3066: use common board file
Move some SoC spec setting into rk3066.c

Change-Id: Iab2bfa8b35ad4253572c326c6c4a06d768760a9d
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:26 +08:00
Kever Yang 60c204703f rockchip: rk3066: remove rockchip timer as systimer
We are going to use ARM arch timer.

Change-Id: If2fde02a06f59fe9e0102f5b141858f02b9c3b9e
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:26 +08:00
Kever Yang 537cfed286 rockchip: sdram_common: add common dram_init_banksize
dram_init_banksize() can be common used by all SoCs, move it into
sdram_common.c

Change-Id: Ie8caa63b898202ae588d5a71f130d14c741943a2
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:26 +08:00
Kever Yang ba59d97fad rockchip: rk3036: use commong board file
Move some soc spec setting into rk3036.c

Change-Id: Ib0c1d222e273e8a8bfc8c58d2e060b696f2a7500
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:25 +08:00
Kever Yang afb735a686 rockchip: rk3036: sdram: use udelay instead of rockchip_udelay
We are going to remove rockchip_udelay after enable arch timer.

Change-Id: I8c7eea8315a42401d0fd7dbf1e4c812b5605bc73
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:25 +08:00
Kever Yang f484cfe287 rockchip: rk3036: remove sys timer
Use ARM arch timer instead.

Change-Id: Idb8dd83d8ee54d8e2a5d7c072f79c17177d89f70
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:25 +08:00
Kever Yang c11c067d96 rockchip: rk322x: use common board file
Change-Id: If3ac0d99a96a784443e16112362fd54576a70c00
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:25 +08:00
Kever Yang 5531a492c0 rockchip: rk322x: sdram: use common udelay instead of rockchip_udelay
Do not need to use rockchip_udelay after we can use systimer.

Change-Id: Ibcd722a71ca383c057128d9706c6679b49c17a3d
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:25 +08:00
Kever Yang 422ee936fd rockchip: rk322x: remove use rockchip timer as sys timer
We can use arch timer instead of rockchip timer.

Change-Id: I9098f42180515202c39c9fd86299687cb4902ec1
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:25 +08:00
Kever Yang 8ec3962084 rockchip: rk3328: add BOOT_MODE_REG for rk3328
Change-Id: Ib0ee4709b6b57b51142c9df2e14ff0be3798f9a3
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:25 +08:00
Kever Yang ffb06671e6 rockchip: rk3066: enable early back to bootrom like rk3188
We don't need tpl for rk3066 after we enable this option.
NOTE: need to update code for clock init in boot0 later

Change-Id: I253e6a0fd3633d982ebabaa045a0d4839570bc6a
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:25 +08:00
Kever Yang e8078e9068 rockchip: add IRAM_START_ADDR for all SoCs
We add this for get the location for boot device of bootrom.

Change-Id: Ibf142129cacb09ed9e4e0084d003c6cc0812df54
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:25 +08:00
Kever Yang d5ed5c22a1 rockchip: add STIMER_BASE for all SoCs
STIMER is can only access in secure mode if the SoCs supports trust,
and it locate in alive power domain, as the source of ARM arch/generic
timer, we add a base addr for all SoCs so that we can init with a common
function.

Change-Id: Iab7b8706344ecdc635d66196eed1ff855afc9a24
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:24 +08:00
Kever Yang 60b9259c7e rockchip: enable SYS_NS16550 for all SoCs by default
All rockchip SoCs can use ns16550 driver, enable it for all
and set SYS_NS16550_MEM32 for all SoCs.

Change-Id: I4be3a801bf5537b94ed0c100cb44f49d78b8b15a
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:24 +08:00
Kever Yang 2d2f5f9a1f rockchip: add common MACRO to enable sys arch timer
All rockchip SoCs can use ARM arch timer, let's enable it in
common header file

Change-Id: Ic74024b34c72cfbeffa2288ef2b2375f5f141c2c
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:24 +08:00
Kever Yang b95943f162 rockchip: rk3288: move configure_l2ctlr back to rk3288
The configure_l2ctlr() is used only by rk3288, do not need to
locate in sys_proto.h

Change-Id: I98f8cffdbc990e3fcf19f41ca53ff5fd25155e63
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-23 08:45:24 +08:00
Kever Yang 89c73a9cca spl: use different BOARD_INIT MACRO for spl and tpl
SPL and TPL may not always need spl_board_init() at the same time.

Change-Id: I5f26956414f1d2ff3fd2fce11a4d7759de7804fe
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-22 18:01:38 +08:00
Kever Yang 8fcd17873c rockchip: make u-boot-tpl.its common
All rockchip can re-use this its file.

Change-Id: I75b5a5b2865d861bc6b746ad42491b5596d269cc
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-22 17:56:31 +08:00
Kever Yang 48e66864c3 power: rk8xx: fix compile warning
If CONFIG_SPL_BUILD is not enable, some functions are defined but
not used.

Change-Id: I1d67f8f5d69c92d2d26209a17d7a765a56b10e59
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-22 17:53:19 +08:00
Kever Yang 3e0b6ad9e6 rockchip: resrouce_img: fix compile warning
Change-Id: I495e289b915dedbfe456d15d28fbc3da4c466fa6
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-22 17:53:01 +08:00
Kever Yang 6f3eb47422 fastboot: fix compile warning
cb_flashing() should be in the same MACRO of cb_flash().

Change-Id: Ic5641a1bf1fb0ab53ad98bdececd028f1e75a5e2
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-22 17:52:48 +08:00
Kever Yang 282f89a3b6 rockchip: param: reverve 4MB for emmc
Need to reserver first 4MB for EMMC while use the addr directly for NAND.

Change-Id: I5c6309e41a9c287388cb6c0ff7ba5b1ef9ff29bf
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-22 17:33:49 +08:00
Joseph Chen 534066e47b bootm: resever memory before any lmb_alloc()
It's better to be done anyway and as early as possible.

Change-Id: I681c93b97a8c3da681886b23ef350ecab8156f8e
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-01-20 22:26:41 +08:00
Joseph Chen df3eab8124 image-fdt: support "reserved-memory" for lmb
Change-Id: Id628c47e2521226777d2391db1fee325592cf3f2
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-01-20 22:26:33 +08:00
Jason Zhu 830c86d992 image-android: get real fdt addr in android_image_get_fdt
Change-Id: Ie9c632c767962f8580bd9adf7727738f28479e4c
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2018-01-18 10:19:23 +08:00
Jason Zhu b7570de26c android: modify the fdt_addr
The env fdt_addr must be set as hex.

Change-Id: I75ffeb832a4b44dcadafdcfecfc6bb282e495b83
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2018-01-18 10:00:58 +08:00