summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-09-04Merge git://git.denx.de/u-boot-dmTom Rini
2017-09-04Prepare v2017.09-rc4v2017.09-rc4Tom Rini
Signed-off-by: Tom Rini <trini@konsulko.com>
2017-09-04crypto/fsl: fix obj-yy in MakefileClemens Gruber
When enabling CONFIG_CMD_BLOB and/or CONFIG_CMD_DEKBLOB, the build fails with a linker error: ... LD u-boot arch/arm/mach-imx/built-in.o: In function `blob_encap_dek': /home/clemens/dev/u-boot/arch/arm/mach-imx/cmd_dek.c:46: undefined reference to `blob_dek' This is due to an error in the Makefile, resulting in obj-yy/obj-yn/.. and fsl_blob.o is therefore not linked. Fix it by splitting it up into two obj-y lines. Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
2017-09-04git: mailrc: Update e-mail addressLukasz Majewski
Signed-off-by: Lukasz Majewski <lukma@denx.de>
2017-09-04dm: core: Add livetree documentationSimon Glass
Add some documentation for the live device tree support in U-Boot. This was missing from the initial series. Signed-off-by: Simon Glass <sjg@chromium.org> Suggested-by: Lukasz Majewski <lukma@denx.de> Reviewed-by: Łukasz Majewski <lukma@denx.de>
2017-09-04gitignore: add intermediates from libfdt buildPhilipp Tomsich
Since ee95d10 (fdt: Build the new python libfdt module), a number of additional files are auto-generated/installed into the tools directory. List these in .gitignore to suppress having them listed as untracked. Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> References: ee95d10 (fdt: Build the new python libfdt module) Reviewed-by: Simon Glass <sjg@chromium.org>
2017-09-04fdt: fix 'prop (...) not found!' error in 'fdt set' commandHannes Schmelzer
This commit brings things back to the well known working state of the command. - With commit 9620d87259572ef21f0df60988d9a932ca673779 (cmd/fdt: support single value replacement within an array) there was an error introduced modifying (inserting) a property to a device-tree node. fdt_getprop(...) returnes a len with -1 for a non-existing property, but a memcpy with len -1 isn't a good idea and things went wrong (crash). - Some times later Tom did repair this with commit 99bb38e2cce9d99238458e0f6d1880c6d2e80a4d (fdt: Check for NULL return from fdt_getprop in 'fdt set') This repairs the crash but the behaviour of the command isn't like before, it makes it impossible to insert a property. - Signed-off-by: Hannes Schmelzer <oe5hpm@oevsv.at> Acked-by: Simon Glass <sjg@chromium.org>
2017-09-04dm: Add migration plan for CONFIG_BLKSimon Glass
The CONFIG_BLK conversion involves quite invasive changes in the U-Boot code, with #ifdefs and different code paths. We should try to move over to this soon so we can drop the old code. Set a deadline of 9 months for this work, rounded up to the next release. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
2017-09-03Makefile: Suppress output of python libfdt build commandBin Meng
This should not be printed by default. Prefix it with $(Q). Fixes ee95d10b: ("fdt: Build the new python libfdt module") Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
2017-09-03Makefile: Quiesce libfdt buildBin Meng
Since commit 3809e302 "Makefile: honor PYTHON configuration properly", the build commands of libfdt are printed while previously were not. This adds the missing '--quiet' back. Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
2017-09-03omap3: evm: Fixes for CONFIG_NAND, SPL_OS_BOOT, USB, and environmentDerald D. Woods
- Pass MTDPARTS kernel arguments to kernel - Use Kconfig CONFIG_NAND instead of CONFIG_SYS_EXTRA_OPTIONS="NAND" - Call 'usb_stop' on kernel start - Update Falcon mode setup to match other OMAP3 boards - Use "uEnv.txt" as boot script instead of "boot.scr"
2017-09-03block: Drop the ftide020 driverBin Meng
This is not used in U-Boot. Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
2017-09-03block: ide: Drop CONFIG_IDE_LEDBin Meng
This is actually not used. Drop it. Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
2017-09-03block: ide: Drop CONFIG_IDE_INIT_POSTRESETBin Meng
This is not referenced anywhere. Drop it. Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
2017-09-03nvme: Remove dead codes in nvme_setup_io_queues()Bin Meng
Execution cannot reach this statement: "nr_io_queues = result;" Reported-by: Coverity (CID: 166731) Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
2017-09-03nvme: Fix potential sign extension issue in nvme_blk_rw()Bin Meng
"lbas" with type "u16" (16 bits, unsigned) is promoted in "lbas << ns->lba_shift" to type "int" (32 bits, signed), then sign-extended to type "unsigned long long" (64 bits, unsigned). If "lbas << ns->lba_shift" is greater than 0x7FFFFFFF, the upper bits of the result will all be 1. Fix it by casting "lbas" to "u32". Reported-by: Coverity (CID: 166730) Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
2017-09-03nvme: Fix wrong ndev->queues memsetBin Meng
memset() was given a sizeof(NVME_Q_NUM * sizeof(struct nvme_queue *) to clear, which is wrong. Reported-by: Coverity (CID: 166729) Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
2017-09-03disk: part: fix typoHeinrich Schuchardt
%s/Desriptor/Descriptor/g Fix lines over 80 characters with said typo. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
2017-09-03fix: fw_env: Prevent writing error message on special files, which don't ↵Lukasz Majewski
support fsync According to fsync specification [1] some special files (e.g., a pipe, FIFO, or socket) don't support synchronization and return either EROFS or EINVAL. On the linux side the sys_fsync -> do_fsync() checks if the requested file has f_op->fsync defined. If not it returns EINVAL [2]. This commit prevents writing error messages for files (devices), which do not support fsync(). [1] - http://man7.org/linux/man-pages/man2/fsync.2.html [2] - http://elixir.free-electrons.com/linux/v4.13-rc6/source/fs/sync.c#L183 Signed-off-by: Lukasz Majewski <lukma@denx.de> Acked-by: Michael Heimpold <mhei@heimpold.de>
2017-09-03bch: don't use __BSD_VISIBLE to test for flsJonathan Gray
Commit 4ecc988301bc8e981e6d7538c57cdb3aa82f7c1d assumes fls is in libc if __BSD_VISIBLE is defined. This appears to only be true on FreeBSD and DragonFlyBSD. OpenBSD defines __BSD_VISIBLE and does not have fls in strings.h/libc. Switch the test for __BSD_VISIBLE to one for __DragonFly__ and __FreeBSD__ to unbreak the build on OpenBSD. Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
2017-09-03include/configs: remove numerous CONFIG_SYS_BARGSIZE definitionsThomas Petazzoni
This commit removes definitions of CONFIG_SYS_BARGSIZE defined to be equal to CONFIG_SYS_CBSIZE in numerous configuration files. We remove such definitions in two situations: - CONFIG_SYS_CBSIZE is otherwise not defined in the board configuration file, which means the default value of CONFIG_SYS_CBSIZE == 256 applies. In this case, the default value of CONFIG_SYS_BARGSIZE == 512 (common/image.c) is suitable, as it is larger. - CONFIG_SYS_CBSIZE is defined in the board configuration file, but to a value equal or less than 512. In this case, the default value of CONFIG_SYS_BARGSIZE == 512 (common.image.c) is suitable, as it is equal or larger. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: Tom Rini <trini@konsulko.com>
2017-09-03include/configs: remove default values of CONFIG_SYS_BARGSIZEThomas Petazzoni
CONFIG_SYS_BARGSIZE is already defined to 512 in common/image.c when not defined. Therefore, there is no point in having board configuration files define it to 512. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: Tom Rini <trini@konsulko.com>
2017-09-03include/configs: drop default definitions of CONFIG_SYS_MAXARGSThomas Petazzoni
Now that include/config_fallbacks.h define a sane fallback for CONFIG_SYS_MAXARGS, we can drop the definition of this constant in all configurations that were using the default value. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: Tom Rini <trini@konsulko.com>
2017-09-03include/config_fallbacks.h: add default for CONFIG_SYS_MAXARGSThomas Petazzoni
CONFIG_SYS_MAXARGS contains the maximum number of arguments accepted by U-Boot commands. Since the vast majority of the platforms define it to 16, it makes sense to have a default definition to 16, which will allow to remove this definition from a significant number of platforms. It will allow to remove the default definition from 216 platform .h files, leaving only 56 platforms with non-default values (15, 24, 32, 48, 64, 96, 128 or 256). Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: Tom Rini <trini@konsulko.com>
2017-09-03include/configs: drop default definitions of CONFIG_SYS_PBSIZEThomas Petazzoni
Now that the fallback value of CONFIG_SYS_PBSIZE in include/config_fallbacks.h has been adjusted, remove its definition from a large number of board configuration files. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: Tom Rini <trini@konsulko.com>
2017-09-03include/config_fallbacks.h: change fallback for CONFIG_SYS_PBSIZEThomas Petazzoni
Most of the platforms are using CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16 as their value for CONFIG_SYS_PBSIZE, so let's adopt this for the fallback value of CONFIG_SYS_PBSIZE. This will allow us to drop an explicit definition of CONFIG_SYS_PBSIZE from a large number of platforms. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: Tom Rini <trini@konsulko.com>
2017-09-03include/configs: remove CONFIG_SYS_CBSIZE when the default value is usedThomas Petazzoni
Now that include/config_fallbacks.h define a sane fallback for CONFIG_SYS_CBSIZE, we can drop the definition of this constant in all configurations that were using the default value. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: Tom Rini <trini@konsulko.com> [trini: Drop <config.h> from stih410-b2260.h] Signed-off-by: Tom Rini <trini@konsulko.com>
2017-09-03include/config_fallbacks.h: add default for CONFIG_SYS_CBSIZEThomas Petazzoni
CONFIG_SYS_CBSIZE contains the buffer size for input for the console. The vast majority of platforms define them to some reasonable value (256, 512 or 1024 bytes), and it is quite annoying to repeat this definition for all platforms while it isn't really HW-related. Therefore, let's provide a sane fallback value in config_fallbacks.h, so that platforms can rely on it instead of having to explicitly define it. We use 1024 when KGDB is enabled, and 256 otherwise, which is what the majority of the platforms are doing. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: Tom Rini <trini@konsulko.com>
2017-09-03part: efi: Disable overlap checkMaxime Ripard
The current code checks that no partitions overlap with the GPT partition table using the offset of the first LBA usable for that partition. This works fine, unless you have a partition entry that is further away than it usually is and you want to create partitions in the gap between the GPT header and the GPT partition entries, for example to reflash a bootloader that needs to be set there. Rework the test to something a bit smarter that checks whether a partition would overlap with either the GPT header or the partition entries, no matter where it is on the disk. Partitions that do not have a start LBA specified will still start at the first LBA usable set in the GPT header, to avoid weird behaviours. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Reviewed-by: Tom Rini <trini@konsulko.com>
2017-09-03part: efi: make gpt_fill_pte take the device descriptorMaxime Ripard
The gpt_fill_pte will need to access the device block size. Let's pass the device descriptor as an argument. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Reviewed-by: Tom Rini <trini@konsulko.com>
2017-09-03part: efi: rework the partition start and size in gpt_fill_pteMaxime Ripard
The start variable is only used inside a loop, and is never affected inside it, so it's a purely local variable. In the same way the partition size is accessed several times, so we can store it in a variable. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Reviewed-by: Tom Rini <trini@konsulko.com>
2017-09-03part: efi: Fix offsetMaxime Ripard
Both the config option and the DT options specify the offset to set the GPT at in bytes, yet the code treats those values as block numbers. Fix that. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
2017-09-02Merge git://git.denx.de/u-boot-x86Tom Rini
2017-09-02Kconfig: Add EEPROM options to Kconfig when I2C_EEPROM is setAdam Ford
Add the following options to drivers/misc/Kconfig: SYS_I2C_EEPROM_ADDR SYS_I2C_EEPROM_BUS SYS_EEPROM_SIZE SYS_EEPROM_PAGE_WRITE_BITS SYS_EEPROM_PAGE_WRITE_DELAY_MS SYS_I2C_EEPROM_ADDR_LEN SYS_I2C_EEPROM_ADDR_OVERFLOW This does not migrate any boards, but provides a foundations for those who want/need these options Signed-off-by: Adam Ford <aford173@gmail.com> [trini: Migrate uniphier] Signed-off-by: Tom Rini <trini@konsulko.com>
2017-09-02x86: theadorable-x86-common: Remove "ip=dhcp" from default environmentStefan Roese
Without ethernet cable plugged, "ip=dhcp" leads to a complete hangup in Linux booting and the system does not boot into userland at all. Since its not required to have an active network connection on these board, lets remove this statement from the default environment. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
2017-09-02x86: baytrail: acpi: Add full reset bit to the reset register value in FADTBin Meng
It was noticed a few times, that the reboot from Linux (reboot command) is different from the reboot (reset command) under U-Boot. The U-Boot version does seem to reset the board more deeply (PCI cards etc) than the Linux reboot. This is actually caused by missing full reset bit in the reset register value in the ACPI FADT table. Reported-by: Stefan Roese <sr@denx.de> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Tested-by: Stefan Roese <sr@denx.de>
2017-09-02x86: ich-spi: Clear atomic preop only when SPI settings are not lockedBin Meng
The atomic preop register can only be written when SPI settings are not locked, otherwise it's read-only. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de>
2017-09-02x86: ich-spi: Remove useless assignment in ich_spi_xfer()Bin Meng
In ich_spi_xfer() when the driver presets control fields, control variable gets assigned twice. Apparently only the last assignment takes effect. Remove the other one. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de>
2017-09-02omap3_logic: Move CONFIG_SYS_NAND_U_BOOT_OFFS to KconfigAdam Ford
Manually enable SYS_NAND_U_BOOT_LOCATIONS. Set CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 and remove it from header Signed-off-by: Adam Ford <aford173@gmail.com>
2017-09-01Convert CONFIG_BCH to KconfigAdam Ford
This converts the following to Kconfig: CONFIG_BCH Signed-off-by: Adam Ford <aford173@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
2017-09-01Convert CONFIG_SPL_OMAP3_ID_NAND to KconfigAdam Ford
This converts the following to Kconfig: CONFIG_SPL_OMAP3_ID_NAND Signed-off-by: Adam Ford <aford173@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2017-09-01Convert CONFIG_SYS_I2C_BUS_MAX to KconfigAdam Ford
This converts the following to Kconfig: CONFIG_SYS_I2C_BUS_MAX Signed-off-by: Adam Ford <aford173@gmail.com> Reviewed-by: Heiko Schocher <hs@denx.de> [trini: Fix AM43XX drop AM44XX] Signed-off-by: Tom Rini <trini@konsulko.com>
2017-09-01Configs: Migrate I2C_BUS_MAX to CONFIG_SYS_I2C_BUS_MAXAdam Ford
For consistency with other platforms and in preparation of Kconfig migration, let's change Several TI platforms that use I2C_BUS_MAX to CONFIG_SYS_I2C_BUS_MAX Signed-off-by: Adam Ford <aford173@gmail.com>
2017-09-01Kconfig: Migrate all of cmd/fastboot/Kconfig to defconfigsTom Rini
- Move ANDROID_IMAGE_SUPPORT to top level Kconfig under images as it's not strictly part of fastboot. - Add some defaults for the fastboot buffer location and size - Migrate all options listed in cmd/fastboot/Kconfig - Cleanup the README Signed-off-by: Tom Rini <trini@konsulko.com>
2017-09-01configs: Migrate all of the existing USB symbols, except fastbootTom Rini
This syncs all of the currently Kconfig'd symbols out of the headers and into the defconfig files. This has two exceptions, first am335x_evm needs to be converted to DM in SPL and then it can stop undef'ing CONFIG_DM_USB. Leaving this as-is results in a build failure, and without work, run time failure. The other case is am43xx_evm.h and in turn am43xx_evm_usbhost_boot. The problem here is that we need DWC3 USB host mode in SPL, but still desire to have gadget mode in U-Boot proper. Signed-off-by: Tom Rini <trini@konsulko.com>
2017-09-01Revert "Merge git://git.denx.de/u-boot-video"Tom Rini
This reverts commit 1d20170467b079642be96996dcd71db64c3c365c, reversing changes made to 6aee2ab68c362ace5a59f89a63abed82e0bf19e5. The mxc_ipuv3_fb.c changes introduce build failures on some targets. Signed-off-by: Tom Rini <trini@konsulko.com>
2017-09-01Merge git://git.denx.de/u-boot-sunxiTom Rini
2017-09-01Merge git://git.denx.de/u-boot-videoTom Rini
2017-09-01sunxi: Fix CONFIG_SUNXI_GMAC referencesDave Prue
SUNXI_GMAC was still used to configure the code where as the same has been renamed and moved to Kconfig in below commit "sunxi: Move SUNXI_GMAC to Kconfig" (sha1: 4d43d065db3262f9a9918ba72457bf36dfb8e0bb) Signed-off-by: Dave Prue <dave@prue.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Jagan Teki <jagan@openedev.com> Reviewed-by: Mark Kettenis <kettenis@openbsd.org> Tested-by: Mark Kettenis <kettenis@openbsd.org> [Tweek commit message, config_whitelist.txt, build-whitelist.sh] Signed-off-by: Jagan Teki <jagan@openedev.com>
2017-09-01Merge git://git.denx.de/u-boot-imxTom Rini
Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: configs/imx6qdl_icore_mmc_defconfig configs/imx6qdl_icore_rqs_defconfig