android: include fdt_support.h file

fix compile error when enable fdt overlay

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

android: fix compare slot_suffix error

If slot_suffix is equal to "_a", slot_index_to_boot is equal to '0'
but not '1' when use function strncmp.

Change-Id: I53ffc920824e03c923f1d9ab8fd326a733c5965

android: fix compare slot_suffix error

If slot_suffix is equal to "_a", slot_index_to_boot is equal to '0'
but not '1' when use function strncmp.

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

show more ...

common: bootm: test cmdtp is NULL or not before use it

Test cmdtp is NULL or not before use it. If not and the image is
incorrect, then the error occur:
"Synchronous Abort" handler, esr 0x96000010
*

common: bootm: test cmdtp is NULL or not before use it

Test cmdtp is NULL or not before use it. If not and the image is
incorrect, then the error occur:
"Synchronous Abort" handler, esr 0x96000010
* Relocate offset = 0000000007911000
* ELR(PC) = 00000000006148f8
* LR = 00000000006148f8
* SP = 0000000005b020d0

* ESR_EL2 = 0000000096000010
EC[31:26] == 100101, Exception from a Data abort,
from current exception level
IL[25] == 1, 32-bit instruction trapped

* DAIF = 00000000000003c0
D[9] == 1, DBG masked
A[8] == 1, ABORT masked
I[7] == 1, IRQ masked
F[6] == 1, FIQ masked

* SPSR_EL2 = 00000000000003c9
D[9] == 1, DBG masked
A[8] == 1, ABORT masked
I[7] == 1, IRQ masked
F[6] == 1, FIQ masked
M[4] == 0, Exception taken from AArch64
M[3:0] == 1001, EL2h

* SCTLR_EL2 = 0000000030c51835
I[12] == 1, Icaches enabled
C[2] == 1, Dcache enabled

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

show more ...

UPSTREAM: fdt: Implement weak arch_fixup_fdt()

Only ARM and in some configs MIPS really implement arch_fixup_fdt().
Others just use the same boilerplate which is not good by itself,
but what's worse

UPSTREAM: fdt: Implement weak arch_fixup_fdt()

Only ARM and in some configs MIPS really implement arch_fixup_fdt().
Others just use the same boilerplate which is not good by itself,
but what's worse if we try to build with disabled CONFIG_CMD_BOOTM
and enabled CONFIG_OF_LIBFDT we'll hit an unknown symbol which was
apparently implemented in arch/xxx/lib/bootm.c.

Now with weak arch_fixup_fdt() right in image-fdt.c where it is
used we get both items highlighted above fixed.

Change-Id: Iaac96fbb0bcc484906952ced132b10b2cead782e
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: York Sun <york.sun@nxp.com>
Cc: Stefan Roese <sr@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

show more ...

UPSTREAM: libfdt: move headers to <linux/libfdt.h> and <linux/libfdt_env.h>

Thomas reported U-Boot failed to build host tools if libfdt-devel
package is installed because tools include libfdt header

UPSTREAM: libfdt: move headers to <linux/libfdt.h> and <linux/libfdt_env.h>

Thomas reported U-Boot failed to build host tools if libfdt-devel
package is installed because tools include libfdt headers from
/usr/include/ instead of using internal ones.

This commit moves the header code:
include/libfdt.h -> include/linux/libfdt.h
include/libfdt_env.h -> include/linux/libfdt_env.h

and replaces include directives:
#include <libfdt.h> -> #include <linux/libfdt.h>
#include <libfdt_env.h> -> #include <linux/libfdt_env.h>

Change-Id: I6c0f7e50e8b571106627f25ddac008a62bd2994e
Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

show more ...

UPSTREAM: libfdt: move FDT_RAMDISK_OVERHEAD to image-fdt.c

This macro is locally referenced in common/image-fdt.c

Change-Id: Iaf308d919d666be2615ef8f894099c538366e89d
Signed-off-by: Masahiro Yamada

UPSTREAM: libfdt: move FDT_RAMDISK_OVERHEAD to image-fdt.c

This macro is locally referenced in common/image-fdt.c

Change-Id: Iaf308d919d666be2615ef8f894099c538366e89d
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

show more ...

common: rkimg: add dev_desc validation check

If we use a NULL dev_desc, it causes data abort.

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

common: autoboot: using ctrl+c to exit bootdelay and enter hush

We hope user can have more clear purpose on entering hush shell,
this avoids some unexpected key hit during normal boot.

Update messa

common: autoboot: using ctrl+c to exit bootdelay and enter hush

We hope user can have more clear purpose on entering hush shell,
this avoids some unexpected key hit during normal boot.

Update message from:
Hit any key to stop autoboot: 5 => Hit key to stop autoboot('CTRL+C'): 5

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

show more ...

rockchip: make avb boot flow uninterruptable

- only allow "boot_android" as bootcmd;
- enter rockusb or fastboot when boot failed;
- don't allow ctrl+c to enter hush;

Change-Id: I7a67f4b738ed78370f

rockchip: make avb boot flow uninterruptable

- only allow "boot_android" as bootcmd;
- enter rockusb or fastboot when boot failed;
- don't allow ctrl+c to enter hush;

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

show more ...

common: board_r: enable initr_serial() anyway

If we don't enable initr_serial(), even after relocation done, the
serial driver always use no relocation address of ns16550_serial_ops
which is setup i

common: board_r: enable initr_serial() anyway

If we don't enable initr_serial(), even after relocation done, the
serial driver always use no relocation address of ns16550_serial_ops
which is setup in serial_init(). This makes abort issue when arm64 kernel
is load to overlap the ram area.

fixes: 064eb4931464a5c5dc66e25fc3af2561bc4cb948
(serial: ns16550: support using pre-loader serial)

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

show more ...

android: make android boot message more accurate and clear

1. Actually, the "kernel_address" is android header address but not
real kernel address, let's use "kernel_addr_r/c" to verbose.

2. pri

android: make android boot message more accurate and clear

1. Actually, the "kernel_address" is android header address but not
real kernel address, let's use "kernel_addr_r/c" to verbose.

2. print compressed type info, like:
"Booting LZ4 kernel at 0x02480000(Uncompress to 00680000) with fdt at 1f00000..." or
"Booting kernel at 0x00680000 with fdt at 0x1f00000..."

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

show more ...

android: fix android load address missing reserve page size

fixes: ee465021feb46515c76fe2291d3fdf31eb6dbb4
(android: support boot images packed with rockchip android hdr)

Change-Id: Iaf340c82819655

android: fix android load address missing reserve page size

fixes: ee465021feb46515c76fe2291d3fdf31eb6dbb4
(android: support boot images packed with rockchip android hdr)

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

show more ...

common: support skip U-Boot relocation

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

common: boot_rkimg: verbose partition type

rockchip platforms support both efi and rkparam partition types,
it helps a lot for debug.

Change-Id: I3ba3fe552ecd99c38112a1417eb6c22721a03242
Signed-off

common: boot_rkimg: verbose partition type

rockchip platforms support both efi and rkparam partition types,
it helps a lot for debug.

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

show more ...

Attestation key: write attestation key to secure storage

Split attestation key into AttestationKey.ec and AttestationKey.rsa,
then write to secure storage.

Change-Id: I8e00d602c4174a002e6ecad2e4cfa

Attestation key: write attestation key to secure storage

Split attestation key into AttestationKey.ec and AttestationKey.rsa,
then write to secure storage.

Change-Id: I8e00d602c4174a002e6ecad2e4cfa846f32a681f
Signed-off-by: Tony Xu <tony.xu@rock-chips.com>

show more ...

rockchip: support get boot devtype and devnum from atags

- preloader would pass bootdev info;
- avoid going through all the possible bootdev;
- rename devtype_num_envset() to boot_devtype_init();

C

rockchip: support get boot devtype and devnum from atags

- preloader would pass bootdev info;
- avoid going through all the possible bootdev;
- rename devtype_num_envset() to boot_devtype_init();

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

show more ...

boot rkimg: record blk_desc for late use

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

common: boot_rkimg: init lmb by bi_dram[...] data.

Keep same with ./common/bootm.c.

Don't rely on env_get_bootm_low() and env_get_bootm_size() since
they can't provide a confirm value, but bi_dram[

common: boot_rkimg: init lmb by bi_dram[...] data.

Keep same with ./common/bootm.c.

Don't rely on env_get_bootm_low() and env_get_bootm_size() since
they can't provide a confirm value, but bi_dram[...] it is.

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

show more ...

android: read two blocks of kernel image

this patch fixes zboot.img boot up failed due to getting kernel
compress type failed(reading IH_COMP_NONE).

we need to read a few kernel image info, i.e. co

android: read two blocks of kernel image

this patch fixes zboot.img boot up failed due to getting kernel
compress type failed(reading IH_COMP_NONE).

we need to read a few kernel image info, i.e. compress type.
Assume 2 blocks maybe enough.

fixes: ee465021feb46515c76fe2291d3fdf31eb6dbb4
(android: support boot images packed with rockchip android hdr)

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

show more ...

common: bootm: add lmb reserve for fdt

this avoids fdt being overriden when ramdisk relocation if
fdt is too close to lmb allocable high memory region.

fixes: 5af94f7887ab4057e9feb37243f843b811a5c0

common: bootm: add lmb reserve for fdt

this avoids fdt being overriden when ramdisk relocation if
fdt is too close to lmb allocable high memory region.

fixes: 5af94f7887ab4057e9feb37243f843b811a5c0cf
(android: get fdt by suitable ways)

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

show more ...

spl: fit: use ddr for mmc read buffer in SPL

SPL need read data to IRAM for bl31(m0&data), but the SDHCI does
not support this path, we need to use DDR space as buffer.
The SDHCI driver do not have

spl: fit: use ddr for mmc read buffer in SPL

SPL need read data to IRAM for bl31(m0&data), but the SDHCI does
not support this path, we need to use DDR space as buffer.
The SDHCI driver do not have any error/warning if we set the
destination address to IRAM, and complete seems normally, but
the data is not transfer.

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

show more ...

common: boot_rkimg: get boot_mode from register without misc partition

If the misc partition is nonexistent, it's still to be hope that get the
boot mode from GRF register.

Change-Id: I94e6a64b9433

common: boot_rkimg: get boot_mode from register without misc partition

If the misc partition is nonexistent, it's still to be hope that get the
boot mode from GRF register.

Change-Id: I94e6a64b9433a0c95071e3ee380841b8fddf768d
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>

show more ...

android: support boot images packed with rockchip android hdr

For some legacy reasons, rockchip use mkbootimg tool to pack android
images with special pack parameters(SDK version lower than 8.1) to

android: support boot images packed with rockchip android hdr

For some legacy reasons, rockchip use mkbootimg tool to pack android
images with special pack parameters(SDK version lower than 8.1) to
assign kernel/ramdisk/seconds address and page size.

Android hdr on RK3399 SDK-7.1:
kernel size: 1299808
kernel address: 60408000
ramdisk size: 1e6b80
ramdisk addrress: 62000000
second size: 41c00
second address: 60f00000
tags address: 60088000
page size: 4000
header_version: 0
os_version: e041114 (ver: 1.7.2, level: 2017.4)
name:
cmdline: buildvariant=userdebug

The kernel/ramdisk/seconds address base is not from 0x10000000 and
page size is not 0x800!

This patch makes bootflow to compatible with above legacy packing.

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

show more ...

android: fix error when the vbmeta is NULL or verification error

If the vbmeta has no data or verify errors occur, the system get abort:
"Synchronous Abort" handler, esr 0x96000010
* Relocate offset

android: fix error when the vbmeta is NULL or verification error

If the vbmeta has no data or verify errors occur, the system get abort:
"Synchronous Abort" handler, esr 0x96000010
* Relocate offset = 000000003db40000
* ELR(PC) = 0000000000220d2c
* LR = 0000000000220d08
* SP = 0000000031d35040

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

show more ...

serial: ns16550: support using pre-loader serial

- pass pre-loader serial configure by rk atags;
- it depends on serial aliases to find uart port;
- enabled by CONFIG_ROCKCHIP_USING_PRELOADER_SERIAL

serial: ns16550: support using pre-loader serial

- pass pre-loader serial configure by rk atags;
- it depends on serial aliases to find uart port;
- enabled by CONFIG_ROCKCHIP_USING_PRELOADER_SERIAL;

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

show more ...