summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-06-30Merge branch '2020-06-30-pxa-dm_mmc-migration' into nextTom Rini
- Migrate the PXA MMC driver to driver model.
2020-06-30colibri_pxa270_defconfig: enable dm_mmcMarcel Ziswiler
Enable CONFIG_DM_MMC. Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com> Reviewed-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2020-06-30colibri_pxa270: add mmc platform dataMarcel Ziswiler
Add MMC platform data. While at it also fix trivial checkpatch.pl issues. Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
2020-06-30colibri_pxa270_defconfig: enable cmd_dmMarcel Ziswiler
Enable CONFIG_CMD_DM. Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
2020-06-30arm: pxa: mmc: add driver model supportMarcel Ziswiler
Add driver model (DM) support. Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
2020-06-30kconfig: mmc: move pxa_mmc_generic to kconfigMarcel Ziswiler
Move CONFIG_PXA_MMC_GENERIC to Kconfig. Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2020-06-30dm: core: gracefully handle alias seq without ofMarcel Ziswiler
Gracefully handle alias seq in the platform data rather than OF case. Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
2020-06-30Makefile: allow dm_mmc without of_controlMarcel Ziswiler
Allow for CONFIG_DM_MMC with platform data rather than CONFIG_OF_CONTROL. Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
2020-06-30serial: pxa: clean-up platform data include fileMarcel Ziswiler
Clean-up platform data include file by using BIT macro and converting indentation with spaces to tabs. Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
2020-06-30mmc: add missing space before comment delimiterMarcel Ziswiler
Add missing space before a comment delimiter. Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2020-06-29Merge branch '2020-06-26-more-Kconfig-migration' into nextTom Rini
- Bring in the first pass at cleaning up config headers that reference symbols that already have Kconfig symbols. - In order to do that, bring in the small series that adds CONFIG_SPL_DM_SPI_FLASH and makes more use of CONFIG_$(SPL_TPL_)DM_SPI in order to allow for disabling those features in SPL stuff but using them in full U-Boot
2020-06-29spi: Move DM_SPI_FLASH and SPI_FLASH_DATAFLASH to Kconfig (for ls1021aXXX)Lukasz Majewski
This patch moves the CONFIG_DM_SPI_FLASH and CONFIG_SPI_FLASH_DATAFLASH to be defined in Kconfig, not in board specific header file (include/configs/<board>.h). Before this change the CONFIG_DM_SPI_FLASH was not set in .config (so it was not possible to use CONFIG_IS_ENABLED(DM_SPI_FLASH) in SPI DM/DTS converted drivers), but it was set in u-boot.cfg file. Signed-off-by: Lukasz Majewski <lukma@denx.de> Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
2020-06-29spi: Move DM_SPI_FLASH to Kconfig (for NXP's ls1043a)Lukasz Majewski
This patch fixes issue with defining the DM_SPI_FLASH in the configs/include/<board.h> instead of enabling this option in Kconfig. The problem is that CONFIG_IS_ENABLED(DM_SPI_FLASH) shows false as there is no DM_SPI_FLASH=y in .config (but the define is set in u-boot.cfg). As a result conversion of DM_SPI_FLASH to using CONFIG_IS_ENABLED() is not working properly. Signed-off-by: Lukasz Majewski <lukma@denx.de> Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
2020-06-29Convert CONFIG_CADENCE_QSPI to KconfigTom Rini
This converts the following to Kconfig: CONFIG_CADENCE_QSPI Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-29spi: Convert CONFIG_DM_SPI* to CONFIG_$(SPL_TPL_)DM_SPI*Lukasz Majewski
This change allows more fine tuning of driver model based SPI support in SPL and TPL. It is now possible to explicitly enable/disable the DM_SPI support in SPL and TPL via Kconfig option. Before this change it was necessary to use: /* SPI Flash Configs */ #if defined(CONFIG_SPL_BUILD) #undef CONFIG_DM_SPI #undef CONFIG_DM_SPI_FLASH #undef CONFIG_SPI_FLASH_MTD #endif in the ./include/configs/<board>.h, which is error prone and shall be avoided when we strive to switch to Kconfig. The goal of this patch: Provide distinction for DM_SPI support in both U-Boot proper and SPL (TPL). Valid use case is when U-Boot proper wants to use DM_SPI, but SPL must still support non DM driver. Another use case is the conversion of non DM/DTS SPI driver to support DM/DTS. When such driver needs to work in both SPL and U-Boot proper, the distinction is needed in Kconfig (also if SPL version of the driver supports OF_PLATDATA). In the end of the day one would have to support following use cases (in single driver file - e.g. mxs_spi.c): - U-Boot proper driver supporting DT/DTS - U-Boot proper driver without DT/DTS support (deprecated) - SPL driver without DT/DTS support - SPL (and TPL) driver with DT/DTS (when the SoC has enough resources to run full blown DT/DTS) - SPL driver with DT/DTS and SPL_OF_PLATDATA (when one have constrained environment with no fitImage and OF_LIBFDT support). Some boards do require SPI support (with DM) in SPL (TPL) and some only have DM_SPI{_FLASH} defined to allow compiling SPL. This patch converts #ifdef CONFIG_DM_SPI* to #if CONFIG_IS_ENABLED(DM_SPI) and provides corresponding defines in Kconfig. Signed-off-by: Lukasz Majewski <lukma@denx.de> Tested-by: Adam Ford <aford173@gmail.com> #da850-evm Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> [trini: Fixup a few platforms] Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-29x86: Don't build some unused objects in TPLTom Rini
In the future if we have separate symbols for DM_SPI_FLASH and SPL_DM_SPI_FLASH we will not always have function declarations available for some DM calls. This in turn leads to build warnings but not failures as the code isn't used and is discarded at link time. Restructure things to not build code we won't use for TPL anyways. Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-26spi: Enable missing CONFIG_SPL_DM_SPI supportTom Rini
Due to how the Makefile logic is we currently get DM_SPI support in SPL enabled by having DM_SPI enabled for full U-Boot but not having CONFIG_SPL_DM_SPI set. Add this missing option to boards that were inadvertently making use of it. Cc: Adam Ford <aford173@gmail.com> Cc: Akash Gajjar <akash@openedev.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Andy Yan <andy.yan@rock-chips.com> Cc: Anup Patel <anup.patel@wdc.com> Cc: Atish Patra <atish.patra@wdc.com> Cc: Bin Meng <bmeng.cn@gmail.com> Cc: Chee Hong Ang <chee.hong.ang@intel.com> Cc: Chin-Liang See <clsee@altera.com> Cc: Dalon Westergreen <dwesterg@gmail.com> Cc: Dinh Nguyen <dinguyen@kernel.org> Cc: Eugen Hristev <eugen.hristev@microchip.com> Cc: Hannes Schmelzer <hannes.schmelzer@br-automation.com> Cc: Heiko Schocher <hs@denx.de> Cc: Jagan Teki <jagan@amarulasolutions.com> Cc: Klaus Goger <klaus.goger@theobroma-systems.com> Cc: Levin Du <djw@t-chip.com.cn> Cc: Ley Foon Tan <ley.foon.tan@intel.com> Cc: Lokesh Vutla <lokeshvutla@ti.com> Cc: Luca Ceresoli <luca@lucaceresoli.net> Cc: Marek Vasut <marex@denx.de> Cc: Michal Simek <monstr@monstr.eu> Cc: Mike Looijmans <mike.looijmans@topic.nl> Cc: Nicolas Ferre <nicolas.ferre@microchip.com> Cc: Nikita Kiryanov <nikita@compulab.co.il> Cc: Palmer Dabbelt <palmer@dabbelt.com> Cc: Patrick Delaunay <patrick.delaunay@st.com> Cc: Paul Walmsley <paul.walmsley@sifive.com> Cc: Pavel Machek <pavel@denx.de> Cc: Peter Robinson <pbrobinson@gmail.com> Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Cc: Simon Glass <sjg@chromium.org> Cc: Stefan Roese <sr@denx.de> Cc: Suniel Mahesh <sunil@amarulasolutions.com> Cc: Vitaly Andrianov <vitalya@ti.com> Cc: Wolfgang Grandegger <wg@aries-embedded.de> Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net>
2020-06-26Kconfig: Remove CONFIG_CLOCKS_IN_MHZTom Rini
This variable is unset anywhere and only unset on a number of platforms. Remove all relevant code. Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-26Convert CONFIG_BOOTM_NETBSD to KconfigTom Rini
This converts the following to Kconfig: CONFIG_BOOTM_NETBSD Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-26arm: imx: Finish migration of CONFIG_CSF_SIZE to KconfigTom Rini
While in most cases CSF_SIZE is handled via Kconfig we have some i.MX8M platforms that set the size based on the now-renamed CONFIG_SECURE_BOOT symbol. Update things so that CSF_SIZE itself depends on IMX_HAB being enabled and provide the default value for i.MX8M family of parts. Cc: Stefano Babic <sbabic@denx.de> Cc: Fabio Estevam <festevam@gmail.com> Cc: Ye Li <ye.li@nxp.com> Cc: NXP i.MX U-Boot Team <uboot-imx@nxp.com> Fixes: d714a75fd4dc ("imx: replace CONFIG_SECURE_BOOT with CONFIG_IMX_HAB") Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Stefano Babic <sbabic@denx.de> Reviewed-by: Ye Li <ye.li@nxp.com>
2020-06-26nxp: Finish switch to CONFIG_NXP_ESBCTom Rini
There are two remaining users of the CONFIG_SECURE_BOOT symbol that have not been migrated to another symbol. In this case, they should be using CONFIG_NXP_ESBC as their guard. Cc: Vladimir Oltean <olteanv@gmail.com> Fixes: 5536c3c9d0d1 ("freescale/layerscape: Rename the config CONFIG_SECURE_BOOT name") Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-26arm: imx: Finish migration from CONFIG_SECURE_BOOT to CONFIG_IMX_HABTom Rini
There are a few remaining places where we say CONFIG_SECURE_BOOT rather than CONFIG_IMX HAB. Update these instances. Cc: Stefano Babic <sbabic@denx.de> Cc: Fabio Estevam <festevam@gmail.com> Cc: NXP i.MX U-Boot Team <uboot-imx@nxp.com> Cc: Eddy Petrișor <eddy.petrisor@gmail.com> Cc: Shawn Guo <shawnguo@kernel.org> Cc: Priyanka Jain <priyanka.jain@nxp.com> Fixes: d714a75fd4dc ("imx: replace CONFIG_SECURE_BOOT with CONFIG_IMX_HAB") Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Stefano Babic <sbabic@denx.de>
2020-06-26Convert CONFIG_CONSOLE_SCROLL_LINES to KconfigTom Rini
This converts the following to Kconfig: CONFIG_CONSOLE_SCROLL_LINES Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-26arm: toradex: Convert CONFIG_CONSOLE_MUX to KconfigTom Rini
This converts the following to Kconfig: CONFIG_CONSOLE_MUX Cc: Igor Opaniuk <igor.opaniuk@toradex.com> Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2020-06-26Convert CONFIG_CONS_INDEX to KconfigTom Rini
This converts the following to Kconfig: CONFIG_CONS_INDEX Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-26Convert CONFIG_CMDLINE_EDITING to KconfigTom Rini
This converts the following to Kconfig: CONFIG_CMDLINE_EDITING Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-26Convert CONFIG_BUILD_TARGET to KconfigTom Rini
This converts the following to Kconfig: CONFIG_BUILD_TARGET Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-26Convert CONFIG_BOUNCE_BUFFER to KconfigTom Rini
This converts the following to Kconfig: CONFIG_BOUNCE_BUFFER Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-26Convert CONFIG_BOOTP_DNS2 to KconfigTom Rini
This converts the following to Kconfig: CONFIG_BOOTP_DNS2 CONFIG_BOOTP_PXE_CLIENTARCH Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-26arm: abb secu1: Convert CONFIG_BOOTDELAY to KconfigTom Rini
This converts the following to Kconfig: CONFIG_BOOTDELAY Cc: Holger Brunck <holger.brunck@ch.abb.com> Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-26arm: capricorn: Convert CONFIG_BOOTCOUNT_ENV et al to KconfigTom Rini
This converts the following to Kconfig: CONFIG_BOOTCOUNT_ENV CONFIG_BOOTCOUNT_LIMIT Cc: Anatolij Gustschin <agust@denx.de> Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-26Convert CONFIG_BOARD_TYPES to KconfigTom Rini
This converts the following to Kconfig: CONFIG_BOARD_TYPES Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-26Convert CONFIG_BCH to KconfigTom Rini
This converts the following to Kconfig: CONFIG_BCH Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-26Convert CONFIG_BOOTARGS to KconfigTom Rini
This converts the following to Kconfig: CONFIG_BOOTARGS Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-26Convert CONFIG_BOARD_EARLY_INIT_F et al to KconfigTom Rini
This converts the following to Kconfig: CONFIG_BOARD_EARLY_INIT_F CONFIG_BOARD_EARLY_INIT_R Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-26Convert CONFIG_BAUDRATE to KconfigTom Rini
This converts the following to Kconfig: CONFIG_BAUDRATE Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-26bk4r1: Re-convert CONFIG_AUTOBOOT_PROMPT et al to KconfigTom Rini
This converts the following to Kconfig: CONFIG_AUTOBOOT_PROMPT CONFIG_AUTOBOOT_KEYED CONFIG_AUTOBOOT_STOP_STR Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-26Convert CONFIG_ATMEL_USART to KconfigTom Rini
This converts the following to Kconfig: CONFIG_ATMEL_USART Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-26Convert CONFIG_ATMEL_NAND_HW_PMECC et al to KconfigTom Rini
This converts the following to Kconfig: CONFIG_ATMEL_NAND_HW_PMECC CONFIG_ATMEL_NAND_HWECC CONFIG_NAND_ATMEL CONFIG_PMECC_CAP CONFIG_PMECC_SECTOR_SIZE Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-26Convert CONFIG_ATMEL_HLCD to KconfigTom Rini
This converts the following to Kconfig: CONFIG_ATMEL_HLCD Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-26Convert CONFIG_AT91_GPIO to KconfigTom Rini
This converts the following to Kconfig: CONFIG_AT91_GPIO Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-26Convert CONFIG_ARM_PL180_MMCI to KconfigTom Rini
This converts the following to Kconfig: CONFIG_ARM_PL180_MMCI Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-26Convert CONFIG_ARCH_MISC_INIT to KconfigTom Rini
This converts the following to Kconfig: CONFIG_ARCH_MISC_INIT Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-26Convert CONFIG_AM335X_LCD to KconfigTom Rini
This converts the following to Kconfig: CONFIG_AM335X_LCD Signed-off-by: Tom Rini <trini@konsulko.com>
2020-06-25Merge branch '2020-06-25-tidy-up-bd-command' into nextTom Rini
- Tidy up the 'bdinfo' command so that it's both consistent for all architectures and sharing as much code as possible.
2020-06-25bdinfo: x86: vesa: Update fb_base to the correct valueSimon Glass
Set this value in global_data so that it is reported correctly on x86 boards. In fact, U-Boot allocates space for the frame buffer even though it is not used. Then the FSP picks the address itself (e.g. 0xb0000000). So the value set by U-Boot (high in memory with everything else that is relocated), is not actually the correct value. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
2020-06-25bdinfo: dm: Update fb_base when using driver modelSimon Glass
Update this value with the address of a video device so that it shows with the 'bd' command. It would be better to obtain the address from the uclass by looking in struct video_uc_platdata for each device. We can move over to that once DM_VIDEO migration is complete. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
2020-06-25bdinfo: Update the file commentsSimon Glass
Update the comment at the top of the file to indicate what this file does. Also drop the line at the bottom and an unnecessary header include. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
2020-06-25bdinfo: m68k: ppc: Move arch-specific code from bdinfoSimon Glass
We don't have an easy way to share these three lines of code with two architectures. We also want to make it clear that this code is actually arch-specific. So just duplicate it in each arch-specific file. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de>
2020-06-25bdinfo: m68k: Move m68k-specific info into its own fileSimon Glass
We don't really want to have m68k-specific code in a generic file. Create a new arch-specific function to hold it, and move it into that. Make the function weak so that any arch can implement it. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Tested-by: Angelo Dureghello <angelo.dureghello@timesys.com> Tested-by: Angelo Dureghello <angelo.dureghello@timesys.com>