Commit Graph

48647 Commits

Author SHA1 Message Date
Joseph Chen 5bb5aa82d3 common: console: optimize console record
- fix: passing argument 1 of ‘membuff_new’ discards ‘volatile’ qualifier from pointer target type;
- add console_record_print_purge();
- set default CONSOLE_RECORD_OUT_SIZE value for rockchip;

Change-Id: Id247d590b677cd2cff95bc5e66963b0ff07b0658
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-09 18:07:45 +08:00
Joseph Chen a69fab4a34 console: remove unused definitions
Change-Id: I281d773196401b57d3db99644d06277255e36c07
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-09 17:21:19 +08:00
Joseph Chen 90b99ac763 common: rkimg: add sysmem alloc for uncompress kernel
It helps check whether uncompress kernel overlap with other region
or not.

Change-Id: I16299d4865fb79c3d0e83ccd2a2f4cdff9df66f9
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-09 17:21:19 +08:00
Joseph Chen 0986a7dda1 common: android: add sysmem alloc for uncompress kernel
It helps check whether uncompress kernel overlap with other region
or not.

Change-Id: Ia7e6c027f68c2e8af398824afd8b7580531cb77e
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-09 17:21:19 +08:00
Joseph Chen c664909e96 rockchip: board: add and use conosle hotkey interface
Change-Id: I9c7b3ce75b9b7652cdd60d0d94d55d34f0a7011e
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-09 17:21:19 +08:00
Joseph Chen 92298dbc5d rockchip: common: increase CONFIG_NR_DRAM_BANKS
Since we have import sysmem/bidram memory management, we can
support any count of discontinuous memory block, let's increase it.

Change-Id: I12e5d7e766c8060e1a50f6eee9eaa23bde8021ea
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-09 17:06:17 +08:00
Andy Yan 63363c40ff spl: fit: all rockchip based soc use dram as sram bounce buffer for
block device

The Storage controller(MMC/NANDC/SFC) on Rockchip based soc can't
access the sram directly, we need use dram memory as a bounce buffer.

Change-Id: Ibe2a10d7b73cb19b093ee372602ade097b689b82
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2019-05-09 16:49:14 +08:00
Andy Yan 912343c03a rockchip: mkimage: add support for RK3308
Usage:

 (1) tools/mkimage -n rk3308 -T rksd -d tpl/u-boot-tpl.bin idbloader.img
 (2) cat spl/u-boot-spl.bin >> idbloader.img
 (3) upgrade_tool wl 0x40 idbloader.img

Note:
  When use a ddr binary from rkbin as tpl, use it replace u-boot-tpl.bin in (1)

Change-Id: Ia6694754ed70d2d5cce04f62dcfac538291f7386
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2019-05-09 16:48:47 +08:00
Jason Zhu 41386edd8d fastboot: add oem command to init ab metadata
The command is: fastboot oem init-ab-metadata

Change-Id: I879929a8a6e1c133725267c94492b2f2495ba5b4
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-05-09 16:48:12 +08:00
Joseph Chen 363411a1e6 rockchip: board: use flushc() to flush console data
Change-Id: I422a8ab8423bbab1922059d1e80d757506a1ca73
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-09 16:24:08 +08:00
Joseph Chen 91cbfde1a2 arm: bootm: use flushc() to flush console data before linux
Remove GD_FLG_OS_RUN definition.

Change-Id: Ib78d4adf58dfea5e40ec79fcb9603020651c6daa
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-09 16:24:04 +08:00
Joseph Chen 7c86130655 serial: ns16550: implement ops->clear callback
Thus, the flushc() can work normally.

Change-Id: I544ed0ffcbc5564913bf89bf1a83c6d540ae6b6a
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-09 16:23:59 +08:00
Joseph Chen c1e72b20c9 dm: console/serial: add flushc() support
Flush console data.

Change-Id: If347b6c8d1126452a1f6386040693b30c66eb5fb
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-09 16:23:55 +08:00
Joseph Chen 3bee194f53 lib: sysmem: add sysmem_can_alloc() interface
Check if the region can be sysmem allocated.

Change-Id: I26a524c1597bee65ab1282da5ec373b9603866ba
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-07 19:46:37 +08:00
Joseph Chen f6e1530165 lib: sysmem: support avb android memblk sysmem alloc
Because avb android image usually needs a large memory buffer,
always alloc avb android memblk right after U-Boot stack is a
better choice to avoid memblk overlap with others.

Since we have overflow protect magic for U-Boot stack, so we add
a pad(4KB) between them.

Change-Id: I72655d022f7e82f1ed9fbb381424d04bc86ccf6a
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-07 19:46:37 +08:00
Joseph Chen dcb404a677 lib: sysmem: add sysmem_alloc() interface
Change-Id: I3ae1fe618ba1bb9c7924bb9816884eb26927dc1e
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-07 19:46:37 +08:00
Jon Lin d92ffd1e48 common: android: do not start kernel when read kernel failed
Change-Id: I032776022378078baae8e59ed8d746ccf13ed373
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2019-05-07 17:21:39 +08:00
Joseph Chen efda1f1db3 lib: sysmem: support M_ATTR_PEEK for memblk
- always return successful for M_ATTR_PEEK;
- add code comments;

Change-Id: I3c7f939ac61d8da5948978de4e70f17576748c91
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-07 17:08:36 +08:00
Joseph Chen 50d35c453f rockchip: board: add amp cpus on
implement cpu_secondary_init_r().

Change-Id: I840db566f18ee7dd270eb837ce0fd9a4e2409ebe
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-07 10:17:09 +08:00
Jason Zhu 94aee224c6 rockchip: param: use module config to decide whether use atags parameters
We can not call some drivers if this driver is closed. But this time we use
the parameters passed by atags directly but not test the drivers whether
exist. Add it.

Change-Id: I857ccf3b3e23a9e92502868d1514849770390ebb
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-05-07 09:55:29 +08:00
Elaine Zhang f149c047e6 clk: rockchip: rk3036: fix up the assert error
Change-Id: Id987e8847dbe97e5502259a9432dac85782769f3
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-05-05 15:49:26 +08:00
Elaine Zhang 27b00bb2a4 clk: rockchip: rk3066: fix up the assert error
Change-Id: I4d75bef4f1450e2cb467eb106b81e80eb8f582d1
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-05-05 15:49:22 +08:00
Elaine Zhang d177ad999c clk: rockchip: rk3188: fix up the assert error
Change-Id: I690798cd9a17e266c32d702f5b2c8bfdc413d970
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-05-05 15:49:19 +08:00
Elaine Zhang a0af2ba7c7 clk: rockchip: rk3288: fix up the assert error
Change-Id: I066a217b15108db21821c63bd7709fb430d34f45
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-05-05 15:49:14 +08:00
Bian Jin chen 3469bfafc4 configs: rk3399pro: enable avb and dtbo for Android P.
Change-Id: I7e3c95d1dbdfded7c89f70b1df9f38a7468573ed
Signed-off-by: Bian Jin chen <kenjc.bian@rock-chips.com>
2019-05-05 09:34:52 +08:00
Joseph Chen 94cf1096ee power: charge animation: fix cmd compile error
cmd depends on DM_CHARGE_DISPLAY and default y.

Change-Id: I5e685e0020c4aa1da80ffc27e5a576bc8969c3be
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-04-30 11:38:48 +08:00
Joseph Chen 6213b40154 cmd: CMD_DTMIG: select OF_LIBFDT_OVERLAY
Change-Id: I67d7040d477712169c815273dfaf913a4cf258e7
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-04-30 10:41:57 +08:00
Jason Zhu c9f547d895 rockchip: param: add sdupdate variable to indicate card function
Add sdupdate variable to receive card function info from preloader atags.
If the sd card is updated-card, set sdupdate to bootargs. otherwise test
whether the sd cart is ROCKCHIP_SD_UPDATE_CARD or not by rkimgtest cmd.

Change-Id: I6c09ade4a31a2e4c8349245e9e345f735afd11e9
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-04-30 08:50:53 +08:00
Joseph Chen ff21a545f5 rockchip: resource: fix parse gpio base address error
We should parse node name to identify the gpio port before
reading base address, it avoids to use miss match address.

Move out gpio_parse_base_address() from sub string parse is
better.

Set gpio as input mode before reading.

Change-Id: Iffd4ef7f3ceb1bb56a65680265af74ca50b14712
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-04-29 16:36:08 +08:00
Hisping Lin efb93541fe lib: optee_client: add module name in print func
Change-Id: I6cdcb0870bf5a3915009421e5c8b09584ac2bb6c
Signed-off-by: Hisping Lin <hisping.lin@rock-chips.com>
2019-04-29 11:09:18 +08:00
Jason Zhu 4f2523c3a0 lib: avb: load full partition if allow verification error
Change-Id: I506676512a46ec09d6c617f555f735a24fc4a594
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-04-29 11:08:08 +08:00
Jason Zhu 813227ad54 lib: avb: add init ab metadata interface
Change-Id: Ifad6c8ca70568c2dc8eea0a4ead23e3e7a2a0e74
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-04-29 11:05:35 +08:00
Wyon Bi 350f6a1836 video/drm: rgb: support pinctrl state select
Change-Id: I7eb1204e24e17894d529fc582d3bd4a90a61327a
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-04-29 10:13:19 +08:00
Elaine Zhang 88c36f1205 clk: rockchip: rk3399: fix up the assert error
Change-Id: I8cc4f6b775243fef1f5c8e2c711eb1b16eac79a8
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-04-28 14:51:00 +08:00
Jon Lin f25e3caf73 rkflash: support 4KB page size spi nand
1.support 4KB page size spi nand
2.add new spi nand: ATO25D1GA, XT26G02B, XT26G01B, HYF4GQ4UAACBE

Change-Id: I331c98341e9aa5f2e15cd7a4a5c6aeb2136d65dd
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2019-04-23 10:25:40 +08:00
Zorro Liu 12bc9cd8e1 rockchip: dts: rk3368: enable sdmmc
Change-Id: I9c9147a952572b36a389dd6ea958f68cdc712121
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2019-04-22 15:13:12 +08:00
Joseph Chen b04f87d753 common: spl: support booting bl32
Change-Id: I525f2b3c9ce24464a775291ab8924adbc0da85f0
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-04-22 14:44:24 +08:00
Jason Zhu 5c391abe02 rockchip: dts: rk3368: add cd-gpios
Add cd-gpios to test the mmc device whether exit.

Change-Id: I8ab96fd5300da25d82005ac638e6d2b728ed82ce
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-04-22 12:36:52 +08:00
Joseph Chen b54b76f12a configs: add rknpu-lion_defconfig
Change-Id: I89d2cc39febbfd4cab8373f0be6f437957c6b758
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-04-18 15:20:26 +08:00
Yu YongZhen f992fe3334 clk: rockchip: rk3308: Make DCLK_VOP clock id consistent with kernel
Change-Id: I3e5b042a5e7b4bd4a7724451b30cfa9601955541
Signed-off-by: Yu YongZhen <yuyz@rock-chips.com>
2019-04-16 09:06:52 +08:00
Yu YongZhen ed73b76733 rockchip: rk3308: release GPIO0_A4 for other usage
After switch to io_vsel3 after system power on, we should release
GPIO0_A4 for other usage.

Change-Id: I16bc33fd976fe957b57cd3a0f90ff44659ca93f2
Signed-off-by: Yu YongZhen <yuyz@rock-chips.com>
2019-04-16 08:56:12 +08:00
Joseph Chen 0436a29d64 make.sh: use "${RKCHIP_LOADER}MINIALL*.ini" to match ini files
clean: use variant "ini" for default MINIALL.ini path

Change-Id: Ia1583a915ebbbc4ec5299b9ef6d81b04592bd04b
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-04-11 15:35:00 +08:00
Joseph Chen f089d907de make.sh: add max limit size check before packing uboot.img
The uboot.img header is 2KB size.

Change-Id: Ia99b71740423a5809233a3401f5a8698ae463749
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-04-11 15:34:03 +08:00
Joseph Chen 9ad3008a7c tools: rockchip: boot/trust_merger: fix prefix append error
- still append prefix if not match legacy prefix;
- ignore append prefix for output;

Change-Id: I1a8fc77ce73cbf169af49ce40ce3a0731861c617
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-04-11 14:28:27 +08:00
Joseph Chen 45c2a034cd tools: rockchip: boot/trust_merge: fix '--replace" missing append new path
Change-Id: Icddfb2ce9c7ba6f4b4e558eb5833ba79d0e7b976
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-04-11 12:15:20 +08:00
Joseph Chen 2bbbd780f8 tools: rockchip: loaderimage: print file size with KB
load addr is 0x600000!
pack input ./u-boot.bin
pack file size: 484551(473 KB)
crc = 0xfef42a0e
uboot version: U-Boot 2017.09-02804-ge3e39ee-dirty (Apr 10 2019 - 14:11:39)

Change-Id: If8fbdd943e328db41523ded47deeedfe8c6bde0e
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-04-11 12:13:41 +08:00
Jason Zhu e65f23e90c disk: rkparam: fix get disk part size error
The disk part size is defined as number of blocks in partition rather
than bytes.So delete "<< 9".

Change-Id: I4428e5965c6456fcc69fb601d18a97fc48210617
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-04-10 14:43:52 +08:00
Simon Xue e7c691e7c7 watchdog: add support for Rockchip watchdog
Change-Id: I6b50f79df12e86453f6defbbddba5f0cf2078d28
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2019-04-10 14:35:24 +08:00
David Wu 860893596c ARM: dts: rk1808-evb: Add gmac support at dts level
Note that the gmac status is disabled.

Change-Id: Ifac56c5d5c1cc10d5f2882fbfd1ef02d97299127
Signed-off-by: David Wu <david.wu@rock-chips.com>
2019-04-10 14:14:15 +08:00
David Wu 4dad63273a config: rk1808: Enable GMAC config
Change-Id: I168a1fd36101ef360461adfe0372d1ad490e41fc
Signed-off-by: David Wu <david.wu@rock-chips.com>
2019-04-10 14:14:15 +08:00