summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-12-31bootm: vxworks: Make do_bootvx_fdt() staticBin Meng
Change the scope of do_bootvx_fdt() to static since it is only used in common/bootm_os.c. Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
2018-12-31Merge git://git.denx.de/u-boot-x86Tom Rini
This includes x86 edison defconfig file clean up, and coreboot file system (cbfs) fixes.
2018-12-31fs: cbfs: Add missing standard CBFS component typesBin Meng
Current CBFS component type list is incomplete. Add missing ones. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2018-12-31fs: cbfs: Make all CBFS_TYPE_xxx macros consistentBin Meng
At present there are 2 macros that are named as CBFS_COMPONENT_xxx. Change them to CBFS_TYPE_xxx for consistency. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2018-12-31fs: cbfs: Fix out of bound access during CBFS walking throughBin Meng
The call to file_cbfs_fill_cache() is given with the parameter 'start' pointing to the offset by the CBFS base address, but with the parameter 'size' that equals to the whole CBFS size. During CBFS walking through, it checks files one by one and after it pass over the end of the CBFS which is 4GiB boundary it tries to check files from address 0 and so on, until the overall size the codes checked hits to the given 'size'. Fix this by passing 'start' pointing to the CBFS base address. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2018-12-31fs: cbfs: remove wrong header validationChristian Gmeiner
cbfs_fileheader.len indicates the content size of the file in the cbfs, and it has nothing to do with cbfs_fileheader.offset which is the starting address of the file in the cbfs. Remove such check in file_cbfs_next_file(). Before this change 'cbfsinit' failed with 'Bad CBFS file'. After this change all cbfs commands are working as expected. Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com> [bmeng: keep the necessary header sanity check] Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2018-12-31x86: edison: Remove staled comments from configuration headerAndy Shevchenko
Since some options had been moved to defconfig from header, the leftover comments are not needed anymore. Remove them. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
2018-12-31x86: edison: move CONFIG_BOOTCOMMAND from header file to defconfigAndy Shevchenko
Use defconfig instead of header file for CONFIG_BOOTCOMMAND. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
2018-12-31x86: edison: move CONFIG_CMD_PCI from header file to defconfigAndy Shevchenko
Use defconfig instead of header file for CONFIG_CMD_PCI. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
2018-12-28Merge branch 'master' of git://git.denx.de/u-boot-uniphierTom Rini
Please pull UniPhier updates v2019.01 - import DIV_ROUND_CLOSEST_ULL macro from Linux - import improvement and fix of Denali NAND driver from Linux - add NAND 200MHz clock to clk driver - allow CONFIG_BOOTCOMMAND to run custom boot command/script - sync DT with Linux 4.20
2018-12-29ARM: uniphier: dts: sync with Linux 4.20Masahiro Yamada
Currently, the DWC3 USB node is out of sync because the bindings for the UniPhier DWC3 PHY diverged between Linux and U-Boot. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-12-29clk: uniphier: add NAND 200MHz clockMasahiro Yamada
The Denali NAND controller IP needs three clocks: - clk: controller core clock - clk_x: bus interface clock - ecc_clk: clock at which ECC circuitry is run Currently, only the first one (50MHz) is provided. The rest of the two clock ports must be connected to the 200MHz clock line. Add this. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-12-29mtd: rawnand: denali: fix a race condition when DMA is kickedMasahiro Yamada
Based on Linux commit cf51e4b9c34407bf0c3d9b582b7837e047e1df47 Add the register read-back, commenting why this is necessary. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-12-29mtd: rawnand: denali: optimize timing parameters for data interfaceMasahiro Yamada
Based on Linux commit 1dfac31a5a63ac04a9b5fbc3f5105a586560f191 This commit improves the ->setup_data_interface() hook. The denali_setup_data_interface() needs the frequency of clk_x and the ratio of clk_x / clk. The latter is currently hardcoded in the driver, like this: #define DENALI_CLK_X_MULT 6 The IP datasheet requires that clk_x / clk be 4, 5, or 6. I just chose 6 because it is the most defensive value, but it is not optimal. By getting the clock rate of both "clk" and "clk_x", the driver can compute the timing values more precisely. To not break the existing platforms, the fallback value, 50 MHz is provided. It is true for all upstreamed platforms. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-12-29mtd: rawnand: denali_dt: add more clocks based on IP datasheetMasahiro Yamada
Based on Linux commit 6f1fe97bec349a1fd6c5a8c7c5998d759fe721d5 Currently, denali_dt.c requires a single anonymous clock, but the Denali User's Guide requires three clocks for this IP: - clk: controller core clock - clk_x: bus interface clock - ecc_clk: clock at which ECC circuitry is run This commit supports these named clocks to represent the real hardware. For the backward compatibility, the driver still accepts a single clock just as before. The clk_x_rate is taken from the clock driver again if the named clock "clk_x" is available. This will happen only for future DT, hence the existing DT files are not affected. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-12-29linux/kernel.h: import DIV_ROUND_CLOSEST_ULL from LinuxMasahiro Yamada
Copied from Linux v4.20-rc7. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-12-29ARM: uniphier: add CONFIG_PREBOOTMasahiro Yamada
For more boot-flow flexibility, Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-12-29ARM: uniphier: allow to source boot script before distro-bootMasahiro Yamada
Some users might need additional setups before booting the kernel. If there is found a file 'boot.scr', run it before invoking the distro boot command. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-12-29ARM: uniphier: do not modify bootcmd environment variable at run-timeMasahiro Yamada
Some users might want to modify 'bootcmd' at compile-time by editing include/configs/uniphier.h, but overwriting it at run-time makes it impossible. Instead, set 'bootdev' at run-time, which contains the boot device the system is booting from, then indirectly reference it from 'bootcmd'. It is up to users whether to override 'bootcmd'. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-12-27Merge tag 'signed-efi-2019.01' of git://github.com/agraf/u-bootTom Rini
Patch queue for efi v2019.01 - 2018-12-27 Three tiny last minute bug fixes: - Fix RTS relocation - Avoid read after free - Fix RTS data positioning (affects BBB)
2018-12-27Merge branch '2018-12-26-master-imports'Tom Rini
- Misc TI platform fixes - mt7629 fix for Linux compatible SMP support - Other small regression fixes
2018-12-27power: regulator: Return success on attempt to disable an always-on regulatorLokesh Vutla
commit 4f86a724e82c0 ("power: regulator: denied disable on always-on regulator") throws an error when requested to disable an always-on regulator. It is right that an always-on regulator should not be attempted to be disabled. But at the same time regulator framework should not return an error when such request is received. Instead it should just return success without attempting to disable the specified regulator. This is because the requesting driver will not have the idea if the regulator is always-on or not. The requesting driver will always try to enable/disable regulator as per the required flow. So it is upto regulator framework to not break such scenarios. Fixes: 4f86a724e82c0 ("power: regulator: denied disable on always-on regulator") Reported-by: Jean-Jacques Hiblot <jjhiblot@ti.com> Reviewed-by: Faiz Abbas <faiz_abbas@ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
2018-12-26doc: README.commands: sub-commandsHeinrich Schuchardt
Describe the implementation of sub-commands. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Simon Glass <sjg@chromium.org>
2018-12-26mt7629: use linux kernel compatible SMP initializationWeijie Gao
This patch changes mt7629 to use the compatible platform SMP initialization method of linux kernel. Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
2018-12-26mt7623: fix a typo in include/configs/mt7623.hWeijie Gao
Fix typo: neede -> needed Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
2018-12-26phy: Fix u-boot coruption when fixed-phy is usedMichal Simek
When fixed-link phy is used subnode offset is used as phy address. This number is bigger then space allocated for bus structure (allocated via mdio_alloc). bus->phymap[] array has PHY_MAX_ADDR size (32). That's why writing bus->phymap[addr] where addr is < 0 or > PHY_MAX_ADDR is causing write to memory which can caused full U-Boot crash. The patch is checking if address is in correct range. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-12-26arm: K3: Fix usage of CONFIG_SYS_K3_KEYLokesh Vutla
For signing the tiboot3.bin image, an optional KEY file can be passed using CONFIG_SYS_K3_KEY. Right now, Makefile scripts directly takes the config value and uses it for signing. This is okay if the build directory is a sub-directory of source tree, otherwise it fails. Fix it by using the path relative to the source tree. Reported-by: Jean-Jacques Hiblot <jjhiblot@ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
2018-12-26api: storage: Fix enumeration of storage devicesCristian Ciocaltea
dev_stor_get() is not able to find the next available device in the current storage group when the previous enumerated device belongs to a different group or class (e.g. network). The root cause is the device group iterator not being reset after an unsuccessful search for the last returned device so that the following search for the next available device will start from beginning. The issue has been identified by loading and booting GRUB in a QEMU vexpress-a9 environment. Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@iquestgroup.com>
2018-12-26dm: pinctrl: Prevent (re-)configuring pins when already done before relocationLukasz Majewski
This commit prevents from re-configuring pins if those were configured before relocation. Some pins - like UART or DDR must be setup before relocation (as they have 'u-boot,dm-pre-reloc' property set in DTS). Without this change, those pins are re-configured after relocation (pre_reloc_only = 0, so we do not "continue"). Such behavior may be a problem for DDR PAD configuration, as they might be already leveled/tuned with original setup). Signed-off-by: Lukasz Majewski <lukma@denx.de>
2018-12-26ARM: mach-omap2: omap3: Fix GPIO clocking in SPLAdam Ford
OMAP3_GPIO_x is needed to enable each GPIO bank on the OMAP3 boards. At one point, the #ifdef's were replaced with if CONFIG_IS_ENABLED but this won't work for people who need OMAP3_GPIO_x in SPL since the SPL prefix for this option isn't used in Kconfig. This patch moves the check to #if defined and also makes Kconfig select the banks if CMD_GPIO is used which makes the checks in the code less cumbersome. Fixes: bd8a9c14c91c ("arm: mach-omap2/omap3/clock.c: Enable all GPIO with CMD_GPIO") Reported-by: Liam O'Shaughnessy <liam.o.shaughnessy@gumstix.com> Signed-off-by: Adam Ford <aford173@gmail.com> [trini: Migrate omap3_igep00x0.h] Signed-off-by: Tom Rini <trini@konsulko.com>
2018-12-26tests: enable DT overlay tests by defaultHeinrich Schuchardt
Enable device tree overlay tests by default if unit tests are selected and the runtime is configured via device tree. Overlays have been mainlined in the device tree compiler so there is no reason anymore to disable the tests by default. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
2018-12-26scripts/check-config.sh: Add usage()Andy Shevchenko
When arguments are not supplied the error message is misleading and doesn't tell what exactly has to be done. Fix this by adding usage() and call it if above circumstance occurs. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2018-12-23efi_loader: Make RTS relocation more robustAlexander Graf
While changing the RTS alignment to 64KB in commit 7a82c3051c8f ("efi_loader: Align runtime section to 64kb") the relocation code started to break. The reason for that is that we didn't actually look at the real relocation data. We merely took the RUNTIME_CODE section as a hint and started to relocate based on self calculated data from that point on. That calculation was now out of sync though. To ensure we're not running into such a situation again, this patch makes the runtime relocation code a bit more robust. We can just trust the phys/virt hints from the payload. We also should check that we really only have a single section, as the code doesn't handle multiple code relocations yet. Fixes: 7a82c3051c8f ("efi_loader: Align runtime section to 64kb") Reported-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reported-by: Loic Devulder <ldevulder@suse.de> Signed-off-by: Alexander Graf <agraf@suse.de> Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Tested-by: Loic Devulder <ldevulder@suse.de> Tested-by: Jonathan Gray <jsg@jsg.id.au> Signed-off-by: Alexander Graf <agraf@suse.de>
2018-12-23lib: crc32: mark static variable as __efi_runtime_dataHeinrich Schuchardt
In commit 483dbab9f931 ("lib: crc32: mark function crc32() as __efi_runtime") one local static variable was missed. It did not end up in the __efi_runtime_data section as it should. If CONFIG_DYNAMIC_CRC_TABLE=y a data abort execption may occur when the UEFI payload calls the SetVirtualAddressMap() runtime service. Reported-by: Dominik Adamski <dominik.adamski@northerntech.community> Fixes: 483dbab9f931 ("lib: crc32: mark function crc32() as __efi_runtime") Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
2018-12-23efi_selftest: block device: avoid read after freeHeinrich Schuchardt
Reading the position in a file after closing the same results in a read after free. Correct the sequence in the test. Reported-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
2018-12-21Merge git://git.denx.de/u-boot-marvellTom Rini
- Fix breakage in helios4: Change U-Boot offset on SPI Flash - Enable CONFIG_BLK for db-88f6820-amc
2018-12-21Merge branch 'master' of git://git.denx.de/u-boot-socfpgaTom Rini
- stratix10 updates
2018-12-21Merge tag 'u-boot-amlogic-20181219' of git://git.denx.de/u-boot-amlogicTom Rini
A single fix to properly enable eMMC on the AXG S400 board.
2018-12-21Merge tag 'mips-updates-for-2019.11' of git://git.denx.de/u-boot-mipsTom Rini
- mips: fix some DTC warnings - bmips: bcm6348: add DMA driver - bmips: bcm5348: add ethernet driver - bmips: bcm6368: add ethernet driver - mips: mt76xx: fix DMA problems, disable CONFIG_OF_EMBED - mips: mscc: add support for Microsemi Ocelot and Luton SoCs - mips: mscc: add support for Ocelot and Luton evaluation boards - mips: jz47xx: add basic support for Ingenic JZ4780 SoC - mips: jz47xx: add support for Imgtec Creator CI20 board
2018-12-21Merge git://git.denx.de/u-boot-riscvTom Rini
- Add DM drivers to support RISC-V CPU and timer, plus some bug fixes. - Support SiFive UART - Rename ax25-ae350 defconfig
2018-12-21arm: mvebu: configs: helios4: Change U-Boot offset on SPI FlashAditya Prayoga
SPI flash support on Helios4 [1] has been merge to u-boot/master on commit 8cb8c0c6a83bef ("Merge git://git.denx.de/u-boot-marvell") However, the SPI image build failed after the merge with following message: COPY spl/u-boot-spl.bin MKIMAGE u-boot-spl.kwb Error: Image header (incl. SPL image) too big! header=0x20816 CONFIG_SYS_U_BOOT_OFFS=0x20000! Increase CONFIG_SYS_U_BOOT_OFFS! Error: Image header (incl. SPL image) too big! header=0x20816 CONFIG_SYS_U_BOOT_OFFS=0x20000! Increase CONFIG_SYS_U_BOOT_OFFS! Could not create image Makefile:1162: recipe for target 'u-boot-spl.kwb' failed make: *** [u-boot-spl.kwb] Error 1 Let's increase the u-boot offset to 0x30000 to accommodate SPL changes and leave some margin for future changes. [1] https://patchwork.ozlabs.org/patch/1007762/ Signed-off-by: Aditya Prayoga <aditya@kobol.io> Reviewed-by: Stefan Roese <sr@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
2018-12-21ARM: mvebu: remove out of date commentChris Packham
The Marvell DDR3 training code is now part of the U-Boot SPL so the comment saying it needs porting is no longer correct. Signed-off-by: Chris Packham <judge.packham@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
2018-12-21ARM: mvebu: define CONFIG_BLK for db-88f6820-amcChris Packham
db-88f6820-amc uses CONFIG_DM_USB and CONFIG_USB_STORAGE already so define CONFIG_BLK to prepare it for full conversion to DM. Signed-off-by: Chris Packham <judge.packham@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
2018-12-20arm: socfpga: stratix10: Enable Stratix10 FPGA ReconfigurationAng, Chee Hong
Select CONFIG_FPGA_STRATIX10 for CONFIG_TARGET_SOCFPGA_STRATIX10. Signed-off-by: Ang, Chee Hong <chee.hong.ang@intel.com>
2018-12-20arm: socfpga: stratix10: Add Stratix10 FPGA into FPGA device tableAng, Chee Hong
Enable 'fpga' command in u-boot. User will be able to use the FPGA command to program the FPGA on Stratix10 SoC. Signed-off-by: Ang, Chee Hong <chee.hong.ang@intel.com>
2018-12-20arm: socfpga: stratix10: Add Stratix 10 FPGA Reconfiguration DriverAng, Chee Hong
Enable FPGA reconfiguration support for Stratix 10 SoC. Signed-off-by: Ang, Chee Hong <chee.hong.ang@intel.com>
2018-12-20arm: socfpga: stratix10: Add macros for mailbox's argumentsAng, Chee Hong
Add macros for specifying number of arguments in mailbox command. Signed-off-by: Ang, Chee Hong <chee.hong.ang@intel.com>
2018-12-20arm: socfpga: stratix10: Add generic FPGA reconfig mailbox API for S10Ang, Chee Hong
Add a generic mailbox API for FPGA reconfig status which can be called by others. This new function accepts 2 different mailbox commands: CONFIG_STATUS or RECONFIG_STATUS. Signed-off-by: Ang, Chee Hong <chee.hong.ang@intel.com>
2018-12-19arm: dts: s400: Fix status for eMMC and SDIO portsNeil Armstrong
Under U-boot, the WiFi SDIO Module should be disabled and the eMMC modules should be enabled, so this patch adds an s400-u-boot.dtsi include file specific for U-Boot that will be included by the build system. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Tested-by: Jerome Brunet <jbrunet@baylibre.com>
2018-12-19mips: jz47xx: Add Creator CI20 platformPaul Burton
Add support for the Creator CI20 platform based on the JZ4780 SoC. Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Paul Burton <paul.burton@imgtec.com> Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> Reviewed-by: Marek Vasut <marex@denx.de>