oweals/u-boot.git
7 years agoARM: DT: stm32f7: add gpio device tree nodes
Vikas Manocha [Mon, 10 Apr 2017 22:02:58 +0000 (15:02 -0700)]
ARM: DT: stm32f7: add gpio device tree nodes

Also created alias for gpios for stm32f7 discovery board. Based on these
aliases, it would be possible to get gpio devices by sequence.

Signed-off-by: Vikas Manocha <vikas.manocha@st.com>
cc: Christophe KERELLO <christophe.kerello@st.com>

7 years agodm: gpio: Add driver for stm32f7 gpio controller
Vikas Manocha [Mon, 10 Apr 2017 22:02:57 +0000 (15:02 -0700)]
dm: gpio: Add driver for stm32f7 gpio controller

This patch adds gpio driver supporting driver model for stm32f7 gpio.

Signed-off-by: Vikas Manocha <vikas.manocha@st.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Cc: Christophe KERELLO <christophe.kerello@st.com>
[trini: Add depends on STM32]
Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agostm32f7: sdram: use sdram device tree node to configure sdram controller
Vikas Manocha [Mon, 10 Apr 2017 22:02:56 +0000 (15:02 -0700)]
stm32f7: sdram: use sdram device tree node to configure sdram controller

Signed-off-by: Vikas Manocha <vikas.manocha@st.com>
cc: Christophe KERELLO <christophe.kerello@st.com>

7 years agostm32f7: use clock driver to enable sdram controller clock
Vikas Manocha [Mon, 10 Apr 2017 22:02:55 +0000 (15:02 -0700)]
stm32f7: use clock driver to enable sdram controller clock

This patch also removes the sdram/fmc clock enable from board specific
code.

Signed-off-by: Vikas Manocha <vikas.manocha@st.com>
cc: Christophe KERELLO <christophe.kerello@st.com>

7 years agostm32f7: use driver model for sdram initialization
Vikas Manocha [Mon, 10 Apr 2017 22:02:54 +0000 (15:02 -0700)]
stm32f7: use driver model for sdram initialization

As driver model takes care of pin control configuraion, this patch also
removes the sdram/fmc pin configuration.

Signed-off-by: Vikas Manocha <vikas.manocha@st.com>
cc: Christophe KERELLO <christophe.kerello@st.com>

7 years agoARM: DT: stm32f7: add sdram pin contol node
Vikas Manocha [Mon, 10 Apr 2017 22:02:53 +0000 (15:02 -0700)]
ARM: DT: stm32f7: add sdram pin contol node

Also added DT binding doc for stm32 fmc(flexible memory controller).

Signed-off-by: Vikas Manocha <vikas.manocha@st.com>
cc: Christophe KERELLO <christophe.kerello@st.com>

7 years agostm32f7: dm: add driver model support for sdram
Vikas Manocha [Mon, 10 Apr 2017 22:02:52 +0000 (15:02 -0700)]
stm32f7: dm: add driver model support for sdram

Signed-off-by: Vikas Manocha <vikas.manocha@st.com>
cc: Christophe KERELLO <christophe.kerello@st.com>

7 years agostm32f7: sdram: move sdram driver code to ram drivers area
Vikas Manocha [Mon, 10 Apr 2017 22:02:51 +0000 (15:02 -0700)]
stm32f7: sdram: move sdram driver code to ram drivers area

Signed-off-by: Vikas Manocha <vikas.manocha@st.com>
cc: Christophe KERELLO <christophe.kerello@st.com>

7 years agostm32f7: use clock driver to enable qspi controller clock
Vikas Manocha [Mon, 10 Apr 2017 22:02:50 +0000 (15:02 -0700)]
stm32f7: use clock driver to enable qspi controller clock

Signed-off-by: Vikas Manocha <vikas.manocha@st.com>
cc: Christophe KERELLO <christophe.kerello@st.com>

7 years agospl: make image arg or fdt blob address reconfigurable
Vikas Manocha [Fri, 7 Apr 2017 22:38:13 +0000 (15:38 -0700)]
spl: make image arg or fdt blob address reconfigurable

At present fdt blob or argument address being passed to kernel is fixed at
compile time using macro CONFIG_SYS_SPL_ARGS_ADDR. FDT blob from
different media like nand, nor flash are copied to the address pointed
by the macro.
The problem is, it makes args/fdt blob compulsory to copy which is not required
in cases like for NOR Flash. This patch removes this limitation.

Signed-off-by: Vikas Manocha <vikas.manocha@st.com>
7 years agoarm: am57xx: cl-som-am57x: enable USB commands
Uri Mashiach [Thu, 23 Feb 2017 13:39:41 +0000 (15:39 +0200)]
arm: am57xx: cl-som-am57x: enable USB commands

Add CONFIG_CMD_USB to the defconfig file.

Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoarm: am57xx: cl-som-am57x: enable USB storage
Uri Mashiach [Thu, 23 Feb 2017 13:39:40 +0000 (15:39 +0200)]
arm: am57xx: cl-som-am57x: enable USB storage

Add CONFIG_USB_STORAGE to the defconfig file.

Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoarm: am57xx: cl-som-am57x: fix USB scan
Uri Mashiach [Thu, 23 Feb 2017 13:39:39 +0000 (15:39 +0200)]
arm: am57xx: cl-som-am57x: fix USB scan

USB bus scan attempt:
----------------------------------cut----------------------------------
=> usb start
starting USB...
USB0:   Register 2000140 NbrPorts 2
Starting the controller
USB XHCI 1.00
scanning bus 0 for devices... data abort
pc : [<fff6240e>]          lr : [<fff623b3>]
reloc pc : [<8081b40e>]    lr : [<8081b3b3>]
sp : fdf42930  ip : fdf42960     fp : 00000000
r10: 00000001  r9 : fdf42ef0     r8 : 48890020
r7 : 00000002  r6 : fffa5840     r5 : fff8b140  r4 : fdf429c0
r3 : 00000000  r2 : 00000004     r1 : 00000000  r0 : 00000000
Flags: nZcv  IRQs off  FIQs off  Mode SVC_32
Resetting CPU ...

resetting ...
----------------------------------cut----------------------------------

Fix by enabling USB configuration in the SPL.

Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Igor Grinberg <grinberg@compulab.co.il>
7 years agoarm: am57xx: cl-som-am57x: invoke clock API to enable/disable clocks
Uri Mashiach [Thu, 23 Feb 2017 13:39:38 +0000 (15:39 +0200)]
arm: am57xx: cl-som-am57x: invoke clock API to enable/disable clocks

Invoke enable_usb_clocks during board_usb_init and disable_usb_clocks
during board_usb_exit to enable and disable clocks respectively.

Modifications:
* Enable USB clocks in the OMAP version of the function
  board_usb_init.
* Disable USB clocks in the OMAP version of the function
  board_usb_cleanup.

Cc: Marek Vasut <marex@denx.de>
Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
Reviewed-by: Marek Vasut <marex@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agousb: host: xhci-omap: fix double weak board_usb_init functions
Uri Mashiach [Thu, 23 Feb 2017 13:39:37 +0000 (15:39 +0200)]
usb: host: xhci-omap: fix double weak board_usb_init functions

A weak version of the function board_usb_init is implemented in:
common/usb.c
drivers/usb/host/xhci-omap.c

To fix the double implementations:
* Convert the board_usb_init function in drivers/usb/host/xhci-omap.c
  normal (not weak).
* The function board_usb_init in drivers/usb/host/xhci-omap.c calls to
  the weak function omap_xhci_board_usb_init.
* Rename board version of the function board_usb_init to
  omap_xhci_board_usb_init.
  Done only for boards that defines CONFIG_USB_XHCI_OMAP.

To achieve the same flexibility with the function board_usb_cleanup:
* Add a normal (not weak) implementation of the function
  board_usb_cleanup in drivers/usb/host/xhci-omap.c
* The function board_usb_cleanup in drivers/usb/host/xhci-omap.c calls
  to the weak function omap_xhci_board_usb_cleanup.
* Rename board version of the function board_usb_cleanup to
  omap_xhci_board_usb_cleanup.
  Done only for boards that defines CONFIG_USB_XHCI_OMAP.

Cc: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
Acked-by: Marek Vasut <marex@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Roger Quadros <rogerq@ti.com>
7 years agoarm: usb: dra7xx: xHCI registers based on USB port index
Uri Mashiach [Thu, 23 Feb 2017 13:39:36 +0000 (15:39 +0200)]
arm: usb: dra7xx: xHCI registers based on USB port index

Modify the determination of the base address of xHCI registers of DRA7XX
targets.
Before the commit: by the target.
After the commit: by the USB port index.

Cc: Lokesh Vutla <lokeshvutla@ti.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Roger Quadros <rogerq@ti.com>
Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
Reviewed-by: Marek Vasut <marex@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Roger Quadros <rogerq@ti.com>
Acked-by: Marek Vasut <marex@denx.de>
Acked-by: Marek Vasut <marex@denx.de>
7 years agoarm: dra7xx: move CONFIG_DRA7XX to Kconfig
Uri Mashiach [Thu, 23 Feb 2017 13:39:35 +0000 (15:39 +0200)]
arm: dra7xx: move CONFIG_DRA7XX to Kconfig

The symbol CONFIG_DRA7XX is needed for Kconfig conditions.

Cc: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoPrepare v2017.05 v2017.05
Tom Rini [Mon, 8 May 2017 14:11:08 +0000 (10:11 -0400)]
Prepare v2017.05

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoboard/BuR/common: incorrect check of dtb
xypron.glpk@gmx.de [Fri, 5 May 2017 18:57:32 +0000 (20:57 +0200)]
board/BuR/common: incorrect check of dtb

The logical expression to check the dtb is incorrect in
load_devicetree.

The problem was indicated by cppcheck.

The inconsistent variable name dtppart is changed to dtbpart.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Hannes Schmelzer <oe5hpm@oevsv.at>
Acked-by: Hannes Schmelzer <oe5hpm@oevsv.at>
7 years agotools: sunxi: avoid read after end of string
xypron.glpk@gmx.de [Thu, 4 May 2017 20:26:42 +0000 (22:26 +0200)]
tools: sunxi: avoid read after end of string

The evaluation of option -c is incorrect:

According to the C99 standard endptr in the first strtol is always
set as &endptr is not NULL.
So the first part of the or condition is always true.
If all digits in optarg are valid endptr will point to the closing \0
and the second strtol will read beyond the end of the string optarg
points to.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
7 years agorelocate-rela: add missing va_end()
xypron.glpk@gmx.de [Wed, 3 May 2017 20:40:11 +0000 (22:40 +0200)]
relocate-rela: add missing va_end()

va_start must always be matched by va_end.

The problem was indicated by cppcheck.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
7 years agolib: circbuf: avoid possible null pointer dereference
xypron.glpk@gmx.de [Wed, 3 May 2017 21:20:10 +0000 (23:20 +0200)]
lib: circbuf: avoid possible null pointer dereference

We should not first dereference p and afterwards assert that is
was not NULL. Instead do the assert first.

The problem was indicated by cppcheck.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
7 years agoarm64: mvebu: incorrect check of fdt address cells
xypron.glpk@gmx.de [Wed, 3 May 2017 21:31:58 +0000 (23:31 +0200)]
arm64: mvebu: incorrect check of fdt address cells

In dram_init_banksize there seems to be a typo concerning
a plausibility check of the fdt.
Testing sc > 2 twice does not make any sense.

The problem was indicated by cppcheck.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
7 years agomeson: gxbb: increase CONFIG_SYS_BOOTM_LEN
xypron.glpk@gmx.de [Fri, 14 Apr 2017 17:54:40 +0000 (19:54 +0200)]
meson: gxbb: increase CONFIG_SYS_BOOTM_LEN

A feature rich Linux kernel needs more than 8 MiB.
Hence enlarge CONFIG_SYS_BOOTM_LEN to 64 MiB for the GXBB systems.
As all known GXBB systems have at least 512 MiB of RAM this poses no problem.

Cc: Andreas Färber <afaerber@suse.de>
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
7 years agoMerge branch 'master' of git://git.denx.de/u-boot-spi
Tom Rini [Fri, 5 May 2017 20:45:30 +0000 (16:45 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-spi

7 years agodrivers: spi: Remove duplicate .probe method
Suniel Mahesh [Wed, 3 May 2017 06:17:29 +0000 (11:47 +0530)]
drivers: spi: Remove duplicate .probe method

.probe method has been assigned twice when declaring
a driver with U_BOOT_DRIVER(). Removed one of them.
Here is the last commit which had the duplicate entry:
"spi: omap3: Convert to driver model"
(sha1: 77b8d04854f486741471ad02b93b473b5b3d72f8)

Signed-off-by: Suniel Mahesh <suniel.spartan@gmail.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>
7 years agozynq: spi: Honour the activation / deactivation delay
Moritz Fischer [Thu, 8 Dec 2016 20:11:09 +0000 (12:11 -0800)]
zynq: spi: Honour the activation / deactivation delay

This is not currently implemented. Add support for this so that the
Chrome OS EC can be used reliably.

Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
Acked-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jagan Teki <jagan@openedev.com>
7 years agospi: atmel: check GPIO validity before using cs_gpios
Wenyou Yang [Fri, 7 Apr 2017 07:14:46 +0000 (15:14 +0800)]
spi: atmel: check GPIO validity before using cs_gpios

Before using the cs_gpio, check if the GPIO is valid or not.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>
7 years agoPrepare v2017.05-rc3 v2017.05-rc3
Tom Rini [Mon, 1 May 2017 23:54:41 +0000 (19:54 -0400)]
Prepare v2017.05-rc3

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoodroid-c2: README: MMC is supported
xypron.glpk@gmx.de [Sat, 15 Apr 2017 09:29:06 +0000 (11:29 +0200)]
odroid-c2: README: MMC is supported

Mention eMMC and microSD as supported devices.

They have been enabled with patch
d0c5c8d529f16fa88ab52a3b5dd2d4fc03664f19
odroid-c2: enable new Meson GX MMC driver in board defconfig
which was accepted for u-boot-mmc.git.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
7 years agomeson: gxbb: change ramdisk_addr_r
xypron.glpk@gmx.de [Fri, 14 Apr 2017 18:04:46 +0000 (20:04 +0200)]
meson: gxbb: change ramdisk_addr_r

0x10000000 is the start of a 2 MiB area used by the
ARM Trusted Firmware (BL31).

See
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/tree/arch/arm64/boot/dts/amlogic/meson-gx.dtsi?id=refs/tags/v4.10.10

So we should not load the ramdisk here.

The legacy Ubuntu image for the Odroid C2 comes with the
following line in boot.ini:
setenv initrd_loadaddr "0x13000000"

See
http://odroid.in/ubuntu_16.04lts/ubuntu64-16.04-minimal-odroid-c2-20160815.img.xz
http://deb.odroid.in/c2/pool/main/u/u-boot/u-boot_20170226-752a100-8_arm64.deb

So let's use the same address.

With the patch booting Linux with booti succeeds on an Odroid C2,
without the patch Linux hangs.

Cc: Andreas Färber <afaerber@suse.de>
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Vagrant Cascadian <vagrant@debian.org>
7 years agomeson: gxbb: enable MMC as boot target
xypron.glpk@gmx.de [Sat, 15 Apr 2017 19:30:39 +0000 (21:30 +0200)]
meson: gxbb: enable MMC as boot target

To enable automatic booting from SD card or eMMC the MMC
devices 0, 1, and 2 are added to the BOOT_TARGET_DEVICES.

Booting from SD card, eMMC, and DHCP are tried in sequence.
A missing or failing device is gracefully handled.

Cc: Andreas Färber <afaerber@suse.de>
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Tested-by: Vagrant Cascadian <vagrant@debian.org>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Tested-by: Andreas Färber <afaerber@suse.de>
7 years agoconfigs: Re-sync
Tom Rini [Mon, 1 May 2017 15:41:11 +0000 (11:41 -0400)]
configs: Re-sync

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoscripts/config_whitelist.txt: Re-sync
Tom Rini [Mon, 1 May 2017 15:34:12 +0000 (11:34 -0400)]
scripts/config_whitelist.txt: Re-sync

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agowarp7: MAINTAINERS: Add warp7_secure_defconfig entry
Fabio Estevam [Sat, 29 Apr 2017 22:01:57 +0000 (19:01 -0300)]
warp7: MAINTAINERS: Add warp7_secure_defconfig entry

Add warp7_secure_defconfig entry to avoid the following warning:

WARNING: no maintainers for 'warp7_secure'

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
7 years agofdt: Move fdt_fixup_ethernet to a common place
Tom Rini [Fri, 28 Apr 2017 12:51:44 +0000 (08:51 -0400)]
fdt: Move fdt_fixup_ethernet to a common place

With 3f66149d9fb4 we no longer have a common call fdt_fixup_ethernet.
This was fine to do on PowerPC as they largely had calls already in
ft_cpu_fixup.  On ARM however we largely relied on this call.  Rather
than introduce a large number of changes to ft_cpu_fixup /
ft_board_fixup we recognize that this is a common enough call that we
should be doing it in a central location.  Do it early enough that we
can do any further updates in ft_cpu_fixup / ft_board_fixup.

Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Thomas Chou <thomas@wytron.com.tw> (maintainer:NIOS)
Cc: York Sun <york.sun@nxp.com> (maintainer:POWERPC MPC85XX)
Cc: Stefan Roese <sr@denx.de> (maintainer:POWERPC PPC4XX)
Cc: Simon Glass <sjg@chromium.org>
Cc: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
Fixes: 3f66149d9fb4 ("Remove extra fdt_fixup_ethernet() call")
Signed-off-by: Tom Rini <trini@konsulko.com>
Acked-by: Stefan Roese <sr@denx.de>
Acked-by: York Sun <york.sun@nxp.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agocmd: add Kconfig option for 'date' command
Chris Packham [Sat, 29 Apr 2017 03:20:28 +0000 (15:20 +1200)]
cmd: add Kconfig option for 'date' command

Signed-off-by: Chris Packham <judge.packham@gmail.com>
[trini: default y if DM_RTC, re-sync]
Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoDrop the pdsp188x driver
Simon Glass [Thu, 27 Apr 2017 04:28:11 +0000 (22:28 -0600)]
Drop the pdsp188x driver

This is not used in U-Boot.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agopowerpc: Drop configs/manroland
Simon Glass [Thu, 27 Apr 2017 04:28:10 +0000 (22:28 -0600)]
powerpc: Drop configs/manroland

This is not used in U-Boot. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agoConvert CONFIG_CMD_DISPLAY to Kconfig
Simon Glass [Thu, 27 Apr 2017 04:28:09 +0000 (22:28 -0600)]
Convert CONFIG_CMD_DISPLAY to Kconfig

This converts the following to Kconfig:
   CONFIG_CMD_DISPLAY

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agoConvert CONFIG_CMD_DIAG to Kconfig
Simon Glass [Thu, 27 Apr 2017 04:28:08 +0000 (22:28 -0600)]
Convert CONFIG_CMD_DIAG to Kconfig

This converts the following to Kconfig:
   CONFIG_CMD_DIAG

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: imply CMD_DIAG on some keymile configs]
Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoKconfig: Drop CONFIG_CMD_DFL
Simon Glass [Thu, 27 Apr 2017 04:28:07 +0000 (22:28 -0600)]
Kconfig: Drop CONFIG_CMD_DFL

This option is not used in U-Boot. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agoConvert CONFIG_CMD_DEKBLOB to Kconfig
Simon Glass [Thu, 27 Apr 2017 04:28:06 +0000 (22:28 -0600)]
Convert CONFIG_CMD_DEKBLOB to Kconfig

This converts the following to Kconfig:
   CONFIG_CMD_DEKBLOB

Note: This option does not seem to actually be enabled by any board.

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: imply under SECURE_BOOT for mx5/6/7]
Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoKconfig: Drop CONFIG_CMD_DEFAULTENV_VARS
Simon Glass [Thu, 27 Apr 2017 04:28:05 +0000 (22:28 -0600)]
Kconfig: Drop CONFIG_CMD_DEFAULTENV_VARS

This option does not exist in U-Boot. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agofs: Kconfig: Add a separate option for FS_CRAMFS
Simon Glass [Thu, 27 Apr 2017 04:28:04 +0000 (22:28 -0600)]
fs: Kconfig: Add a separate option for FS_CRAMFS

Rather than using CMD_CRAMFS for both the filesystem and its command, we
should have a separate option for each. This allows us to enable CRAMFS
support without the command, if desired, which reduces U-Boot's size
slightly.

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: imply FS_CRAMFS for keymile]
Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agofs: Convert CONFIG_CMD_CRAMFS to Kconfig
Simon Glass [Thu, 27 Apr 2017 04:28:03 +0000 (22:28 -0600)]
fs: Convert CONFIG_CMD_CRAMFS to Kconfig

This converts the following to Kconfig:
   CONFIG_CMD_CRAMFS

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: imply CMD_CRAMFS for keymile]
Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoConvert CONFIG_CMD_CLK to Kconfig
Simon Glass [Thu, 27 Apr 2017 04:28:02 +0000 (22:28 -0600)]
Convert CONFIG_CMD_CLK to Kconfig

This converts the following to Kconfig:
   CONFIG_CMD_CLK

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: imply CMD_CLK on ARCH_ZYNQ]
Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoDrop CONFIG_CMD_CLEAR
Simon Glass [Thu, 27 Apr 2017 04:28:01 +0000 (22:28 -0600)]
Drop CONFIG_CMD_CLEAR

This option is not used in U-Boot. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agoConvert CONFIG_CMD_CHIP_CONFIG to Kconfig
Simon Glass [Thu, 27 Apr 2017 04:28:00 +0000 (22:28 -0600)]
Convert CONFIG_CMD_CHIP_CONFIG to Kconfig

This converts the following to Kconfig:
   CONFIG_CMD_CHIP_CONFIG

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agofs: Kconfig: Add a separate config for FS_CBFS
Simon Glass [Thu, 27 Apr 2017 04:27:59 +0000 (22:27 -0600)]
fs: Kconfig: Add a separate config for FS_CBFS

Rather than using CMD_CBFS for both the filesystem and its command, we
should have a separate option for each. This allows us to enable CBFS
support without the command, if desired, which reduces U-Boot's size
slightly.

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: imply FS_CBFS on SYS_COREBOOT]
Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agofs: Convert CONFIG_CMD_CBFS to Kconfig
Simon Glass [Thu, 27 Apr 2017 04:27:58 +0000 (22:27 -0600)]
fs: Convert CONFIG_CMD_CBFS to Kconfig

This converts the following to Kconfig:
   CONFIG_CMD_CBFS

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: imply CMD_CBFS on SYS_COREBOOT]
Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoConvert CONFIG_SYS_WHITE_ON_BLACK to Kconfig
Simon Glass [Thu, 27 Apr 2017 04:27:57 +0000 (22:27 -0600)]
Convert CONFIG_SYS_WHITE_ON_BLACK to Kconfig

This converts the following to Kconfig:
   CONFIG_SYS_WHITE_ON_BLACK

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: Make this default y on various SoCs]
Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoConvert CONFIG_CMD_BSP to Kconfig
Simon Glass [Thu, 27 Apr 2017 04:27:56 +0000 (22:27 -0600)]
Convert CONFIG_CMD_BSP to Kconfig

This converts the following to Kconfig:
   CONFIG_CMD_BSP

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agoConvert CONFIG_CMD_BMP to Kconfig
Simon Glass [Thu, 27 Apr 2017 04:27:55 +0000 (22:27 -0600)]
Convert CONFIG_CMD_BMP to Kconfig

This converts the following to Kconfig:
   CONFIG_CMD_BMP

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: Add depends on LCD || DM_VIDEO || VIDEO]
Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoConvert CONFIG_CMD_BMODE to Kconfig
Simon Glass [Thu, 27 Apr 2017 04:27:54 +0000 (22:27 -0600)]
Convert CONFIG_CMD_BMODE to Kconfig

This converts the following to Kconfig:
   CONFIG_CMD_BMODE

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: Make this default y and depend on mx5/6/7]
Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoConvert CONFIG_CMD_BLOB to Kconfig
Simon Glass [Thu, 27 Apr 2017 04:27:53 +0000 (22:27 -0600)]
Convert CONFIG_CMD_BLOB to Kconfig

This converts the following to Kconfig:
   CONFIG_CMD_BLOB

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: Add imply CMD_BLOB under CHAIN_OF_TRUST]
Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoConvert CONFIG_CMD_BEDBUG to Kconfig
Simon Glass [Thu, 27 Apr 2017 04:27:52 +0000 (22:27 -0600)]
Convert CONFIG_CMD_BEDBUG to Kconfig

This converts the following to Kconfig:
   CONFIG_CMD_BEDBUG

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agoConvert CONFIG_CMD_BAT to Kconfig
Simon Glass [Thu, 27 Apr 2017 04:27:51 +0000 (22:27 -0600)]
Convert CONFIG_CMD_BAT to Kconfig

This converts the following to Kconfig:
   CONFIG_CMD_BAT

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agoti816x_evm: Change CONFIG_CMD_ASKEN to CONFIG_CMD_ASKENV
Simon Glass [Thu, 27 Apr 2017 04:27:50 +0000 (22:27 -0600)]
ti816x_evm: Change CONFIG_CMD_ASKEN to CONFIG_CMD_ASKENV

This looks like a typo. Fix it.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agoConvert CONFIG_CMD_AES et al to Kconfig
Simon Glass [Thu, 27 Apr 2017 04:27:49 +0000 (22:27 -0600)]
Convert CONFIG_CMD_AES et al to Kconfig

This converts the following to Kconfig:
   CONFIG_CMD_AES
   CONFIG_AES

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: Add select AES to CMD_AES]
Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agopower: Drop CONFIG_PMIC
Simon Glass [Thu, 27 Apr 2017 04:27:48 +0000 (22:27 -0600)]
power: Drop CONFIG_PMIC

This option is not used in U-Boot. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agopower: Drop CONFIG_I2C_PMIC
Simon Glass [Thu, 27 Apr 2017 04:27:47 +0000 (22:27 -0600)]
power: Drop CONFIG_I2C_PMIC

This is only used by one board and should not be a CONFIG option. Instead
it should use the driver model pmic framework. For now, just move the
setting into the only board that uses it.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agopower: Convert CONFIG_PMIC_AS3722 to Kconfig
Simon Glass [Thu, 27 Apr 2017 04:27:46 +0000 (22:27 -0600)]
power: Convert CONFIG_PMIC_AS3722 to Kconfig

This converts the following to Kconfig:
   CONFIG_PMIC_AS3722

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agopower: Move as3722 pmic to pmic/ directory
Simon Glass [Thu, 27 Apr 2017 04:27:45 +0000 (22:27 -0600)]
power: Move as3722 pmic to pmic/ directory

Most of the PMICs are in the drivers/power/pmic/ directory. Move this one
there.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agopower: Rename CONFIG_AS3722_POWER to CONFIG_PMIC_AS3722
Simon Glass [Thu, 27 Apr 2017 04:27:44 +0000 (22:27 -0600)]
power: Rename CONFIG_AS3722_POWER to CONFIG_PMIC_AS3722

Before converting this to Kconfig, rename it to match the other PMICs.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agoarm: Re-sync ARCH_MX5 / MX51 / MX53 CONFIG options
Tom Rini [Sat, 29 Apr 2017 23:20:27 +0000 (19:20 -0400)]
arm: Re-sync ARCH_MX5 / MX51 / MX53 CONFIG options

A few boards had not been fully re-synced with CONFIG_ARCH_MX5 / CONFIG_MX51 /
CONFIG_MX53 being in Kconfig.  Do so now.

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoMerge tag 'xilinx-fixes-for-v2017.05' of git://www.denx.de/git/u-boot-microblaze
Tom Rini [Thu, 27 Apr 2017 20:49:19 +0000 (16:49 -0400)]
Merge tag 'xilinx-fixes-for-v2017.05' of git://denx.de/git/u-boot-microblaze

Xilinx fixes for v2017.05

- Fix usbotg on Miami board
- Cleanup zc1751 defconfig

7 years agoext4: Fix comparision of unsigned expression with < 0
Lokesh Vutla [Wed, 26 Apr 2017 11:28:22 +0000 (16:58 +0530)]
ext4: Fix comparision of unsigned expression with < 0

In file ext4fs.c funtion ext4fs_read_file() compares an
unsigned expression with < 0 like below

lbaint_t blknr;
blknr = read_allocated_block(&(node->inode), i);
if (blknr < 0)
return -1;

blknr is of type ulong/uint64_t. read_allocated_block() returns
long int. So comparing blknr with < 0 will always be false. Instead
declare blknr as long int.

Similarly ext4/dev.c does a similar comparison. Drop the redundant
comparison.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoMAINTAINERS: Update for Keystone2 secure devices
Lokesh Vutla [Wed, 26 Apr 2017 06:05:19 +0000 (11:35 +0530)]
MAINTAINERS: Update for Keystone2 secure devices

Update Keystone2 secure device configs under
"TI SYSTEM SECURITY". Without this buildman keeps complaining
about the status of these boards.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Acked-by: Andrew F. Davis <afd@ti.com>
7 years agoarm/lib/bootm.c: keep ARM v7M in thumb mode during boot_jump_linux()
Patrice Chotard [Tue, 25 Apr 2017 09:07:46 +0000 (11:07 +0200)]
arm/lib/bootm.c: keep ARM v7M in thumb mode during boot_jump_linux()

On ARM v7M, the processor will return to ARM mode when executing
a blx instruction with bit 0 of the address == 0. Always set it
to 1 to stay in thumb mode.

Tested on STM32f746-disco board

Similar commit:
f99993c10882f7dc8ec35993d5febe59aac01e6a
Author: Matt Porter <mporter@konsulko.com>

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
7 years agoARM: omap2+: rename config to ARCH_OMAP2PLUS and consolidate Kconfig
Masahiro Yamada [Tue, 25 Apr 2017 04:10:11 +0000 (13:10 +0900)]
ARM: omap2+: rename config to ARCH_OMAP2PLUS and consolidate Kconfig

In Linux, CONFIG_ARCH_OMAP2PLUS is used for OMAP2 or later SoCs.
Rename CONFIG_ARCH_OMAP2 to CONFIG_ARCH_OMAP2PLUS to follow this
naming.

Move the OMAP2+ board/SoC choice down to mach-omap2/Kconfig to slim
down the arch/arm/Kconfig level.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoadd Kconfig for fsuuid command
Josua Mayer [Mon, 24 Apr 2017 08:10:45 +0000 (10:10 +0200)]
add Kconfig for fsuuid command

CONFIG_CMD_FS_UUID was neither whitelisted, nor was it declared in
Kconfig.
Now it can be enabled in .config and defconfig as expected.

Signed-off-by: Josua Mayer <josua.mayer97@gmail.com>
7 years agoKconfig: Enable FIT support by default for TI platforms
Andrew F. Davis [Fri, 21 Apr 2017 15:01:28 +0000 (10:01 -0500)]
Kconfig: Enable FIT support by default for TI platforms

Almost all TI defconfigs enable this already, add this as a default
and remove the explicit assignment.

Signed-off-by: Andrew F. Davis <afd@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agotravisci: Add support for ARC
Alexey Brodkin [Fri, 21 Apr 2017 10:35:43 +0000 (13:35 +0300)]
travisci: Add support for ARC

Finally adding support for ARC boards in TravisCI.

To build for ARC boards we need to install Synopsys prebuilt toolchain
which we do here.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Tom Rini <trini@konsulko.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoboard: dra71: Fix selection of OPPs
Lokesh Vutla [Thu, 20 Apr 2017 08:37:52 +0000 (14:07 +0530)]
board: dra71: Fix selection of OPPs

As per the DM[1] Dated June 2016–Revised February 2017, Table 5-3,
DRA71 supports the following OPPs for various voltage domains:

VDD_MPU: OPP_NOM
VDD_CORE: OPP_NOM
VDD_GPU: OPP_NOM
VDD_DSPEVE: OPP_NOM, OPP_HIGH
VDD_IVA: OPP_NOM, OPP_HIGH

This patch add support for selection of the above OPPs instead of
using OPP_NOM for all voltage domains.

[1] http://www.ti.com/lit/ds/symlink/dra718.pdf

Reported-by: Vishal Mahaveer <vishalm@ti.com>
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
7 years agopinctrl: Kconfig: sort pinctrl config options to prevent future clutter
Philipp Tomsich [Wed, 19 Apr 2017 14:46:37 +0000 (16:46 +0200)]
pinctrl: Kconfig: sort pinctrl config options to prevent future clutter

This originally started out as
     "pinctrl: Kconfig: reorder to keep Rockchip options together"
and tried to keep the Rockchip-related config options together.

However, we now rewrite all chip-specific driver selections to start
with CONFIG_PINCTRL_ (with the inadvertent changes to related
Makefiles) and sort those alphabetically. And as this already means
touching most of the file, we also reformat the help text to not exceed
80 characters (but make full use of those 80 characters).

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: Simon Glass <sjg@chromium.org>
7 years agorockchip: mkimage: remove (left-over) assignment w/o effect [coverity]
Philipp Tomsich [Wed, 19 Apr 2017 13:09:04 +0000 (15:09 +0200)]
rockchip: mkimage: remove (left-over) assignment w/o effect [coverity]

An assignment (of a value to itself) was left over (after removing and
addition from the line) from moving the common padding code into
rkcommon_vrec_header.

This change removes this to avoid a spurious warning in static code
analysis (i.e. Coverity).

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reported-by: Coverity (CID: 161418)
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoclean-up: Remove uselsess mentions of CONFIG_COMMAND_HISTORY
Alexey Brodkin [Tue, 18 Apr 2017 19:09:10 +0000 (22:09 +0300)]
clean-up: Remove uselsess mentions of CONFIG_COMMAND_HISTORY

These were reminders that somehow slipped through the cracks
or were erroneously introduced after previous clean-ups.

Getting rid of then once again. Hopefully for good now :)

Where missing and appropriate replace with CONFIG_CMDLINE_EDITING
which really enables shell history as of now.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Peter Griffin <peter.griffin@linaro.org>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Steve Rae <steve.rae@raedomain.com>
Cc: Jon Mason <jon.mason@broadcom.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stefan Roese <sr@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agoarm: Warn that starting with v2018.01 gcc-6 or later is required
Tom Rini [Mon, 17 Apr 2017 13:18:00 +0000 (09:18 -0400)]
arm: Warn that starting with v2018.01 gcc-6 or later is required

There are more and more cases where if we do not use gcc-6.0 or later we
run into problems where our binaries are too large for the targets.
Given the prevalence of gcc-6.0 or later toolchains at this point in
time, we give notice now that starting with v2018.01 we will require
gcc-6 (or later) for ARM.

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agodm: sandbox: pwm: Add a basic pwm test
Simon Glass [Mon, 17 Apr 2017 03:01:11 +0000 (21:01 -0600)]
dm: sandbox: pwm: Add a basic pwm test

Unfortunately a test for the PWM uclass was not included when it was
submitted. This was noticed when trying to add more functionality:

   http://patchwork.ozlabs.org/patch/748172/

Add a simple test to get us started.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agoconfigs: keystone2: Standardise U-boot prompt
Lokesh Vutla [Sun, 16 Apr 2017 05:51:28 +0000 (11:21 +0530)]
configs: keystone2: Standardise U-boot prompt

Standardise U-Boot prompt on all keystone2 platforms
instead of platform specific prompt.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoOMAP3: Correct name of omap34xx_gpios when using DM_GPIO
Adam Ford [Sun, 9 Apr 2017 12:35:12 +0000 (07:35 -0500)]
OMAP3: Correct name of omap34xx_gpios when using DM_GPIO

The name of the gpio bank under DM_GPIO appear to be a copy-paste error.
This changes the name of the gpio bank from am33xx_gpios to omap34xx_gpios.

Signed-off-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoomap3: i2c: correct register
Adam Ford [Sat, 8 Apr 2017 22:34:29 +0000 (17:34 -0500)]
omap3: i2c: correct register

The register names and offset were not correct as per the TRM for OMAP3530
and OMAP3630.  Correct the naing and offsets per the documentation

Signed-off-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
7 years agoarm64: zynqmp: Sync defconfig with Kconfig
Michal Simek [Thu, 20 Apr 2017 09:47:21 +0000 (11:47 +0200)]
arm64: zynqmp: Sync defconfig with Kconfig

Remove option which depends on MMC controller which is disabled for dc2.
Savedefconfig is removing it because of new dependencies.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agozynq-topic-miami.dts: Add usbotg0 alias to make USB actually work
Mike Looijmans [Mon, 10 Apr 2017 06:56:22 +0000 (08:56 +0200)]
zynq-topic-miami.dts: Add usbotg0 alias to make USB actually work

Fixes the following problem:
zynq-uboot> run dfu_ram
Setting bus to 1
g_dnl_register: failed!, error: -19

The cause appears to be that the USB framework is looking for a usbotg aliases,
so add the alias to point to our USB device.

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agoMerge git://git.denx.de/u-boot-sunxi
Tom Rini [Tue, 25 Apr 2017 20:12:42 +0000 (16:12 -0400)]
Merge git://git.denx.de/u-boot-sunxi

7 years agoMerge git://git.denx.de/u-boot-fsl-qoriq
Tom Rini [Tue, 25 Apr 2017 20:11:35 +0000 (16:11 -0400)]
Merge git://git.denx.de/u-boot-fsl-qoriq

7 years agoMerge branch 'master' of git://git.denx.de/u-boot-usb
Tom Rini [Tue, 25 Apr 2017 13:00:18 +0000 (09:00 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-usb

7 years agoMerge branch 'master' of git://git.denx.de/u-boot-socfpga
Tom Rini [Tue, 25 Apr 2017 12:59:56 +0000 (08:59 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-socfpga

7 years agoehci-ppc4xx: Prepare for usage of readl()/writel() accessors
Alexey Brodkin [Mon, 17 Apr 2017 16:13:17 +0000 (19:13 +0300)]
ehci-ppc4xx: Prepare for usage of readl()/writel() accessors

We used to have opencoded ehci_readl()/writel() which required no
external functions to be called.

Now with attempt to switch to generic readl()/writel() accessors
we see a missing declaration of those accessors in ehci-ppc4xx.
Something like that happens if applied
http://patchwork.ozlabs.org/patch/726714/:
---------------->8---------------
  CC      drivers/usb/host/ehci-ppc4xx.o
drivers/usb/host/ehci-ppc4xx.c: In function 'ehci_hcd_init':
drivers/usb/host/ehci-ppc4xx.c:23:3: warning: implicit declaration of function 'readl' [-Wimplicit-function-declaration]
   HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
   ^
---------------->8---------------

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Tom Rini <trini@konsulko.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
Reviewed-by: Stefan Roese <sr@denx.de>
7 years agousb: musb: avoid out of bound access in udc_setup_ep
Heinrich Schuchardt [Sat, 15 Apr 2017 12:29:54 +0000 (14:29 +0200)]
usb: musb: avoid out of bound access in udc_setup_ep

For id = 15 an out of bound access occurs in udc_setup_ep().
Increase the size of epinfo[] from 30 to 32 to encompass
ids 0..15.

The problem was highlighted by cppcheck.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
7 years agomusb: properly detect failed initialization of controller
Heinrich Schuchardt [Sat, 15 Apr 2017 11:46:22 +0000 (13:46 +0200)]
musb: properly detect failed initialization of controller

We want to check the result of musb_init_controller
and not the address were the result is stored.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
7 years agoarm: socfpga: add cyclone5 based de10-nano board
Dalon Westergreen [Tue, 18 Apr 2017 15:11:16 +0000 (08:11 -0700)]
arm: socfpga: add cyclone5 based de10-nano board

Add support for the Terasic DE10-Nano board.  The board
is based on the DE0-Nano-Soc board but adds a larger FPGA
and an HDMI output.

Signed-off-by: Dalon Westergreen <dwesterg@gmail.com>
Reviewed-by: Dinh Nguyen <dinguyen@kernel.org>
7 years agosunxi: fix the default value of CONS_INDEX on non-A23/A33 SUN8I
Icenowy Zheng [Mon, 24 Apr 2017 17:39:51 +0000 (01:39 +0800)]
sunxi: fix the default value of CONS_INDEX on non-A23/A33 SUN8I

Only A23/A33 in SUN8I want a default value of CONS_INDEX of 5, for other
chips the default value is 1 like other Allwinner SoCs.

Fix this default value.

The original wrong value has lead to wrong console on H3 Orange Pi
boards.

Fixes: 7095f8641863 ("sunxi: Convert CONS_INDEX to Kconfig")

Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
7 years agoMerge branch 'master' of git://git.denx.de/u-boot-uniphier
Tom Rini [Tue, 25 Apr 2017 01:08:42 +0000 (21:08 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-uniphier

7 years agoMerge branch 'master' of git://git.denx.de/u-boot-mips
Tom Rini [Tue, 25 Apr 2017 01:08:10 +0000 (21:08 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-mips

7 years agoarmv8: layerscape: Fix DDR size calcuation for SPL build
York Sun [Thu, 20 Apr 2017 23:04:23 +0000 (16:04 -0700)]
armv8: layerscape: Fix DDR size calcuation for SPL build

Commit 088454cd dropped return value from initram(), setting
gd->ram_size directly. Three boards were missed for SPL boot.

Signed-off-by: York Sun <york.sun@nxp.com>
7 years agoarm: psci: make psci usable on single core socs
Yuantian Tang [Wed, 19 Apr 2017 05:27:39 +0000 (13:27 +0800)]
arm: psci: make psci usable on single core socs

PSCI can be used on both multiple and single core socs. Current
implementation only allows PSCI to work on multiple core socs.
This patch removes this restriction so that PSCI can work on
single core socs as well.

Signed-off-by: Chenhui Zhao <chenhui.zhao@nxp.com>
Signed-off-by: Tang Yuantian <andy.tang@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agoarmv8: ls104xardb: Secure Boot: enable PPA support for eMMC/SD and NAND boot
Sumit Garg [Wed, 19 Apr 2017 23:39:13 +0000 (05:09 +0530)]
armv8: ls104xardb: Secure Boot: enable PPA support for eMMC/SD and NAND boot

Signed-off-by: Sumit Garg <sumit.garg@nxp.com>
Signed-off-by: Udit Agarwal <udit.agarwal@nxp.com>
Tested-by: Vinitha Pillai <vinitha.pillai@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agoarmv8: fsl-layerscape: Add validation of PPA image from NAND and SD
Sumit Garg [Wed, 19 Apr 2017 23:39:12 +0000 (05:09 +0530)]
armv8: fsl-layerscape: Add validation of PPA image from NAND and SD

Signed-off-by: Sumit Garg <sumit.garg@nxp.com>
Signed-off-by: Udit Agarwal <udit.agarwal@nxp.com>
Tested-by: Vinitha Pillai <vinitha.pillai@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>