Commit Graph

3287 Commits

Author SHA1 Message Date
Hans Yang c5ef40e370 configs: rk3036: enable CONFIG_RKNAND
Signed-off-by: Hans Yang <yhx@rock-chips.com>
Change-Id: Ic15e6113566ccf07ea9a0572f1c5326a2c784c84
2020-03-02 17:29:48 +08:00
Lin Huang f116e38908 configs: rk1808/rk1806: add SPL relate config
with these config, rk1808/rk1806 support SPL boot kernel.

Change-Id: I8efcb93d03d12adbefbe7b16dd1f25ee8d4fb0ee
Signed-off-by: Lin Huang <hl@rock-chips.com>
2020-02-24 18:22:38 +08:00
Joseph Chen da5d85a3ee configs: add rk3128_defconfig
Enable kernel dtb feature.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I525ebc89dd6b72e06848e501e5a1db1cc13cdcbc
2020-02-20 14:27:10 +08:00
Jeffy Chen 85f87933fd configs: rk3399: enable CONFIG_EFI_LOADER and CONFIG_BOOTEFI
These configs are needed for EFI booting.

Change-Id: I36d074525fdf3df5e068f5aecd35c1b43145ccd6
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-02-14 15:23:34 +08:00
Jean-Jacques Hiblot 5d262e9885 UPSTREAM: usb: host: remove the xhci-zynqmp driver
This driver is not used anymore.

Conflicts:
	configs/avnet_ultra96_rev1_defconfig
	configs/xilinx_zynqmp_zcu100_revC_defconfig
	configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
	configs/xilinx_zynqmp_zcu104_revA_defconfig
	configs/xilinx_zynqmp_zcu104_revC_defconfig
	configs/xilinx_zynqmp_zcu106_revA_defconfig
	configs/xilinx_zynqmp_zcu111_revA_defconfig
	drivers/usb/host/Kconfig
	drivers/usb/host/xhci-zynqmp.c

Change-Id: I1faf3a98a74132ca2b2ba8b35931dee2c5bd5822
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit a8973731a452323e8767e8f9775c7d06921ebed5)
2020-01-07 17:25:01 +08:00
Andrew F. Davis 09b32b41f2 UPSTREAM: spl: Kconfig: Drop the _SUPPORT postfix from SPL_DFU
The symbol CONFIG_SPL_DFU_SUPPORT in SPL build has the same
meaning as CONFIG_DFU in regular U-Boot. Drop the _SUPPORT
to allow for cleaner use in code.

Conflicts:
	arch/arm/mach-zynqmp/spl.c
	common/Makefile
	common/spl/Kconfig
	common/spl/spl_ram.c

Change-Id: I93f09d5953284d511df135e6e71c03c0552719a2
Signed-off-by: Andrew F. Davis <afd@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Acked-by: Lukasz Majewski <lukma@denx.de>
(cherry picked from commit 6536ca4d6676bf38e50784298e713edc30b9cde9)
2020-01-07 17:24:56 +08:00
Jean-Jacques Hiblot eccca8a35d UPSTREAM: Kconfig: rename CONFIG_SPL_USB_GADGET as CONFIG_SPL_USB_GADGET
The SPL option for USB gadget should be named after the option for u-boot
(CONFIG_USB_GADGET)

Conflicts:
	arch/arm/mach-imx/mx6/Kconfig
	arch/arm/mach-imx/spl.c
	configs/am335x_boneblack_vboot_defconfig
	configs/am335x_evm_usbspl_defconfig
	configs/am43xx_evm_defconfig
	configs/am43xx_hs_evm_defconfig
	configs/imx6q_logic_defconfig
	configs/mx6memcal_defconfig
	configs/mx6sabresd_defconfig
	configs/pico-hobbit-imx6ul_defconfig
	configs/pico-hobbit-imx7d_defconfig
	configs/pico-imx6ul_defconfig
	configs/pico-imx7d_defconfig
	configs/pico-pi-imx6ul_defconfig
	configs/pico-pi-imx7d_defconfig
	drivers/Makefile

Change-Id: I51305422f13cb7d743274f82c531000c0f93c144
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit f811e9763f4b6f6f5e3fe9c2fa30d2b6c62d289e)
2020-01-07 17:24:55 +08:00
Jean-Jacques Hiblot 5277273c32 UPSTREAM: usb: host: replace xhci-keystone driver by the generic dwc3 driver
The keystone platforms can use the generic DC3 driver. Removing the
keystone-spcecific xchi driver and add the configuration options to enable
the generic DWC3 driver on all K2 platforms.

Conflicts:
	configs/k2e_evm_defconfig
	configs/k2e_hs_evm_defconfig
	configs/k2g_evm_defconfig
	configs/k2g_hs_evm_defconfig
	configs/k2hk_evm_defconfig
	configs/k2hk_hs_evm_defconfig
	configs/k2l_evm_defconfig
	configs/k2l_hs_evm_defconfig
	drivers/usb/host/xhci-keystone.c

Change-Id: I0d708152a220704d24b86c528ee7ace2b0b05a4a
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
(cherry picked from commit 4dd76d0f96ab18a2bda622ec4dac822e908dd069)
2020-01-07 17:24:55 +08:00
Frank Wang ad761bde9c configs: rk3328: enable dwc3 core
Change-Id: I2a3b7e0afaadb36db46d36e84bdf03ca712aa84c
Fixes: d648a50c0a27 ("dwc3: move phy operation to core.c")
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2020-01-07 17:24:54 +08:00
Maxime Ripard 2646d32f70 UPSTREAM: sunxi: provide default USB gadget setup
All the Allwinner boards use the same manufacturer, VID and PID for the
gadgets. Make them the defaults to remove some boilerplate from our
defconfigs.

Change-Id: I53d0e6d45a60645af4b8c0a16afb81e4db97b9f6
Reviewed-by: Łukasz Majewski <lukma@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit e02687bda96cc8ed942e14b558796d3043d24b23)
2020-01-07 17:24:45 +08:00
Maxime Ripard b466df35fb UPSTREAM: usb: gadget: usb_ether: Move settings to common
The usb_ether gadget duplicates the USB settings for the manufacturer,
product ID and vendor ID.

Make sure we use the common option so that we can expect a single VID/PID
couple for a single device.

Change-Id: I71cabacc3dcf5a7335996b2ddaf812e1c97b097b
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 10ac57fda3ff46a20af7ded6cc03d78e88032495)
2020-01-07 17:24:45 +08:00
Maxime Ripard 473221da5a 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)
2020-01-07 17:24:45 +08:00
Maxime Ripard 68e15c2b92 UPSTREAM: usb: gadget: usb_ether: Move the interfaces to Kconfig
We need to select an interface for the usb_ether gadget, and they haven't
been converted to Kconfig yet. Add a choice to make sure we have an option
selected, and convert all the users.

Change-Id: Idd2f234e7538672e2002d14eb2b11893f2751a66
Reviewed-by: Łukasz Majewski <lukma@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit d2f0f4af4b655de9c63976be659288c88ae23953)
2020-01-07 17:24:44 +08:00
Maxime Ripard 74fae1c7e9 UPSTREAM: usb: gadget: Convert USB_ETHER to Kconfig
The USB Ethernet gadget option has not yet been moved to Kconfig, let's
deal with that.

Change-Id: Ie970ea4a67b81012f1c6382b38a04fac00c6ee75
Reviewed-by: Łukasz Majewski <lukma@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit 3f33d3c8f4cc1b19a4a74e185bd3b6910f30e00f)
2020-01-07 17:24:44 +08:00
Maxime Ripard 17c5fbc90d UPSTREAM: usb: gadget: Move USBNET_HOST_ADDR to Kconfig
While the USB Ethernet device address is already defined in Kconfig, the
host address isn't. Convert it.

Change-Id: I527f287a8714bd460a2261a9b4ba6be71e8ee436
Reviewed-by: Łukasz Majewski <lukma@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit c163668a4abaeef3eaab22b4a5ac13d2d74f1306)
2020-01-07 17:24:44 +08:00
Joseph Chen faf4a351fc configs: rk1806: use rk1806-evb.dts
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I6b0c8ea9882ae70945b33331f80137f4724a7f3e
2019-12-30 10:24:03 +08:00
Jon Lin 771645931b configs: rk3036: enable CONFIG_RKSFC_NOR
Change-Id: I1c5ad37110d0bdc0f3847bd972fa7f7fb679b3fa
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
Signed-off-by: Hans Yang <yhx@rock-chips.com>
2019-12-24 17:32:20 +08:00
Joseph Chen ea9b5c12f7 configs: rk3036: remove unused modules
rk3036 is usual for linux os.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I0ad8559eaa47d28ce979ddff05c50a376d63899a
2019-12-23 14:48:39 +08:00
Lin Jinhan 6e4be8490d configs: rk3288: enable crypto v1
enable CONFIG_DM_CRYPTO
enable CONFIG_ROCKCHIP_CRYPTO_V1

Change-Id: Ib641019dcefdc7d26f0836783701e90b857779b3
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2019-12-10 17:24:14 +08:00
Lin Jinhan ea43a22275 configs: rk3128x: enable crypto v1
enable CONFIG_DM_CRYPTO
enable CONFIG_ROCKCHIP_CRYPTO_V1

Change-Id: I009fb6441f3fa7e61b3f2c6f32ae8d8161747aa9
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2019-12-10 11:32:34 +08:00
Lin Jinhan 44d495f611 configs: rk3368: enable crypto v1
enable CONFIG_DM_CRYPTO
enable CONFIG_ROCKCHIP_CRYPTO_V1

Change-Id: Ib37e4587b5f28f45c7d1389922060ddbd787f24e
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2019-12-10 11:32:12 +08:00
Lin Jinhan 897c26947d configs: rk3328: enable crypto v1
enable CONFIG_DM_CRYPTO
enable CONFIG_ROCKCHIP_CRYPTO_V1

Change-Id: I26a5c561c768a28bb63cfce382b59ad2b3f69296
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2019-12-10 08:39:35 +08:00
Lin Jinhan ba68da9b9c configs: rk1808: enable crypto v2
enable CONFIG_DM_CRYPTO
enable CONFIG_ROCKCHIP_CRYPTO_V2

Change-Id: I2af6bac370e421428e6a3bdc2ef77a8e51656a0e
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2019-12-10 08:39:34 +08:00
Lin Jinhan ccd7cfbbb3 configs: rk3399pro: enable crypto v1
enable CONFIG_DM_CRYPTO
enable CONFIG_ROCKCHIP_CRYPTO_V1

Change-Id: I53216cdf0fcb64ff7b05e078d7137d03c522711a
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2019-12-10 08:39:34 +08:00
Lin Jinhan 8e2f0535a9 configs: rk322x: enable crypto v1
enable CONFIG_DM_CRYPTO
enable CONFIG_ROCKCHIP_CRYPTO_V1

Change-Id: Ia58772565619f5c8c825a5d7eb9707c29084f144
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2019-12-10 08:39:34 +08:00
Lin Jinhan d7c8479792 configs: rk3308(aarch32): enable crypto v2
enable CONFIG_DM_CRYPTO
enable CONFIG_ROCKCHIP_CRYPTO_V2

Change-Id: Ic7a3aff9702fae6766ed1e2e0db30e26c448d838
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2019-12-10 08:39:34 +08:00
Lin Jinhan c13aa93bb6 configs: px30: enable crypto v2
enable CONFIG_DM_CRYPTO
enable CONFIG_ROCKCHIP_CRYPTO_V2

Change-Id: I3bf90bb2ca0e8af7643348fd96328bea092dd34c
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2019-12-10 08:39:33 +08:00
Lin Jinhan 3cdcdbca2d configs: rk3326(aarch32): enable crypto v2
enable CONFIG_DM_CRYPTO
enable CONFIG_ROCKCHIP_CRYPTO_V2

Change-Id: I4a21d5daaf6edc75e5df1b343e0fd29a46da45be
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2019-12-10 08:39:33 +08:00
Joseph Chen 4887899d2f configs: add rk1806 defconfig
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I6e064c470e3f2ea6ea1aa622fc0776ea73675b7a
2019-11-29 17:05:35 +08:00
Xiao Ya peng c6d268e39e configs: rk322x: enable CONFIG_CMD_DTIMG
Change-Id: I2565da9b3ce0475709cec2ec5d2f51f4383655ea
Signed-off-by: Xiao Ya peng <yp.xiao@rock-chips.com>
2019-11-27 16:41:54 +08:00
Wu Liangqing 5e941216fb configs: rk3126: add CONFIG_ROCKCHIP_VENDOR_PARTITION
Change-Id: Id0212bae4bd018404cb2d09f415a8ca207010706
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2019-11-26 16:03:39 +08:00
Andy Yan a05d668445 rockchip: rv1108: reduce u-boot.bin size below 512KB
According to rkcommon.h, when back to bootrom from ddr
initializing, the next payload size is defined RK_MAX_BOOT_SIZE,
which is 512KB.

So we disable some cmd module here.

Current u-boot-dtb.bin is 508KB.

Change-Id: I1ff97907c19fd33f428627a6de66ec790514599a
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2019-11-15 09:09:01 +08:00
Kever Yang 0db1499c05 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>
2019-11-12 09:59:47 +08:00
Kever Yang 0bd7957468 rockchip: configs: rk3328: 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: I39a69f2ee03a93b4556cc29ab41f62c344f28a02
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-11-12 09:59:47 +08:00
Kever Yang 81adf89fd1 rockchip: configs: rk3368: 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: I76385fcb3524eb16c19c3006c59954edc2f3531e
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-11-12 09:59:47 +08:00
Kever Yang 714c681b54 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>
2019-11-12 09:59:47 +08:00
Joseph Chen 48f2fe23c2 configs: rk3308: increase CONFIG_SYS_MALLOC_F_LEN
Make sure there is enough memory when more nodes are
enabled in u-boot.dtb.

Change-Id: Ieb204daa41c04035b86064962569b08152375124
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-11-11 17:00:57 +08:00
Joseph Chen fde344bd1b configs: rk3399: enable crypto v1
Change-Id: Iea8c869ff9cec34f1117dd3b3f995df2db73cf4c
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-11-07 09:37:18 +08:00
Jian Qiu 4d8bb99d14 configs: rk3126: enable CONFIG_CMD_DTIMG
Change-Id: Ia17bc29999577503220023036738aea07a612dc2
Signed-off-by: Jian Qiu <qiujian@rock-chips.com>
2019-10-22 09:17:05 +08:00
Wyon Bi 5e135dc791 configs: rk3368: enable rockchip io domain driver
Change-Id: I65508590bbc78b532b3f968c47b6c861d35c14bc
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-10-15 19:36:44 +08:00
Jason Zhu 160fd5b688 configs: rk1808: support build spl image
Change-Id: Ibb8718c85991e85556b199d6221eb249e0d8e2e4
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-10-15 08:49:07 +08:00
YouMin Chen 16bd710246 driver: ram: rockchip: rk3328: dram init select common code
Change-Id: Ifa9561942a631ec5feed75e558a0cbe5e20673af
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2019-10-10 11:55:22 +08:00
YouMin Chen 5e6e8f2deb 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>
2019-10-10 11:55:22 +08:00
Andy Yan f84e81c7ce rockchip: configs: enable usb host for rk3308 evb
Enable usb host and ums cmd.

Change-Id: Iaed75bffc7156620b1b523ebf4ffc077c1bdf939
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2019-09-26 14:13:57 +08:00
Kever Yang 2e7f9d3c94 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>
2019-09-19 12:48:28 +08:00
Algea Cao 35cd2352c8 configs: rk3368: Enable rk1000
Change-Id: I17347c882f04b69282f1cdf9266488ccf7662130
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2019-09-17 10:37:51 +08:00
Joseph Chen f877a23945 configs: rknpu-lion: enable CONFIG_CMD_BOOTD
clean by make savedefconfig.

Change-Id: Ib68c35deb8768b9ad31fd5e1fdaca683c281fcdd
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-09-10 14:13:24 +08:00
Joseph Chen d9f1798458 configs: rk3036: enable CONFIG_CMD_BOOTD
clean by make savedefconfig.

Change-Id: Ic8a0ed6e156e36bdad4e318c8e79971e1652591f
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-09-10 14:13:24 +08:00
Joseph Chen 64c205a554 configs: rk3399pro: enable CONFIG_CMD_BOOTD
clean by make savedefconfig.

Change-Id: I3408dd723824e2b7c982f81059e8012b3e635d16
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-09-10 14:13:24 +08:00
Joseph Chen 25dc164ec0 configs: px30/rk3326: enable CONFIG_CMD_BOOTD
enable CONFIG_CMD_BOOTD

Change-Id: Ia13bc0a59939a4adc2484e44f4c3e0ee352bf0c3
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-09-10 14:13:24 +08:00