Tom Rini [Mon, 19 Jun 2017 12:08:40 +0000 (08:08 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
Heiko Schocher [Wed, 14 Jun 2017 03:49:42 +0000 (05:49 +0200)]
powerpc, 5xx: remove some "5xx" remains
we removed 5xx support. So delete some forgotten remains.
Signed-off-by: Heiko Schocher <hs@denx.de>
Heiko Schocher [Wed, 14 Jun 2017 03:49:41 +0000 (05:49 +0200)]
powerpc, 82xx: remove some missed mpc82xx remains
we removed 82xx support. Missed some 82xx remains,
remove them now.
Signed-off-by: Heiko Schocher <hs@denx.de>
Heiko Schocher [Wed, 14 Jun 2017 03:49:40 +0000 (05:49 +0200)]
powerpc, 5xxx, 512x: remove support for mpc5xxx and mpc512x
There was for long time no activity in the mpx5xxx area.
We need to go further and convert to Kconfig, but it
turned out, nobody is interested anymore in mpc5xxx,
so remove it.
Signed-off-by: Heiko Schocher <hs@denx.de>
Andrew F. Davis [Tue, 13 Jun 2017 20:04:59 +0000 (15:04 -0500)]
arm: mach-omap2: Generate MLO file from SD boot capable targets
Secure boot targets that can be loaded from an SD card FAT partition
need to be called "MLO" on the filesystem, make a copy with this name
to clarify the correct image for SD card booting.
Signed-off-by: Andrew F. Davis <afd@ti.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
York Sun [Tue, 13 Jun 2017 16:50:41 +0000 (09:50 -0700)]
cmd: ethsw: Fix out-of-bounds error
The for loop in cmd_keywords_opt_check() seems to use wrong array to
set boundary, reported by Coverity analysis.
Signed-off-by: York Sun <york.sun@nxp.com>
CC: Joe Hershberger <joe.hershberger@ni.com>
CC: Tom Rini <trini@konsulko.com>
CC: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
Reported-by: Coverity (CID: 163251)
Reviewed-by: Tom Rini <trini@konsulko.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Semen Protsenko [Tue, 13 Jun 2017 15:15:58 +0000 (18:15 +0300)]
arm: ti: Add missing guards to headers
To prevent possible double inclusions in future.
Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Hannes Schmelzer [Tue, 13 Jun 2017 12:11:33 +0000 (14:11 +0200)]
board/BuR/brxre1: refactor default environment
For better readability and setup-handling we refactor the default
environment.
Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Hannes Schmelzer [Tue, 13 Jun 2017 12:11:32 +0000 (14:11 +0200)]
board/BuR/brxre1: cosmetic cleanup of config-header
Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Hannes Schmelzer [Tue, 13 Jun 2017 12:11:31 +0000 (14:11 +0200)]
board/BuR/brxre1: drop obsolete CONFIG_LCD_NOSTDOUT from config-header
This define isn't used anymore in the u-boot source tree, so we drop it
from the config header.
We drop it also from the 'config_whitelist.txt'
Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Hannes Schmelzer [Tue, 13 Jun 2017 12:11:30 +0000 (14:11 +0200)]
board/BuR/brxre1: drop bootlogo feature
the BMP logo loading has become obsolete and is not used any more. So we
drop the support for it.
Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Hannes Schmelzer [Tue, 13 Jun 2017 12:11:29 +0000 (14:11 +0200)]
board/BuR/brxre1: fix MMC boot
since commit
'
d5abcf94c7123167725fc22ace342f0d455093c1' -
ti: boot: Register the MMC controllers in SPL in the same way as in u-boot
MMC boot on brxre1 board is broken, with this commit we make our board
working again.
Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Masahiro Yamada [Tue, 13 Jun 2017 06:17:28 +0000 (15:17 +0900)]
treewide: remove unneeded semicolons
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Michael Welling [Mon, 12 Jun 2017 23:02:39 +0000 (18:02 -0500)]
defconfig: arm335x_evm_usbspl: Update MUSB Ethernet
Adds CONFIG_SPL_USB_GADGET_SUPPORT and CONFIG_SPL_USBETH_SUPPORT.
Removes CONFIG_SPL_NAND_SUPPORT, CONFIG_SPL_MTD_SUPPORT, and CONFIG_SPL_YMODEM_SUPPORT
to free up space to fit in RAM.
Signed-off-by: Michael Welling <mwelling@ieee.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Mugunthan V N [Mon, 23 Jan 2017 22:04:34 +0000 (16:04 -0600)]
include: nand: move endif to end of file
The terminator endif of ifdef _NAND_H_ should be at the
end of file as a fail safe.
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Tom Rini [Wed, 14 Jun 2017 22:53:03 +0000 (18:53 -0400)]
Merge git://git.denx.de/u-boot-mpc85xx
Tom Rini [Wed, 14 Jun 2017 22:52:49 +0000 (18:52 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Jagan Teki [Tue, 30 May 2017 17:41:15 +0000 (17:41 +0000)]
sun50i: h5: Add initial NanoPi NEO2 support
NanoPi NEO2 is designed and developed by FriendlyElec
using the Allwinner 64-bit H5 SOC.
NanoPi Neo2 key features
- Allwinner H5, Quad-core 64-bit Cortex-A53
- 512MB DDR3 RAM
- microSD slot
- 10/100/1000M Ethernet
- Serial Debug Port
- 5V 2A DC MicroUSB power-supply
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Tested-by: Jagan Teki <jagan@amarulasolutions.com>
Tom Rini [Wed, 14 Jun 2017 13:13:21 +0000 (09:13 -0400)]
Revert "ARM: fixed relocation using proper alignment"
It turns out this change was not intended to be merged and as such,
revert it.
This reverts commit
cdde7de0364ffa505d631b342f1a2fa729e8e67d.
Reported-by: Manfred Schlaegl <manfred.schlaegl@ginzinger.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Jagan Teki [Tue, 13 Jun 2017 09:44:42 +0000 (15:14 +0530)]
sun50i: a64: Add initial Orangepi Win/WinPlus support
Orangepi Win/WinPlus is an open-source single-board computer
using the Allwinner A64 SOC.
A64 Orangepi Win/WinPlus has
- A64 Quad-core Cortex-A53 64bit
- 1GB(Win)/2GB(Win Plus) DDR3 SDRAM
- Debug TTL UART
- Four USB 2.0
- HDMI
- LCD
- Audio and MIC
- Wifi + BT
- IR receiver
- 5V DC power supply
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Tested-by: Jagan Teki <jagan@amarulasolutions.com>
Jagan Teki [Thu, 25 May 2017 16:00:09 +0000 (16:00 +0000)]
sun50i: h5: Add initial Orangepi Zero Plus 2 support
Orangepi Zero Plus 2 is an open-source single-board computer
using the Allwinner h5 SOC.
H5 Orangepi Zero Plus 2 has
- Quad-core Cortex-A53
- 512MB DDR3
- micrSD slot and 8GB eMMC
- Debug TTL UART
- HDMI
- Wifi + BT
- OTG+power supply
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Tested-by: Jagan Teki <jagan@amarulasolutions.com>
Stephen Warren [Thu, 13 Apr 2017 18:57:21 +0000 (12:57 -0600)]
ARM: tegra: remove Whistler support
Whistler is an ancient Tegra 2 reference board. I may have been the only
person who ever used it with upstream software, and I've just recycled
the board hardware. Hence, it makes sense to remove support from software.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
York Sun [Mon, 12 Jun 2017 16:05:05 +0000 (09:05 -0700)]
powerpc: fsl: Update maintainers
Update maintainers for B4860QDS, P1010RDB, P1_TWR, T104xRDB.
Signed-off-by: York Sun <york.sun@nxp.com>
York Sun [Mon, 12 Jun 2017 17:01:11 +0000 (10:01 -0700)]
powerpc: mpc8569mds: Update config and maintainer
Enable DHCP command by default. Update maintainer info.
Signed-off-by: York Sun <york.sun@nxp.com>
York Sun [Fri, 9 Jun 2017 19:50:26 +0000 (12:50 -0700)]
powerpc: mpc8568mds: Update board config
Enable DHCP command by default. Move environmental variable location
to before U-Boot image. Enlarge reserved mem for malloc. Update
maintainer.
Signed-off-by: York Sun <york.sun@nxp.com>
York Sun [Thu, 8 Jun 2017 19:51:34 +0000 (12:51 -0700)]
powerpc: mpc8536ds: Update maintainer
Signed-off-by: York Sun <york.sun@nxp.com>
York Sun [Wed, 7 Jun 2017 17:13:39 +0000 (10:13 -0700)]
powerpc: mpc8544ds: Update maintainer
Signed-off-by: York Sun <york.sun@nxp.com>
York Sun [Wed, 7 Jun 2017 17:12:56 +0000 (10:12 -0700)]
powerpc: mpc8544ds: Fix environmental variable location
Signed-off-by: York Sun <york.sun@nxp.com>
York Sun [Wed, 7 Jun 2017 17:12:20 +0000 (10:12 -0700)]
powerpc: mpc8544ds: Enable DHCP command by default
Signed-off-by: York Sun <york.sun@nxp.com>
York Sun [Tue, 6 Jun 2017 16:33:02 +0000 (09:33 -0700)]
powerpc: mpc8548cds: Enable DHCP command by default
Signed-off-by: York Sun <york.sun@nxp.com>
York Sun [Tue, 6 Jun 2017 16:32:42 +0000 (09:32 -0700)]
powerpc: mpc8548cds: Update maintainer
Signed-off-by: York Sun <york.sun@nxp.com>
York Sun [Tue, 6 Jun 2017 16:22:40 +0000 (09:22 -0700)]
net: phy: marvell: Fix init function for m88e1145
Commit
a058052c changed the generic phy_reset() to clear all bits in
BMCR. This inevitably clears the ANEG bit. m88e1145 requires any
change to ANEG bit to be followed by a software reset. This seems to
be different from other PHYs. Implement read-modify-write procedure
for this PHY init.
Signed-off-by: York Sun <york.sun@nxp.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
York Sun [Fri, 26 May 2017 00:04:42 +0000 (17:04 -0700)]
powerpc: mpc8641hpcn: Enable DHCP command and DDR debug
Enable DHCP command to make TFTP easier.
Enable DDR interactive debug by default.
Signed-off-by: York Sun <york.sun@nxp.com>
York Sun [Fri, 26 May 2017 00:03:23 +0000 (17:03 -0700)]
driver: ddr: fsl: Fix compiling error for DDR2
Fix compiling error of "no member named 'taamin_ps'" for DDR2.
Signed-off-by: York Sun <york.sun@nxp.com>
York Sun [Thu, 25 May 2017 22:43:45 +0000 (15:43 -0700)]
powerpc: mpc8536ds: Enable DHCP command by default
Enable DHCP command to make TFTP easier. Users don't have to use
static IP address.
Signed-off-by: York Sun <york.sun@nxp.com>
York Sun [Wed, 17 May 2017 17:21:47 +0000 (10:21 -0700)]
powerpc: mpc86xx: Update maintainer for MPC8610HPCD and MPC8641HPCN
Signed-off-by: York Sun <york.sun@nxp.com>
York Sun [Wed, 17 May 2017 17:21:24 +0000 (10:21 -0700)]
powerpc: mpc85xx: Update maintainer for MPC8541CDS and MPC8555CDS
Signed-off-by: York Sun <york.sun@nxp.com>
York Sun [Wed, 17 May 2017 17:19:35 +0000 (10:19 -0700)]
powerpc: mpc8540ads: mpc8560ads: Drop support for MPC8540/60ADS
Drop support for these two legacy boards.
Signed-off-by: York Sun <york.sun@nxp.com>
Lokesh Vutla [Sat, 10 Jun 2017 07:52:56 +0000 (13:22 +0530)]
board: ti: am335x: Fix scale_vcore for beaglebones
commit
0650798824 ("board: am335x: Introduce scale_vcores")
updated voltages of each board based on efuse. It updated
beagle bone specific voltages under the condition board_is_bone().
But this is true only for BeagleBoneWhite. Due to which voltages
are not configured for BBB, BBW as wrong device is being probed.
So create a common function board_is_beaglebonex() which includes
am335x based beagle family. Use this for updating voltages.
Also remove extra if condition for selecting voltages which is
done later using a switch case and match usb current limit as
before the commit
0650798824.
Fixes:
0650798824 ("board: am335x: Introduce scale_vcores")
Reported-by: Emmanuel Vadot <manu@bidouilliste.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Semen Protsenko [Fri, 9 Jun 2017 14:12:56 +0000 (17:12 +0300)]
arm: am57xx: Keep environment in eMMC
Use eMMC (instead of SD card) to store U-Boot environment. Use
"reserved" partition for U-Boot environment.
Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: Lokesh Vutla <lokeshvuta@ti.com>
Semen Protsenko [Fri, 9 Jun 2017 14:12:48 +0000 (17:12 +0300)]
arm: dra7: Increase "bootloader" partition size
Increase the size of u-boot.img, so that it conforms with new DFU
configuration (see commit [1]).
[1]
7a53a1a8115b ARM: ti: Update layout for MMC and eMMC (env and dfu)
Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Semen Protsenko [Fri, 9 Jun 2017 14:12:41 +0000 (17:12 +0300)]
arm: am57xx: Increase "bootloader" partition size
Increase the size of u-boot.img, so that it conforms with new DFU
configuration (see commit [1]).
[1]
7a53a1a8115b ARM: ti: Update layout for MMC and eMMC (env and dfu)
Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
mario.six@gdsys.cc [Fri, 9 Jun 2017 12:50:47 +0000 (14:50 +0200)]
MAINTAINERS: mpc83xx: Add new custodian
Add myself as mpc83xx custodian.
Heiko Schocher [Fri, 9 Jun 2017 04:13:34 +0000 (06:13 +0200)]
tools/tbot: update README
refer in the README to tbots webpage, and delete
the README in tools/tbot, as the latest documentation
for tbot is on this webpage.
Signed-off-by: Heiko Schocher <hs@denx.de>
Cooper Jr., Franklin [Thu, 8 Jun 2017 17:33:21 +0000 (12:33 -0500)]
ARM: dts: keystone-k2hk-evm: Add U-boot specific dtsi file
With Davinci I2C switching to device model, K2HK requires U-boot specific
device tree entries. This is only required for I2C 1 which is needed
extremely early during the boot process.
Fixes:
1743d040b1df ("ARM: keystone: Enable DM_I2C by default")
Reported-by: Yan Liu <yan-liu@ti.com>
Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
Lothar WaĂmann [Thu, 8 Jun 2017 12:16:14 +0000 (14:16 +0200)]
cmd: nvedit: bring error message in sync with condition under which it appears
The list of symbols listed in the error message for missing Kconfig
symbols is out of sync with the symbols actually tested.
Add the missing symbols and reorder their appearance to be in sync
with the #if statement for easier checking.
Signed-off-by: Lothar WaĂmann <LW@KARO-electronics.de>
Lothar WaĂmann [Thu, 8 Jun 2017 12:04:03 +0000 (14:04 +0200)]
cmd: mtdparts: fix uninitialized variable warning
commit
06a040a31bcf ("cmd: mtdparts: fix null pointer dereference in parse_mtdparts")
removed the initialization of a pointer variable, which is
subsequently used in a debug() call. This produces an uninitialized
variable warning, when compiling with DEBUG defined.
Signed-off-by: Lothar WaĂmann <LW@KARO-electronics.de>
Axel Lin [Thu, 8 Jun 2017 09:20:12 +0000 (17:20 +0800)]
dm: bcm6345_gpio: Set proper output level in bcm6345_gpio_direction_output
Current code does not set output level in bcm6345_gpio_direction_output,
fix it.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Lothar WaĂmann [Thu, 8 Jun 2017 08:18:25 +0000 (10:18 +0200)]
board_f: fix calculation of reloc_off
relocate_code() calculates the relocation offset wrt. the symbol
__image_copy_start which happens to have the same value as
CONFIG_TEXT_BASE on most systems.
When creating an i.MX boot image with an integrated IVT it is
convenient to have CONFIG_TEXT_BASE point to the start of the IVT
that is prepended to the actual code. Thus CONFIG_TEXT_BASE will
differ from __image_copy_start, while the calculation
'gd->relocaddr - __image_copy_start' still gives the right relocation
offset.
Signed-off-by: Lothar WaĂmann <LW@KARO-electronics.de>
Lothar WaĂmann [Thu, 8 Jun 2017 08:16:36 +0000 (10:16 +0200)]
ARM: provide a valid exception stack address for startup code
Create exception stack in IRAM if available to facilitate debugging of
pre-relocation code by catching exceptions rather than stopping dead.
Signed-off-by: Lothar WaĂmann <LW@KARO-electronics.de>
Lothar WaĂmann [Thu, 8 Jun 2017 07:52:33 +0000 (09:52 +0200)]
arm: adjust PC displayed in exception handlers to point to the failing instruction
Adjust the program counter register to point to the failing
instruction depending on the exeption type.
This makes it easier to localize the offending instruction leading to
a fatal exception.
Signed-off-by: Lothar WaĂmann <LW@KARO-electronics.de>
Lothar WaĂmann [Thu, 8 Jun 2017 07:48:41 +0000 (09:48 +0200)]
ARM: remove bogus cp_delay() function
The cp_delay() function was introduced because of a missing 'volatile'
attribute to the 'asm' statement in get_cr() which led to the 'mrc'
instruction in get_cr() being optimised out eventually.
This has been fixed in commit
53fd4b8c22bb ("arm: mmu: Add missing volatile for reading SCTLR register")
but the bogus cp_delay() function which was introduced as a workaround
for the malfunctioning get_cr() was never removed.
Signed-off-by: Lothar WaĂmann <LW@KARO-electronics.de>
Patrice Chotard [Thu, 8 Jun 2017 07:26:55 +0000 (09:26 +0200)]
serial: stm32x7: simplify baud rate register calculation
Simplify baud rate register formula and use the oversampling
uart feature.
This code is aligned with what is implemented in kernel driver
drivers/tty/serial/stm32-usart.c since kernel v4.9.
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Reviewed-by: Christophe KERELLO <christophe.kerello@st.com>
Reviewed-by: Patrick DELAUNAY <patrick.delaunay@st.com>
Acked-by: Vikas MANOCHA <vikas.manocha@st.com>
Patrice Chotard [Thu, 8 Jun 2017 07:26:54 +0000 (09:26 +0200)]
serial: stm32x7: align compatible with kernel one
stm32x7.c driver is dedicated for STM32F7.
In kernel, "st,stm32-usart" and "st,stm32-uart" compatible
strings are dedicated for STM32F4.
To keep U-boot and kernel aligned, replace the serial compatible
string from "st,stm32-usart", "st,stm32-uart" to
"st,stm32f7-usart", "st,stm32f7-uart" specific for STM32F7.
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Reviewed-by: Christophe KERELLO <christophe.kerello@st.com>
Reviewed-by: Patrick DELAUNAY <patrick.delaunay@st.com>
Acked-by: Vikas MANOCHA <vikas.manocha@st.com>
Simon Glass [Wed, 7 Jun 2017 16:28:47 +0000 (10:28 -0600)]
rkcommon.c: Drop pointless assignment
Assigning a variable to itself is not necessary. Drop this and also add a
check for malloc() failure.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Coverity (CID: 161418)
Fixes: 111bcc4 (rockchip: mkimage: pad the header to 8-bytes (using a 'nop') for RK3399)
Simon Glass [Wed, 7 Jun 2017 16:28:46 +0000 (10:28 -0600)]
board_f: Use IS_ENABLED instead of #ifdef in initf_bootstage()
The current implementation makes it look like the 'if (from_spl)' part is
dead code because these features are not enabled for sandbox. We could
enable it for sandbox_spl, but this is not done yet (it requires sharing
memory between SPL and U-Boot proper which is in fact supported).
It is probably nicer to avoid #ifdef anyway. Change it.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Coverity (CID: 163244)
Fixes: 824bb1b (bootstage: Support SPL)
Simon Glass [Wed, 7 Jun 2017 16:28:45 +0000 (10:28 -0600)]
dm: core: Supress dead-code warning in __of_get_next_child()
Suppress a warning on next = next->sibling.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Coverity (CID: 163245)
Fixes 644ec0a (dm: core: Add livetree access functions)
Simon Glass [Wed, 7 Jun 2017 16:28:44 +0000 (10:28 -0600)]
test: bus: Add a check that dev is not NULL
We know that uclass_get_device() and device_find_child_by_of_offset() do
not return NULL for dev when they succeeds but coverity does not. Add an
extra check to hopefully keep it happy.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Coverity (CID: 163246)
Fixes: 0753bc2 (dm: Simple Watchdog uclass)
Simon Glass [Wed, 7 Jun 2017 16:28:43 +0000 (10:28 -0600)]
test: wdt: Add a check that dev is not NULL
We know that uclass_get_device() does not return NULL for dev when it
succeeds but coverity does not. Add an extra check to hopefully keep it
happy.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Coverity (CID: 163247)
Fixes: 0753bc2 (dm: Simple Watchdog uclass)
Simon Glass [Wed, 7 Jun 2017 16:28:42 +0000 (10:28 -0600)]
fdt: Add a check to fdt_print() for coverity
We know that fdt_getprop() does not return NULL when len is > 0 but
coverity does not. Add an extra check to keep it happy.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Coverity (CID: 163248)
Simon Glass [Wed, 7 Jun 2017 16:28:41 +0000 (10:28 -0600)]
fdt: Add a check to do_fdt() for coverity
We know that fdt_getprop() does not return NULL when len is > 0 but
coverity does not. Add an extra check to keep it happy.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Coverity (CID: 163249)
Fixes:
bc80295b (fdt: Add get commands to fdt)
Simon Glass [Wed, 7 Jun 2017 16:28:40 +0000 (10:28 -0600)]
fdtgrep: Deal with NULL data passed to check_type_include()
Since the parameter can be NULL we must be careful not to dereference it
in this case.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Coverity (CID: 163250)
Fixes:
1043d0a0 (fdt: Add fdtgrep tool)
Simon Glass [Wed, 7 Jun 2017 16:28:39 +0000 (10:28 -0600)]
edid: Use sizeof() in cea_is_hdmi_vsdb_present()
We should not use an open-coded value here. Use sizeof() instead.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Coverity (CID: 163252)
Fixes:
43c6bdd0 (edid: Add HDMI flag to timing info)
Simon Glass [Wed, 7 Jun 2017 16:28:38 +0000 (10:28 -0600)]
test: pwm: Add a check that dev is not NULL
We know that uclass_get_device() does not return NULL for dev when it
succeeds but coverity does not. Add an extra check to hopefully keep it
happy.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Coverity (CID: 161690)
Fixes: 43b4156 (dm: sandbox: pwm: Add a basic pwm test)
Heiko Schocher [Wed, 7 Jun 2017 15:33:11 +0000 (17:33 +0200)]
powerpc, 5xx: remove support for 5xx
There was for long time no activity in the 5xx area.
We need to go further and convert to Kconfig, but it
turned out, nobody is interested anymore in 5xx,
so remove it.
Signed-off-by: Heiko Schocher <hs@denx.de>
Heiko Schocher [Wed, 7 Jun 2017 15:33:10 +0000 (17:33 +0200)]
powerpc, 8260: remove support for mpc8260
There was for long time no activity in the 8260 area.
We need to go further and convert to Kconfig, but it
turned out, nobody is interested anymore in 8260,
so remove it.
Signed-off-by: Heiko Schocher <hs@denx.de>
Heiko Schocher [Wed, 7 Jun 2017 15:33:09 +0000 (17:33 +0200)]
powerpc, 8xx: remove support for 8xx
There was for long time no activity in the 8xx area.
We need to go further and convert to Kconfig, but it
turned out, nobody is interested anymore in 8xx,
so remove it (with a heavy heart, knowing that I remove
here the root of U-Boot).
Signed-off-by: Heiko Schocher <hs@denx.de>
Semen Protsenko [Mon, 22 May 2017 16:16:42 +0000 (19:16 +0300)]
arm: dra7: Set fastboot variables in environment
One can obtain those variables using next commands:
$ fastboot getvar cpu
$ fastboot getvar secure
$ fastboot getvar board_rev
$ fastboot getvar userdata_size
Those variables are needed for fastboot.sh script.
Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Semen Protsenko [Mon, 22 May 2017 16:16:41 +0000 (19:16 +0300)]
arm: am57xx: Set fastboot variables in environment
One can obtain those variables using next commands:
$ fastboot getvar cpu
$ fastboot getvar secure
$ fastboot getvar board_rev
$ fastboot getvar userdata_size
Those variables are needed for fastboot.sh script.
Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Semen Protsenko [Mon, 22 May 2017 16:16:40 +0000 (19:16 +0300)]
omap: Add routine for setting fastboot variables
This patch reuses new option, which allows us to expose variables
from environment to "fastboot getvar" command. Those variables must be
of "fastboot.%s" format.
Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Manfred Schlaegl [Wed, 10 May 2017 13:41:32 +0000 (15:41 +0200)]
ARM: fixed relocation using proper alignment
Using u-boot-2017.05 on i.MX6UL we ran into following problem:
Initially U-Boot could be started normally.
If we added one random command in configuration, the newly generated
image hung at startup (last output was DRAM: 256 MiB).
We tracked this down to a data abort within relocation (relocated_code).
relocated_code in arch/arm/lib/relocate.S copies 8 bytes per loop
iteration until the source pointer is equal to __image_copy_end.
In a good case __image_copy_end was aligned to 8 bytes, so the loop
stopped as suggested, but in an errornous case __image_copy_end was
not aligned to 8 bytes, so the loop ran out of bounds and caused a
data abort exception.
This patches solves the issue by aligning __image_copy_end to 8 byte
using the linker script related to arm.
I don't know if it's the correct way to solve this, so some review would
be very appreciated.
Chen-Yu Tsai [Wed, 7 Jun 2017 07:11:49 +0000 (15:11 +0800)]
sunxi: psci: Move entry address setting to separate function
Currently we set the entry address in the psci_cpu_on function.
However R40 has a different register for this. This resulted in
an #ifdef / #else block in psci_cpu_on, which we avoided having
in the first place.
Move this part into a separate function, defined differently for
the R40 as opposed to the other single cluster platforms.
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
Tom Rini [Sat, 10 Jun 2017 22:01:22 +0000 (18:01 -0400)]
Merge git://git.denx.de/u-boot-dm
Tom Rini [Sat, 10 Jun 2017 14:01:05 +0000 (10:01 -0400)]
dm: blk: Fix warning on !CONFIG_BLK
When we don't have CONFIG_BLK defined we don't have a forward
declaration of struct udevice, and thus get a warning about it on
blk_get_from_parent(), which we only have when CONFIG_BLK is set. Move
the declaration of blk_get_from_parent() to be with the other CONFIG_BLK
parts.
Fixes
9f103b9cb5f8 ("dm: blk: Add a way to obtain a block device from ...")
Signed-off-by: Tom Rini <trini@konsulko.com>
Tom Rini [Sat, 10 Jun 2017 13:48:09 +0000 (09:48 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-video
Tom Rini [Sat, 10 Jun 2017 13:47:57 +0000 (09:47 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-mmc
Marek BehĂșn [Tue, 6 Jun 2017 13:17:27 +0000 (15:17 +0200)]
tools/kwbimage: Support building with LibreSSL
The kwbimage utility fails to compile when LibreSSL is present on
the host system instead of OpenSSL. This one-line patch resolves
this.
Signed-off-by: Marek Behun <marek.behun@nic.cz>
Sekhar Nori [Tue, 6 Jun 2017 11:41:53 +0000 (17:11 +0530)]
configs: omapl138_lcdk: dont disable fat write
CONFIG_FAT_WRITE is imply'ed when CONFIG_CMD_FAT
is selected (see CONFIG_TI_COMMON_CMD_OPTIONS).
Dont disable it in defconfig so the imply takes
effect and 'fatwrite' is available for users.
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Alison Wang [Tue, 6 Jun 2017 07:32:40 +0000 (15:32 +0800)]
armv8: Support loading 32-bit OS which is not in the form of FIT
As only FIT image is supported now, this patch is to support loading
32-bit uImage, dtb and rootfs separately.
Signed-off-by: Alison Wang <alison.wang@nxp.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Chakra Divi [Mon, 5 Jun 2017 17:39:30 +0000 (23:09 +0530)]
board: mpl: pci: Fix checkpatch.pl
Fixed checkpatch.pl errors/warnings in board/mpl/common/pci.c
Signed-off-by: Chakra Divi <chakra@openedev.com>
Enric Balletbo i Serra [Mon, 5 Jun 2017 17:27:23 +0000 (19:27 +0200)]
igep0020: Enable DISTRO_DEFAULTS on IGEPv2 platforms
Like commit
3337e3af5d3d this enables suitable commands needed for booting
general purpose Linux distribution. This is required for example if we want
to use PXE or DHCP as default boot targets, symbols no longer enabled by
config_distro_defaults.h.
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Lokesh Vutla [Mon, 5 Jun 2017 09:18:17 +0000 (14:48 +0530)]
board: ti: am572x-evm: Update pinmux using latest PMT
Update the board pinmux for AM572x-evm using latest PMT[1] and the
board files named am572x_gp_evm_A3a_sr2p0 and am572x_gp_evm_A2b_sr1p1
that were autogenerated on 30th January, 2017 by
"Ahmad Rashed <a-rashed@ti.com>" and "Tom Johnson <thjohnson@ti.com>".
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Lokesh Vutla [Mon, 5 Jun 2017 09:18:16 +0000 (14:48 +0530)]
board: ti: am571x-idk: Update pinmux using latest PMT
Update the board pinmux for AM571x-IDK board using latest PMT[1] and the
board files named am571x_idk_v1p3b_sr2p0 that were autogenerated on
23rd March, 2017 by "Ahmad Rashed <a-rashed@ti.com>" and
"Tom Johnson <thjohnson@ti.com>".
[1] https://dev.ti.com/pinmux/app.html#/default/
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Lokesh Vutla [Mon, 5 Jun 2017 09:18:15 +0000 (14:48 +0530)]
board: ti: am572x-idk: Update pinmux using latest PMT
Update the board pinmux for AM572x-IDK board using latest PMT[1] and the
board files named am572x_idk_v1p3b_sr2p0 that were autogenerated on
30th January, 2017 by "Ahmad Rashed <a-rashed@ti.com>" and
"Tom Johnson <thjohnson@ti.com>".
[1] https://dev.ti.com/pinmux/app.html#/default/
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Michal Simek [Mon, 5 Jun 2017 06:28:17 +0000 (08:28 +0200)]
Kconfig: Add description for CMD_POWEROFF
Add poweroff description to Kconfig to make it selectable
via menuconfig.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
tnishinaga.dev@gmail.com [Sun, 4 Jun 2017 16:18:08 +0000 (01:18 +0900)]
armv7m: Disable D-cache when booting nommu(ARMv7M) Linux kernel
Disable D-Cache is required when booting nommu Linux kernel.
(please see Linux kernel source "arch/arm/kernel/head-nommu.S")
U-Boot is enabled D-cache and I-Cache at startup.
However, it does not disable D-Cache before
booting nommu Linux kernel.
Therefore, I call dcache_disable()
when the CPU is ARMv7M to fix this problem.
Signed-off-by: Toshifumi NISHINAGA <tnishinaga.dev@gmail.com>
Semen Protsenko [Fri, 2 Jun 2017 15:00:00 +0000 (18:00 +0300)]
arm: omap: Unify get_device_type() function
Refactor OMAP3/4/5 code so that we have only one get_device_type()
function for all platforms.
Details:
- Add ctrl variable for AM33xx and OMAP3 platforms (like it's done for
OMAP4/5), so we can obtain status register in common way
- For now ctrl structure for AM33xx/OMAP3 contains only status register
address
- Run hw_data_init() in order to assign ctrl to proper structure
- Remove DEVICE_MASK and DEVICE_GP definitions as they are not used
(DEVICE_TYPE_MASK and GP_DEVICE are used instead)
- Guard structs in omap_common.h with #ifdefs, because otherwise
including omap_common.h on non-omap4/5 board files breaks compilation
Buildman script was run for all OMAP boards. Result output:
arm: (for 38/616 boards)
all +352.5
bss -1.4
data +3.5
rodata +300.0
spl/u-boot-spl:all +284.7
spl/u-boot-spl:data +2.2
spl/u-boot-spl:rodata +252.0
spl/u-boot-spl:text +30.5
text +50.4
(no errors to report)
Tested on AM57x EVM and BeagleBoard xM.
Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
[trini: Rework the guards as to not break TI81xx]
Signed-off-by: Tom Rini <trini@konsulko.com>
Tom Rini [Fri, 9 Jun 2017 20:59:17 +0000 (16:59 -0400)]
am33xx: Finish migration of CONFIG_AM33XX/AM43XX
Almost all users of CONFIG_AM33XX/AM43XX have been migrated. Finish
moving the last few over to Kconfig, and put all of the boards under the
appropriate Kconfig chocie now. This board choice is non-optional, so
remove that keyword on am33xx.
Signed-off-by: Tom Rini <trini@konsulko.com>
Hannes Schmelzer [Tue, 30 May 2017 13:05:44 +0000 (15:05 +0200)]
cmd/fdt: support single value replacement within an array
With this commit we can modify single values within an array of a dts
property.
This is useful if we have for example a pwm-backlight where we want to
modifiy the pwm frequency per u-boot script.
The pwm is described in dts like this:
backlight {
pwms = <0x0000002b 0x00000000 0x004c4b40>;
};
For changing the frequency, here the 3rd parameter, we simply type:
fdt set /backlight pwms <? ? 0x1E8480>;
For doing all this we:
- backup the property content into our 'SCRATCHPAD'
- only modify the array-cell if the new content doesn't start with '?'
Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Daniel Schwierzeck [Thu, 8 Jun 2017 01:07:09 +0000 (03:07 +0200)]
buildman: properly translate strings for log and err files to ASCII
The build output can still produce unicode encoded output. But in
the buildman's log and err files we only want plain ASCII characters.
To handle all situations with unicode and non-unicode output, encode
the stdout and stderr strings to UTF-8 and afterwards to ASCII with
replacing all special characters.
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Daniel Schwierzeck [Thu, 8 Jun 2017 01:07:08 +0000 (03:07 +0200)]
buildman: disable localized and unicode output of all build tools
Build tools like Make, gcc or binutils support localized output
or unicode encoded output dependent on the default system locale.
This is not useful for buildman, where we want reproducible
warning or error messages or where the output of binutils is
further processed.
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Simon Glass [Wed, 31 May 2017 23:57:36 +0000 (17:57 -0600)]
README: Add instructions for chain-loading U-Boot on jerry
Add instructions for chromebook_jerry.
Signed-off-by: Simon Glass <sjg@chromium.org>
Simon Glass [Wed, 31 May 2017 23:57:35 +0000 (17:57 -0600)]
rockchip: jerry: Disable CONFIG_CONSOLE_SCROLL_LINES
The display on jerry is so fast that this option is not needed. Drop it so
that the display scrolls more smoothly.
Signed-off-by: Simon Glass <sjg@chromium.org>
Simon Glass [Wed, 31 May 2017 23:57:34 +0000 (17:57 -0600)]
rockchip: Enable the video display banner
Show the U-Boot banner and board information on the video display during
boot.
Signed-off-by: Simon Glass <sjg@chromium.org>
Simon Glass [Wed, 31 May 2017 23:57:33 +0000 (17:57 -0600)]
rockchip: rk3288: Allow setting up clocks in U-Boot proper
If U-Boot is chain-loaded from a previous boot loader we must set up the
clocks the way U-Boot wants them. Add code for this. It will do nothing if
SPL has already done the job.
Signed-off-by: Simon Glass <sjg@chromium.org>
Simon Glass [Wed, 31 May 2017 23:57:32 +0000 (17:57 -0600)]
rockchip: Init clocks again when chain-loading
Detect with a previous boot loader has already set up the clocks and set
them up again so that U-Boot gets what it expects.
Signed-off-by: Simon Glass <sjg@chromium.org>
Simon Glass [Wed, 31 May 2017 23:57:31 +0000 (17:57 -0600)]
rockchip: rk3288: Convert clock driver to use shifted masks
Shifted masks are the standard approach with rockchip since it allows
use of the mask without shifting it each time. Update the definitions and
the driver to match.
Signed-off-by: Simon Glass <sjg@chromium.org>
Simon Glass [Wed, 31 May 2017 23:57:30 +0000 (17:57 -0600)]
rockchip: jerry: Add a .its file for chromium
Add a sample .its file for booting U-Boot on a jerry Chromebook.
Signed-off-by: Simon Glass <sjg@chromium.org>
Simon Glass [Wed, 31 May 2017 23:57:29 +0000 (17:57 -0600)]
rockchip: video: Take the vop device out of standby
On reset the standby bit is clear, but if U-Boot is chain-loaded from
another boot loader it may be set. Clear it before starting up video so
that it works correctly.
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Anatolij Gustschin <agust@denx.de>
Squashed in 'rockchip: video: fix taking the VOP device out of standby':
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Simon Glass [Wed, 31 May 2017 23:57:28 +0000 (17:57 -0600)]
rockchip: video: Add remove() methods
Add remove() methods for EDP and VOP so that U-Boot can shut down the
video on exit. This avoids leaving DMA running while booting Linux which
can cause problems if Linux uses the frame buffer for something else.
It also makes it clear what is needed to shut down video.
While we are here, make rkvop_enable() static.
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Anatolij Gustschin <agust@denx.de>
Squashed in 'rockchip: video: fix taking the VOP device out of standby':
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>