common: boot_rkimg: clean up boot options

options are: "storagemedia=" and "androidboot.mode=".

Change-Id: I4deba2fce27324bc5020ba79e586383fefe92b83
Signed-off-by: Joseph Chen <chenjh@rock-chips.co

common: boot_rkimg: clean up boot options

options are: "storagemedia=" and "androidboot.mode=".

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

show more ...

rockchip: add support to load and use kernel dtb

We are going to use a tiny dtb(with 'u-boot,dm-pre-reloc') in pre-relocate,
and then read kernel dtb and use it after relocate.
This feature only wor

rockchip: add support to load and use kernel dtb

We are going to use a tiny dtb(with 'u-boot,dm-pre-reloc') in pre-relocate,
and then read kernel dtb and use it after relocate.
This feature only works with CONFIG_OF_LIVE enabled now.

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

show more ...

bootm: fix to lmb mem reserve

This is a bug fix to:
534066e bootm: resever memory before any lmb_alloc()
the patch make distro boot hand.

Change-Id: I13634154daad211a2f51ee94043f6dfd57710eb3
Signed

bootm: fix to lmb mem reserve

This is a bug fix to:
534066e bootm: resever memory before any lmb_alloc()
the patch make distro boot hand.

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

show more ...

android: replace CONFIG_ROCKCHIP_BOOTLOADER with CONFIG_RKIMG_BOOTLOADER

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

rockchip: resource_img: remove compile warning

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

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) l

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>

show more ...

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

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>

show more ...

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

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>

show more ...

image-fdt: support "reserved-memory" for lmb

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

image-android: get real fdt addr in android_image_get_fdt

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

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>

common: boot_rkimg: fix compile warnings

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

rockchip: remove no use BITS_PER_LONG

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

spl: add support to booting with OP-TEE

OP-TEE is an open source trusted OS, in armv7, its loading and
running are like this:
loading:
- SPL load both OP-TEE and U-Boot
running:
- SPL run into OP-TE

spl: add support to booting with OP-TEE

OP-TEE is an open source trusted OS, in armv7, its loading and
running are like this:
loading:
- SPL load both OP-TEE and U-Boot
running:
- SPL run into OP-TEE in secure mode;
- OP-TEE run into U-Boot in non-secure mode;

More detail:
https://github.com/OP-TEE/optee_os
and search for 'boot arguments' for detail entry parameter in:
core/arch/arm/kernel/generic_entry_a32.S

Change-Id: I1344a35dd11bd69ca00e9b99909e1eb610648d86
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit 32470d8ebee6a9c31a7a6b82704c486ef06cf549)

show more ...

UPSTREAM: image: add os type for OP-TEE

OP-TEE is an open source trust OS maintained here:
https://github.com/OP-TEE/optee_os

Series-changes: 2
- Add new image type like ATF

Change-Id: Idaae12027b

UPSTREAM: image: add os type for OP-TEE

OP-TEE is an open source trust OS maintained here:
https://github.com/OP-TEE/optee_os

Series-changes: 2
- Add new image type like ATF

Change-Id: Idaae12027be1f8a3252d2f9ad2ee689b6dfcb3ad
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>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit 8f7658998ba3ba4338344cee1d235bf090a1dd94)

show more ...

spl: atf: add SPL_ATF_NO_PLATFORM_PARAM option

While we expect to call a pointer to a valid FDT (or NULL) as the
platform parameter to an ATF, some ATF versions are not U-Boot aware
and have an insu

spl: atf: add SPL_ATF_NO_PLATFORM_PARAM option

While we expect to call a pointer to a valid FDT (or NULL) as the
platform parameter to an ATF, some ATF versions are not U-Boot aware
and have an insufficiently robust (or an overzealour) parameter
validation: either way, this may cause a hard-stop with uncooperative
ATF versions.

This change adds the option to suppress passing a platform parameter
and will always pass NULL.

Debug output from ATF w/ this option disabled (i.e. default):
INFO: plat_param_from_bl2: 0x291450
Debug output from ATF w/ this option enabled:
INFO: plat_param_from_bl2: 0

Change-Id: Ic13bf77aa509407563d10ad3ce790087f2d1dc07
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Tested-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit d21fb63d772d32373600abeb7afcb53033e087a7)

show more ...

UPSTREAM: common: Fix-up MAC addr in dts by fetching env variable serially

The MAC addresses get fixed in the device tree for "ethernet" nodes
is by using trailing number behind "ethernet" found in

UPSTREAM: common: Fix-up MAC addr in dts by fetching env variable serially

The MAC addresses get fixed in the device tree for "ethernet" nodes
is by using trailing number behind "ethernet" found in "/aliases".
It may not be necessary for the "ethernet" nodes to be sequential.
There can be gaps in between or any node disabled

So provide a support to fetch MAC addr sequentially from env
and apply them to "ethernet" nodes in the order they appear in
device tree only if "ethernet" is not "disabled"

Change-Id: I1bd6544a2bfe5cd5d6708e249c1e07d44d6944d2
Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit 24acb83d8f04e9a49f161c07d38da50c70e9f16d)

show more ...

UPSTREAM: log: Plumb logging into the init sequence

Set up logging both before and after relocation.

Change-Id: I225a1077880b14a6f3eabc19b2a5b9fe4c6a530d
Signed-off-by: Simon Glass <sjg@chromium.or

UPSTREAM: log: Plumb logging into the init sequence

Set up logging both before and after relocation.

Change-Id: I225a1077880b14a6f3eabc19b2a5b9fe4c6a530d
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit af1bc0cf46c49c5ddb13b8c75bad31a05a137eba)

show more ...

UPSTREAM: board_f: Drop the timer after relocation

Once U-Boot relocates itself the existing driver-model timer (if any) is
no-longer valid until the device is reinitialised. Any use of the device
m

UPSTREAM: board_f: Drop the timer after relocation

Once U-Boot relocates itself the existing driver-model timer (if any) is
no-longer valid until the device is reinitialised. Any use of the device
may cause a crash. To handle this, set the timer to NULL after relocation.

Change-Id: I041cc547659b540735dcaf52444d97834ea10059
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit 5ee94b4f4032502c26cd3c9ede6a910d7e2c9b46)

show more ...

log: Add a test command

Add a command which exercises the logging system.

Change-Id: I4eb139b69937c752d7f6fc42dde3f757260b832b
Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Kever Yan

log: Add a test command

Add a command which exercises the logging system.

Change-Id: I4eb139b69937c752d7f6fc42dde3f757260b832b
Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit ef11ed8239bf02b347e7fb9fc6d980aec0c7810a)

show more ...

UPSTREAM: log: Add a console driver

It is useful to display log messages on the console. Add a simple driver
to handle this.

Note that this driver outputs to the console, which may be serial or
vid

UPSTREAM: log: Add a console driver

It is useful to display log messages on the console. Add a simple driver
to handle this.

Note that this driver outputs to the console, which may be serial or
video. It does not specifically select serial output.

Change-Id: I3626673a306557400584e673f9725e74ecbaaf98
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit c6d47535dfb6636ae5244958a2a9e043bb7646ae)

show more ...

log: Add an implementation of logging

Add the logging header file and implementation with some configuration
options to control it.

Change-Id: Ic711fa39ba3183b288170ebdd4bfdf0a9e472bad
Signed-off-b

log: Add an implementation of logging

Add the logging header file and implementation with some configuration
options to control it.

Change-Id: Ic711fa39ba3183b288170ebdd4bfdf0a9e472bad
Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit e9c8d49d54cbbc7b219a1637d2994de7448b767d)

show more ...

Drop the log buffer

This does not appear to be used by any boards. Before introducing a new
log system, remove this old one.

Change-Id: I798cd4aff50b7136ae9f84362185f9f73b04f710
Signed-off-by: Simo

Drop the log buffer

This does not appear to be used by any boards. Before introducing a new
log system, remove this old one.

Change-Id: I798cd4aff50b7136ae9f84362185f9f73b04f710
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit c5404b64fb5a35d41f7eff6d12b8ffdb0c851040)

show more ...

UPSTREAM: usb: Correct use of debug()

With clang this gives a warning because hubsts appears to be used before
it is set, even if ultimately it is not used. Simplify the code to avoid
this problem.

UPSTREAM: usb: Correct use of debug()

With clang this gives a warning because hubsts appears to be used before
it is set, even if ultimately it is not used. Simplify the code to avoid
this problem.

Change-Id: If765f7b0c909de125e163875856e43ddf9b6c5d5
Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit 0ad0458c76107b29325b8c38804e0407bed42a79)

show more ...

UPSTREAM: usb: hub: identify the hub-device to usb_hub_reset_devices

When usb_hub_reset_devices is called, it should be passed both an
indicator which hub it should operate on and what port number (

UPSTREAM: usb: hub: identify the hub-device to usb_hub_reset_devices

When usb_hub_reset_devices is called, it should be passed both an
indicator which hub it should operate on and what port number (local
to that hub) should be reset.

Previously, the usb_hub.c code did not include such context and
always started resets from port number 1, performing multiple
reset-requests for the same devices:

/*
* Reset any devices that may be in a bad state when applying
* the power. This is a __weak function. Resetting of the devices
* should occur in the board file of the device.
*/
for (i = 0; i < dev->maxchild; i++)
usb_hub_reset_devices(i + 1);

This adds an additional 'hub' parameter to usb_hub_reset_devices
that provides the context to fully qualify the port-number in.

Existing implementations are changed to accept and ignore the new
parameter.

Change-Id: I2f201cb9c52522f6e553cbf54aae9bbb2e549a21
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Tested-by: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit 883946e8e7c5dacb5e12f18703e20d49a4886f0e)

show more ...