rockchip: rk3036: decrease malloc length to 20MB

Free more memory space for kernel/fdt/ramdisk, in order
to fit with 128M memory board.

This avoid issue msg:
Sysmem Error: "RAMDISK" (0x64000000 - 0

rockchip: rk3036: decrease malloc length to 20MB

Free more memory space for kernel/fdt/ramdisk, in order
to fit with 128M memory board.

This avoid issue msg:
Sysmem Error: "RAMDISK" (0x64000000 - 0x6406f400) alloc is overlap
with existence "UBOOT" (0x63db94b0 - 0x68000000)

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

show more ...

Merge branch 'next-dev' into thunder-boot

include: rk3036: update configures

- define CONFIG_PREBOOT empty;
- add ENV_MEM_LAYOUT_SETTINGS1 for 128M board;
- remove fdt_high to enable relocation skip by android_image_separate().

Signed-off-

include: rk3036: update configures

- define CONFIG_PREBOOT empty;
- add ENV_MEM_LAYOUT_SETTINGS1 for 128M board;
- remove fdt_high to enable relocation skip by android_image_separate().

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

show more ...

UPSTREAM: Convert CONFIG_SPI to Kconfig

This converts the following to Kconfig:
CONFIG_SPI

This partly involves updating code that assumes that CONFIG_SPI implies
things that are specific to the

UPSTREAM: Convert CONFIG_SPI to Kconfig

This converts the following to Kconfig:
CONFIG_SPI

This partly involves updating code that assumes that CONFIG_SPI implies
things that are specific to the MPC8xx SPI driver. For now, just update
the CONFIG tests. This also involves reworking the default for
CONFIG_SYS_DEF_EEPROM_ADDR so that we don't set it when we cannot make a
reasonable default, as it does not cause any compile failures.

Signed-off-by: Adam Ford <aford173@gmail.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
(cherry picked from commit f1b1f77060beadbfe9f42a3be00019bd025afbd6)
Change-Id: Ie9f15ada869105eb407f41d4df7eecbaa916b940
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>

show more ...

UPSTREAM: Convert CONFIG_SF_DEFAULT_* to Kconfig

This converts the following to Kconfig:
CONFIG_SF_DEFAULT_BUS
CONFIG_SF_DEFAULT_CS
CONFIG_SF_DEFAULT_MODE
CONFIG_SF_DEFAULT_SPEED

I use move

UPSTREAM: Convert CONFIG_SF_DEFAULT_* to Kconfig

This converts the following to Kconfig:
CONFIG_SF_DEFAULT_BUS
CONFIG_SF_DEFAULT_CS
CONFIG_SF_DEFAULT_MODE
CONFIG_SF_DEFAULT_SPEED

I use moveconfig script and then manual check on generated u-boot.cfg
to solve the remaining issue.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Change-Id: I6aaaaf572649fd16925af9eb457ea19423372e60
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit 14453fbfadc2f98ca35d6033140466c7a4b4947a)

show more ...

UPSTREAM: configs: Move CONFIG_SPI_FLASH into defconfigs

Completely move CONFIG_SPI_FLASH from remaining board header files to
defconfigs

Signed-off-by: Vignesh R <vigneshr@ti.com>
Reviewed-by: Jag

UPSTREAM: configs: Move CONFIG_SPI_FLASH into defconfigs

Completely move CONFIG_SPI_FLASH from remaining board header files to
defconfigs

Signed-off-by: Vignesh R <vigneshr@ti.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>
Tested-by: Jagan Teki <jagan@amarulasolutions.com> #zynq-microzed
Change-Id: Iab125975d8e45a953666dcc04c989da9ae9b7f93
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit ea4805d6b26282451eee9c701a456225bcf7db85)

show more ...

include: rk3066: 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: rk3066: 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: Ida5470874e8373026112236db59d30ebd9c58f37
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>

show more ...

rockchip: rk3036: add rk3036_defconfig

enable kernel dtb.

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

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

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

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

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

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

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

show more ...

rockchip: tpl: rename CONFIG_TINY_TPL to CONFIG_TPL_TINY_FRAMEWORK

Change-Id: Ia05a73467578f5620a9ba168e67bcfb02c40e1d0
Signed-off-by: YouMin Chen <cym@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: rk3036: Enable tpl and optee support

Move original spl to tpl, and add spl to load next stage firmware,
adapt all the address and option for them. Then Enable all the
options for TPL/SPL a

rockchip: rk3036: Enable tpl and optee support

Move original spl to tpl, and add spl to load next stage firmware,
adapt all the address and option for them. Then Enable all the
options for TPL/SPL and OPTEE.

Change-Id: I44568d84984ca2f4b019fc85e80fbcbaba16fed4
Signed-off-by: David Wu <david.wu@rock-chips.com>

show more ...

rockchip: rk3036: remove sys timer

Use ARM arch timer instead.

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

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

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

UPSTREAM: rockchip: rk3036: use aligned address for SPL_TEXT_BASE

With the boot0-hook inserting the additional padding to receive our
SPL magic, the SPL_TEXT_BASE can be aligned again.

Change-Id: I

UPSTREAM: rockchip: rk3036: use aligned address for SPL_TEXT_BASE

With the boot0-hook inserting the additional padding to receive our
SPL magic, the SPL_TEXT_BASE can be aligned again.

Change-Id: I938b95ff1ab639047bf86cd975900a2242cd4ac2
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Signed-off-by: Andy Yan <andy.yan@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 ...

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

Convert CONFIG_ENV_IS_IN_MMC/NAND/UBI and NOWHERE to Kconfig

This converts the following to Kconfig:
CONFIG_ENV_IS_IN_MMC
CONFIG_ENV_IS_IN_NAND
CONFIG_ENV_IS_IN_UBI
CONFIG_ENV_IS_NOWHERE

Convert CONFIG_ENV_IS_IN_MMC/NAND/UBI and NOWHERE to Kconfig

This converts the following to Kconfig:
CONFIG_ENV_IS_IN_MMC
CONFIG_ENV_IS_IN_NAND
CONFIG_ENV_IS_IN_UBI
CONFIG_ENV_IS_NOWHERE

In fact this already exists for sunxi as a 'choice' config. However not
all the choices are available in Kconfig yet so we cannot use that. It
would lead to more than one option being set.

In addition, one purpose of this series is to allow the environment to be
stored in more than one place. So the existing choice is converted to a
normal config allowing each option to be set independently.

There are not many opportunities for Kconfig updates to reduce the size of
this patch. This was tested with

./tools/moveconfig.py -i CONFIG_ENV_IS_IN_MMC

And then manual updates. This is because for CHAIN_OF_TRUST boards they
can only have ENV_IS_NOWHERE set, so we enforce that via Kconfig logic
now.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>

show more ...

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

usb: Kconfig: migrate USB_DWC2 to Kconfig

This change migrates the USB_DWC2 configuration item to Kconfig
and runs moveconfig to adjust header files and defconfig.

Signed-off-by: Meng Dongyang <dan

usb: Kconfig: migrate USB_DWC2 to Kconfig

This change migrates the USB_DWC2 configuration item to Kconfig
and runs moveconfig to adjust header files and defconfig.

Signed-off-by: Meng Dongyang <daniel.meng@rock-chips.com>
Split off into a separate patch:
Ran moveconfig to migrate other boards:
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

show more ...