summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
* Revert "ti_armv7_common.h: Fix U-Boot location on eMMC"Tom Rini2016-05-02-2/+2
| | | | | | | | | We cannot change the long standing hard-coded offset for raw boot mode for everyone to accommodate how Android expects things to be done here. This reverts commit ef5ebe951bec72631cdbc7cef9079e6c684e5d0b. Signed-off-by: Tom Rini <trini@konsulko.com>
* omap3: Reduce logic/overo SPL max image sizeTom Rini2016-04-27-2/+2
| | | | | | | | | | | | While the OMAP3 has 64KiB of SRAM, per the TRM the download area is only from 0x40200000 to 0x4020F000 and exceeding that will cause failure to boot. Further, we need to make sure that we don't run into SRAM_SCRATCH_SPACE_ADDR as once SPL is running we will write values there and would corrupt our running image. Cc: Adam Ford <aford173@gmail.com> Cc: Steve Sakoman <sakoman@gmail.com> Signed-off-by: Tom Rini <trini@konsulko.com>
* ARM64: zynqmp: Cleanup config file after CMD moveMichal Simek2016-04-26-4/+0
| | | | | | | | | The patch: "configs: Re-sync almost all of cmd/Kconfig" (sha1: 78d1e1d0a157c8b48ea19be6170b992745d30f38) doesn't remove empty if-endif. This patch is fixing it. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* Merge branch 'master' of git://git.denx.de/u-boot-samsungTom Rini2016-04-26-0/+1
|\
| * exynos: Set CNTFRQAlexander Graf2016-04-14-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 73a1cb27 moved the check whether we should set the architected timer frequency from CONFIG_SYS_CLK_FREQ to CONFIG_TIMER_CLK_FREQ, but did not update all users of it. The one where I (finally) realized why KVM didn't work is the Arndale board, so this patch adds the respective define to it. Signed-off-by: Alexander Graf <agraf@suse.de> Fixes: 73a1cb27 Reviewed-by: York Sun <york.sun@nxp.com> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
* | pico-imx6ul: Update the defconfigTom Rini2016-04-25-8/+0
| | | | | | | | | | | | | | | | | | The defconfig/config.h file were merged but were already out of sync with mainline. This brings them further into line now. Cc: Richard Hu <richard.hu@technexion.com> Cc: Fabio Estevam <fabio.estevam@nxp.com> Signed-off-by: Tom Rini <trini@konsulko.com>
* | mmc: sdhci: add const qualifier to the name of struct sdhci_hostMasahiro Yamada2016-04-25-1/+1
| | | | | | | | | | | | | | This allows to drop annoying (char *) casts when setting the host name of struct sdhci_host. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* | ARM: hisilicon: hikey: Align memory node with upstream kernelPeter Griffin2016-04-25-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The memory node gets automatically generated by U-Boot in arch_fixup_fdt(), before passing control to the kernel using U-Boots representation of the dram banks. However the upstream kernel uses the memory node to carve-out regions of RAM for various purposes. To make this work without changing arch_fixup_fdt() which will effect many platforms we replicate the upstream memory node layout using the dram banks. Signed-off-by: Peter Griffin <peter.griffin@linaro.org> Reviewed-by: Tom Rini <trini@konsulko.com>
* | ARM: hisilicon: hikey: Add hikey & hi6220 dts from v4.6-rc3.Peter Griffin2016-04-25-0/+173
| | | | | | | | | | | | | | | | | | Import the upstream kernel dts into U-Boot. Currently only serial is supported, but a lot more DT changes are queued for v4.7. Signed-off-by: Peter Griffin <peter.griffin@linaro.org> Reviewed-by: Tom Rini <trini@konsulko.com>
* | ti_armv7_common.h: Fix U-Boot location on eMMCSemen Protsenko2016-04-25-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to common eMMC partition table for Android boot (see PARTS_DEFAULT definition in include/configs/dra7xx_evm.h), "bootloader" partition (where u-boot.img is stored) starts at 256 KiB. Which is equal to 512 sectors (as 1 MMC sector size is 512 bytes). This patch fixes CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR constant so that it points to correct address of "bootloader" partition and SPL is able to read, parse and run u-boot.img correctly. This change was originally done as part of patch [1] in omapzoom u-boot. Without this patch, SPL fails to parse U-Boot header with next error: mkimage signature not found - ih_magic = 4814325a While at it, also fix U-Boot partition size, which is 384 KiB (as stated in include/configs/dra7xx_evm.h). [1] http://omapzoom.org/?p=repo/u-boot.git;a=commit;h=742b82d0c0aa0ed8096c2225a00e9f350212efa9 Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> Reviewed-by: Tom Rini <trini@konsulko.com>
* | configs: Re-sync with cmd/KconfigTom Rini2016-04-25-1294/+0
| | | | | | | | | | | | | | Update the config.h and defconfig files for the commands that 8e3c036 converted over to Kconfig Signed-off-by: Tom Rini <trini@konsulko.com>
* | include/configs: Whitespace fixupTom Rini2016-04-25-675/+0
| | | | | | | | | | | | | | A number of moveconfig.py runs have left a instances of multiple empty lines in a row. Correct this to a single empty line. Signed-off-by: Tom Rini <trini@konsulko.com>
* | configs: Re-sync almost all of cmd/KconfigTom Rini2016-04-25-1500/+0
| | | | | | | | | | | | | | | | This syncs up the current cmd/Kconfig and include/configs/ files with the only exception being CMD_NAND. Due to how we have used this historically we need to take further care here when converting. Signed-off-by: Tom Rini <trini@konsulko.com>
* | configs: Re-sync CONFIG_USB_MUSB_HOSTTom Rini2016-04-25-12/+0
| | | | | | | | | | | | | | Now that CONFIG_USB_MUSB_HOST is part of Kconfig, migrate that over to the defconfig files. Signed-off-by: Tom Rini <trini@konsulko.com>
* | configs: Re-sync HUSH optionsTom Rini2016-04-25-405/+1
| | | | | | | | | | | | | | Move all cases of CONFIG_SYS_HUSH_PARSER out of the config.h files. Remove all cases of CONFIG_SYS_PROMPT_HUSH_PS2 as everyone uses the default. Signed-off-by: Tom Rini <trini@konsulko.com>
* | Merge branch 'master' of git://www.denx.de/git/u-boot-uniphierTom Rini2016-04-25-8/+44
|\ \
| * | ARM: uniphier: speed up loading kernel image from NOR deviceMasahiro Yamada2016-04-24-1/+2
| | | | | | | | | | | | | | | | | | Copy the kernel image double-word-wise rather than byte-wise. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: uniphier: reserve the last 64 byte of SDRAMMasahiro Yamada2016-04-24-0/+2
| | | | | | | | | | | | | | | | | | | | | The last 64 byte of each DDR channel of PH1-LD20 is periodically used as a scratch area for the DDR PHY training. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: uniphier: add PH1-LD20 SoC supportMasahiro Yamada2016-04-24-7/+40
| | | | | | | | | | | | | | | | | | This is the first ARMv8 SoC from Socionext Inc. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* | | Merge branch 'master' of git://www.denx.de/git/u-boot-imxTom Rini2016-04-25-0/+143
|\ \ \
| * | | Add initial support for Technexion's PICO-IMX6UL-EMMC boardFabio Estevam2016-04-19-0/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Technexion's PICO-IMX6UL-EMMC board. For information about this board, please visit: http://www.technexion.com/products/pico/pico-som/pico-imx6-emmc Signed-off-by: Richard Hu <richard.hu@technexion.com> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
| * | | board: ge: bx50v3: Use pwm for display backlightAkshay Bhat2016-04-19-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Setup the LCD backlight brightness control pin to use PWM Signed-off-by: Akshay Bhat <akshay.bhat@timesys.com> Cc: Stefano Babic <sbabic@denx.de>
* | | | dm: core: Add dev_get_addr_ptr() to return a pointer to the reg addressStefan Roese2016-04-25-0/+10
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some platforms (e.g. x86), the return value of dev_get_addr() can't be assigned to a pointer type variable directly. As there might be a difference between the size of fdt_addr_t and the pointer type. On x86 for example, "fdt_addr_t" is 64bit but "void *" only 32bit. So assigning the register base directly in dev_get_addr() results in this compilation warning: warning: cast to pointer from integer of different size This patch introduces the new function dev_get_addr_ptr() that returns a pointer to the 'reg' address that can be used by drivers in this case. Signed-off-by: Stefan Roese <sr@denx.de> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
* | | Merge branch 'master' of git://git.denx.de/u-boot-usbTom Rini2016-04-20-327/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configs/bcm28155_ap_defconfig configs/dra72_evm_defconfig configs/dra74_evm_defconfig configs/ma5d4evk_defconfig Signed-off-by: Tom Rini <trini@konsulko.com>
| * | | usb: gadget Move: CONFIG_G_DNL_* to KconfigSam Protsenko2016-04-20-146/+8
| | | | | | | | | | | | | | | | | | | | | | | | And also reformat defconfigs using "make savedefconfig" rule. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
| * | | usb: dwc3: Move CONFIG_USB_DWC3_PHY_* to KconfigSam Protsenko2016-04-20-9/+1
| | | | | | | | | | | | | | | | Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
| * | | usb: dwc3: Move CONFIG_USB_DWC3_OMAP to KconfigSam Protsenko2016-04-20-3/+1
| | | | | | | | | | | | | | | | Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
| * | | usb: dwc3: Move CONFIG_USB_DWC3_GADGET/HOST to KconfigSam Protsenko2016-04-20-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | Description was borrowed from kernel dwc3 Kconfig. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
| * | | usb: gadget: Move CONFIG_USB_GADGET_DOWNLOAD to KconfigSam Protsenko2016-04-20-45/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | While at it, remove obsolete CONFIG_USBDOWNLOAD_GADGET option from some config headers. This is also probably fixes am335x_baltos board. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
| * | | usb: gadget: Move CONFIG_USB_GADGET_DUALSPEED to KconfigSam Protsenko2016-04-20-91/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move CONFIG_USB_GADGET_DUALSPEED option to Kconfig and make all UDC controllers select USB_GADGET_DUALSPEED: - add next options to Kconfig selecting USB_GADGET_DUALSPEED: - USB_GADGET_ATMEL_USBA - USB_GADGET_DWC2_OTG - USB_DWC3 - CI_UDC - make USB_MUSB_GADGET select USB_GADGET_DUALSPEED While at it, make some related fixes: - remove DUALSPEED from configs that don't enable gadget support: - kwb.h - tseries.h - add missing USB_GADGET option to next configs: - novena_defconfig - pcm051_rev*_defconfig - xfi3_defconfig Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
| * | | usb: gadget: Move CONFIG_USB_GADGET_VBUS_DRAW to KconfigSam Protsenko2016-04-20-32/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The description was borrowed from kernel. Definitions were added to defconfig files in a way that "make savedefconfig" generates exactly the same file as used defconfig. Boards using 0 mA as CONFIG_USB_GADGET_VBUS_DRAW value were moved to use 2 mA (as minimal allowed by Kconfig). Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
* | | bx50v3: Enable CONFIG_OF_LIBFDT in defconfigAkshay Bhat2016-04-18-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | As of commit 69e173eb57d1f4848f070c83456096ba5d2ba1b4, CONFIG_OF_LIBFDT needs to be selected in defconfig instead of board specific header file. Hence enable CONFIG_OF_LIBFDT in defconfig. Signed-off-by: Akshay Bhat <akshay.bhat@timesys.com>
* | | efi_loader: Fall back to fdtfile naming conventionAlexander Graf2016-04-18-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there is no $fdtfile variable set, we still have a good chance that on 32bit arm the fdtfile really is just called $soc-$board.dtb. Enable the exports for $soc and $board in our distr defaults and make use of them in the efi boot script. Reported-by: Andreas Faerber <afaerber@suse.de> Reported-by: Stephen Warren <swarren@wwwdotorg.org> Signed-off-by: Alexander Graf <agraf@suse.de> Reviewed-by: Andreas Färber <afaerber@suse.de>
* | | efi_loader: Pass fdt address directly to bootefi cmdAlexander Graf2016-04-18-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bootefi cmd today fetches its device tree pointer from either the location appointed by "fdt addr" with a fallback to the U-Boot control fdt. This integration is unusual for U-Boot and diverges from the way we usually handle parameters to boot commands. So let's pass the fdt directly into the bootefi command instead and move the control fdt logic into the distro boot script. Signed-off-by: Alexander Graf <agraf@suse.de> Acked-by: Stephen Warren <swarren@wwwdotorg.org> Reviewed-by: Andreas Färber <afaerber@suse.de>
* | | Remove references to CONFIG_CMD_EXT3, no such commandRobert P. J. Day2016-04-18-2/+0
| | | | | | | | | | | | Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
* | | dragonboard410c: Fix environment variablesAndreas Färber2016-04-18-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Some variables for the distro boot commands were missing, using some custom name instead. Rename them. Cc: Mateusz Kulikowski <mateusz.kulikowski@gmail.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
* | | configs: ks2: move CMD_NAND to defconfigsLokesh Vutla2016-04-18-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | NAND is not yet enabled on all Keystone2 platforms. So enabled CMD_NAND in the respective defconfigs only if available. Reported-by: Nishanth Menon <nm@ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* | | memory: Move TI_AEMIF config to KCONFIGLokesh Vutla2016-04-18-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all Keystone2 devices has AEMIF NAND controller. So adding Kconfig entry for CONFIG_TI_AEMIF and enabling it in respective defconfigs on platforms with AEMIF controller. Reported-by: Nishanth Menon <nm@ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* | | dragonboard410c: Add CONFIG_SYS_CACHELINE_SIZEMateusz Kulikowski2016-04-18-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Add missing define to board header file. Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com> Acked-by: Marek Vasut <marex@denx.de> Reviewed-by: Andreas Färber <afaerber@suse.de>
* | | distro: Enable iso partition codeAlexander Graf2016-04-18-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Now that we can properly boot EFI payloads from iso el torito images, let's enable support for isos by default in the distro header. Signed-off-by: Alexander Graf <agraf@suse.de>
* | | efi_loader: Increase path string to 32 charactersAlexander Graf2016-04-18-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever we want to tell our payload about a path, we limit ourselves to a reasonable amount of characters. So far we only passed in device names - exceeding 16 chars was unlikely there. However by now we also pass real file path information, so let's increase the limit to 32 characters. That way common paths like "boot/efi/bootaa64.efi" fit just fine. Signed-off-by: Alexander Graf <agraf@suse.de>
* | | efi_loader: Pass file path to payloadAlexander Graf2016-04-18-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The payload gets information on where it got loaded from. This includes the device as well as file path. So far we've treated both as the same thing and always gave it the device name. However, in some situations grub2 actually wants to find its loading path to find its configuration file. So let's split the two semantically separte bits into separate structs and pass the loaded file name into our payload when we load it using "load". Signed-off-by: Alexander Graf <agraf@suse.de>
* | | cmd: fdt: Use separate CMD_FDT Kconfig entry instead of OF_LIBFDTMichal Simek2016-04-18-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create CMD_FDT Kconfig entry to have an option to disable fdt command which is not required for small configuration which requires libfdt only. Enable it by default for all targets which enables OF_LIBFDT. Signed-off-by: Michal Simek <michal.simek@xilinx.com> [trini: Fixup flea3/sandbox/id8313/siemens-am33xx/smartweb] Signed-off-by: Tom Rini <trini@konsulko.com>
* | | kconfig: Move CONFIG_OF_LIBFDT to KconfigMichal Simek2016-04-18-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch follows work done by: "Move CONFIG_OF_LIBFDT to Kconfig" (sha1: 69e173eb57d1f4848f070c83456096ba5d2ba1b4) Signed-off-by: Michal Simek <michal.simek@xilinx.com> [trini: Add xpress* to the patch] Signed-off-by: Tom Rini <trini@konsulko.com>
* | | bcm281xx: save ENV to MMCSteve Rae2016-04-18-2/+5
|/ / | | | | | | | | | | Enable saving ENV to MMC for the bcm281xx boards. Signed-off-by: Steve Rae <srae@broadcom.com>
* | ARM: rpi: fix 64-bit CONFIG_SYS_TEXT_BASEStephen Warren2016-04-16-0/+4
| | | | | | | | | | | | | | | | The Pi firmware has changed the default "kernel" load address for 64-bit mode. The authors have confirmed that this is a deliberate and long-term change. Adapt U-Boot to the new value. Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
* | fdt: implement dev_get_addr_name()Stephen Warren2016-04-15-0/+12
|/ | | | | | | | | This function parses the reg property based on an index found in the reg-names property. This is required for bindings that are written using reg-names rather than hard-coding indices in reg. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Simon Glass <sjg@chromium.org>
* Merge branch 'master' of git://www.denx.de/git/u-boot-microblazeTom Rini2016-04-13-15/+161
|\
| * ARM64: zynqmp: Use i2c cadence DM driverMichal Simek2016-04-13-9/+0
| | | | | | | | | | | | | | | | Use i2c cadence DM driver for all zynqmp targets except ZCU102 because I2C muxes and PCA953x are not supported in the tree yet. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Heiko Schocher <hs@denx.de>
| * ARM64: zynqmp: Enable pca953x driver for zcu102Michal Simek2016-04-13-0/+4
| | | | | | | | | | | | | | zcu102 has two pca953x on i2c bus 0. Chips 0x20 and 0x21. Enable option to work with these two chips. Signed-off-by: Michal Simek <michal.simek@xilinx.com>