summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'signed-efi-v2018.03' of git://github.com/agraf/u-bootTom Rini2018-02-1016-313/+453
|\ | | | | | | | | | | | | | | | | | | | | Patch queue for efi in 2018.03 - 2018-02-10 This time we have a few important bug fixes. Most noticable are: - Fix OpenBSD loader with CONFIG_BLK=n - Fix builds on various circumstances - Add missing stubs so callers don't call NULL - Bump UEFI revision to 2.7
| * efi_loader: correct efi_disk_registerHeinrich Schuchardt2018-02-102-28/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | efi_disk_register should return as status code (efi_status_t). Disks with zero blocks should be reported as 'not ready' without throwing an error. This patch solves a problem running OpenBSD on system configured with CONFIG_BLK=n (e.g. i.MX6). Reported-by: Jonathan Gray <jsg@jsg.id.au> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Tested-by: Jonathan Gray <jsg@jsg.id.au> Signed-off-by: Alexander Graf <agraf@suse.de>
| * efi_loader: add missing runtime services stubsHeinrich Schuchardt2018-02-102-3/+54
| | | | | | | | | | | | | | | | Add stubs for UpdateCapsule, QueryCapsuleCapabilities, and QueryVariableInfo. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
| * efi_loader: split README.efi into two separate documentsHeinrich Schuchardt2018-02-103-264/+271
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | README.efi describes two different concepts: * U-Boot exposing the UEFI API * U-Boot running on top of UEFI. This patch splits the document in two. Religious references are removed. The separation of the concepts makes sense before detailing the internals of U-Boot exposing the UEFI API in a future patch. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
| * efi_driver: return type of efi_driver_init()Heinrich Schuchardt2018-02-102-4/+4
| | | | | | | | | | | | | | | | | | | | | | Change the return type of efi_driver_init() to efi_status_t. efi_driver_init() calls efi_add_driver() which returns an efi_status_t value. efi_driver_init() should not subject this value to a conversion to int losing high bits on 64bit systems. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
| * efi_loader: do not use 2.0.5 as UEFI revision numberHeinrich Schuchardt2018-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Currently the UEFI revision number in the system table header is set to 2.0.5. This version number does not refer to any existing version of the UEFI standard. Set the revision number to 2.7. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Mark Kettenis <kettenis@openbsd.org> Signed-off-by: Alexander Graf <agraf@suse.de>
| * efi_loader: create stub for CreateEventExHeinrich Schuchardt2018-02-102-1/+41
| | | | | | | | | | | | | | | | | | | | | | Currently we set the function pointer for the CreateEventEx boot service to NULL. When called this would lead to an immediate failure. A function stub is provided which handles the case that the boot service is called without an event group and returns EFI_UNSUPPORTED otherwise. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
| * efi_selftest: use correct compiler flags for miniappsHeinrich Schuchardt2018-02-101-2/+4
| | | | | | | | | | | | | | | | | | For EFI binaries we need special CFLAGS. They were specified for an object file that since has been replaced. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
| * efi_loader: fix the online help for bootefi bootmgrHeinrich Schuchardt2018-02-101-1/+1
| | | | | | | | | | | | | | | | The bootefi command is missing in the online help for bootefi bootmgr. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
| * efi_loader: fix building crt0 on armHeinrich Schuchardt2018-02-106-9/+32
|/ | | | | | | | | | | | | | | | | | | | | | Before the patch an undefined constant EFI_SUBSYSTEM was used in the crt0 code. The current version of binutils does not swallow the error. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=888403 The necessary constant IMAGE_SUBSYSTEM_EFI_APPLICATION is already defined in pe.h. So let's factor out asm-generic/pe.h for the image subsystem constants and use it in our assembler code. IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER does not exist in the specification let's use IMAGE_SUBSYSTEM_EFI_ROM instead. The include pe.h is only used in code maintained by Alex so let him be the maintainer here too. Reported-by: Andre Przywara <andre.przywara@arm.com> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Tested-by: Vagrant Cascadian <vagrant@debian.org> Signed-off-by: Alexander Graf <agraf@suse.de>
* Move most CONFIG_HAVE_BLOCK_DEVICE to KconfigAdam Ford2018-02-0820-37/+31
| | | | | | | | | | | config_fallbacks.h has some logic that sets HAVE_BLOCK_DEVICE based on a list of enabled options. Moving HAVE_BLOCK_DEVICE to Kconfig allows us to drastically shrink the logic in config_fallbacks.h Signed-off-by: Adam Ford <aford173@gmail.com> [trini: Rename HAVE_BLOCK_DEVICE to CONFIG_BLOCK_DEVICE] Signed-off-by: Tom Rini <trini@konsulko.com>
* block: Migrate SystemACE chip to KconfigTom Rini2018-02-084-16/+21
| | | | | | | | | | | | Migrate the base and sub-options to Kconfig. Note that we only enable this in the base sandbox config now. Cc: Alexey Brodkin <alexey.brodkin@gmail.com> Cc: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Tom Rini <trini@konsulko.com> --- Is this driver still used anywhere? It's fishy that it's only enabled in sandbox anymore.
* Convert LIB_UUID to KconfigAdam Ford2018-02-085-10/+8
| | | | | | | | | config_fallback.h has some logic that checks a variety of options and selects LIB_UUID if it hasn't already been selected. This will all LIB_UUID in Kconfig and select this option for the list of options to allow us to remove the logic from fallbacks Signed-off-by: Adam Ford <aford173@gmail.com>
* Convert CONFIG LIB_HW_RAND to KconfigAdam Ford2018-02-0813-20/+19
| | | | | | | | | | | | config_fallbacks.h had some logic to automatically select LIB_RAND if RANDOM_UUID or CMD_UUID were set if LIB_HW_RAND wasn't already selected. By migrating LIB_HW_RAND to Kconfig, we can remove this check from config_fallbacks.h and put it into Kconfig Signed-off-by: Adam Ford <aford173@gmail.com> Reviewed-by: Lukasz Majewski <lukma@denx.de> [trini: Turn into a choice, add NET_RANDOM_ETHADDR] Signed-off-by: Tom Rini <trini@konsulko.com>
* Convert CONFIG_APBH_DMA et al to KconfigAdam Ford2018-02-0818-44/+22
| | | | | | | | | | | | This converts the following to Kconfig: CONFIG_APBH_DMA CONFIG_APBH_DMA_BURST CONFIG_APBH_DMA_BURST8 Signed-off-by: Adam Ford <aford173@gmail.com> Reviewed-by: Stefan Agner <stefan.agner@toradex.com> [trini: Add in MMC as well] Signed-off-by: Tom Rini <trini@konsulko.com>
* Kconfig: Select networking commands only when NET is enabledMichal Simek2018-02-081-4/+4
| | | | | | | There is no reason to unconditially select network commands as distro defaults without networking enable. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* Kconfig: net: phylib: Phylib should depends on NETMichal Simek2018-02-081-0/+1
| | | | | | | There is no value to enable phylib without networking support. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
* omap4: sdp4430: Enable CONFIG_NET for this platformMichal Simek2018-02-081-0/+5
| | | | | | | | Distro default configuration contains also dhcp and pxe setting which can't working without enabling CONFIG_NET. EFI is not required that's why it is not enabled. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* configs: stm32: Enable CONFIG_ENV_VARS_UBOOT_CONFIGPatrice Chotard2018-02-086-0/+8
| | | | | | | | | | Enable CONFIG_ENV_VARS_UBOOT_CONFIG for all STM32 boards It allows to retrieve the SoC name into the "soc" environment variable. Signed-off-by: Christophe Priouzeau <christophe.priouzeau@st.com> Signed-off-by: Patrice Chotard <patrice.chotard@st.com> Reviewed-by: Vikas Manocha <vikas.manocha@st.com>
* Convert CONFIG_NAND_MXS to KconfigStefan Agner2018-02-0832-40/+42
| | | | | | This converts CONFIG_NAND_MXS to Kconfig. Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
* spl: use ARCH_MX23/28 to specify SPL_LDSCRIPTStefan Agner2018-02-081-1/+1
| | | | | | | Simplify SPL_LDSCRIPT config by using the new arch Kconfig configurations ARCH_MX23 and ARCH_MX28. Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
* arm: imx: mx28: Move MX28 selection to KconfigStefan Agner2018-02-0818-63/+67
| | | | | | | | | | The motivation for moving MX28 selection to Kconfig is to be able to better handle NAND MXS selection through Kconfig. This selection method also aligns with the way other i.MX SoCs are selected in U-Boot. Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
* arm: imx: mx23: Move MX23 selection to KconfigStefan Agner2018-02-0811-42/+50
| | | | | | | | | | The motivation for moving MX23 selection to Kconfig is to be able to better handle NAND MXS selection through Kconfig. This selection method also aligns with the way other i.MX SoCs are selected in U-Boot. Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
* Convert CONFIG_MXC_GPIO to KconfigAdam Ford2018-02-0841-55/+20
| | | | | | | This converts the following to Kconfig: CONFIG_MXC_GPIO Signed-off-by: Adam Ford <aford173@gmail.com>
* configs: imx6q_logic: Move CONFIG_PHY_SMSC to defconfigAdam Ford2018-02-082-1/+1
| | | | | | | Since CONFIG_PHY_SMSC was already in Kconfig, move this from header file to defconfig Signed-off-by: Adam Ford <aford173@gmail.com>
* configs: imx6q_logic: Move CONFIG_MXC_UART to KconfigAdam Ford2018-02-082-2/+1
| | | | | | | | Since CONFIG_MXC_UART is already in Kconfig, move this from the header to imx6q_logic_defconfig Signed-off-by: Adam Ford <aford173@gmail.com> Reviewed-by: Stefano Babic <sbabic@denx.de>
* doc: watchdog: Remove Blackfin related documentation entryLukasz Majewski2018-02-071-3/+0
| | | | | | | This commit cleans up the README.watchdog by removing the reminescent of ADI's Blackfin architecture removed some time ago. Signed-off-by: Lukasz Majewski <lukma@denx.de>
* ARM: omap3: evm: Remove CONFIG_SYS_NS16550_REG_SIZE undefineDerald D. Woods2018-02-071-3/+0
| | | | | | | | This commit removes an attempt to workaround a previous compilation warning that is is now fixed in "include/configs/ti_omap3_common.h". Signed-off-by: Derald D. Woods <woods.technical@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* ARM: omap3: ti_omap3_common: Fix CONFIG_SYS_NS16550_REG_SIZE compiler warningDerald D. Woods2018-02-071-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes the following compiler warnings when DM_SERIAL is enabled. ---8<------------------------------------------------------------------- ... CC spl/board/ti/evm/evm.o In file included from /solution/scm/u-boot-master/board/ti/evm/evm.c:16:0: /solution/scm/u-boot-master/include/ns16550.h:31:0: warning: "CONFIG_SYS_NS16550_REG_SIZE" redefined #define CONFIG_SYS_NS16550_REG_SIZE (-1) In file included from /solution/scm/u-boot-master/include/configs/omap3_evm.h:22:0, from include/config.h:5, from /solution/scm/u-boot-master/include/common.h:21, from /solution/scm/u-boot-master/board/ti/evm/evm.c:14: /solution/scm/u-boot-master/include/configs/ti_omap3_common.h:33:0: note: this is the location of the previous definition # define CONFIG_SYS_NS16550_REG_SIZE (-4) LD spl/board/ti/evm/built-in.o ... CC spl/drivers/serial/ns16550.o In file included from /solution/scm/u-boot-master/drivers/serial/ns16550.c:11:0: /solution/scm/u-boot-master/include/ns16550.h:31:0: warning: "CONFIG_SYS_NS16550_REG_SIZE" redefined #define CONFIG_SYS_NS16550_REG_SIZE (-1) In file included from /solution/scm/u-boot-master/include/configs/omap3_evm.h:22:0, from include/config.h:5, from /solution/scm/u-boot-master/include/common.h:21, from /solution/scm/u-boot-master/drivers/serial/ns16550.c:7: /solution/scm/u-boot-master/include/configs/ti_omap3_common.h:33:0: note: this is the location of the previous definition # define CONFIG_SYS_NS16550_REG_SIZE (-4) LD spl/drivers/serial/built-in.o ... ---8<------------------------------------------------------------------- Signed-off-by: Derald D. Woods <woods.technical@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* spl: eMMC/SD: Provide one __weak spl_boot_mode() functionLukasz Majewski2018-02-0716-163/+11
| | | | | | | | | | | | | | | | | The goal of this patch is to clean up the code related to choosing SPL MMC boot mode. The spl_boot_mode() now is called only in spl_mmc_load_image() function, which is only compiled in if CONFIG_SPL_MMC_SUPPORT is enabled. To achieve the goal, all per mach/arch implementations eligible for unification has been replaced with one __weak implementation. Signed-off-by: Lukasz Majewski <lukma@denx.de> Reviewed-by: Marek Vasut <marex@denx.de> Reviewed-by: Stefano Babic <sbabic@denx.de> Acked-by: Michal Simek <michal.simek@xilinx.com> (For ZynqMP) Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
* ARM: dts: keystone-k2g-ice: Add support for QSPIVignesh R2018-02-071-0/+48
| | | | | | | K2G ICE has a s25fl256s1 QSPI NOR flash connected to QSPI at CS0. Add DT entries for the same. Signed-off-by: Vignesh R <vigneshr@ti.com>
* ARM: k2g: Add pinmux data for QSPI on K2G ICEVignesh R2018-02-071-0/+9
| | | | | | Add pinmux for QSPI pins on K2G ICE board. Signed-off-by: Vignesh R <vigneshr@ti.com>
* atcspi200: avoid possible NULL dereferenceHeinrich Schuchardt2018-02-071-2/+2
| | | | | | | | Check if ns before and not after dereferencing it. Indicated by cppcheck. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
* part: Allocate only one legacy_mbr bufferAlexey Brodkin2018-02-071-1/+1
| | | | | | | | | | | | | | Commit ff98cb90514d ("part: extract MBR signature from partitions") blindly switched allocated by ALLOC_CACHE_ALIGN_BUFFER buffer type from "unsigned char" to "legacy_mbr" which caused allocation of size = (typeof(legacy_mbr) * dev_desc->blksize) instead of just space enough for "legacy_mbr" structure. Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> Cc: Rob Clark <robdclark@gmail.com> Cc: Peter Jones <pjones@redhat.com> Cc: Alexander Graf <agraf@suse.de> Cc: Tom Rini <trini@konsulko.com>
* move booti_setup to arch/arm/lig/image.cBin Chen2018-02-074-80/+100
| | | | | | | | | | | | | | Follow bootz's pattern by moving the booti_setup to arch/arm/lib. This allows to use booti_setup in other paths, e.g booting an Android image containing Image format. Note that kernel relocation is move out of booti_setup and it is the caller's responsibility to do it and allows them do it differently. say, cmd/booti.c just do a manually, while in the bootm path, we can use bootm_load_os(with some changes). Signed-off-by: Bin Chen <bin.chen@linaro.org> Reviewed-by: Tom Rini <trini@konsulko.com>
* parse the second area of android imageBin Chen2018-02-072-0/+21
| | | | | | | | | | | | | | | The second area of android image was intended to put a 2nd stage bootloader but in practice were rarely used (in my knowledge). An proposal was made to the AOSP to (re)use the second area as the dtb[1], This patch itself doesn't depend on that proposal being accepted but it won't be that helpful as well if that proposal won't be accepted. But don't do any harm as well. [1] https://android-review.googlesource.com/#/c/417447/ Signed-off-by: Bin Chen <bin.chen@linaro.org> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
* Merge git://git.denx.de/u-boot-ubiTom Rini2018-02-061-5/+0
|\
| * ubi: Ensure no fastmap flush after uif_closeMartin Townsend2018-02-061-5/+0
| | | | | | | | | | | | | | | | | | | | | | On detach UBI attempts to update fastmap after closing user interfaces but at this point UBI volumes have already been free()'ed and fastmap can no longer access these data structures. Signed-off-by: Martin Townsend <mtownsend1973@gmail.com> Cc: hs@denx.de Cc: kmpark@infradead.org Cc: richard@sigma-star.at
* | Merge git://git.denx.de/u-boot-i2cTom Rini2018-02-064-104/+311
|\ \ | |/ |/|
| * i2c: mvtwsi.c: Avoid NULL dereferenceHeinrich Schuchardt2018-02-061-1/+2
| | | | | | | | | | | | | | | | | | For '#ifndef CONFIG_DM_I2C' twsi_i2c_init() passes NULL as 4th parameter to __twsi_i2c_init(). Identified with cppcheck. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
| * i2c: ihs_i2c: Factor out send_buffer methodMario Six2018-02-061-24/+26
| | | | | | | | | | | | Simplify the driver logic by extracting a common send_buffer method. Signed-off-by: Mario Six <mario.six@gdsys.cc>
| * i2c: ihs_i2c: Make DM compatibleMario Six2018-02-062-3/+199
| | | | | | | | | | | | | | | | | | | | Make the ihs_i2c driver DM-compatible; for legacy boards, the old functions are retained within #ifdefs. No board uses the new DM driver yet; this patch only lays the foundation for future support. Signed-off-by: Mario Six <mario.six@gdsys.cc>
| * i2c: ihs_i2c: Prepare DM conversionMario Six2018-02-061-29/+40
| | | | | | | | | | | | | | | | | | Prepare the function interface of the ihs_i2c driver for DM conversion in a future patch. While we're at it, fix some style violations, and make the code more readable. Signed-off-by: Mario Six <mario.six@gdsys.cc>
| * i2c: fsl_i2c: Make live-tree compatibleMario Six2018-02-061-10/+6
| | | | | | | | | | | | | | Make the fsl_i2c driver compatible with a live device tree. Reviewed-by: Heiko Schocher <hs@denx.de> Signed-off-by: Mario Six <mario.six@gdsys.cc>
| * i2c: fsl_i2c: Remove inline declarationsMario Six2018-02-061-7/+7
| | | | | | | | | | | | | | | | | | | | | | Some functions in the fsl_i2c driver are declared as inline, even though they are quite large, which needlessly increases the size of the resulting binary. This patch removes the inline declarations. Reviewed-by: Heiko Schocher <hs@denx.de> Signed-off-by: Mario Six <mario.six@gdsys.cc>
| * i2c: fsl_i2c: Fix style violationsMario Six2018-02-061-55/+56
|/ | | | | | | | Fix some style violations in the fsl_i2c I2C driver, and use shorter type names for variables in some cases. Reviewed-by: Heiko Schocher <hs@denx.de> Signed-off-by: Mario Six <mario.six@gdsys.cc>
* usb: ulpi: kconfig: Remove meaningless choice defaultUlf Magnusson2018-02-051-1/+0
| | | | | | | | | | | | | | | | | | 'default' on a choice refers to the symbol selected by default, not to the choice mode, so 'default n' is meaningless. No functional changes. Optional choices implicitly default to n mode (and there is no way to make them default to another mode). Discovered in Kconfiglib (https://github.com/ulfalizer/Kconfiglib), which prints the following warning: warning: the default selection n (undefined) of <choice> (defined at drivers/usb/ulpi/Kconfig:3) is not contained in the choice I've added a corresponding warning to the C tools too, which is currently in linux-next: https://patchwork.kernel.org/patch/9983667/ Signed-off-by: Ulf Magnusson <ulfalizer@gmail.com>
* am335x, shc: kconfig: Fix misspelled choice defaultUlf Magnusson2018-02-051-1/+1
| | | | | | | | | | | | | | | | | | | There is no EMMC symbol in the "enable different boot versions for the shc board" choice. SHC_EMMC was probably intended. No functional changes. Kconfig choices fall back on using the first (visible) symbol in the choice as the default if the default symbol is not visible. Discovered in Kconfiglib (https://github.com/ulfalizer/Kconfiglib), which prints the following warning: warning: the default selection EMMC (undefined) of <choice> (defined at board/bosch/shc/Kconfig:15) is not contained in the choice I've added a corresponding warning to the C tools too, which is currently in linux-next: https://patchwork.kernel.org/patch/9983667/ Signed-off-by: Ulf Magnusson <ulfalizer@gmail.com>
* Fix FreeBSD endian checksJustin Hibbits2018-02-051-0/+3
| | | | | | FreeBSD, like OpenBSD, uses BIG_ENDIAN, LITTLE_ENDIAN, and BYTE_ORDER, whereas Linux and compatibles use __-prefixed names. Define the names the same as the OpenBSD block below it.
* cmd: Make CONFIG_CMD_FPGA depend on CONFIG_FPGATuomas Tynkkynen2018-02-05357-357/+1
| | | | | | | | | | | | | | | | | | cmd/Makefile has: ifdef CONFIG_FPGA obj-$(CONFIG_CMD_FPGA) += fpga.o endif which means that if CONFIG_FPGA is not set, CONFIG_CMD_FPGA silently does nothing. Let's remove that Makefile conditional and instead express this equivalent dependency in Kconfig, so a lot of redundant # CONFIG_CMD_FPGA is not set can be removed from board defconfigs that don't actually have an FPGA. Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
View Lorry Controller Status