summaryrefslogtreecommitdiff
path: root/configs
Commit message (Collapse)AuthorAgeFilesLines
* env: Convert CONFIG_ENV_IS_IN... to a choiceSimon Glass2017-08-1516-0/+16
| | | | | | | | | | | | | | | | | | At present we support multiple environment drivers but there is not way to select between them at run time. Also settings related to the position and size of the environment area are global (i.e. apply to all locations). Until these limitations are removed we cannot really support more than one environment location. Adjust the location to be a choice so that only one can be selected. By default the environment is 'nowhere', meaning that the environment exists only in memory and cannot be saved. Also expand the help for the 'nowhere' option and move it to the top since it is the default. Signed-off-by: Simon Glass <sjg@chromium.org> [trini: Move all of the imply logic to default X if Y so it works again] Signed-off-by: Tom Rini <trini@konsulko.com>
* configs: Resync with savedefconfigTom Rini2017-08-14896-1572/+1559
| | | | | | Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini <trini@konsulko.com>
* common: Move CONFIG_BOOTARGS to KconfigSam Protsenko2017-08-14263-2/+528
| | | | | | | | | Also introduce CONFIG_USE_BOOTARGS option so we can control if CONFIG_BOOTARGS defined at all. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> [trini: Resync r8a779[56]_ulcb, various ls10xx targets] Signed-off-by: Tom Rini <trini@konsulko.com>
* Merge branch 'master' of git://git.denx.de/u-boot-rockchipTom Rini2017-08-1432-28/+144
|\
| * rockchip: rk3368: spl: move SPL_LDSCRIPT to KconfigPhilipp Tomsich2017-08-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | With the new way of doing things (i.e. the hierarchical selection of SPL_LDSCRIPT via Kconfig) in place, this moves the SPL_LDSCRIPT setting for the RK3368 from defconfig back into Kconfig. With this done, there should be no lingering cases of SPL_LDSCRIPT outside of Kconfig files. Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * rockchip: rk3188: rock: adjust for SPL/TPL splitPhilipp Tomsich2017-08-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | With the changes to split SPL/TPL for the RK3368, I apparently missed some needed adjustments to the RK3188 Kconfig and rock_defconfig. This fixes build-issues for the rock board after applying the RK3368 enablement (and SPL/TPL) set that resulted from TPL_SERIAL_SUPPORT, TPL_ROCKCHIP_BACK_TO_BROM and TPL_TINY_MEMSET being separate symbols now. Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * rockchip: set Pre-reloc malloc pool size to 4kb for rk3368 based boardsAndy Yan2017-08-133-0/+3
| | | | | | | | | | | | | | | | | | The default 1kb pre-reloc malloc pool is not enough for dm core to enable the dm-pre-reloc device drivers. Signed-off-by: Andy Yan <andy.yan@rock-chips.com> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
| * rockchip: lion-rk3368: defconfig: enable DM timer for all stagesPhilipp Tomsich2017-08-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | There is no reasonably robust way (this will be needed so early that diagnostics will be limited) to specify the base-address of the secure timer through the DTS for TPL and SPL. In order to allow us a cleaner way to structure our SPL and TPL stage, we now move to a DM timer driver. Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * dm: timer: normalise SPL and TPL supportPhilipp Tomsich2017-08-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To fully support DM timer in SPL and TPL, we need a few things cleaned up and normalised: - inclusion of the uclass and drivers should be an all-or-nothing decision for each stage and under control of $(SPL_TPL_)TIMER instead of having the two-level configuration with TIMER and $(SPL_TPL_)TIMER_SUPPORT - when $(SPL_TPL_)TIMER is enabled, the ARMv8 generic timer code can not be compiled in This normalises configuration to $(SPL_TPL_)TIMER and moves the config options to drivers/timer/Kconfig (and cleans up the collateral damage to some defconfigs that had SPL_TIMER_SUPPORT enabled). Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * configs: mpc85xx: fix fallout from SPL/TPL changesPhilipp Tomsich2017-08-1316-16/+32
| | | | | | | | | | | | | | | | Splitting the feature selection for SPL and TPL, caused a few build failures to mpx85xx boards. This fixes the fallout by adding the needed new option names to the respective defconfig files. Signed-off-byL Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
| * rockchip: board: lion-rk3368: add support for the RK3368-uQ7Philipp Tomsich2017-08-131-0/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RK3368-uQ7 (codenamed 'Lion') is a micro-Qseven (40mm x 70mm, MXM-230 edge connector compatible with the Qseven specification) form-factor system-on-module based on the octo-core Rockchip RK3368. It is designed, supported and manufactured by Theobroma Systems. It provides the following features: - 8x Cortex-A53 (in 2 clusters of 4 cores each) - (on-module) up to 4GB of DDR3 memory - (on-module) SPI-NOR flash - (on-module) eMMC - Gigabit Ethernet (with an on-module KSZ9031 PHY) - USB - HDMI - MIPI-DSI/single-channel LVDS (muxed on the 'LVDS-A' pin-group) - various 'slow' interfaces (e.g. UART, SPI, I2C, I2S, ...) Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * rockchip: back-to-bootrom: split BACK_TO_BOOTROM for TPL/SPLPhilipp Tomsich2017-08-1310-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The back-to-bootrom option is rather unfortunately named CONFIG_ROCKCHIP_SPL_BACK_TO_BOOTROM instead of CONFIG_SPL_ROCKCHIP_BACK_TO_BOOTROM To make is selectable through CONFIG_IS_ENABLED(ROCKCHIP_BACK_TO_BOOTROM), we need to rename it. At the same time, we introduce a TPL_ variant of the option to give us finer-grained control over when it should be used. This change is motivated by our RK3368 boot process, which returns to the boot ROM only from the TPL stage, but not from the SPL stage. Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> [added fix-up for evb-rk3229_defconfig and phycore-rk3288_defconfig:] [fixed inverted CONFIG_IS_ENABLED test for rk3288:] Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com> include/configs/rock.h: undef
* | x86: qemu: Enable NVMe driverBin Meng2017-08-131-0/+1
| | | | | | | | | | | | | | QEMU supports NVMe emulation. Enable the NVMe driver on QEMU x86. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* | Convert CONFIG_OMAP3_SPI to KconfigAdam Ford2017-08-1353-0/+54
|/ | | | | | | | | This converts the following to Kconfig: CONFIG_OMAP3_SPI Signed-off-by: Adam Ford <aford173@gmail.com> [trini: Minor comment tweaks] Signed-off-by: Tom Rini <trini@konsulko.com>
* Convert CONFIG_NAND to KconfigAdam Ford2017-08-12103-69/+143
| | | | | | | | | This converts the following to Kconfig: CONFIG_NAND Signed-off-by: Adam Ford <aford173@gmail.com> [trini: Sync up a few more, add imply's] Signed-off-by: Tom Rini <trini@konsulko.com>
* omap3: evm: Update board, defconfig, and maintainer fileDerald D. Woods2017-08-111-13/+42
| | | | | | | | This patch brings the OMAP3 EVM to a bootable state, on master, as of v2017.09-rc1. Signed-off-by: Derald D. Woods <woods.technical@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* Convert CONFIG_CMD_TSI148 to KconfigSimon Glass2017-08-112-0/+2
| | | | | | | | | This converts the following to Kconfig: CONFIG_CMD_TSI148 Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* Convert CONFIG_CMD_THOR_DOWNLOAD to KconfigSimon Glass2017-08-1122-0/+22
| | | | | | | | | This converts the following to Kconfig: CONFIG_CMD_THOR_DOWNLOAD Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* Convert CONFIG_CMD_TCA642X to KconfigSimon Glass2017-08-111-0/+1
| | | | | | | | | This converts the following to Kconfig: CONFIG_CMD_TCA642X Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* Convert CONFIG_CMD_SPL_WRITE_SIZE to KconfigSimon Glass2017-08-1110-0/+10
| | | | | | | | | This converts the following to Kconfig: CONFIG_CMD_SPL_WRITE_SIZE Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* Convert CONFIG_CMD_SPL_NAND_OFS to KconfigSimon Glass2017-08-1120-0/+20
| | | | | | | | | This converts the following to Kconfig: CONFIG_CMD_SPL_NAND_OFS Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* Convert CONFIG_CMD_SPL to KconfigSimon Glass2017-08-1129-0/+29
| | | | | | | | | | | | This converts the following to Kconfig: CONFIG_CMD_SPL Note that trats does not actually use SPL, so this option can no-longer be set. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* Convert CONFIG_CMD_SF_TEST to KconfigSimon Glass2017-08-115-3/+5
| | | | | | | | | This converts the following to Kconfig: CONFIG_CMD_SF_TEST Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* Convert CONFIG_CMD_SDRAM to KconfigSimon Glass2017-08-1132-0/+32
| | | | | | | | | This converts the following to Kconfig: CONFIG_CMD_SDRAM Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* Convert CONFIG_CMD_SCSI to KconfigSimon Glass2017-08-112-0/+2
| | | | | | | | | | | | | | | This converts the following to Kconfig: CONFIG_CMD_SCSI Also update the Makefile to use CONFIG_CMD_SCSI instead of CONFIG_SCSI to enable the command, fixing an earlier error. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> [trini: Rework to default y if SCSI, drop cl-som-am57x which did not use CMD_SCSI for real] Signed-off-by: Tom Rini <trini@konsulko.com>
* Convert CONFIG_CMD_SAVES to KconfigSimon Glass2017-08-114-0/+4
| | | | | | | | | This converts the following to Kconfig: CONFIG_CMD_SAVES Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* Convert CONFIG_CMD_REISER to KconfigSimon Glass2017-08-111-0/+1
| | | | | | | | | This converts the following to Kconfig: CONFIG_CMD_REISER Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* Convert CONFIG_CMD_REGINFO to KconfigChristophe Leroy2017-08-1124-0/+24
| | | | | | | | | This patch converts CONFIG_CMD_REGINFO to Kconfig Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* Kconfig: Convert CMD_READ to KconfigSimon Glass2017-08-111-0/+3
| | | | | | | | | Convert this option and enable it in sandbox. Also correct a bug which was introduced with the block-device driver model conversion. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* Convert CONFIG_CMD_PCMCIA to KconfigSimon Glass2017-08-111-0/+1
| | | | | | | | | This converts the following to Kconfig: CONFIG_CMD_PCMCIA Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* Convert CONFIG_CMD_PCI to KconfigSimon Glass2017-08-11204-12/+215
| | | | | | | | | This converts the following to Kconfig: CONFIG_CMD_PCI Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* Convert CONFIG_CMD_PCA953X to KconfigSimon Glass2017-08-1112-0/+12
| | | | | | | | | This converts the following to Kconfig: CONFIG_CMD_PCA953X Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* Convert CONFIG_CMD_ONENAND to KconfigSimon Glass2017-08-1111-0/+11
| | | | | | | | | This converts the following to Kconfig: CONFIG_CMD_ONENAND Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* Convert CONFIG_CMD_MTDPARTS_SPREAD to KconfigSimon Glass2017-08-111-0/+1
| | | | | | | | | | | This converts the following to Kconfig: CONFIG_CMD_MTDPARTS_SPREAD Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> [trini: Make this a bool not a string] Signed-off-by: Tom Rini <trini@konsulko.com>
* Convert CONFIG_CMD_MMC_SPI to KconfigSimon Glass2017-08-113-0/+3
| | | | | | | | | This converts the following to Kconfig: CONFIG_CMD_MMC_SPI Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* Convert CONFIG_CMD_MAX6957 to KconfigSimon Glass2017-08-111-0/+1
| | | | | | | | | This converts the following to Kconfig: CONFIG_CMD_MAX6957 Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* at91, smartweb: use SPL_SYS_MALLOC_F_LENHeiko Schocher2017-08-111-0/+1
| | | | | | | | | | commit f1896c45cb2f: spl: make SPL and normal u-boot stage use independent SYS_MALLOC_F_LEN introduced independent SYS_MALLOC_F_LEN for SPL and U-Boot. Use it on the smartweb board, as above commit broke the smartweb board. Signed-off-by: Heiko Schocher <hs@denx.de>
* configs: Resync with savedefconfigTom Rini2017-08-1174-175/+72
| | | | | | Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini <trini@konsulko.com>
* Merge git://git.denx.de/u-boot-fsl-qoriqTom Rini2017-08-1112-0/+12
|\
| * dm: arm: ls1021a: Move to driver model for USBAlison Wang2017-08-0912-0/+12
| | | | | | | | | | | | | | | | | | This patch enables driver model for USB in defconfigs for LS1021A platforms. Signed-off-by: Alison Wang <alison.wang@nxp.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: York Sun <york.sun@nxp.com>
* | Merge git://git.denx.de/u-boot-i2cTom Rini2017-08-101-0/+1
|\ \
| * | Convert CONFIG_SYS_I2C_OMAP24XX to KconfigAdam Ford2017-08-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | This converts the following to Kconfig: CONFIG_SYS_I2C_OMAP24XX Signed-off-by: Adam Ford <aford173@gmail.com> Reviewed-by: Heiko Schocher <hs@denx.de>
* | | Merge git://git.denx.de/u-boot-x86Tom Rini2017-08-085-8/+115
|\ \ \ | |/ / |/| |
| * | x86: Add defconfig for theadorable-x86-conga with PCIe x4 blobsStefan Roese2017-08-081-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | This defconfig uses the PCIe x4 binary blobs from the congatec BIOS. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * | x86: conga: theadorable-x86-conga-qa3-e3845_defconfig: Misc defconfig updatesStefan Roese2017-08-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Disable debug UART - Enable more partition support Signed-off-by: Stefan Roese <sr@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * | x86: conga: conga-qeval20-qa3-e3845_defconfig: Misc defconfig updatesStefan Roese2017-08-081-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Enable ACPI resume support - Disable debug UART - Enable Spansion and Winbond SPI flash support - Move VGA BIOS binary address to enable bigger U-Boot images Signed-off-by: Stefan Roese <sr@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * | x86: conga: Add option to select different config headers for baseboardsStefan Roese2017-08-081-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the infrastructure to define different config headers with different configurations and default environment for the baseboards that can now be selected via Kconfig. The new configuration for the theadorable-x86-conga-qa3-e3845 is also added. Also the new defconfig file for this new target is added. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * | x86: dfi: Add option to select different config headers for baseboardsStefan Roese2017-08-082-5/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | This patch adds the infrastructure to define different config headers with different configurations and default environment for the baseboards that can now be selected via Kconfig. The new configuration for the theadorable-x86-dfi-bt700 is also added. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
* | configs: Finish migration of PHY_GIGETom Rini2017-08-08350-0/+350
| | | | | | | | | | Reviewed-by: Joe Hershberger <joe.hershberger@ni.com> Signed-off-by: Tom Rini <trini@konsulko.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-netTom Rini2017-08-07518-2/+615
|\ \