summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* spl: handoff: Correct Kconfig condition for SPL and TPLSimon Glass2019-10-081-2/+2
| | | | | | | | At present these options can be enabled when bloblist is not enabled for SPL or TPL. This is incorrect as SPL handoff requires bloblist. Fix it. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
* spl: Avoid checking for Ctrl-C in SPL with print_buffer()Simon Glass2019-10-081-0/+2
| | | | | | | | | We don't have a console in SPL so it doesn't make sense to check for Ctrl-C when printing a memory dump. Skip this so that print_buffer() can be used in SPL. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
* serial: ns16550: Allow serial to enabled/disabled in SPLSimon Glass2019-10-081-3/+3
| | | | | | | | | At present this driver uses the wrong condition for including the code and drivers in SPL/TPL. Update it so that the code is only included if DM_SERIAL is enabled for SPL/TPL. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
* mtd: spi: Add 'struct spi_flash {' to the codeSimon Glass2019-10-081-1/+7
| | | | | | | | | At present spi_flash is defined to be spi_nor which is confusing since it is not possible to find the 'spi_flash' by normal text search. Add a comment to help with this. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
* binman: Allow selection of logging verbositySimon Glass2019-10-082-1/+8
| | | | | | | | | Support a new BINMAN_VERBOSE option to the build, to allow passing the -v flag to binman. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Tested-by: Bin Meng <bmeng.cn@gmail.com>
* binman: Pass the toolpath to binman from the main MakefileSimon Glass2019-10-081-0/+1
| | | | | | | | Pass in the toolpath in case binman needs to use tools compiled in the U-Boot tools/ directory. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
* x86: Move fsp_ffs.h include to fsp_arch.hSimon Glass2019-10-081-0/+1
| | | | | | | | | This include file is only used for FSP v1. Avoid including it from fdt_support.h so we can use the latter with FSP v2. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Tested-by: Bin Meng <bmeng.cn@gmail.com>
* x86: Move fsp_bootmode.h to the generic fsp directorySimon Glass2019-10-082-1/+1
| | | | | | | | | This header file is the same for FSP v1 and v2, although there may be some additions to come. Move it into the generic fsp directory. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Tested-by: Bin Meng <bmeng.cn@gmail.com>
* x86: Move fsp_infoheader.h to the generic fsp directorySimon Glass2019-10-082-1/+1
| | | | | | | | | | | This header file is the same for FSP v1 and v2. Move it into the general fsp directory. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Tested-by: Bin Meng <bmeng.cn@gmail.com> [bmeng: move rename of fsp_infoheader.h from previous patch to this one] Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
* x86: Move fsp_hob.h to the generic fsp directorySimon Glass2019-10-082-1/+1
| | | | | | | | | | | This header file is the same for FSP v1 and v2. Move it into the general fsp directory. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Tested-by: Bin Meng <bmeng.cn@gmail.com> [bmeng: remove inclusion of fsp_hob.h in fsp_support.h] Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
* x86: Move fsp_fv.h to the generic fsp directorySimon Glass2019-10-082-1/+1
| | | | | | | | | This header file is the same for FSP v1 and v2. Move it into the general fsp directory. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Tested-by: Bin Meng <bmeng.cn@gmail.com>
* x86: Move fsp_types.h to the generic fsp directorySimon Glass2019-10-082-1/+1
| | | | | | | | | This header file is the same for FSP v1 and v2. Move it into the general fsp directory. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Tested-by: Bin Meng <bmeng.cn@gmail.com>
* x86: Move fsp_api.h inclusion out of fsp_support.hSimon Glass2019-10-082-1/+1
| | | | | | | | | This header file is different for each version of FSP. Move it into the fsp_arch.h header file. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Tested-by: Bin Meng <bmeng.cn@gmail.com>
* x86: Create a new fsp_arch.h headerSimon Glass2019-10-082-2/+21
| | | | | | | | | | | | | At present fsp_support.h includes fsp_vpd.h which is an FPSv1 concept (VPD means Vital Product Data). For FSPv2 only UPD (Updatable Product Data) is used. To avoid mangling header files, put these two includes in a separate header which we can adjust as necessary for FSPv2. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Tested-by: Bin Meng <bmeng.cn@gmail.com>
* x86: Move fsp_azalia.h to the generic fsp directorySimon Glass2019-10-082-2/+1
| | | | | | | | | | | This header file is the same for FSP v1 and v2. Move it into the general fsp directory. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Tested-by: Bin Meng <bmeng.cn@gmail.com> [bmeng: remove forward declarations in fsp_support.h] Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
* x86: Rename existing FSP code to fsp1Simon Glass2019-10-0828-17/+41
| | | | | | | | | | | | | | | Since there is now a new version of the FSP and it is incompatible with the existing version, move the code into an fsp1 directory. This will allow us to put FSP v2 code into an fsp2 directory. Add a Kconfig which defines which version is in use. Some of the code in this new fsp1/ directory is generic across both FSPv1 and FSPv2. Future patches will address this. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Tested-by: Bin Meng <bmeng.cn@gmail.com>
* Prepare v2019.10Tom Rini2019-10-071-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* NET: DW: fix regression for ARC boardsEugeniy Paltsev2019-10-073-2/+3
| | | | | | | | | | | | | The commit 642b80d256e ("net: designware: drop compatible altr, socfpga-stmmac") breaks designware ethernet for all ARC boards. It removes "altr, socfpga-stmmac" compatible from "drivers/net/designware.c" without changing compatible in the boards which use it. Fix that by adding "snps,arc-dwmac-3.70a" compatible string to "drivers/net/designware.c" and using it in ARC boards device tree. Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
* Merge branch '2019-10-06-master-imports'Tom Rini2019-10-0617-9/+22
|\ | | | | | | | | - Regression work-around on SoCFPGA by disabling WDT in some cases. - Fix seg fault on 'host info' in some cases.
| * cmd: host: fix seg fault at "host info"AKASHI Takahiro2019-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | With the patch below applied, host_block_dev structure was switched to be placed in platdata rather than priv. The command "host info" must be aligned with this change. Otherwise, we will see "Segmentation Fault." Fixes: 8f994c860d91 ("sandbox: blk: Switch to use platdata_auto_alloc_size for the driver data") Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Tested-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
| * MAINTAINERS: Update my email addressMaxime Ripard2019-10-062-4/+4
| | | | | | | | | | | | I'm not at bootlin anymore, and my mail address doesn't work any longer. Signed-off-by: Maxime Ripard <mripard@kernel.org>
| * arm: socfpga: disable CONFIG_SPL_WDT for gen5 and a10Simon Goldschmidt2019-10-0613-0/+13
| | | | | | | | | | | | | | | | | | These boards don't have a watchdog enabled in SPL, so make sure CONFIG_SPL_WDT is not enabled. Fixes: commit 6874cb72204f ("watchdog: Split WDT from SPL_WDT") Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
| * gitlab-ci: fix typo 'plaforms'Heinrich Schuchardt2019-10-061-4/+4
|/ | | | | | | %s/plaforms/platforms/g Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
* Merge branch 'master' of git://git.denx.de/u-boot-shTom Rini2019-10-057-0/+44
|\ | | | | | | - ARM: dts: rmobile: Restore increase off-on delay on the SD Vcc regulator
| * ARM: dts: rmobile: Restore increase off-on delay on the SD Vcc regulatorMarek Vasut2019-09-307-0/+44
| | | | | | | | | | | | | | | | | | | | | | This patch restores commit c49d0ac38a76 ("ARM: dts: rmobile: Increase off-on delay on the SD Vcc regulator"), which was accidentally dropped during DT resync in commit 317d13ac6307 ("ARM: dts: rmobile: Synchronize Gen3 DTs with Linux 5.0"). Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Fixes: 317d13ac6307 ("ARM: dts: rmobile: Synchronize Gen3 DTs with Linux 5.0")
* | Merge branch '2019-10-04-master-imports'Tom Rini2019-10-0443-72/+145
|\ \ | | | | | | | | | | | | | | | | | | | | | - Assorted TI platform fixes - Revert the change that broke environment flag validation - Assorted typo fixes - Assorted Kconfig dependency fixes - Other minor bug fixes
| * | Revert "env: solve compilation error in SPL"Tom Rini2019-10-041-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7d4776545b0f8a8827e5d061206faf61c9ba6ea9. The changes here break environment validation and furthermore do not seem to be required. Signed-off-by: Tom Rini <trini@konsulko.com>
| * | ARM: dts: imx6q-logicpd: Add missing imx6q-logicpd-u-boot for SPLAdam Ford2019-10-042-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SPL device tree is missing the entires for gpio1, uart1, usdhc1 and usdhc2. This creates the missing imx6q-logicpd-u-boot.dtsi file which will enable these functions so SPL can properly setup UART, detect microSD card, and startup. Fixes: 8f4691e31a18 ("ARM: imx6q_logic: With SPL_OF_CONTROL enabled, remove MMC init") Signed-off-by: Adam Ford <aford173@gmail.com>
| * | initcall.h: initcall_run_list(): Improve debug outputOvidiu Panait2019-10-041-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Existing debug output is mixed with the function name: initcall_run_list() initcall: 25263initcall_run_list() (relocated to 425263) Turn it to: initcall_run_list() initcall: 25263 (relocated to 425263) Signed-off-by: Ovidiu Panait <ovpanait@gmail.com>
| * | Kconfig: fix a typo in the description of bmp command.Andrius Štikonas2019-10-041-1/+1
| | | | | | | | | | | | Signed-off-by: Andrius Štikonas <andrius@stikonas.eu>
| * | Kconfig: Migrate CONFIG_BOOTM_* optionsTom Rini2019-10-0430-53/+74
| | | | | | | | | | | | | | | | | | | | | Migrate all of the existing OS support options that are under CONFIG_BOOTM_* to Kconfig. Signed-off-by: Tom Rini <trini@konsulko.com>
| * | cmd: part: number: return hexadecimal valueRoman Stratiienko2019-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At this point we are using part number sub-command to retrieve UUID of the partition using it's name. e.g.: part number mmc $mmcdev system_a system_a_index part uuid mmc $mmcdev:${system_a_index} system_a_uuid Since 'part uuid' sub-command expects partition index in hex format and 'part number' returns decimal value, 'part uuid' command will provide wrong UUID or fail. Fixes: be683756f62034 ("cmd: part: Add 'number' sub-command") Cc: Dirk Behme <dirk.behme@de.bosch.com> Reported-by: Pontus Fuchs <pontus.fuchs@se.bosch.com> Signed-off-by: Roman Stratiienko <roman.stratiienko@globallogic.com> Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Igor Opaniuk <igor.opaniuk@gmail.com>
| * | ARM: keystone2: update the default addresses of the secure monitorJean-Jacques Hiblot2019-10-041-2/+2
| | | | | | | | | | | | | | | | | | | | | To accommodate the growth of u-boot, we need to shift the location of the secure monitor. Moving it 64kB further. Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
| * | board: ti: am654: Disable TRNG node for HS devicesAndrew F. Davis2019-10-043-2/+35
| | | | | | | | | | | | | | | | | | | | | | | | On HS devices the access to TRNG is restricted on the non-secure ARM side, disable the node in DT to prevent firewall violations. Signed-off-by: Andrew F. Davis <afd@ti.com> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
| * | autoboot: add necessary dependency at AUTOBOOT_MENU_SHOWAKASHI Takahiro2019-10-041-0/+1
| | | | | | | | | | | | | | | | | | Otherwise, menu_show() will be undefined in bootdelay_process(). Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
| * | MAINTAINERS, git-mailrc: Update the maintainer for socfpgaLey Foon Tan2019-10-042-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | This updates MAINTAINERS and git-mailrc to add me as maintainer for socfpga. Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com> Acked-by: Marek Vasut <marex@denx.de>
| * | Makefile: mrproper should remove *.pyc filesHeinrich Schuchardt2019-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | *.pyc files contain compiled Python bytecode. 'make mrproper' should remove them. Removing *.pyc files helps for instance sometimes when running into an error "binman: Unknown entry type 'blob' in node '/binman/blob'". Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * | Makefile: Fix typo around CONFIG_SPL_FIT_SOURCEMichal Simek2019-10-041-1/+1
| | | | | | | | | | | | | | | | | | Trivial fix. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | arm: K3: Increase default SYSFW image size allocationAndrew F. Davis2019-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The memory allocated to store the FIT image containing SYSFW and board configuration data is statically defined to the largest size expected. This was 269000 bytes but now needs to be grown to 276000 to make room for the signatures attached to the board configuration data on High Security devices. Signed-off-by: Andrew F. Davis <afd@ti.com>
* | | Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86Tom Rini2019-10-042-4/+7
|\ \ \ | |/ / |/| | | | | | | | - dm: core: Correct low cell in ofnode_read_pci_addr() - dm: core: Correct bad cast in ofnode_get_addr_size_index()
| * | dm: core: Correct bad cast in ofnode_get_addr_size_index()Simon Glass2019-10-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At present this code passes an fdt_addr_t pointer as a u64 pointer which is not safe, since sizeof(fdt_addr_t) may be 4, e.g. with sandbox. Correct this to avoid a stack corruption problem. Fixes: e679d03b08 (core: ofnode: Add ofnode_get_addr_size_index) Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> [bmeng: correct one typo in the commit message] Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
| * | dm: core: Correct low cell in ofnode_read_pci_addr()Simon Glass2019-10-032-2/+2
|/ / | | | | | | | | | | | | | | | | | | | | This reads the low cell of the PCI address from the wrong cell. Fix it. Also fix the function that this code came from. Fixes: 9e51204527 (dm: core: Add operations on device tree references) Fixes: 4ea5243a3a (fdt: fix fdtdec_get_pci_addr() for CONFIG_PHYS_64BIT) Signed-off-by: Simon Glass <sjg@chromium.org> Tested-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
* | Merge tag 'rpi-next-2019.10.2' of https://github.com/mbgg/u-bootTom Rini2019-10-012-1/+11
|\ \ | | | | | | | | | | | | RPi4: Fix amount of memory seen by the kernel.
| * | rpi4: enable dram bank initializationMatthias Brugger2019-10-012-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When booting through the efi stub, the memory map get's created by reading the dram bank information. Depending on the version of the RPi4 this information changes. Read the device tree to initialize the dram bank data structure. This way the kernel is able to access the whole range of available memory. Signed-off-by: Matthias Brugger <mbrugger@suse.com>
* | | Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86Tom Rini2019-10-012-1/+6
|\ \ \ | |/ / |/| | | | | - Propagate acpi_rsdp_addr to x86 kernel via boot parameters
| * | x86: zImage: Propagate acpi_rsdp_addr to kernel via boot parametersAndy Shevchenko2019-10-012-1/+6
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is reincarnation of the U-Boot commit 3469bf4274540d1491d58e878a9edc0bdcba17ac Author: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Date: Wed Jan 10 19:40:15 2018 +0200 x86: zImage: Propagate acpi_rsdp_addr to kernel via boot parameters after upstream got eventually the Linux kernel commit e6e094e053af75cbc164e950814d3d084fb1e698 Author: Juergen Gross <jgross@suse.com> Date: Tue Nov 20 08:25:29 2018 +0100 x86/acpi, x86/boot: Take RSDP address from boot params if available Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
* | Merge tag 'u-boot-atmel-fixes-2019.10-a' of ↵Tom Rini2019-09-305-23/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.denx.de/u-boot/custodians/u-boot-atmel First set of u-boot-atmel fixes for 2019.10 cycle: This includes only tiny cleanups on env changes related to 2019.10 new features: removal of duplicate env settings (otherwise there may be warnings in building..) and a small fix for flashes on Gardena smart gateway (requires nand bad block tables).
| * | at91: configs: Drop duplication of defconfig macrosTudor Ambarus2019-09-304-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'commit a9221f3ebd6d ("at91, omap2plus: configs: migrate CONFIG_ENV_ to defconfigs")' migrated CONFIG_ENV_ macros to defconfigs but did not remove the identical redefinition of these macros in include/configs/. Since the duplicated macros have the same value as the ones in defconfigs, no "redefined" warnings were raised. Remove duplicated macros for all sama5 and sam9x5ek boards. While verifying that the removal of the macros from include/configs did not change the same macros in defconfigs, overwrite the old defconfig by saving them with the output from "make arch=ARM savedefconfig". This resulted in the movement of some macros in the defconfig files. Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
| * | arm: at91: gardena-smart-gateway-at91sam: Enable CONFIG_SYS_NAND_USE_FLASH_BBTStefan Roese2019-09-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch enables the BBT in NAND on the AT91SAM based GARDENA smart Gateway. This is especially important, since the Linux driver also enables this option and uses the BBT table pages. Without setting this option, U-Boot will try to re-use these pages again (e.g. UBI). Signed-off-by: Stefan Roese <sr@denx.de> Cc: Eugen Hristev <eugen.hristev@microchip.com> Cc: Tom Rini <trini@konsulko.com>
* | | Merge tag 'u-boot-rockchip-20190928' of ↵Tom Rini2019-09-302-3/+3
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip - Fix efuse read data number for rk3399 - make_fit_atf.py: fix .its generation for a single atf image