rockchip: sdram: support atags parse ddr and reserve atf/optee memory regions

it compatibles with legacy ways.

Change-Id: I0e66d7973263ed2284a1524e571c8d99ff77326f
Signed-off-by: Joseph Chen <chenj

rockchip: sdram: support atags parse ddr and reserve atf/optee memory regions

it compatibles with legacy ways.

Change-Id: I0e66d7973263ed2284a1524e571c8d99ff77326f
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>

show more ...

rockchip: ARM: tpl: add TPL_TINY_FRAMEWORK flow for arm

If sram size is small for TPL build, it can defined
CONFIG_TPL_TINY_FRAMEWORK to reduce TPL size.
For ARM if defined CONFIG_TPL_TINY_FRAMEWORK

rockchip: ARM: tpl: add TPL_TINY_FRAMEWORK flow for arm

If sram size is small for TPL build, it can defined
CONFIG_TPL_TINY_FRAMEWORK to reduce TPL size.
For ARM if defined CONFIG_TPL_TINY_FRAMEWORK when build TPL, after
save_boot_params(), it jump to board_init_f() directly, then return to
maskrom. and stack also use maskrom defined result, never change the SP.

Change-Id: I9a90d031a5d200f86c437175e9ea47e8a34062ac
Signed-off-by: Zhihuan He <huan.he@rock-chips.com>

show more ...

rockchip: bootcmd: change rksfc to spi flash devices in bootdev

1.Under the control of sfc, SPI Nand and SPI Nor are registered as two
different if_type block dev and are both the child_dev of sfc:

rockchip: bootcmd: change rksfc to spi flash devices in bootdev

1.Under the control of sfc, SPI Nand and SPI Nor are registered as two
different if_type block dev and are both the child_dev of sfc:
a.Dev 0: blk_dev "rkflash", devenum 0, if_type SpiNand
b.Dev 1: blk_dev "rkflash", devenum 1, if_type SpiNor

Change-Id: Iaa90fdc5c0926495c989189b9ef9e317b70f23a4
Signed-off-by: Dingqiang Lin <jon.lin@rock-chips.com>

show more ...

rockchip: common: fix scan mmc 1 bug

Set detect mmc 1 and rkimgtest mmc 1 at the same
level. If not, the devtype will be set as default
when run rkimgtest mmc 1 fail but not scan other
storge device

rockchip: common: fix scan mmc 1 bug

Set detect mmc 1 and rkimgtest mmc 1 at the same
level. If not, the devtype will be set as default
when run rkimgtest mmc 1 fail but not scan other
storge devices.

Change-Id: I971ea5a8e70f17641483f00b8d467ac5757ca533
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>

show more ...

rockchip: config: add rksfc dev scan

Change-Id: I68e4205db9000bd254f3cdcf1d69aef508fdc468
Signed-off-by: Dingqiang Lin <jon.lin@rock-chips.com>

rockchip: boot_mode: get the bootdev detect command from env

Define command list in header env instead of C source.

Change-Id: I781d86588f4981347233f4e1b6c63b0dbef98e08
Signed-off-by: Kever Yang <k

rockchip: boot_mode: get the bootdev detect command from env

Define command list in header env instead of C source.

Change-Id: I781d86588f4981347233f4e1b6c63b0dbef98e08
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

show more ...

rockchip: update emmc/sd index

We define emmc/sdcard index in dts alias, emmc is 0 and sdcard is 1.

Change-Id: If0adb46298bf10f7a829a456ad147efd863792d0
Signed-off-by: Kever Yang <kever.yang@rock-c

rockchip: update emmc/sd index

We define emmc/sdcard index in dts alias, emmc is 0 and sdcard is 1.

Change-Id: If0adb46298bf10f7a829a456ad147efd863792d0
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

show more ...

rockchip: add distro boot for rockchip boot cmd

The boot image scan sequence will be:
- Android AOSP with rockchip extention(resource.img as second)
- RKIMG(kernel.img, resource.img, boot.img)
- Lin

rockchip: add distro boot for rockchip boot cmd

The boot image scan sequence will be:
- Android AOSP with rockchip extention(resource.img as second)
- RKIMG(kernel.img, resource.img, boot.img)
- Linux distro

Change-Id: I534f7944b1927544b5571353894e724307b2d26f
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

show more ...

rockchip: update and move CONFIG_NR_DRAM_BANKS to common header

Most of SoCs have 2 banks after we enable OP-TEE,
for those still only have 1 bank soc, it's OK to use 2 bank
for the other one have s

rockchip: update and move CONFIG_NR_DRAM_BANKS to common header

Most of SoCs have 2 banks after we enable OP-TEE,
for those still only have 1 bank soc, it's OK to use 2 bank
for the other one have size 0 if not used.

Change-Id: Ifa0ee3e12960794c71398636e525ef853eae7870
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

show more ...

cockchip: bootcmd: do not detect dev type in bootcmd

We should already set boot devtype and devnum in getting resource
for kernel dtb or display logos, no need do it one more time.

Change-Id: I88b2

cockchip: bootcmd: do not detect dev type in bootcmd

We should already set boot devtype and devnum in getting resource
for kernel dtb or display logos, no need do it one more time.

Change-Id: I88b2e552a0a6b216eec81bcbcf06bfa6b25f7671
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

show more ...

rockchip: fix RKIMG default partitions

we need to end with '\0', or else the partitions will be broken.

Change-Id: I2bc480165ab7873be35614287b27e855bb5c39b9
Signed-off-by: Kever Yang <kever.yang@ro

rockchip: fix RKIMG default partitions

we need to end with '\0', or else the partitions will be broken.

Change-Id: I2bc480165ab7873be35614287b27e855bb5c39b9
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

show more ...

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: I4be3a801bf5537b94ed0c100cb44f49d

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>

show more ...

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-b

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>

show more ...

UPSTREAM: rockchip: move CONFIG_ENV_SIZE and CONFIG_ENV_OFFSET to Kconfig

This commit adds ENV_SIZE and ENV_OFFSET configuration items for
ARCH_ROCKCHIP, but keeps these non-visible (i.e. not prompt

UPSTREAM: rockchip: move CONFIG_ENV_SIZE and CONFIG_ENV_OFFSET to Kconfig

This commit adds ENV_SIZE and ENV_OFFSET configuration items for
ARCH_ROCKCHIP, but keeps these non-visible (i.e. not prompt is given).
With these new items present, the configuration from the header files
is moved to Kconfig.

Keeping these non-visible is necessary to have the possibility to
select new default values if CONFIG_IS_IN_* is changed (interactively
or with oldconfig). Otherwise it will always be set to a previous
value if used with a prompt. As an example if we do a defconfig with
CONFIG_IS_IN_MMC and change it to CONFIG_IS_IN_SPI_FLASH via
menuconfig, ENV_SIZE and ENV_OFFSET will not be changed to the correct
values as defconfig will already have set them to the default values
of CONFIG_IS_IN_MMC in .config.

Change-Id: I72dcb184406523a3a846322fd58ee7b9669d3390
Signed-off-by: Klaus Goger <klaus.goger@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit 81f53b0dafdfe9458f6d04fc5ec2732c2ea23a71)

show more ...

UPSTREAM: rockchip: configs: only add available BOOT_TARGET_DEVICES

BOOT_TARGET_DEVICES should only be added if the corresponding u-boot
command is enabled.

Change-Id: I5d692bf95d04b3efb876ccd1e97b

UPSTREAM: rockchip: configs: only add available BOOT_TARGET_DEVICES

BOOT_TARGET_DEVICES should only be added if the corresponding u-boot
command is enabled.

Change-Id: I5d692bf95d04b3efb876ccd1e97be807f2443efd
Signed-off-by: Klaus Goger <klaus.goger@theobroma-systems.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit 6e278a8c1c28efc12668d2761cb2fb0264668da4)

show more ...

UPSTREAM: cmd: Move CONFIG_RANDOM_UUID to Kconfig

CONFIG_RANDOM_UUID is used by the GPT command to generate random UUID when
none are provided.

Move that option to Kconfig.

Reviewed-by: Tom Rini <

UPSTREAM: cmd: Move CONFIG_RANDOM_UUID to Kconfig

CONFIG_RANDOM_UUID is used by the GPT command to generate random UUID when
none are provided.

Move that option to Kconfig.

Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>
Change-Id: Ie4c840fb583d1e5c95170e452ccbb04034926119
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit 47738acceda5bae52b7c33ce912da6b52244c033)

show more ...

rockchip: update rkimg bootcmd

Change-Id: Id7e051156e74acc1b0fd5dc50ae4646be2f9067a

rockchip: config: add a bootcmd for rkimg

Try emmc first, and then nand;
Try boot_android first, and then bootrkp;

Change-Id: I21ae59bbfe420adc66409766aca05d44db7e19aa
Signed-off-by: Kever Yang <ke

rockchip: config: add a bootcmd for rkimg

Try emmc first, and then nand;
Try boot_android first, and then bootrkp;

Change-Id: I21ae59bbfe420adc66409766aca05d44db7e19aa
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

show more ...

rockchip: config: add a default partition table for rkimg

Rockchip use it's own partition table for product like android.

Change-Id: I1c46c7aebd07ff0b433c4ebeba97673983297205
Signed-off-by: Kever Y

rockchip: config: add a default partition table for rkimg

Rockchip use it's own partition table for product like android.

Change-Id: I1c46c7aebd07ff0b433c4ebeba97673983297205
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

show more ...

rockchip: config: update partition table

User do not need to access the reserved part in system, remove them
from partition table.
Rename atf to trust as generic name for armv7 do not use ATF.

Chan

rockchip: config: update partition table

User do not need to access the reserved part in system, remove them
from partition table.
Rename atf to trust as generic name for armv7 do not use ATF.

Change-Id: Iadf98fca8ec8887e4bca8f5feef9cf0071b1813f
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

show more ...

rockchip: config: use common CONFIG_ENV_SIZE for all SoCs

All Rockchip SoCs use 32KB as CONFIG_ENV_SIZE.

Change-Id: I4e7bb94be70ece871fa339feb90a591f889e833d
Signed-off-by: Kever Yang <kever.yang@r

rockchip: config: use common CONFIG_ENV_SIZE for all SoCs

All Rockchip SoCs use 32KB as CONFIG_ENV_SIZE.

Change-Id: I4e7bb94be70ece871fa339feb90a591f889e833d
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

show more ...

rockchip: config: sync the ENV offset from rockchip legacy U-Boot

Using the ENV offset from rockchip legacy U-Boot for all SoCs,
the offset is 4MB-32KB

Change-Id: Ic63d24c2089ff325df312759a78cbea20

rockchip: config: sync the ENV offset from rockchip legacy U-Boot

Using the ENV offset from rockchip legacy U-Boot for all SoCs,
the offset is 4MB-32KB

Change-Id: Ic63d24c2089ff325df312759a78cbea20097b1a5
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

show more ...

Merge branch 'master' of git://git.denx.de/u-boot-rockchip

rockchip: back-to-bootrom: split BACK_TO_BOOTROM for TPL/SPL

The back-to-bootrom option is rather unfortunately named
CONFIG_ROCKCHIP_SPL_BACK_TO_BOOTROM
instead of
CONFIG_SPL_ROCKCHIP_BACK_TO_B

rockchip: back-to-bootrom: split BACK_TO_BOOTROM for TPL/SPL

The back-to-bootrom option is rather unfortunately named
CONFIG_ROCKCHIP_SPL_BACK_TO_BOOTROM
instead of
CONFIG_SPL_ROCKCHIP_BACK_TO_BOOTROM

To make is selectable through CONFIG_IS_ENABLED(ROCKCHIP_BACK_TO_BOOTROM),
we need to rename it. At the same time, we introduce a TPL_ variant of
the option to give us finer-grained control over when it should be used.

This change is motivated by our RK3368 boot process, which returns to
the boot ROM only from the TPL stage, but not from the SPL stage.

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
[added fix-up for evb-rk3229_defconfig and phycore-rk3288_defconfig:]
[fixed inverted CONFIG_IS_ENABLED test for rk3288:]
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

include/configs/rock.h: undef

show more ...

rockchip: use UUID for root partitions

We use to use /dev/mmcbl0p7 as root partition, and pass it
to kernel by cmdline, but the mmc number in kernel in not
fixed, we need to change the bootargs to a

rockchip: use UUID for root partitions

We use to use /dev/mmcbl0p7 as root partition, and pass it
to kernel by cmdline, but the mmc number in kernel in not
fixed, we need to change the bootargs to adapt it from time
to time.
We can use the UUID to fix it, the ID is from:
https://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/
ARM 32bit: 69dad710-2ce4-4e3c-b16c-21a1d49abed3
ARM 64bit: b921b045-1df0-41c3-af44-4c6f280d3fae

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

show more ...