summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
...
* scripts/config_whitelist.txt: RegenerateTom Rini2017-03-13-64/+0
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* configs: Re-syncTom Rini2017-03-13-1189/+1154
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* arm: omap-common: Fix typo in CONFIG_OMAP54XX guardMatthijs van Duin2017-03-11-1/+1
| | | | | | | | Some initialization was unintentionally being skipped on omap5. Fixes: f5af0827f276 ("arm: omap-common: Guard some parts of the code with CONFIG_OMAP44XX/OMAP54XX") Signed-off-by: Matthijs van Duin <matthijsvanduin@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* tools: binman: change shebang from python into python2Jörg Krause2017-03-11-1/+1
| | | | | | | This tool does not work with Python 3. Change the shebang to make sure the script is run by a Python 2 interpreter. Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
* arm: OMAP2+: nandecc: propagate error to command return statusLadislav Michl2017-03-11-20/+16
| | | | | | | | | Currently nandecc returns zero even if underlaying omap_nand_switch_ecc function fails. Fix that by propagating error returned to command return value. Signed-off-by: Ladislav Michl <ladis@linux-mips.org> Reviewed-by: Tom Rini <trini@konsulko.com>
* Merge branch 'pmic' of git://git.denx.de/u-boot-mmcTom Rini2017-03-09-1/+1
|\
| * sunxi: power: axp809.c: Fix aldo1-2 being disabled for mvolt != 0Rask Ingemann Lambertsen2017-03-09-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The execution flow is currently like this for aldo_num == 1 or 2: int axp_set_aldo(int aldo_num, unsigned int mvolt) { ... if (mvolt == 0) return pmic_bus_clrbits(AXP809_OUTPUT_CTRL1, AXP809_OUTPUT_CTRL1_ALDO1_EN << (aldo_num - 1)); ... return pmic_bus_clrbits(AXP809_OUTPUT_CTRL1, AXP809_OUTPUT_CTRL1_ALDO1_EN << (aldo_num - 1)); } I.e. aldo1 and aldo2 will always be disabled. This patch fixes it by setting (rather than clearing) the enable bit when mvolt != 0. Signed-off-by: Rask Ingemann Lambertsen <rask@formelder.dk> Fixes: 795857df413a ("sunxi: power: add AXP809 support")
* | ARM: Migrate errata to KconfigTom Rini2017-03-09-122/+85
| | | | | | | | | | | | | | | | | | This moves all of the current ARM errata from various header files and in to Kconfig. This allows for a minor amount of cleanup as we had some instances where both a general common header file was enabling errata as well as the board config. We now just select these once at the higher level in Kconfig Signed-off-by: Tom Rini <trini@konsulko.com>
* | omap4: Migrate to using implyTom Rini2017-03-09-36/+12
| | | | | | | | | | | | | | Move the default y options under arch/arm/mach-omap2/omap4/Kconfig to be using imply instead in arch/arm/Kconfig Signed-off-by: Tom Rini <trini@konsulko.com>
* | omap3: Migrate to using implyTom Rini2017-03-09-33/+11
| | | | | | | | | | | | | | Move the default y options under arch/arm/mach-omap2/omap3/Kconfig to be using imply instead in arch/arm/Kconfig Signed-off-by: Tom Rini <trini@konsulko.com>
* | TI: Migrate board/ti/common/Kconfig to implyTom Rini2017-03-09-82/+39
| | | | | | | | | | | | | | The option that we had set in board/ti/common/Kconfig as default y are best done with imply under the appropriate main Kconfig option instead. Signed-off-by: Tom Rini <trini@konsulko.com>
* | am335x_evm: Switch to using imply keywordTom Rini2017-03-09-9/+3
| | | | | | | | | | | | | | | | These particular SPL options are part of what the ROM provides, but for compatibility with how we have previously used them, move them to being implied by the board being selected. Signed-off-by: Tom Rini <trini@konsulko.com>
* | kconfiglib.py: Kludge in 'imply' supportTom Rini2017-03-09-5/+6
| | | | | | | | | | | | | | | | | | Currently upstream does not yet understand the imply keyword. For what we use kconfiglib.py for today, this is OK. We only need to be able to evaluate in order to make boards.cfg and none of those choices will depend on how imply evaluates out. Signed-off-by: Tom Rini <trini@konsulko.com>
* | do_smhload: fix return codeRyan Harkin2017-03-09-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | do_smhload was using a ulong to store the return value from smh_load_file. That returns an int, where -1 indicates an error. As a ulong will never be negative, smh_load_file errors were not detected and so_smhload always returned zero. Also, when errors were spotted, do_smhload was returning 1, rather than the enumeration CMD_RET_FAILURE (which is also 1). Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
* | Freescale/NXP: Migrate CONFIG_FSL_CAAM to defconfigsTom Rini2017-03-09-41/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases this is absolutely required, so select this for some secure features. This also requires migration of RSA_FREESCALE_EXP Cc: Ruchika Gupta <ruchika.gupta@nxp.com> Cc: Poonam Aggrwal <poonam.aggrwal@freescale.com> Cc: Naveen Burmi <NaveenBurmi@freescale.com> Cc: Po Liu <po.liu@freescale.com> Cc: Shengzhou Liu <Shengzhou.Liu@freescale.com> Cc: Priyanka Jain <Priyanka.Jain@freescale.com> Cc: Sumit Garg <sumit.garg@nxp.com> Cc: Shaohui Xie <Shaohui.Xie@freescale.com> Cc: Chunhe Lan <Chunhe.Lan@freescale.com> Cc: Feng Li <feng.li_2@nxp.com> Cc: Alison Wang <alison.wang@freescale.com> Cc: Mingkai Hu <Mingkai.Hu@freescale.com> Cc: York Sun <york.sun@nxp.com> Cc: Saksham Jain <saksham.jain@nxp.freescale.com> Cc: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com> Signed-off-by: Tom Rini <trini@konsulko.com>
* | tools: Remove CONFIG_SYS_TEXT_BASE in MakefilePatrick Delaunay2017-03-09-1/+0
| | | | | | | | | | | | | | | | | | This define is not used in tools sources and can be removed to avoid unnecessary link between tools and defconfig Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | kbuild: turn of dtc unit address warnings by defaultMasahiro Yamada2017-03-09-1/+12
|/ | | | | | | | | | | | | | DTC 1.4.2 or later checks DT unit-address without reg property and vice-versa, and generates lots of warnings. Fixing DT files will take for a while. Until then, let's turn off the check unless building with W=*. Introduce a new helper dtc-option to check if the option is supported in order to suppress warnings on older versions. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org> Tested-by: Bin Meng <bmeng.cn@gmail.com>
* Merge branch 'master' of git://git.denx.de/u-boot-videoTom Rini2017-03-08-5/+5
|\
| * video: cfb_console: fix 32-bit display on 64-bit architecturesAndre Przywara2017-03-07-5/+5
| | | | | | | | | | | | | | | | | | | | | | "unsigned long" is a lousy data type when it comes to match peripheral hardware registers with a fixed size. Just do the obvious and match a 32-bit display format with an "u32" data type for casting. This fixes the logo display on 64-bit architectures, which produced a black line on the right side of the logo with non-black backgrounds. Signed-off-by: Andre Przywara <andre.przywara@arm.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-netTom Rini2017-03-08-1/+1
|\ \
| * | net: zynq_gem: Fix masking of supported phydev featuresNathan Rossi2017-03-07-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the zynq_gem driver initializes the phy it sets the supported features that the phy can support and advertise. However instead of masking the supported features such that it limits the available features it sets the phy to have the exact supported features of the zynq_gem. This is problematic as it will enable features that a phy does not have or cannot advertise. Specifically this appears as an issue when using a phy that is only capable of 10/100, but the zynq_gem driver will override this and try to enable and advertise 10/100/1000. Reported-by: Arno Steffens <star@gmx.li> Fixes: 80243528ef ("net: gem: Fix gem driver on 1Gbps LAN") Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> Tested-by: Arno Steffens <star@gmx.li> Cc: Joe Hershberger <joe.hershberger@ni.com> Cc: Michal Simek <michal.simek@xilinx.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Michal Simek <michal.simek@xilinx.com>
* | omap3_logic: Move SPL Stack into SDRAMAdam Ford2017-03-08-0/+3
|/ | | | | | | | | | | | | | | | A previous patch broke the board. This patch will add missing part from the previous patch and also move the SPL Stack into SDRAM at 0x82000000. Tested with GCC 4.8.2 and GCC 6.2 Fixes: 0959649dc6d9 ("omap3_logic: Switch to simple malloco in SPL") Signed-off-by: Adam Ford <aford173@gmail.com> Changes in V2: - Keep CONFIG_SPL_SYS_MALLOC_SIMPLE - Add CONFIG_SYS_MALLOC_F_LEN=0x2000 (8 MB)
* 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>
generated by cgit v1.1 at 2024-11-15 14:49:20 +0000