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

configs: rk3399: change the CONFIG_FASTBOOT_BUF_SIZE value

Change the CONFIG_FASTBOOT_BUF_SIZE value to 0x4000000

Change-Id: Ic93057bf55b3ad6825650cd734c64826748e4a97
Signed-off-by: Jason Zhu <jaso

configs: rk3399: change the CONFIG_FASTBOOT_BUF_SIZE value

Change the CONFIG_FASTBOOT_BUF_SIZE value to 0x4000000

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

show more ...

configs: evb-rk3399_defconfig: Remove unused Kconfig option

Change-Id: I78b0b73a0f4aa9356ae7c61a623ebed1563a0454
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>

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

rockchip: config: enable ohci support for rk3399

We have added OHCI nodes in rk3399 device-tree, so let's
enable OHCI config to support USB 1.1/1.0 in rk3399 boards.

Change-Id: I0a2af0e404b281c6bec

rockchip: config: enable ohci support for rk3399

We have added OHCI nodes in rk3399 device-tree, so let's
enable OHCI config to support USB 1.1/1.0 in rk3399 boards.

Change-Id: I0a2af0e404b281c6bec627dc7871471043b8a65a
Signed-off-by: William Wu <william.wu@rock-chips.com>

show more ...

rockchip: rk3399-evb: enable rockchip drm display without kernel dtb

Use rockchip display driver instead of upstream display driver.

Change-Id: Ie6356f447bcd49d65b81cec8c09a80c3cb333c70
Signed-off-

rockchip: rk3399-evb: enable rockchip drm display without kernel dtb

Use rockchip display driver instead of upstream display driver.

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

show more ...

configs: evb-rk3399: use CONFIG_ENV_IS_NOWHERE

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

evb-rk3399_defconfig: support android boot image

Change-Id: Ie574b91b0dfa9d0cbfcd46699684f34f27323d53
Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>

rockchip/rk3399: update the evb config to support the RK bootloader

Change-Id: Iac3b642ee180caa7654a94525c1b359b366fa092
Signed-off-by: Caesar <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>

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: evb-rk3399: update defconfig after rebase

Change-Id: I81018850cc6612d2252558db53f864651c6f73d6
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: rk3399-evb: update defconfig

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

rk3399: config: evb: enable drm display related configs

Change-Id: I3abdf6caf533f6dbc7bc979718adff0302676e78
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>

rk3399: config: enable usb mass storage gadget

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

FROMLIST: config: rk3399: add support for dwc3 gadget

To support fastboot, we need to enable the controller first.
rk3399 is using dwc3 as usb device controller, this patch enable
the configs for dw

FROMLIST: config: rk3399: add support for dwc3 gadget

To support fastboot, we need to enable the controller first.
rk3399 is using dwc3 as usb device controller, this patch enable
the configs for dwc3 gadget.

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

Conflicts:
configs/evb-rk3399_defconfig

show more ...