summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
...
* | | | omapl138_lcdk: remove empty ifdef blockFabien Parent2017-01-14-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Small clean-up. Signed-off-by: Fabien Parent <fparent@baylibre.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* | | | mkimage: Add support for signing with pkcs11George McCollister2017-01-14-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for signing with the pkcs11 engine. This allows FIT images to be signed with keys securely stored on a smartcard, hardware security module, etc without exposing the keys. Support for other engines can be added in the future by modifying rsa_engine_get_pub_key() and rsa_engine_get_priv_key() to construct correct key_id strings. Signed-off-by: George McCollister <george.mccollister@gmail.com>
* | | | ti: am335x: mmc: Set CONFIG_SYS_MMC_MAX_DEVICEEmmanuel Vadot2017-01-14-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Set CONFIG_SYS_MMC_MAX_DEVICE to 2 for am335x SoC. This define is needed in the API code. Signed-off-by: Emmanuel Vadot <manu@bidouilliste.com>
* | | | ARM: omap3_logic: Use DEFAULT_LINUX_BOOT_ENV from ti_armv7_commonAdam Ford2017-01-14-19/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we're including ti_armv7_common, let's pull in DEFAULT_LINUX_BOOT_ENV and remove unnecessary duplicative definitions. This patch also renames a few environmental variables to match what is inside ti_armv7_common. This should help future-proof any subsequent memory or memory location changes. Signed-off-by: Adam Ford <aford173@gmail.com>
* | | | iopoll: import include/linux/iopoll.h from Linux 4.9Masahiro Yamada2017-01-14-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was imported from Linux 4.9 and adjusted for U-Boot. - Replace the license block with SPDX - Drop all *_atomic variants, which make no sense for U-Boot - Remove the sleep_us argument, which makes no sense for U-Boot Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* | | | time: import time_after, time_before and friends from LinuxMasahiro Yamada2017-01-14-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not safe to compare timer values directly. On 32-bit systems, for example, timer_get_us() wraps around every 72 min. (2 ^ 32 / 1000000 =~ 4295 sec =~ 72 min). Depending on the get_ticks() implementation, it may wrap more frequently. The 72 min might be possible on the use of U-Boot. Let's borrow time_after, time_before, and friends to solve the wrap-around problem. These macros were copied from include/linux/jiffies.h of Linux 4.9. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | | | typecheck: import include/linux/typecheck.h from Linux 4.9Masahiro Yamada2017-01-14-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | Copied from Linux 4.9. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* | | | time: move timer APIs to include/time.hMasahiro Yamada2017-01-14-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The include/common.h is a collection of unrelated declarations, macros, etc. It is horrible to include such a cluttered header just for some timer functions. Split out timer functions into include/time.h. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | | | delay: collect {m, n, u}delay declarations to include/linux/delay.hMasahiro Yamada2017-01-14-7/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, mdelay() and udelay() are declared in include/common.h, while ndelay() in include/linux/compat.h. It would be nice to collect them into include/linux/delay.h like Linux. While we are here, fix the ndelay() implementation; I used the DIV_ROUND_UP() instead of (x)/1000 because it must wait *longer* than the given period of time. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | | | Convert CONFIG_SPL_RAM_DEVICE to defconfigStefan Agner2017-01-14-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This converts the following to Kconfig: CONFIG_SPL_RAM_DEVICE Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
* | | | ti_armv7_common: env: Use FIT image configs by defaultAndrew F. Davis2017-01-14-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to specify a FIT configuration that will automatically use the correct images from the FIT blob. Signed-off-by: Andrew F. Davis <afd@ti.com>
* | | | arm: Remove unregister MACH_TYPE_xxx usesTom Rini2017-01-14-33/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before we can sync with the latest mach-types.h file from the Linux Kernel we need to remove some instances of MACH_TYPE_xxx from our sources. As these values have been removed from the canonical upstream source we should not be using them either, so drop. Cc: Tom Warren <twarren@nvidia.com> Cc: Lucas Stach <dev@lynxeye.de> Cc: Luka Perkov <luka@openwrt.org> Cc: Stephen Warren <swarren@wwwdotorg.org> Cc: Heiko Schocher <hs@denx.de> Cc: Thomas Weber <weber@corscience.de> Cc: Lucile Quirion <lucile.quirion@savoirfairelinux.com> Cc: Matthias Weisser <weisserm@arcor.de> Cc: Suriyan Ramasami <suriyan.r@gmail.com> Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Cc: Bo Shen <voice.shen@atmel.com> Cc: Nick Thompson <nick.thompson@gefanuc.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Erik van Luijk <evanluijk@interact.nl> Cc: Lokesh Vutla <lokeshvutla@ti.com> Signed-off-by: Tom Rini <trini@konsulko.com>
* | | | omap3_igep00x0: Rework MACH_TYPE and status LED logic slightlyTom Rini2017-01-14-3/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | The MACH_TYPE for IGEP0032 was never officially used and has been removed from upstream, so we must not use it. In order to remove this we need to rework the status LED logic. Cc: Enric Balletbo i Serra <eballetbo@gmail.com> Signed-off-by: Tom Rini <trini@konsulko.com> Acked-by: Enric Balletbo i Serra <eballetbo@gmail.com>
* | | rockchip: Add PXE and DHCP to the default boot targetsSjoerd Simons2017-01-11-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Now that at least on the firefly board we have network support, enable PXE and DHCP boot targets by default. Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> Acked-by: Simon Glass <sjg@chromium.org> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
* | | rockchip: configs: make rk3036 env config same as rk3288Jacob Chen2017-01-11-3/+14
| | | | | | | | | | | | | | | | | | To make rockchip soc keep the same partition map Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
* | | rockchip: configs: correct env offset when enable ↵Jacob Chen2017-01-11-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_ROCKCHIP_SPL_BACK_TO_BROM With CONFIG_ROCKCHIP_SPL_BACK_TO_BROM enabled, the environment is inside u-boot. So solve it by moving environment after u-boot. Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
* | | rockchip: config: popmetal: enable the USB host controller and functionKever Yang2017-01-11-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RK3288 using the dwc2 USB host controller, enable it and other usb host funtion like storage and ether. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> Acked-by: Simon Glass <sjg@chromium.org> Added rockchip: tag: Signed-off-by: Simon Glass <sjg@chromium.org>
* | | Merge tag 'xilinx-for-v2017.03' of git://www.denx.de/git/u-boot-microblazeTom Rini2017-01-11-9/+35
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xilinx changes for v2017.03 - ATF handoff - DT syncups - gem: Use wait_for_bit(), add simple clk support - Simple clk driver for ZynqMP - Other small changes
| * | | ARM64: zynqmp: Move CONFIG_AHCI from board fileMichal Simek2017-01-11-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Move configuration option from board file to defconfig. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | | ARM64: zynqmp: Enable fastboot for first SD/MMC/EMMC deviceSiva Durga Prasad Paladugu2017-01-10-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DNL numbers are not changed that's why fastboot needs to be called with -i parameter (Xilinx vendor id). - Show available devices sudo fastboot -i 0x03fd devices xilinx_zynqmp_zcu100 fastboot - Stop fastboot and go back to U-Boot prompt sudo fastboot -i 0x03fd continue - Reboot the board sudo fastboot -i 0x03fd reboot - Get internal variables sudo fastboot -i 0x3fd getvar bootloader-version bootloader-version: U-Boot 2016.07-00026-g19bd53044817 sudo fastboot -i 0x3fd getvar downloadsize downloadsize: 0x06000000 sudo fastboot -i 0x3fd getvar version version: 0.4 (regular variables needs to have fastboot. prefix - there is also serialno variable which should be define as serial#) - Format SD/MMC/EMMC card sudo fastboot -i 0x3fd oem format - Write images to boot and Linux partition sudo fastboot -i 0x3fd flash boot sd.img sudo fastboot -i 0x3fd flash Linux os.img - Creating sd.img or os.img $ dd if=/dev/zero of=sd.img bs=1024 count=1024 $ mkfs.vfat sd.img $ mkdir sd-mount $ mount -o loop sd.img sd-mount $ echo foo > sd-mount/bar $ umount sd-mount partitions setting should be checked by running gpt command. Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | | ARM: zynq: Remove CONFIG_BOOTP_SERVERIPMichal Simek2017-01-10-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do the same change which was done in ZynqMP by: "ARM64: zynqmp: Remove CONFIG_BOOTP_SERVERIP" (sha1: a8b6a156c0f7fb99502229e454bc9c3b38645280) Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | | ARM: zynq: Move CONFIG_SYS_TEXT_BASE to KconfigMichal Simek2017-01-10-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | Enable CONFIG_SYS_TEXT_BASE via Kconfig. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | | ARM64: zynqmp: Add support to save env to FATSiva Durga Prasad Paladugu2017-01-10-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support to save environment as a file of FAT filesystem on to SD card. The file will be saved with name uEnv.txt. This environment will be retrieved during boot. Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | | ARM64: zynqmp: Increase environment size to 32KSiva Durga Prasad Paladugu2017-01-10-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase environment size to 32K as the current default environment itself is greater than 4K. Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | | microblaze: Enable option to overwrite default variablesMichal Simek2017-01-10-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Enable overwriting variables out of main config file. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | | microblaze: Remove hardcoded IP address from configMichal Simek2017-01-10-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | IP addresses shouldn't be hardcoded in board config. This patch removes them. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | | lib: Add WATCHDOG_RESET to wait_bit.hMichal Simek2017-01-10-0/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | wait_for_bit() is missing reset watchdog in case watchdog is configured. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* | | mmc: move more driver config options to KconfigMasahiro Yamada2017-01-11-56/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move (and rename) the following CONFIG options to Kconfig: CONFIG_DAVINCI_MMC (renamed to CONFIG_MMC_DAVINCI) CONFIG_OMAP_HSMMC (renamed to CONFIG_MMC_OMAP_HS) CONFIG_MXC_MMC (renamed to CONFIG_MMC_MXC) CONFIG_MXS_MMC (renamed to CONFIG_MMC_MXS) CONFIG_TEGRA_MMC (renamed to CONFIG_MMC_SDHCI_TEGRA) CONFIG_SUNXI_MMC (renamed to CONFIG_MMC_SUNXI) They are the same option names as used in Linux. This commit was created as follows: [1] Rename the options with the following command: find . -name .git -prune -o ! -path ./scripts/config_whitelist.txt \ -type f -print | xargs sed -i -e ' s/CONFIG_DAVINCI_MMC/CONFIG_MMC_DAVINCI/g s/CONFIG_OMAP_HSMMC/CONFIG_MMC_OMAP_HS/g s/CONFIG_MXC_MMC/CONFIG_MMC_MXC/g s/CONFIG_MXS_MMC/CONFIG_MMC_MXS/g s/CONFIG_TEGRA_MMC/CONFIG_MMC_SDHCI_TEGRA/g s/CONFIG_SUNXI_MMC/CONFIG_MMC_SUNXI/g ' [2] Commit the changes [3] Create entries in driver/mmc/Kconfig. (copied from Linux) [4] Move the options with the following command tools/moveconfig.py -y -r HEAD \ MMC_DAVINCI MMC_OMAP_HS MMC_MXC MMC_MXS MMC_SDHCI_TEGRA MMC_SUNXI [5] Sort and align drivers/mmc/Makefile for readability Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Marek Vasut <marex@denx.de>
* | | ARM: davinci: remove unused CONFIG_DAVINCI_MMC_SD1Masahiro Yamada2017-01-11-2/+0
| | | | | | | | | | | | | | | | | | | | | This CONFIG is not referenced from anywhere. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Marek Vasut <marex@denx.de>
* | | mmc: move DesignWare-based drivers to KconfigMasahiro Yamada2017-01-11-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move (and rename) the following CONFIG options to Kconfig: CONFIG_EXYNOS_DWMMC (renamed to CONFIG_MMC_DW_EXYNOS) CONFIG_HIKEY_DWMMC (renamed to CONFIG_MMC_DW_K3) CONFIG_SOCFPGA_DWMMC (renamed to CONFIG_MMC_DW_SOCFPGA) The "HIKEY" is a board name, so it is not suitable for the MMC controller name. I am following the name used in Linux. This commit was generated as follows: [1] Rename the config options with the following command: find . -name .git -prune -o ! -path ./scripts/config_whitelist.txt \ -type f -print | xargs sed -i -e ' s/CONFIG_EXYNOS_DWMMC/CONFIG_MMC_DW_EXYNOS/g s/CONFIG_HIKEY_DWMMC/CONFIG_MMC_DW_K3/g s/CONFIG_SOCFPGA_DWMMC/CONFIG_MMC_DW_SOCFPGA/g ' [2] Commit the changes [3] Create the entries in drivers/mmc/Kconfig (with default y for EXYNOS and SOCFPGA) [4] Run the following: tools/moveconfig.py -y -r HEAD MMC_DW_EXYNOS MMC_DW_K3 MMC_DW_SOCFPGA [5] Sort and align drivers/mmc/Makefile for readability [6] Clean-up doc/README.socfpga by hand Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Marek Vasut <marex@denx.de>
* | | mmc: move CONFIG_DWMMC to Kconfig, renaming to CONFIG_MMC_DWMasahiro Yamada2017-01-11-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit was created as follows: [1] Rename the option with the following command: find . -name .git -prune -o ! -path ./scripts/config_whitelist.txt \ -type f -print | xargs sed -i -e 's/CONFIG_DWMMC/CONFIG_MMC_DW/g' [2] create the entry for MMC_DW in drivers/mmc/Kconfig (the prompt and help were copied from Linux) [3] run "tools/moveconfig.py -y MMC_DW" [4] add "depends on MMC_DW" to the MMC_DW_ROCKCHIP entry [5] Clean-up doc/README.socfpga by hand Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Marek Vasut <marex@denx.de>
* | | ARM: socfpga: remove unused CONFIG option and cleanup README.socfpgaMasahiro Yamada2017-01-11-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_SOCFPGA_DWMMC_FIFO_DEPTH is defined in the socfpga_common.h, but not referenced at all. Remove. Also, clean-up the README.socfpga. CONFIG_MMC should not be defined in the header since it was moved to Kconfig by commit c27269953b94 ("mmc: complete unfinished move of CONFIG_MMC"). I see no grep hit for the others. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Marek Vasut <marex@denx.de>
* | | mmc: sdhci: remove the SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWERJaehoon Chung2017-01-11-1/+0
| | | | | | | | | | | | | | | | | | Ther is no usage anywhere. It doesn't need to maintain this bit. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
* | | mmc: sdhci: use the bitops APIs in sdhci.hJaehoon Chung2017-01-11-56/+56
| | | | | | | | | | | | | | | | | | The using the bitops is too easy controlling than now. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
* | | mmc: sdhci: move the callback function into sdhci_opsJaehoon Chung2017-01-11-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | callback function should be moved into sdhci_ops struct. Other controller can use these ops for controlling clock or their own specific register. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
* | | mmc: change the set_ios return type from void to intJaehoon Chung2017-01-11-1/+1
| | | | | | | | | | | | | | | | | | To maintain consistency, set_ios type of legacy mmc_ops changed to int. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
* | | mmc: sdhci: remove the SDHCI_QUIRK_NO_CDJaehoon Chung2017-01-11-1/+0
| | | | | | | | | | | | | | | | | | | | | This quirk doesn't need anymore. It's replaced to get_cd callback function. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
* | | mmc: sdhci: add the get_cd callback function in sdhci_opsJaehoon Chung2017-01-11-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Some SoCs can have their own card dect scheme. Then they may use this get_cd callback function after implementing init in their drivers. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
* | | Merge git://git.denx.de/u-boot-dmTom Rini2017-01-10-3/+7
|\ \ \
| * | | am335x_evm: enable usb ether gadget as it supports DM_ETHMugunthan V N2017-01-09-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since usb ether gadget have support for driver model, so enable usb ether gadget. Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com>
| * | | drivers: usb: gadget: ether/rndis: convert driver to adopt device driver modelMugunthan V N2017-01-09-0/+7
| |/ / | | | | | | | | | | | | | | | Adopt usb ether gadget and rndis driver to adopt driver model Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
* | | Merge branch 'master' of git://git.denx.de/u-boot-sunxiTom Rini2017-01-10-4/+17
|\ \ \ | |/ / |/| |
| * | sunxi: A64: enable SPLAndre Przywara2017-01-04-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the SPL is ready to be compiled in AArch64 and the DRAM init code is ready, enable SPL support for the A64 SoC and in the Pine64 defconfig. For now we keep the boot0 header in the U-Boot proper, as this allows to still use boot0 as an SPL replacement without hurting the SPL use case. We disable FEL support for now by making its compilation conditional and disabling it for ARM64, as the code isn't ready yet. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Jagan Teki <jagan@openedev.com>
| * | SPL: make struct spl_image 64-bit safeAndre Przywara2017-01-04-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since entry_point and load_addr are addresses, they should be represented as longs to cover the whole address space and to avoid warning when compiling the SPL in 64-bit. Also adjust debug prints to add the 'l' specifier, where needed. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Alexander Graf <agraf@suse.de> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Reviewed-by: Jagan Teki <jagan@openedev.com>
| * | move UL() macro from armv8/mmu.h into common.hAndre Przywara2017-01-04-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The UL() macro is pretty useful in sharing constants between assembly and C files while still being able to specify a type for C. Move the macro from an armv8 specific header into a common header file to be able to use it by arm code (for instance) as well. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Alexander Graf <agraf@suse.de> Reviewed-by: Jagan Teki <jagan@openedev.com>
| * | armv8: prevent using THUMBAndre Przywara2017-01-04-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The predominantely 32-bit ARM targets try to compile the SPL in Thumb mode to reduce code size. The 64-bit AArch64 instruction set does not know an alternative, concise encoding, so the Thumb build option should only be set for 32-bit targets. Likewise -marm machine options are only valid for ARMv7 targets. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Alexander Graf <agraf@suse.de> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Reviewed-by: Jagan Teki <jagan@openedev.com>
* | am335x: configs: Use ISW_ENTRY_ADDR to set SPL_TEXT_BASEAndrew F. Davis2017-01-08-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The SPL load address changes based on boot type in HS devices, ISW_ENTRY_ADDR is used to set this address for AM43xx based SoCs for similar reasons. Add this same logic for AM33xx devices. Also make the default value for ISW_ENTRY_ADDR correct for GP devices based on SoC, HS devices already pick the correct value in their defconfig. Signed-off-by: Andrew F. Davis <afd@ti.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-spiTom Rini2017-01-04-0/+3
|\ \
| * | spi: cadence_qspi_apb: Use 32 bit indirect write transaction when possibleVignesh R2017-01-04-0/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to Section 11.15.4.9.2 Indirect Write Controller of K2G SoC TRM SPRUHY8D[1], the external master is only permitted to issue 32-bit data interface writes until the last word of an indirect transfer otherwise indirect writes is known to fails sometimes. So, make sure that QSPI indirect writes are 32 bit sized except for the last write. If the txbuf is unaligned then use bounce buffer to avoid data aborts. So, now that the driver uses bounce_buffer, enable CONFIG_BOUNCE_BUFFER for all boards that use Cadence QSPI driver. [1]www.ti.com/lit/ug/spruhy8d/spruhy8d.pdf Signed-off-by: Vignesh R <vigneshr@ti.com> Reviewed-by: Marek Vasut <marex@denx.de> Reviewed-by: Jagan Teki <jagan@openedev.com>
* | ddr: fsl: Merge macro CONFIG_NUM_DDR_CONTROLLERS and CONFIG_SYS_NUM_DDR_CTRLSYork Sun2017-01-04-15/+14
| | | | | | | | | | | | | | | | These two macros are used for the same thing, the total number of DDR controllers for a given SoC. Use SYS_NUM_DDR_CTRLS in Kconfig and merge existing usage. Signed-off-by: York Sun <york.sun@nxp.com>