summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* net: macb: Fix ETH not found when clock not supportWenyou Yang2017-03-01-4/+9
| | | | | | | | | | | | | For the boards such as smartweb on which the clock driver isn't supported, the ethernet fail to be found when booting up with the below log. ---8<--- Net: No ethernet found. --->8--- Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> Tested-by: Heiko Schocher <hs@denx.de> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
* armv8: spl: Call spl_relocate_stack_gd for ARMv8Philipp Tomsich2017-03-01-2/+12
| | | | | | | | | | As part of the startup process for boards using the SPL, we need to call spl_relocate_stack_gd. This is needed to set up malloc with its DRAM buffer. Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* armv5te: make 'ret lr' produce iinterworking 'bx lr'Albert ARIBAUD2017-03-01-1/+1
| | | | | | | | | | | | | | | | | Current ARM assembler helper for the 'return to caller' pseudo-instruction turns 'ret lr' into 'mov pc, lr' for ARMv5TE. This causes the core to remain in its current ARM state even when the routine doing the 'ret' was called from Thumb-1 state, triggering an undefined instruction exception. This causes early run-time failures in all boards compiled using the Thumb-1 instruction set (for instance the Open-RD family). ARMv5TE supports 'bx lr' which properly implements interworking and thus correctly returns to Thumb-1 state from ARM state. This change makes 'ret lr' turn into 'bx lr' for ARMv5TE. Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
* Prepare v2017-rc3Tom Rini2017-02-27-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* arm: mach-omap2: Flush cache after FIT post-processing imageAndrew F. Davis2017-02-27-0/+6
| | | | | | | | | | After we authenticate/decrypt an image we need to flush the caches as they may still contain bits of the encrypted image. This will cause failures if we attempt to jump to this image. Reported-by: Yogesh Siraswar<yogeshs@ti.com> Signed-off-by: Andrew F. Davis <afd@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* drivers/net/Kconfig: Correct use of apostropheTom Rini2017-02-27-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* Merge branch 'master' of git://www.denx.de/git/u-boot-imxTom Rini2017-02-27-27/+22
|\
| * tqma6: [cosmetic] sanitize environment definesMarkus Niebel2017-02-19-1/+1
| | | | | | | | Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
| * tqma6: fix rounding in envMarkus Niebel2017-02-19-6/+6
| | | | | | | | | | | | | | need to add before div in mmc update scripts. Otherwise we could write one block more ba acident Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
| * mx6: tqma6: add rootfsmode environment for mmc / sdMarkus Niebel2017-02-19-1/+3
| | | | | | | | Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
| * mx6: tqma6: fix typo in envMarkus Niebel2017-02-19-1/+1
| | | | | | | | | | | | there was a double bracketed var ref. fix this. Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
| * imx6: tqma6: rely on default setting for tftp and nfsMarkus Niebel2017-02-19-4/+0
| | | | | | | | | | | | | | Playing with USB-to-Ethernet dongles it turns out, that these will not work with special settings Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
| * arm: imx6: tqma6: add configurable CMA sizeMarkus Niebel2017-02-19-2/+7
| | | | | | | | | | | | | | | | depending on the use case different CMA sizes are needed for linux. Add env var to enable passing CMA size via kernel command line Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
| * mtd: nand: build MXS driver for MX7 as wellAndrey Yurovsky2017-02-19-1/+1
| | | | | | | | | | | | | | | | | | | | | | The i.MX7 has the same GPMI controller as i.MX6 and is covered by the MXS driver. Tell Kconfig that we can use this driver on the MX7 platform (the MXS driver already has the few i.MX7-specific changes needed for basic operation and the board itself sets the pinmux correctly). Tested on i.MX7D with the Sabre board and a NAND Flash soldered to U12. Signed-off-by: Andrey Yurovsky <yurovsky@gmail.com>
| * mx6sx: udoo_neo: Enable distro boot options in configPeter Robinson2017-02-19-10/+1
| | | | | | | | | | | | | | | | | | The include/configs/udoo_neo.h already includes the distro defaults include files so it seems the board was missed in the move to the config file, whether that in initial commit or conversion, so enable the option now and remove duplicated settings. Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
| * mx6sx: udoo_neo: use different load address for ramdiskPeter Robinson2017-02-19-1/+1
| | | | | | | | | | | | | | | | The fdt_addr and ramdisk_addr_r are currently both defined to 0x83000000 and that's not going to work well for anyone. Move the ramdisk_addr_r to 0x84000000. Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
| * mx6sx: udoo_neo: Define the default serial consolePeter Robinson2017-02-19-0/+1
| | | | | | | | | | | | | | | | Standard boot processes including distro boot generally expect the default console to be defined. Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Tested-by: Breno Lima <breno.lima@nxp.com>
* | rockchip: video: fix 83500000 clock mistake in rockchip HDMINickey Yang Nickey Yang2017-02-27-1/+1
| | | | | | | | | | | | | | There is one "0" too many in 83500000 mpixelclock in rockchip_mpll_cfg[]. fix it. Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
* | splash: Prevent splash_load_fs from writing to 0x0Jonathan Golder2017-02-27-1/+2
| | | | | | | | | | | | | | | | | | | | | | Passing NULL to fs_read() for actread value results in hanging U-Boot at least on our ARM plattform (TI AM335x). Since fs_read() and following functions do not catch nullpointers, writing to 0x0 occurs. Passing a local dummy var instead of NULL solves this issue. Signed-off-by: Jonathan Golder <jonathan.golder@kurz-elektronik.de> Cc: Anatolij Gustschin <agust@denx.de>
* | travis-ci: Temporarily disable using a newer device tree compilerTom Rini2017-02-26-2/+3
| | | | | | | | | | | | | | | | | | For a long while dtc has warned about various constructs. This is now leading to log file size being exceeded in travis, and as the majority of these errors need to be fixed in the kernel, switch to using the stock device-tree-compiler package. Signed-off-by: Tom Rini <trini@konsulko.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-usbTom Rini2017-02-26-38/+40
|\ \
| * | usb: gadget: f_dfu: set serial number if serial# is validFelipe Balbi2017-02-26-0/+5
| | | | | | | | | | | | | | | | | | | | | With this patch, USB Command Verifier is happy with our DFU implementation on Chapter 9 tests. Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
| * | usb: gadget: g_dnl: fix g_dnl_set_serialnumber()Felipe Balbi2017-02-26-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of only copying if strlen(s) is less than 32 characters, let's just copy at most 31 characters regardless of the size of serial#. This will guarantee that we always have a serial number if serial# environment variable is set to anything. Note that without a proper serial number, USB Command Verifier fails our test of Device Descriptor since we will claim to have a serial number without really providing one when requested. Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
| * | usb: gadget: f_dfu: write req->actual bytesFelipe Balbi2017-02-26-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | If last packet is short, we shouldn't write req->length bytes to non-volatile media, we should write only what's available to us, which is held in req->actual. Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
| * | usb: gadget: dfu: add result for handle_getstatus()Patrick Delaunay2017-02-26-22/+13
| | | | | | | | | | | | | | | | | | | | | | | | harmonize result with other handle_XXX() functions: return int for size remove the define RET_STAT_LEN : no more necessary Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> Signed-off-by: Patrick Delaunay <patrick.delaunay73@gmail.com>
| * | usb: gadget: dfu: correct size for USB_REQ_DFU_GETSTATE resultPatrick Delaunay2017-02-26-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return the correct size for DFU_GETSTATE result (1 byte in DFU 1.1 spec) to avoid issue in USB protocol and the variable "value" is propagated to req->lenght as all the in the other request with answer - DFU_GETSTATUS - DFU_DNLOAD - DFU_UPLOAD Then the buffer is correctly treated in USB driver NB: it was the only request witch directly change "req->actual" Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> Signed-off-by: Patrick Delaunay <patrick.delaunay73@gmail.com>
| * | usb: gadget: dfu: add functional descriptor in descriptor setPatrick Delaunay2017-02-26-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "DFU descriptor set" must contain the "DFU functional descriptor" but it is missing today in U-Boot code (cf: DFU spec 1.1, chapter 4.2 DFU Mode Descriptor Set) This patch only allocate buffer and copy DFU functional descriptor after interfaces. Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> Signed-off-by: Patrick Delaunay <patrick.delaunay73@gmail.com>
| * | usb: dwc3: gadget: Remove unused header inclusionVincent Tinelli2017-02-26-1/+0
| | | | | | | | | | | | | | | | | | | | | Remove sys_proto.h inclusion which is not used by the driver. Signed-off-by: Vincent Tinelli <vincent.tinelli@intel.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
* | | Merge branch 'master' of git://git.denx.de/u-boot-uniphierTom Rini2017-02-23-659/+948
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | - Fix regressions caused by the previous reworks - Add pin configuration support - Re-work SPL code - Update DRAM and PLL setup code - Enable needed configs, disable unneeded configs
| * | ARM: uniphier: set up charge pump current for MPLL of LD11 SoCMasahiro Yamada2017-02-23-0/+24
| | | | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: uniphier: add simple eMMC load APIs instead of ROM APIMasahiro Yamada2017-02-23-58/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-use of routines embedded in the Boot ROM requires a function pointer table for each SoC. This is not nice in terms of the maintainability in a long run. Implement simple eMMC load APIs that are commonly used for LD11, LD20, and hopefully future SoCs. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: uniphier: enable CONFIG_CMD_CONFIGMasahiro Yamada2017-02-23-0/+7
| | | | | | | | | | | | | | | | | | | | | This command is useful to see which config options are enabled on the running U-Boot image. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: uniphier: enable CONFIG_CMD_GPTMasahiro Yamada2017-02-23-0/+13
| | | | | | | | | | | | | | | | | | | | | Enable CONFIG_CMD_GPT, keeping CONFIG_SPL_EFI_PARTITION because the SPL for UniPhier platform does not recognize any partitions. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: uniphier: disable CONFIG_SPL_DOS_PARTITIONMasahiro Yamada2017-02-23-0/+6
| | | | | | | | | | | | | | | | | | | | | The SPL for UniPhier platform does not recognize any partitions. Do not compile unneeded features. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: uniphier: deassert RST_n of eMMC device for LD11/LD20Masahiro Yamada2017-02-23-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For LD11 and LD20 SoCs, the RST_n pin is asserted by default. If the EXT_CSD[162], bit[1:0] (RST_n_ENABLE) is fused, the eMMC device would stay in the reset state until its RST_n pin is deasserted by software. Currently, this is cared by an ad-hoc way because the eMMC hardware reset provider is not supported in U-Boot for now. This code should be re-written once the "mmc-pwrseq-emmc" binding is supported. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: uniphier: add DRAM PHY clock duty adjustment for LD20 SoCKotaro Hayashi2017-02-23-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the DRAM clock duty does not meet the allowable tolerance, it is marked in an efuse register. If the register is fused, the boot code should compensate for the DRAM clock duty error. Signed-off-by: Kotaro Hayashi <hayashi.kotaro@socionext.com> [masahiro: simplify code, add git-log] Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: uniphier: remove dram_nr_ch from board parametersMasahiro Yamada2017-02-23-26/+18
| | | | | | | | | | | | | | | | | | | | | This parameter is redundant because we can know the number of channels by checking if dram_ch[2].size is zero. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: uniphier: rework spl_boot_device() and related codeMasahiro Yamada2017-02-23-344/+312
| | | | | | | | | | | | | | | | | | | | | | | | The current implementation has ugly switch statements here and there, and duplicates similar code. Rework it using table lookups for SoC data and reduce code duplication. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: uniphier: move spl_boot_mode() to a separate fileMasahiro Yamada2017-02-23-24/+35
| | | | | | | | | | | | | | | | | | | | | | | | The spl_boot_mode() is unrelated to the other code in this file. Besides, this function is only called from common/spl/spl_mmc.c, so it is reasonable to guard with CONFIG_SPL_MMC_SUPPORT. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: uniphier: move MMC code to a separate fileMasahiro Yamada2017-02-23-38/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, arch/arm/mach-uniphier/boot-mode/boot-mode.c is messed up with unrelated code; there is no reason why the "mmcsetn" command must be placed in this file. Split out the MMC code into arch/arm/mach-uniphier/mmc-first-dev.c. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: uniphier: disable CONFIG_MTD_NOR_FLASHMasahiro Yamada2017-02-23-7/+0
| | | | | | | | | | | | | | | | | | This feature is seldom used these days on UniPhier boards. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: dts: uniphier: drop u-boot, dm-pre-reloc from system-bus pinctrl nodeMasahiro Yamada2017-02-23-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | Since commit 26b09c022ab6 ("ARM: uniphier: move SBC and Support Card init code to U-Boot proper"), SPL does not need pin-mux settings for the System Bus. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: uniphier: rename second stage loader nameMasahiro Yamada2017-02-23-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | For the memory footprint reason, the Boot ROM can not load the ARM Trusted Firmware BL1 directly when Trusted Board Boot is enabled. The second stage loader is Socionext's own firmware, so rename it for clarification. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | pinctrl: uniphier: support pin configurationMasahiro Yamada2017-02-23-12/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support the following DT properties: "bias-disable" "bias-pull-up" "bias-pull-down" "bias-pull-pin-default" "input-enable" "input-disable" My main motivation is to support pull up/down biasing. For Pro5 and later SoCs, the pupdctrl register number is the same as the pinmux number, so this feature can be supported without having big pin tables. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: uniphier: enable generic EHCI driver for uniphier_v8_defconfigMasahiro Yamada2017-02-23-0/+2
| | | | | | | | | | | | | | | | | | The LD11 SoC is equipped with USB EHCI controllers. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: uniphier: remove DRAM base address from board parametersMasahiro Yamada2017-02-23-57/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | The base address of each DRAM channel can be calculated from other parameters, so does not need hard-coding. What we need is the size of each DRAM channel and DRAM_SPARSE flag to decide the start address of DRAM channel 1. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: uniphier: update README.uniphier for latest build instructionMasahiro Yamada2017-02-23-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Since commit c0efc3140e75 ("ARM: uniphier: change CONFIG_SPL_PAD_TO to 128KB"), the u-boot.bin should be burned at the offset 0x20000. I missed to update README.uniphier in that commit. Now updating. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: uniphier: print Support Card info very lateMasahiro Yamada2017-02-23-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 26b09c022ab6 ("ARM: uniphier: move SBC and Support Card init code to U-Boot proper"), the System Bus is initialized by board_init(). The show_board_info() is called from board_init_f() by default, so the revision register of the Micro Support Card may not be accessed at this point. Show its revision after the System Bus is initialized. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: uniphier: skip memreserve of unused DRAM bank of LD20Masahiro Yamada2017-02-23-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Now the "for" loop here iterates on the detected memory banks. It must skip unused DRAM banks. Fixes: c995f3a3c526 ("ARM: uniphier: use gd->bd->bi_dram for memory reserve on LD20 SoC") Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: uniphier: correct spelling of "invalid"Masahiro Yamada2017-02-23-3/+3
| | | | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>