Merge branch 'next-dev' into thunder-boot

configs: rk322x: remove fdt_high

We place it at the address lower than 256MB, remove this in order
to enable relocation skip by android_image_separate().

Signed-off-by: Joseph Chen <chenjh@rock-chi

configs: rk322x: remove fdt_high

We place it at the address lower than 256MB, remove this in order
to enable relocation skip by android_image_separate().

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

show more ...

configs: rk322x: update malloc size to 32MB

Since AVB use sysmem alloc, we can decrease malloc size.

Change-Id: Ie863ed0627dd8604c8dbc8b59ed8f4197c68bc93
Signed-off-by: Joseph Chen <chenjh@rock-chi

configs: rk322x: update malloc size to 32MB

Since AVB use sysmem alloc, we can decrease malloc size.

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

show more ...

include: rk322x: move fdt to 131M and ramdisk to 162M

It avoids fdt overlap with large boot.img/recovery.img, moving
fdt ahead of boot.img/recovery.img and moving ramdisk backward
is safer.

Change-

include: rk322x: move fdt to 131M and ramdisk to 162M

It avoids fdt overlap with large boot.img/recovery.img, moving
fdt ahead of boot.img/recovery.img and moving ramdisk backward
is safer.

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

show more ...

rockchip: update kernel default load address

The 32bit arm kernel load address should be end with 0x8000 for
non-compress Image.
The compress zImage is fine for different address because the
decompo

rockchip: update kernel default load address

The 32bit arm kernel load address should be end with 0x8000 for
non-compress Image.
The compress zImage is fine for different address because the
decomporess program will copy the Image to address end with 0x8000.

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

show more ...

rockchip: rk322x: adjust U-Boot text base and init sp

- set text base to 2MB offset;
- set init sp to 4MB offset;

Change-Id: I4a482d854bc00e1592f5877cf7f3217b8752c81c
Signed-off-by: Joseph Chen <ch

rockchip: rk322x: adjust U-Boot text base and init sp

- set text base to 2MB offset;
- set init sp to 4MB offset;

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

show more ...

rockchip: rk3128h: Fix AVB2.0 boot failure for Android P GSI

Generic System Image (GSI) for Android P use the vbmeta without
the "Authentication data" and "Auxiliary data" block, in this case
just l

rockchip: rk3128h: Fix AVB2.0 boot failure for Android P GSI

Generic System Image (GSI) for Android P use the vbmeta without
the "Authentication data" and "Auxiliary data" block, in this case
just load the entire partition. This led to a malloc fail in libavb.
This increase malloc pool len.

GSI vbmeta image info:
avbtool info_image --image vbmeta.img
Minimum libavb version: 1.0
Header Block: 256 bytes
Authentication Block: 0 bytes
Auxiliary Block: 0 bytes
Algorithm: NONE
Rollback Index: 0
Flags: 2
Release String: 'avbtool 1.1.0'
Descriptors:
(none)

This fixes boot failure seen on rk3128h target: avb_util.c:199:
ERROR: Failed to allocate memory.

Change-Id: I148f60774916eca4c5e326385c733535633a6c75
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>

show more ...

rk322x: enable CONFIG_SYS_CBSIZE to 2048

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

rockchip: rk322x: add RKIMG_DET_BOOTDEV

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

rockchip: rk322x: enable vidconsole

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

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

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@

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>

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: rk322x: update defconfig after back port

update text base, update its file

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

usb: gadget: force rockchip vid and pid for rockusb

This change amend USB VID & PID to Rockchip for rockusb.

Change-Id: I3c94e442cc0190d2d3f13424470dd2d84af55eb0
Signed-off-by: Frank Wang <frank.wa

usb: gadget: force rockchip vid and pid for rockusb

This change amend USB VID & PID to Rockchip for rockusb.

Change-Id: I3c94e442cc0190d2d3f13424470dd2d84af55eb0
Signed-off-by: Frank Wang <frank.wang@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: rk322x: enable interrupt support

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

rockchip: rk322x: enable tpl support

Move original spl to tpl, and add spl to load next stage firmware,
adapt all the address and option for them.

Change-Id: I3fd2b8305ba8fa9ea687ab7f3fd1ffd2fac9ec

rockchip: rk322x: enable tpl support

Move original spl to tpl, and add spl to load next stage firmware,
adapt all the address and option for them.

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

show more ...

rockchip: rk3229: move usb gadget into defconfig

Use the defconfig for all usb gadget and function related
option instead of define then in header file.

Change-Id: Ibd21f6693ffb573c88eed69ddddeaa92

rockchip: rk3229: move usb gadget into defconfig

Use the defconfig for all usb gadget and function related
option instead of define then in header file.

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

show more ...

usb: net: migrate USB Ethernet adapters to Kconfig

This migrates ASIX, ASIX88179, MCS7830, RTL8152 and SMSC95XX to Kconfig.
Update defconfigs.

Signed-off-by: Chris Packham <judge.packham@gmail.com>

usb: net: migrate USB Ethernet adapters to Kconfig

This migrates ASIX, ASIX88179, MCS7830, RTL8152 and SMSC95XX to Kconfig.
Update defconfigs.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

show more ...

usb: net: migrate CONFIG_USB_HOST_ETHER to Kconfig

CONFIG_USB_HOST_ETHER is the framework that the drivers are dependent on
USB_HOST_ETHER. Use this as a menu and move the existing LAN75XX and
LAN78

usb: net: migrate CONFIG_USB_HOST_ETHER to Kconfig

CONFIG_USB_HOST_ETHER is the framework that the drivers are dependent on
USB_HOST_ETHER. Use this as a menu and move the existing LAN75XX and
LAN78XX options under new menu. Finally update the defconfigs that need
CONFIG_USB_HOST_ETHER.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

show more ...

include/configs: drop default definitions of CONFIG_SYS_MAXARGS

Now that include/config_fallbacks.h define a sane fallback for
CONFIG_SYS_MAXARGS, we can drop the definition of this constant in all

include/configs: drop default definitions of CONFIG_SYS_MAXARGS

Now that include/config_fallbacks.h define a sane fallback for
CONFIG_SYS_MAXARGS, we can drop the definition of this constant in all
configurations that were using the default value.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

show more ...

Kconfig: Migrate all of cmd/fastboot/Kconfig to defconfigs

- Move ANDROID_IMAGE_SUPPORT to top level Kconfig under images as it's
not strictly part of fastboot.
- Add some defaults for the fastboo

Kconfig: Migrate all of cmd/fastboot/Kconfig to defconfigs

- Move ANDROID_IMAGE_SUPPORT to top level Kconfig under images as it's
not strictly part of fastboot.
- Add some defaults for the fastboot buffer location and size
- Migrate all options listed in cmd/fastboot/Kconfig
- Cleanup the README

Signed-off-by: Tom Rini <trini@konsulko.com>

show more ...

configs: Migrate all of the existing USB symbols, except fastboot

This syncs all of the currently Kconfig'd symbols out of the headers and
into the defconfig files. This has two exceptions, first a

configs: Migrate all of the existing USB symbols, except fastboot

This syncs all of the currently Kconfig'd symbols out of the headers and
into the defconfig files. This has two exceptions, first am335x_evm
needs to be converted to DM in SPL and then it can stop undef'ing
CONFIG_DM_USB. Leaving this as-is results in a build failure, and
without work, run time failure. The other case is am43xx_evm.h and in
turn am43xx_evm_usbhost_boot. The problem here is that we need DWC3 USB
host mode in SPL, but still desire to have gadget mode in U-Boot proper.

Signed-off-by: Tom Rini <trini@konsulko.com>

show more ...

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