summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* scripts/setlocalversion: sync with linux 5.8WIP/2020-08-27-misc-fixesRasmus Villemoes2020-08-271-17/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | The linux changes since v3.16 are 78283edf2c01 kbuild: setlocalversion: print error to STDERR b24413180f56 License cleanup: add SPDX GPL-2.0 license identifier to files with no license 6147b1cf1965 scripts/setlocalversion: git: Make -dirty check more robust 8ef14c2c41d9 Revert "scripts/setlocalversion: git: Make -dirty check more robust" ff64dd485730 scripts/setlocalversion: Improve -dirty check with git-status --no-optional-locks 7a82e3fa28f1 scripts/setlocalversion: clear local variable to make it work for sh 991b78fbd223 scripts: setlocalversion: fix a bashism 3c96bdd0ebfa scripts: setlocalversion: replace backquote to dollar parenthesis and it's ff64dd485730 that is the motivation for this sync. It fixes false positive "-dirty" added to the version string when building with Yocto (https://lists.openembedded.org/g/openembedded-core/message/137702). There has been one U-Boot specific patch since this was synced with linux 3.16: 81630a3b38c2 (scripts: setlocalversion: safely extract variables from auto.conf using awk). Keep these changes applied. Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> [trini: Re-add 81630a3b38c2 and reword message] Signed-off-by: Tom Rini <trini@konsulko.com>
* checkpatch.pl: Make fdt / initrd relocation disabling an errorTom Rini2020-08-271-0/+6
| | | | | | | | Entirely disabling relocation of the device tree or initrd is almost never the right answer. Doing this by default leads to hard to diagnose run-time failures. Signed-off-by: Tom Rini <trini@konsulko.com>
* configs: Resync with savedefconfigTom Rini2020-08-261-1/+0
| | | | | | Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini <trini@konsulko.com>
* Convert CONFIG_SYS_DEVICE_NULLDEV to KconfigSimon Glass2020-08-231-1/+0
| | | | | | | This converts the following to Kconfig: CONFIG_SYS_DEVICE_NULLDEV Signed-off-by: Simon Glass <sjg@chromium.org>
* Convert CONFIG_SPLASH_SCREEN et al to KconfigSimon Glass2020-08-231-4/+0
| | | | | | | | | | This converts the following to Kconfig: CONFIG_SPLASH_SCREEN CONFIG_SPLASH_SCREEN_ALIGN CONFIG_SPLASHIMAGE_GUARD CONFIG_SPLASH_SOURCE Signed-off-by: Simon Glass <sjg@chromium.org>
* Convert CONFIG_SYS_MMC_ENV_DEV et al to KconfigWIP/08Aug2020Tom Rini2020-08-081-2/+0
| | | | | | | | | | | | This converts the following to Kconfig: CONFIG_SYS_MMC_ENV_DEV CONFIG_SYS_MMC_ENV_PART Note that with this conversion we now have consistent behavior with respect to ensuring that we have always selected the correct MMC device and hardware partition. Signed-off-by: Tom Rini <trini@konsulko.com>
* Kconfig: Remove CONFIG_SYS_SRAM_STARTOvidiu Panait2020-08-061-1/+0
| | | | | | | Remove ad-hoc CONFIG_SYS_SRAM_START and use CONFIG_SYS_SRAM_BASE instead. Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
* Kconfig: Convert CONFIG_SYS_SRAM_SIZE to KconfigOvidiu Panait2020-08-061-1/+0
| | | | | | | This converts ad-hoc CONFIG_SYS_SRAM_SIZE to Kconfig. Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
* Kconfig: Convert CONFIG_SYS_SRAM_BASE to KconfigOvidiu Panait2020-08-061-1/+0
| | | | | | | This converts ad-hoc CONFIG_SYS_SRAM_BASE to Kconfig. Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
* Makefile.lib: Build all DTS with -@ if OF_LIBFDT_OVERLAY is enabledMichal Simek2020-08-041-1/+1
| | | | | | | | | | | | | | | | | The commit 47818e23a228 ("Makefile.lib: include /__symbols__ in dtb if SPL_LOAD_FIT_APPLY_OVERLAY is enabled") enables DT building as overlays based on symbols which depends on SPL. But there is already an option to apply overlays in full U-Boot too. And there are platforms which are not using SPL and there is no option to build DTs with -@ parameter. That's why change dependency on OF_LIBFDT_OVERLAY which is already symbol which is selected when SPL_LOAD_FIT_APPLY_OVERLAY is enabled but also adding support for platforms which don't enable SPL and want to work with overlays on U-Boot prompt. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Simon Glass <sjg@chromium.org>
* fixdep: fix coding style in previous fixStephen Warren2020-08-041-1/+1
| | | | | | | Remove a double space introduced by my previous fixdep fix. Fixes: 76ae74d348a0 ("fixdep: fix CONFIG_IS_ENABLED etc. handling") Signed-off-by: Stephen Warren <swarren@nvidia.com>
* checkpatch: Don't allow common.h and dm.h in headersSimon Glass2020-08-031-2/+8
| | | | | | | These headers should not be included in other header files. Add a checkpatch rule and test for this. Signed-off-by: Simon Glass <sjg@chromium.org>
* Makefile: Rename ALL-y to INPUTS-ySimon Glass2020-07-281-12/+12
| | | | | | | | | | | When binman is in use, most of the targets built by the Makefile are inputs to binman. We then need a final rule to run binman to produce the final outputs. Rename the variable to indicate this, and add a new 'inputs' target. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
* configs: migrate CONFIG_SPL_LOAD_FIT_ADDRESS to defconfigsWIP/20202-07-28-Kconfig-migrationsPeng Fan2020-07-281-1/+0
| | | | | | | | | | Done with: ./tools/moveconfig.py -S SPL_LOAD_FIT_ADDRESS ./tools/moveconfig.py -S SPL_LOAD_FIT_ADDRESS -H Signed-off-by: Peng Fan <peng.fan@nxp.com> [trini: A few more migrations] Signed-off-by: Tom Rini <trini@konsulko.com>
* Convert CONFIG_SYS_MMCSD_FS_BOOT_PARTITION to KconfigAdam Ford2020-07-281-1/+0
| | | | | | | This converts the following to Kconfig: CONFIG_SYS_MMCSD_FS_BOOT_PARTITION Signed-off-by: Adam Ford <aford173@gmail.com>
* configs: Remove dead CONFIG optionsAdam Ford2020-07-281-1/+0
| | | | | | | | | | BOOTP_DEFAULT is defined in several boards, but this config option is never checked or used. This patch removes this config option from config files and the whitelist.txt Signed-off-by: Adam Ford <aford173@gmail.com>
* Convert CONFIG_BOOTP_SEND_HOSTNAME to KconfigAdam Ford2020-07-281-1/+0
| | | | | | | This converts the following to Kconfig: CONFIG_BOOTP_SEND_HOSTNAME Signed-off-by: Adam Ford <aford173@gmail.com>
* Convert CONFIG_DRIVER_TI_EMAC_USE_RMII to KconfigAdam Ford2020-07-281-1/+0
| | | | | | | This converts the following to Kconfig: CONFIG_DRIVER_TI_EMAC_USE_RMII Signed-off-by: Adam Ford <aford173@gmail.com>
* Convert CONFIG_SPL_NAND_BASE et al to KconfigAdam Ford2020-07-281-2/+0
| | | | | | | | This converts the following to Kconfig: CONFIG_SPL_NAND_BASE CONFIG_SPL_NAND_IDENT Signed-off-by: Adam Ford <aford173@gmail.com>
* Convert CONFIG_SPL_NAND_DRIVERS et al to KconfigAdam Ford2020-07-281-2/+0
| | | | | | | | | This converts the following to Kconfig: CONFIG_SPL_NAND_DRIVERS CONFIG_SPL_NAND_ECC CONFIG_SPL_NAND_SIMPLE Signed-off-by: Adam Ford <aford173@gmail.com>
* Convert CONFIG_ENV_OVERWRITE to KconfigAdam Ford2020-07-281-1/+0
| | | | | | | | | This converts the following to Kconfig: CONFIG_ENV_OVERWRITE Signed-off-by: Adam Ford <aford173@gmail.com> [trini: Rerun migration, remove some comments] Signed-off-by: Tom Rini <trini@konsulko.com>
* configs: Resync with savedefconfigTom Rini2020-07-281-69/+0
| | | | | | Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini <trini@konsulko.com>
* Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriqWIP/27Jul2020Tom Rini2020-07-271-1/+0
|\ | | | | | | | | | | | | | | - Bug fixes and updates on ls2088a,ls1028a, ls1046a, ls1043a, ls1012a - lx2-watchdog support - layerscape: pci-endpoint support, spin table relocation fixes and cleanups - fsl-crypto: RNG support and bug fixes
| * Move eSDHC adapter card identification to board filesYangbo Lu2020-07-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The eSDHC adapter card identification and multiplexing configuration through FPGA had been implemented in both common mmc driver and fsl_esdhc driver. However it is proper to move these code to board files and do it during board initialization. The FPGA registers are also board specific. This patch is to move eSDHC adapter card identification and multiplexing configuration from mmc driver to specific board files. And the option CONFIG_FSL_ESDHC_ADAPTER_IDENT is no longer needed. Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> [Rebased, Removed T1040QDS change as board does not exist] Signed-off-by: Priyanka Jain <priyanka.jain@nxp.com>
* | Merge tag 'dm-pull-20jul20-take2a' of ↵Tom Rini2020-07-271-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.denx.de/u-boot/custodians/u-boot-dm binman support for FIT new UCLASS_SOC patman switch 'test' command minor fdt fixes patman usability improvements
| * | binman: Adjust pylibfdt for incremental buildSimon Glass2020-07-241-0/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the pylibfdt shared-object file is detected, then Python assumes that the libfdt.py file exists also. Sometimes when an incremental build aborts, the shared-object file is built but the libfdt.py is not. The only way out at this point is to use 'make mkproper', or similar. Fix this by removing the .so file before it is built. This seems to make Python rebuild everything. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
* | net: dc2114x: Add Kconfig entriesMarek Vasut2020-07-251-1/+0
|/ | | | | | | | Add Kconfig entries for the dc2114x driver and convert various boards. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Joe Hershberger <joe.hershberger@ni.com> Cc: Ramon Fried <rfried.dev@gmail.com>
* Revert "Merge tag 'dm-pull-20jul20' of git://git.denx.de/u-boot-dm"Tom Rini2020-07-241-3/+0
| | | | | | | | | | This reverts commit 5d3a21df6694ebd66d5c34c9d62a26edc7456fc7, reversing changes made to 56d37f1c564107e27d873181d838571b7d7860e7. Unfortunately this is causing CI failures: https://travis-ci.org/github/trini/u-boot/jobs/711313649 Signed-off-by: Tom Rini <trini@konsulko.com>
* binman: Adjust pylibfdt for incremental buildSimon Glass2020-07-201-0/+3
| | | | | | | | | | | | | | | If the pylibfdt shared-object file is detected, then Python assumes that the libfdt.py file exists also. Sometimes when an incremental build aborts, the shared-object file is built but the libfdt.py is not. The only way out at this point is to use 'make mkproper', or similar. Fix this by removing the .so file before it is built. This seems to make Python rebuild everything. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
* mips: octeon: Initial minimal support for the Marvell Octeon SoCAaron Williams2020-07-181-1/+0
| | | | | | | | | | | | | | This patch adds very basic support for the Octeon III SoCs. Only CFI parallel NOR flash and UART is supported for now. Please note that the basic Octeon port does not include the DDR3/4 initialization yet. This will be added in some follow-up patches later. To still use U-Boot on with this port, the L2 cache (4MiB on Octeon III CN73xx) is used as RAM. This way, U-Boot can boot to the prompt on such boards. Signed-off-by: Aaron Williams <awilliams@marvell.com> Signed-off-by: Stefan Roese <sr@denx.de>
* fixdep: fix CONFIG_IS_ENABLED etc. handlingStephen Warren2020-07-171-0/+1
| | | | | | | | | | | | | | | | | When fixdep detects CONFIG_IS_ENABLED and other similar macros, it must parse the macro parameter to determine which actual CONFIG_ option is being referenced. This involves moving a pointer forward through the entire CONFIG_ option "word". Currently, the code uses variable q to walk through the word, but doesn't actually initialize it to point at the parameter before doing so. Consequently, the walking process immediately fails since it sees the macro invocatoins's ( rather than the expected alpha-numeric characters in the macro parameter. Fix this by adding the missing initialization. Fixes: 67f2ee86ccbe ("kbuild: fixdep: Resync this with v4.17") Fixes: 7012865e961c ("gpio: fix test.py for gpio label lookup") Signed-off-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* remove include/config_defaults.hRasmus Villemoes2020-07-171-1/+0
| | | | | | | | | | Since commit 4b0bcfa7c4ec (Kconfig: Migrate CONFIG_BOOTM_* options), the config_defaults.h file has been void of any actual content - and these days, "sane defaults for everyone" is achieved by appropriate default values in Kconfig. Remove it, and thus make every translation unit process one less header file. Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
* arm64: Remove CONFIG_SYS_FULL_VA macroMichal Simek2020-07-171-1/+0
| | | | | | | All configurations have been removed in 2016 by commit 7985cdf74b28 ("arm64: Remove non-full-va map code"). Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* Convert CONFIG_ARMV7_PSCI_1_0 and CONFIG_ARMV7_PSCI_0_2 to KconfigPatrick Delaunay2020-07-171-1/+0
| | | | | | | | This converts the following to Kconfig: CONFIG_ARMV7_PSCI_1_0 CONFIG_ARMV7_PSCI_0_2 Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
* ARM: da850-evm: Unify config options with KconfigAdam Ford2020-07-131-2/+0
| | | | | | | | | | | | | | | | | | | | There are two options that are currently whitelisted, but they are redundant, because there are not necessary since Kconfig options exist to basically state the same thing. CONFIG_DIRECT_NOR_BOOT and CONFIG_USE_NOR are both set together and only used by the da850 when booting from NOR, however the only time CONFIG_MTD_NOR_FLASH is configured is when booting from NOR. Since NOR doesn't need SPL, the options for SPL can be moved to a check for building SPL instead of checking for NOR. This patch removes the checks for these two config options and unifies the checks around the Kconfig option of CONFIG_MTD_NOR_FLASH. Since this board is the only board that uses these two config options, they can be removed from the whitelist table. Signed-off-by: Adam Ford <aford173@gmail.com>
* Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-spiWIP/11Jul2020Tom Rini2020-07-111-2/+0
|\ | | | | | | | | | | | | - Enable DM_SPI on siemens omap boards (Jagan) - Dropped some non-dm supported omap3 boards (Jagan) - Dropped non-dm code in omap3 spi driver (Jagan) - Dropped non-dm code in kirkwood spi driver (Bhargav)
| * spi: kirkwood: Drop nondm codeBhargav Shah2020-07-101-1/+0
| | | | | | | | | | | | | | | | Drop the nondm code from kirkwood_spi.c since there is no board or any other code using for it. Signed-off-by: Bhargav Shah <bhargavshah1988@gmail.com> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
| * arm: Remove overo boardJagan Teki2020-07-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | OF_CONTROL, DM_SPI and other driver model migration deadlines are expired for this board. Drop it. Cc: Ash Charles <ash@gumstix.com> Cc: Steve Sakoman <sakoman@gmail.com> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
* | Merge tag 'dm-pull-10jul20' of ↵WIP/10Jul2020-cTom Rini2020-07-101-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | https://gitlab.denx.de/u-boot/custodians/u-boot-dm of-platdata: better phandle and compatible-string support patman support for Python3 on Ubuntu 14.04 new checkpatch check to avoid #ifdefs
| * | checkpatch: Don't warn about PREFER_IF in headers/DT filesSimon Glass2020-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | This warning should only be displayed for C files. Fix it and update the test. Signed-off-by: Simon Glass <sjg@chromium.org>
* | | powerpc: move ADDR_MAP to KconfigMarek Szyprowski2020-07-101-2/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | Move ADDR_MAP related config options from include/configs/*.h to the proper place in lib/Kconfig. This has been done using ./tools/moveconfig.py and manual inspection of the generated changes. This is a preparation to use ADDR_MAP helper on ARM 32bit Raspberry Pi4 board for mapping the PCIe XHCI MMIO, which is above the 4GiB identity mapping limit. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* | linux/kconfig.h: remove unused helper macrosRasmus Villemoes2020-07-091-2/+0
|/ | | | | | | | | | | | | | | | U-Boot does not have loadable modules, and nothing currently uses any of the (CONFIG_)?IS_(BUILTIN|MODULE) macros - only the (CONFIG_)?IS_ENABLED variants are ever used. While I understand the desire to keep this somewhat synchronized with linux, we've already departed by the introduction of the CONFIG_IS_ENABLED extra logic, and deleting these makes the next patch much simpler, since I won't have to duplicate a lot of logic for no real gain (as there are no users). Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Simon Glass <sjg@chromium.org>
* checkpatch.pl: Fully re-sync with v5.7WIP/2020-07-01-kconfig-etc-updatesTom Rini2020-07-011-106/+302
| | | | | | | | | | While commit 048a648298b1 ("checkpatch.pl: Update to v5.7") largely re-syncs us with checkpatch.pl from v5.7 there are a number of things missing still. Re-copy the script and again take care to keep our allowed debug prints and now localized checks intact. Fixes: 048a648298b1 ("checkpatch.pl: Update to v5.7") Signed-off-by: Tom Rini <trini@konsulko.com>
* kconfig: Add scripts/Kconfig.include from v4.19Tom Rini2020-07-011-0/+30
| | | | | | | | | | | | | As part of re-syncing our Kconfig logic up to v4.19, we had missed adding this new file that includes helper macros. To quote the upstream commit e1cfdc0e72fc ("kconfig: add basic helper macros to scripts/Kconfig.include"): Kconfig got text processing tools like we see in Make. Add Kconfig helper macros to scripts/Kconfig.include like we collect Makefile macros in scripts/Kbuild.include. Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Tom Rini <trini@konsulko.com>
* kconfig: mmc: move pxa_mmc_generic to kconfigMarcel Ziswiler2020-06-301-1/+0
| | | | | | | Move CONFIG_PXA_MMC_GENERIC to Kconfig. Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* Merge tag 'xilinx-for-v2020.10' of ↵WIP/25Jun2020-nextTom Rini2020-06-251-17/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze into next Xilinx changes for v2020.10 Versal: - xspi bootmode fix - Removing one clock from clk driver - Align u-boot memory setting with OS by default - Map TCM and OCM by default ZynqMP: - Minor DT improvements - Reduce console buffer for mini configurations - Add fix for AMS - Add support for XDP platform Zynq: - Support for AES engine - Enable bigger memory test by default - Extend documentation for SD preparation - Use different freq for Topic miami board mmc: - minor GD pointer removal net: - Support fixed-link cases by zynq gem - Fix phy looking loop in axi enet driver spi: - Cleanup global macros for xilinx spi drivers firmware: - Add support for pmufw reloading fpga: - Improve error status reporting common: - Remove 4kB addition space for FDT allocation
| * spi: zynq_[q]spi: Convert config's to macro'sAshok Reddy Soma2020-06-241-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove below config options and convert them to macros. They have never been configured to different values than default one. And also it makes sense to reduce the config_whitelist. CONFIG_SYS_ZYNQ_SPI_WAIT CONFIG_SYS_ZYNQ_QSPI_WAIT CONFIG_XILINX_SPI_IDLE_VAL Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * configs: Resync with savedefconfigTom Rini2020-06-231-14/+0
| | | | | | | | | | | | Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini <trini@konsulko.com>
* | Merge branch 'net' of https://gitlab.denx.de/u-boot/custodians/u-boot-sh ↵WIP/20Jun2020-nextTom Rini2020-06-201-2/+0
|\ \ | | | | | | | | | | | | | | | into next - Convert pcnet and eepro100 ethernet drivers to DM
| * | net: eepro100: Add Kconfig entriesMarek Vasut2020-06-181-1/+0
| | | | | | | | | | | | | | | | | | Add Kconfig entries for the eepro100 driver and convert various boards. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>