summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Convert CONFIG_BOOTCOUNT_RAM to KconfigAlex Kiernan2018-02-2415-6/+16
| | | | | | | | This converts the following to Kconfig: CONFIG_BOOTCOUNT_RAM Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Reviewed-by: Lukasz Majewski <lukma@denx.de>
* Convert CONFIG_BOOTCOUNT_ENV to KconfigAlex Kiernan2018-02-2410-14/+18
| | | | | | | | This converts the following to Kconfig: CONFIG_BOOTCOUNT_ENV Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Reviewed-by: Lukasz Majewski <lukma@denx.de>
* Convert CONFIG_BOOTCOUNT_AM33XX to KconfigAlex Kiernan2018-02-2410-11/+9
| | | | | | | | | | This converts the following to Kconfig: CONFIG_BOOTCOUNT_AM33XX Reviewed-by: Lukasz Majewski <lukma@denx.de> Reviewed-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com> Acked-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com> Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
* Prepare for multiple bootcount driversAlex Kiernan2018-02-241-14/+11
| | | | | Reviewed-by: Lukasz Majewski <lukma@denx.de> Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
* Merge CONFIG_BOOTCOUNT and CONFIG_BOOTCOUNT_LIMITAlex Kiernan2018-02-243-10/+1
| | | | | | | | | CONFIG_BOOTCOUNT was only used in mx53ppd, merge it with CONFIG_BOOTCOUNT_LIMIT Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Reviewed-by: Lukasz Majewski <lukma@denx.de> Reviewed-by: Ian Ray <ian.ray@ge.com>
* Merge git://git.denx.de/u-boot-videoTom Rini2018-02-245-29/+102
|\
| * rockchip: video: update MAINTAINERSPhilipp Tomsich2018-02-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The video drivers (VOP, HDMI encoder, LVDS encoder, MIPI encoder) for Rockchip SOCs are self-contained and are mainly impacted by other changes in the architecture support (e.g. pinctrl, clocking, etc). Let's add these to the list of files maintained as part of the Rockchip port. Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Anatolij Gustschin <agust@denx.de>
| * rockchip: video: rk_vop: migrate to livetreePhilipp Tomsich2018-02-231-28/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This migrates rk_vop (the shared functions used by multiple VOP mini-drivers) to be compatible with a live tree. Unfortunately, there's (i) a lot of tree traversal needed for a VOP (as each active VOP vnode references back to the endpoints in the encoders and vice versa) to configure the connection between VOPs and encoders; (ii) the DTS binding is not too sane and one needs to walk a node's parents (the original code just assumed that the device would live 3 levels above the property linked through a phandle) until a UCLASS_DISPLAY device can be found. As part of the migration, the code for finding the enclosing display device has been changed to not assume a specific depth of nesting (i.e. we walk until we reach the root or find a matching device) and to use the newly introduced (in the same series) ofnode_get_parent() function. Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Tested-by: Klaus Goger <klaus.goger@theobroma-systems.com> Reviewed-by: Anatolij Gustschin <agust@denx.de>
| * rockchip: video: rk_hdmi: migrate to livetreePhilipp Tomsich2018-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | The rk_hdmi (shared functions for multiple HDMI mini-drivers) has been using devfdt_get_addr() to read the HDMI controller's IO base address. This will cause a failure with a live tree. This changes the driver to use dev_read_addr() which is safe both for flat trees and live trees. Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Tested-by: Klaus Goger <klaus.goger@theobroma-systems.com> Reviewed-by: Anatolij Gustschin <agust@denx.de>
| * core: add ofnode_get_by_phandle() apiKever Yang2018-02-232-0/+21
| | | | | | | | | | | | | | | | | | | | | | We need to get ofnode from a phandle, add interface to support both live dt and fdt. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Tested-by: Klaus Goger <klaus.goger@theobroma-systems.com> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
| * core: ofnode: add ofnode_get_parent functionPhilipp Tomsich2018-02-232-0/+22
| | | | | | | | | | | | | | | | | | | | The Rockchip video drivers need to walk the ofnode-parrents to find an enclosing device that has a UCLASS_DISPLAY driver bound. This adds a ofnode_get_parent()-function that returns the parent-node. Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Tested-by: Klaus Goger <klaus.goger@theobroma-systems.com> Reviewed-by: Anatolij Gustschin <agust@denx.de>
* | Remove config_distro_defaults.hAdam Ford2018-02-2350-95/+1
| | | | | | | | | | | | | | With the contents of config_distro_defaults.h migrated to Kconfig, we can remove this header file completely Signed-off-by: Adam Ford <aford173@gmail.com>
* | Convert CONFIG_BOOTP_BOOTPATH et al to KconfigAdam Ford2018-02-23804-1265/+1208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This converts the following to Kconfig: CONFIG_BOOTP_BOOTPATH CONFIG_BOOTP_DNS CONFIG_BOOTP_GATEWAY CONFIG_BOOTP_HOSTNAME CONFIG_BOOTP_PXE CONFIG_BOOTP_SUBNETMASK CONFIG_CMDLINE_EDITING CONFIG_AUTO_COMPLETE CONFIG_SYS_LONGHELP CONFIG_SUPPORT_RAW_INITRD CONFIG_ENV_VARS_UBOOT_CONFIG Signed-off-by: Adam Ford <aford173@gmail.com> [trini: Re-run the migration] Signed-off-by: Tom Rini <trini@konsulko.com>
* | Merge git://git.denx.de/u-boot-shTom Rini2018-02-233-32/+8
|\ \
| * | mmc: uniphier-sd: Add compatible strings for RCar Gen2Marek Vasut2018-02-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add DT compatible strings for RCar Gen2 SoCs, so that this driver can bind with them. Unlike Gen3, which uses 64bit FIFO, the Gen2 uses 16bit FIFO. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Jaehoon Chung <jh80.chung@samsung.com> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | sh: Do not provide strncmpTom Rini2018-02-231-31/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With modern GCC, we get warnings such as: cmd/jffs2.c: In function 'mtdparts_init': arch/sh/include/asm/string.h:110:38: warning: array subscript is above array bounds [-Warray-bounds] : "0" (__cs), "1" (__ct), "r" (__cs+__n) ~~~~^~~~ This results in a small size reduction as well. Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Signed-off-by: Tom Rini <trini@konsulko.com>
| * | sh: Use -m2a-nofpu onlyTom Rini2018-02-211-1/+1
| |/ | | | | | | | | | | | | | | | | | | Based on reading over the GCC manual, passing both -m2a and -m2a-nofpu are redundant, as -m2a-nofpu will provide functional code for both. As -m2a-nofpu functions with more toolchains and does what is expected, switch. Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Signed-off-by: Tom Rini <trini@konsulko.com>
* | Merge git://git.denx.de/u-boot-usbTom Rini2018-02-2315-35/+75
|\ \
| * | cmd: fastboot: Kconfig: solve config issuePatrick Delaunay2018-02-211-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When FASTBOOT is activated, only one the supported device is supported in code at the same time - CONFIG_FASTBOOT_FLASH_MMC_DEV - CONFIG_FASTBOOT_FLASH_NAND_DEV But Today the choice is not exclusive in Kconfig and that cause Kconfig issue when : - CONFIG_FASTBOOT, CONFIG_MMC, CONFIG_NAND are activated - CONFIG_FASTBOOT_FLASH_MMC_DEV = 0 - CONFIG_FASTBOOT_FLASH_NAND_DEV is not activated The patch add a choice in Kconfig to select the FLASH provider - CONFIG_FASTBOOT_FLASH_MMC - CONFIG_FASTBOOT_FLASH_NAND Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
| * | dfu: tftp: Fix arm64 build warningsMarek Vasut2018-02-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix two build warnings when building for arm64: drivers/dfu/dfu_tftp.c: In function ‘dfu_tftp_write’: drivers/dfu/dfu_tftp.c:59:37: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] ret = dfu_write_from_mem_addr(dfu, (void *)addr, len); ^ and drivers/dfu/dfu_tftp.c: In function ‘dfu_tftp_write’: drivers/dfu/dfu_tftp.c:41:8: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 4 has type ‘__kernel_size_t {aka long unsigned int}’ [-Wformat=] debug("%s: image name: %s strlen: %u\n", __func__, sb, strlen(sb)); ^ Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Lukasz Majewski <lukma@denx.de>
| * | dfu: Rename _FUNCTION_DFU to DFU_OVER_Marek Vasut2018-02-217-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do the following to make the symbol names less confusing. sed -i "s/\([TU][^_]\+\)_FUNCTION_DFU/DFU_OVER_\1/g" \ `git grep _FUNCTION_DFU | cut -d ":" -f 1 | sort -u` Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Lukasz Majewski <lukma@denx.de>
| * | dfu: Fix up the Kconfig messMarek Vasut2018-02-215-10/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up the screaming mess of configuration options that DFU is. It was impossible to configure DFU such that TFTP is enabled and USB is not, this patch fixes that and assures that DFU TFTP and DFU USB can be enabled separatelly and that the correct pieces of code are compiled in. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Lukasz Majewski <lukma@denx.de>
| * | usb: kbd: select SYS_STDIO_DEREGISTERHeinrich Schuchardt2018-02-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | If SYS_STDIO_DEREGISTER is not selected and USB_KEYBOARD is selected U-Boot cannot be built due to missing function stdio_deregister_dev. So USB_KEYBOARD should select SYS_STDIO_DEREGISTER. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
| * | usb: gadget: sdp: fix pointer cast warnings for 64bit archsAndre Heider2018-02-211-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SDP protocol contains multiple 32bit pointers. Add a helper function to get a valid pointer from these values and use it. This fixes the following warnings: drivers/usb/gadget/f_sdp.c: In function ‘sdp_rx_data_complete’: drivers/usb/gadget/f_sdp.c:347:10: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] memcpy((void *)sdp->dnl_address, req->buf + 1, datalen); ^ drivers/usb/gadget/f_sdp.c: In function ‘sdp_jump_imxheader’: drivers/usb/gadget/f_sdp.c:625:10: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] entry = (void *)headerv2->entry; ^ drivers/usb/gadget/f_sdp.c: In function ‘sdp_handle_in_ep’: drivers/usb/gadget/f_sdp.c:668:20: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] memcpy(&data[1], (void *)sdp_func->dnl_address, datalen); ^ drivers/usb/gadget/f_sdp.c:679:31: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] status = sdp_jump_imxheader((void *)sdp_func->jmp_address); ^ Signed-off-by: Andre Heider <a.heider@gmail.com>
| * | usb: gadget: sdp: add missing line breaksAndre Heider2018-02-213-11/+11
| |/ | | | | | | | | | | | | | | Cosmetic change. Signed-off-by: Andre Heider <a.heider@gmail.com> Reviewed-by: Lukasz Majewski <lukma@denx.de> Acked-by: Stefan Agner <stefan.agner@toradex.com>
* | config_whitelist: remove false-positive CONFIG optionsMasahiro Yamada2018-02-231-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U-Boot pulled in several core makefiles from Linux. The following are not used in U-Boot: - CONFIG_DEBUG_SECTION_MISMATCH - CONFIG_FTRACE_MCOUNT_RECORD - CONFIG_GCOV_KERNEL - CONFIG_GCOV_PROFILE_ALL - CONFIG_KASAN - CONFIG_MODVERSIONS We can remove the unused code if we like. (although it will get the scripts out of sync) CONFIG_BOOM and CONFIG_HIS_DRIVER are just mentioned in the comment block of scripts/basic/fixdep.c CONFIG_SHELL is not configuration, but a variable for internal-use. It is just a historical misnomer in Kbuild. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | omap3_logic: Fix Environmental locationAdam Ford2018-02-231-0/+1
| | | | | | | | | | | | | | For the omap3_logic boards, the environment is always in NAND. This removes the ENV_IS_IN_FAT flag to eliminate the extra chatter. Signed-off-by: Adam Ford <aford173@gmail.com>
* | sf: Add ISSI IS25LP256 entryMarek Vasut2018-02-231-0/+1
| | | | | | | | | | | | | | Add entry for ISSI IS25LP256 part. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Jagan Teki <jagan@openedev.com>
* | Makefile: Don't mess with .text section location for selected archesAlexey Brodkin2018-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of architectures have .text section situated in the very beginning of U-Boot binary and thus it is very logical that CONFIG_SYS_TEXT_BASE is used on final linkage step to specify where U-Boot gets linked to. For that we pass the following construction to the LD: ---------------------------->8----------------------- xxx-ld ... -Ttext $(CONFIG_SYS_TEXT_BASE) ... ---------------------------->8----------------------- But there could be exceptions. For example: 1. In case of ARCv2 we want to put vectors table in its own section .ivt in front of .text section which means we need either add an offset to CONFIG_SYS_TEXT_BASE to compensate for .ivt or don't pass "-Ttext" to the LD at all and specify link base in linker script directly. 2. Some architectures even though have .text section in the very beginning of the U-Boot image still use different symbols to specify link-base: * NIOS2: CONFIG_SYS_MONITOR_BASE (which I really like because that exactly what makes sense - where out image starts but not beginning of its .text section which just happened to match the whole image beginning) * EXTENSA: CONFIG_SYS_TEXT_ADDR * X86: Which doesn't use CONFIG_SYS_MONITOR_BASE in case of EFI otherwise sets explicit link base in u-boot.lds I think that's good to allow for flexibility and don't require each and every architecture or even platform to specify CONFIG_SYS_TEXT_BASE as well as use it to set .text section location. So let's only pass "-Ttext xxx" for those architectures who don't set link-base explicitly in their linker scripts. This patch iaddresses comments for previously sent https://patchwork.ozlabs.org/patch/867540/. Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Max Filippov <jcmvbkbc@gmail.com> Cc: Simon Glass <sjg@chromium.org> Cc: Tom Rini <trini@konsulko.com>
* | arm64: show_regs: Dump the LRs HW valuesKarl Beldan2018-02-231-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | These were dropped in [1], after relocation, for their values offset by reloc_off. Unconditionally show the HW values and add a '(reloc)' hint for the offset values showed after relocation. Also, the LRs' dumps are now formatted the same way the other regs' are. [1] Commit 082693f4 ("arm64 :show_regs: show the address before relocation") Signed-off-by: Karl Beldan <karl.beldan+oss@gmail.com>
* | tools/kwbimage: fix LibreSSL buildJonathan Gray2018-02-231-2/+3
| | | | | | | | | | | | | | | | Fix build after addition of RSA_get0_key() to LibreSSL. Patch from Theo Buehler and Stuart Henderson. Signed-off-by: Theo Buehler <tb@openbsd.org> Signed-off-by: Stuart Henderson <sthen@openbsd.org>
* | net: Remove Xilinx ll_temac driverMichal Simek2018-02-2311-1772/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | ll_temac driver was used by Xilinx Microblaze big endian and Xilinx ppc405/ppc440 SoCs. ppc support was removed by: "powerpc: remove 4xx support" (sha1: 98f705c9cefdfdba62c069821bbba10273a0a8ed) and Microblaze BE is not tested for a long time that's why this driver can be removed because none is going to updated it to DM anyway. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
* | configs: am335x_evm_usbspl: Add CONFIG_SPL_NET_VCI_STRINGFaiz Abbas2018-02-231-0/+1
| | | | | | | | | | | | | | | | Add CONFIG_SPL_NET_VCI_STRING to enable USB-Ethernet boot mode support. Signed-off-by: Faiz Abbas <faiz_abbas@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* | fdt: Fixup only valid memory banksThierry Reding2018-02-231-0/+7
| | | | | | | | | | | | | | | | Memory banks with address 0 and size 0 are empty and should not be passed to the OS via device tree. Acked-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
* | ns16550: Fix mem mapped endian checkBernhard Messerklinger2018-02-231-2/+2
| | | | | | | | | | | | | | | | | | Do a explicit check for CONFIG_SYS_BIG_ENDIAN and CONFIG_SYS_LITTLE_ENDIAN to avoid errors on platforms where both are undefined (x86). Signed-off-by: Bernhard Messerklinger <bernhard.messerklinger@br-automation.com> Reviewed-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
* | pci: Fix decode regions for memory banksBernhard Messerklinger2018-02-231-1/+16
| | | | | | | | | | | | | | | | Since memory banks may not be located behind each other we need to add them separately. Signed-off-by: Bernhard Messerklinger <bernhard.messerklinger@br-automation.com> Reviewed-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
* | defconfig: k2x_hs_evm: Re-enable TI_SECURE_DEVICE in HS K2x partsAndrew F. Davis2018-02-233-0/+6
| | | | | | | | | | | | | | | | These got removed in config re-syncs due to a Kconfig bug. Add these back here. Signed-off-by: Andrew F. Davis <afd@ti.com> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
* | env: Fix missed getenv_ulong to env_get_ulong conversionAndrew F. Davis2018-02-231-1/+1
| | | | | | | | | | | | | | | | | | This seems to have been missed, possibly due to the inability to enable TI_SECURE_DEVICE on Keystone2 devices previously. Fixes: bfebc8c965e4 ("env: Rename getenv_hex(), getenv_yesno(), getenv_ulong()") Signed-off-by: Andrew F. Davis <afd@ti.com> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
* | ARM: Kconfig: Move TI_SECURE_DEVICE to a common areaAndrew F. Davis2018-02-232-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TI_SECURE_DEVICE is used by both OMAP2+ and Keystone2 family devices, and so when ARCH_OMAP2PLUS was used to gate off the OMAP2+ Kconfig Keystone2 family devices lost this config option. Move this option out of mach-omap2 Kconfig to a spot accessible by both families. We picked arch/arm/Kconfig over the TI specific board/ti/ location as this option is not specific to our boards but rather our architecture. Plus at some point this option can be changed to just SECURE_DEVICE, as having secure parts is not exclusive to TI and so other vendors can interpret this option as needed by their device configurations. Fixes: a93fbf4a7892 ("ARM: omap2+: rename config to ARCH_OMAP2PLUS and consolidate Kconfig") Signed-off-by: Andrew F. Davis <afd@ti.com> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
* | xtensa: clean up CONFIG_SYS_TEXT_ADDRMax Filippov2018-02-233-6/+5
| | | | | | | | | | | | | | Drop CONFIG_SYS_MEMORY_TOP. Rename CONFIG_SYS_TEXT_ADDR to XTENSA_SYS_TEXT_ADDR. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
* | configs: Re-sync with CONFIG_DISTRO_DEFAULTSTom Rini2018-02-23111-753/+223
|/ | | | | | | | A number of platforms include config_distro_defaults.h but do not enable CONFIG_DISTRO_DEFAULTS. As they plainly intended to, set that flag and re-sync config files. Signed-off-by: Tom Rini <trini@konsulko.com>
* Prepare v2018.03-rc3v2018.03-rc3Tom Rini2018-02-201-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* script: Make the get_default_envs.sh script working with newest u-bootLukasz Majewski2018-02-201-6/+15
| | | | | | | | | | | | | | | | | This commit fixes several issues: - After moving env related code to ./env directory the env_common.o file is no longer present in the system (has been replaced with built-in.o). - Use ${OBJCOPY} if available, fallback to system default's objcopy if not present. - Extend the script to accept different build directory than current one. It is extremely handy with OE usage, where source code is separated from build. Signed-off-by: Lukasz Majewski <lukma@denx.de> Tested-by: Alex Kiernan <alex.kiernan@gmail.com>
* env: mmc/fat/ext4: make sure that the MMC sub-system is initialized before ↵Faiz Abbas2018-02-203-0/+8
| | | | | | | | | | | | | using it When booting from a non-MMC device, the MMC sub-system may not be initialized when the environment is first accessed. We need to make sure that the MMC sub-system is ready in even a non-MMC boot case. Therefore, initialize mmc before loading environment from it. Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
* Merge git://git.denx.de/u-boot-mmcTom Rini2018-02-1918-111/+1125
|\
| * mmc: Fix uninitialised priv memberAlex Kiernan2018-02-191-1/+1
| | | | | | | | | | | | | | | | | | When using omap_hsmmc without the device model then the allocation of mmc->priv ends up uninitialised. Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Tested-by: Robert Nelson <robertcnelson@gmail.com> Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org>
| * mmc: fix bug in mmc_startup_v4()Jean-Jacques Hiblot2018-02-192-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The correspondence between mmc versions as used in u-boot and the version numbers reported in register EXT_CSD_REV is wrong for versions above and including MMC_VERSION_4_41. All those versions were shifted by one: real 4.5 hardware appeared to be MMC_VERSION_5_0. Fix this by adding the missing version in the correspondence table. Reported-by: eil Eilmsteiner Heribert <eil@keba.com> Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org>
| * mmc: Fix bug in sd_set_card_speed()Jean-Jacques Hiblot2018-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | After settings the speed of the sd with the switch command, a check is done to make sure that the new speed has been set. The current check has a masking error: speed are encoded on 4 bits only. Fix it by masking the upper bits. This fixes a problem seen with QEmu emulating a vexpress-a15. Reported-by: Jonathan Gray <jsg@jsg.id.au> Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com> Tested-by: Jonathan Gray <jsg@jsg.id.au>
| * configs: dra7xx_evm/dra7xx_hs_evm: Enable MMC HS200 and SD UHS supportJean-Jacques Hiblot2018-02-192-0/+6
| | | | | | | | | | | | By default UHS and HS200 are not enabled. Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
| * ARM: DRA7x/AM57x: Add MMC/SD fixups for rev1.0 and rev 1.1Kishon Vijay Abraham I2018-02-192-0/+59
| | | | | | | | | | | | | | | | | | | | Since DRA7xx/AM57xx SR1.1 and SR1.0 has errata to limit the frequency of MMC1 to 96MHz and frequency of MMC2 to 48MHz for AM572x SR1.1, limit the frequency and disable higher speed modes for those revision. Also use the recommended IO delays (those tagged with "rev11") Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
View Lorry Controller Status