Merge branch 'next-dev' into thunder-boot

UPSTREAM: usb: gadget: Make g_dnl USB settings common

The g_dnl USB settings for the vendor ID, product ID and manufacturer are
actually common settings that can and should be shared by all the gadg

UPSTREAM: usb: gadget: Make g_dnl USB settings common

The g_dnl USB settings for the vendor ID, product ID and manufacturer are
actually common settings that can and should be shared by all the gadgets.

Make them common by renaming them, and convert all the users.

Conflicts:
configs/cgtqmx6eval_defconfig
configs/dms-ba16-1g_defconfig
configs/evb-rk3036_defconfig
configs/evb-rk3229_defconfig
configs/evb-rv1108_defconfig
configs/fennec-rk3288_defconfig
configs/stih410-b2260_defconfig

Change-Id: Ib855d37af9f539ef794a2519c75c027e67bd091c
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit a95aee6af70d8815547b81329125f2800c8ee37c)

show more ...

Merge branch 'next-dev' into thunder-boot

rockchip: rk3399: update SPL_STACK_R_ADDR

Use the same SPL_STACK_R_ADDR in Kconfig instead of each board config;
default to 0x4000000(64MB) instead of 0x80000(512KB) for this address
can support all

rockchip: rk3399: update SPL_STACK_R_ADDR

Use the same SPL_STACK_R_ADDR in Kconfig instead of each board config;
default to 0x4000000(64MB) instead of 0x80000(512KB) for this address
can support all the SoCs including those may have only 64MB memory, and
also reserve enough space for atf, kernel(in falcon mode) loading.

After the ATF entry move to 0x40000, the stack from 0x80000 may be override
when loading ATF bl31.

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

show more ...

rockchip: rk3399: configs: no need to reserve IRAM in SPL

Remove CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000 and it will default to
0. No need to reserve the space for we move the bl31 entry to 0x40000

rockchip: rk3399: configs: no need to reserve IRAM in SPL

Remove CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000 and it will default to
0. No need to reserve the space for we move the bl31 entry to 0x40000
and limit the size of SPL at 0~0x40000.

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

show more ...

driver: ram: rockchip: modify sdram common driver

Remove the config about SDRAM_COMMON_CAP_DETECT,SDRAM_COMMON_OSREG,
SDRAM_COMMON_MSCH_RK3399 and SDRAM_COMMON_MSCH_PX30.

Change-Id: I17f2bdae585454

driver: ram: rockchip: modify sdram common driver

Remove the config about SDRAM_COMMON_CAP_DETECT,SDRAM_COMMON_OSREG,
SDRAM_COMMON_MSCH_RK3399 and SDRAM_COMMON_MSCH_PX30.

Change-Id: I17f2bdae585454a1d869ae9d967843d1d169381f
Signed-off-by: YouMin Chen <cym@rock-chips.com>

show more ...

rockchip: firefly-rk3399: remove SPL legacy raw image support

RK3399 SPL only supports FIT and rockchip image type.

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

rockchip: firefly-rk3399: remove SPL legacy raw image support

RK3399 SPL only supports FIT and rockchip image type.

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

show more ...

driver: ram: rockchip: rk3399: dram init select common code

Add support dram capacity detect.
Select dram timing file base on dram type and clock frequency,
don't need care dram capacity.Dram capaci

driver: ram: rockchip: rk3399: dram init select common code

Add support dram capacity detect.
Select dram timing file base on dram type and clock frequency,
don't need care dram capacity.Dram capacity will auto detect.

Change-Id: I0554a0ec0c753a159406330aa0baa2daafe7ab93
Signed-off-by: YouMin Chen <cym@rock-chips.com>

show more ...

rockchip: rk3399: update defconfig for TPL

The SPL is now running at SDRAM, and 0x10000 is used by BL31,
and the ARM SPL do not support relocate now, we need reserved
0x50000 so that it won't overwr

rockchip: rk3399: update defconfig for TPL

The SPL is now running at SDRAM, and 0x10000 is used by BL31,
and the ARM SPL do not support relocate now, we need reserved
0x50000 so that it won't overwrite the code when we load the
bl31 to target space.
We should remove this after we enable the relocate feature.

The SPL need malloc 0x9000 for MMC as buffer used for transfer
data to IRAM(The EMMC DMA can not transfer data to IRAM directly).

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

show more ...

config: firefly-rk3399: support android boot image

The boot.img will instead of the kernel.img and resource.img on linux
platform.

Change-Id: I392beb9b79b8c6c1a8974e70f7f0b3be43f42692
Signed-off-by

config: firefly-rk3399: support android boot image

The boot.img will instead of the kernel.img and resource.img on linux
platform.

Change-Id: I392beb9b79b8c6c1a8974e70f7f0b3be43f42692
Signed-off-by: Caesar Wang <wxt@rock-chips.com>

show more ...

rockchip/rk3399: update config for firefly

Change-Id: I608f5cc9bd956c58693f52895ab883c9c7ea42da
Signed-off-by: Caesar Wang <wxt@rock-chips.com>

defconfig: rockchip: Clean the unused pinctrl config

If we used the pinctrl-rockchip driver, these config is not needed,
so remove them.

Change-Id: I606b706dd7d45a947a9aeb32c0ca61d44cef0651
Signed-

defconfig: rockchip: Clean the unused pinctrl config

If we used the pinctrl-rockchip driver, these config is not needed,
so remove them.

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

show more ...

rockchip: rk3399: update with save defconfig

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

rockchip: firefly-rk3399: enable SPL_ATF_NO_PLATFORM_PARAM

The Rockchip-released ATF for the Firefly apparently (i.e. Kever
reported this) does not tolerate a FDT being passed as the platform
parame

rockchip: firefly-rk3399: enable SPL_ATF_NO_PLATFORM_PARAM

The Rockchip-released ATF for the Firefly apparently (i.e. Kever
reported this) does not tolerate a FDT being passed as the platform
parameter and will run into a hard stop.

To work around this limitation in the ATF parameter handling, we
enable SPL_ATF_NO_PLATFORM_PARAM (which will force passing NULL for
the platform parameters).

Note that this only affects this platform, as the ATF releases for the
RK3368 and RK3399 have always either ignored the platform parameter
(i.e. before the FDT-based parameters were supported) or support
receiving a pointer to a FDT.

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

show more ...

rockchip: firefly-rk3399: update fit source

use pythone script

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

UPSTREAM: rockchip: update ROCKCHIP_SPL_RESERVE_IRAM to 0

Only rk3399 atf need ROCKCHIP_SPL_RESERVE_IRAM. This commit updates
its default setting to 0 so that other SoCs do not need to define it.

C

UPSTREAM: rockchip: update ROCKCHIP_SPL_RESERVE_IRAM to 0

Only rk3399 atf need ROCKCHIP_SPL_RESERVE_IRAM. This commit updates
its default setting to 0 so that other SoCs do not need to define it.

Change-Id: I40e453451d5376ce15aede0859a7e5b336220094
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 8a8106f06639314f750c9f8dc2b72df3925f7fbf)

show more ...

rockchip: defconfig: firefly-rk3399: sync up with SPL changes for ATF

This tracks the SPL changes for ATF for the Firefly:
* renames ATF_SUPPORT to ATF
* drops CONFIG_SPL_ATF_TEXT_BASE

Change-Id:

rockchip: defconfig: firefly-rk3399: sync up with SPL changes for ATF

This tracks the SPL changes for ATF for the Firefly:
* renames ATF_SUPPORT to ATF
* drops CONFIG_SPL_ATF_TEXT_BASE

Change-Id: I3e386320f689b010344a0f1c8ca87fe9bcc0d075
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit cd5eae5590fcf8529ff0b2268db0968558842218)

show more ...

rockchip: enable fastboot for firefly

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

rockchip: remove SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR from defconfig

Use default value 0x4000 for SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR instead
of define a new one.

Change-Id: Icfaf22554f3dd3581b1ad92dc0529

rockchip: remove SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR from defconfig

Use default value 0x4000 for SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR instead
of define a new one.

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

show more ...

rockchip: configs: enable DM_RESET config by default

Change-Id: Iff8e5ff45a1acc6255ca1ca41892c837891a9ac0
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Signed-off-by: Kever Yang <kever.yang

rockchip: configs: enable DM_RESET config by default

Change-Id: Iff8e5ff45a1acc6255ca1ca41892c837891a9ac0
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

show more ...

rockchip: remove CONFIG_SPL_ATF_TEXT_BASE for all boards

After update bl31_entry(), we don't need CONFIG_SPL_ATF_TEXT_BASE.

Change-Id: Ia64fdaa37242332a497077ecc7833c7c8d0b0d45
Signed-off-by: Kever

rockchip: remove CONFIG_SPL_ATF_TEXT_BASE for all boards

After update bl31_entry(), we don't need CONFIG_SPL_ATF_TEXT_BASE.

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

show more ...

rockchip: firefly-rk3399: enable SPL_SYSRESET config

After the patch below, we need to add SPL_SYSRESET for do_reset()
in SPL:
87c16d4 drivers: spl: consistently use the $(SPL_TPL_) macro

Change-Id

rockchip: firefly-rk3399: enable SPL_SYSRESET config

After the patch below, we need to add SPL_SYSRESET for do_reset()
in SPL:
87c16d4 drivers: spl: consistently use the $(SPL_TPL_) macro

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

show more ...

rockchip: firefly-rk3399: add FIT for rk3399

Enable SPL_FIT_GENERATOR with path.

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

rockchip: rk3399-firefly: enable usb device gadget

ums and fastboot.

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

rockchip: firefly-rk3399: enable EFUSE drive

Enable the EFUSE driver for get the cpuid and serial.

Change-Id: Ic347b9edbb06da784f0788fc29d61c3003e2b69b
Signed-off-by: Kever Yang <kever.yang@rock-ch

rockchip: firefly-rk3399: enable EFUSE drive

Enable the EFUSE driver for get the cpuid and serial.

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

show more ...