project/bcm63xx/u-boot.git
7 years agoMerge git://git.denx.de/u-boot-usb
Tom Rini [Tue, 6 Jun 2017 01:05:51 +0000 (21:05 -0400)]
Merge git://git.denx.de/u-boot-usb

7 years agoPrepare v2017.07-rc1
Tom Rini [Tue, 6 Jun 2017 00:40:22 +0000 (20:40 -0400)]
Prepare v2017.07-rc1

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoarmv7m: Fix larger builds
Phil Edworthy [Thu, 1 Jun 2017 06:33:29 +0000 (07:33 +0100)]
armv7m: Fix larger builds

The branch instruction only has an 11-bit relative target address, which
is sometimes not enough.

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
7 years agoarm: Add Kconfig symbols used for Linux asm compatibility
Phil Edworthy [Thu, 1 Jun 2017 06:33:28 +0000 (07:33 +0100)]
arm: Add Kconfig symbols used for Linux asm compatibility

Rather than change asm files that come from Linux, add the symbols
to Kconfig. Since one of the symbols is for thumb2 builds, make
CPU_V7M always select them.

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
7 years agoarm64: hikey: Fix instructions in readme
Michal Simek [Wed, 31 May 2017 09:28:30 +0000 (11:28 +0200)]
arm64: hikey: Fix instructions in readme

Fix inaccurate instructions in README.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agodrivers: ram: stm32: fix compilation issue
Patrice Chotard [Tue, 30 May 2017 13:06:31 +0000 (15:06 +0200)]
drivers: ram: stm32: fix compilation issue

If CONFIG_CLK flag is not set, compilation raises the
following error message:

drivers/ram/stm32_sdram.c: In function 'stm32_fmc_probe':
drivers/ram/stm32_sdram.c:154:2: error: 'ret' undeclared (first use in this function)
  ret = stm32_sdram_init(dev);

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
cc: Vikas Manocha <vikas.manocha@st.com>

7 years agoarm64: Add NOLOAD attribute NOLOAD to .bss sections
Michal Simek [Mon, 29 May 2017 08:26:53 +0000 (10:26 +0200)]
arm64: Add NOLOAD attribute NOLOAD to .bss sections

Mark explicitly bss sections to not be loaded at
run time.
The similar patch was done in past by:
"Fix linker scripts: add NOLOAD atribute to .bss/.sbss sections"
(sha1: 64134f011254123618798ff77c42ba196b2ec485)

The problem is related to latest toolchain added to Xilinx
v2017.1 design tools where jtag loader is trying to access
ununitialized memory.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agoARMv8: Add support for poweroff via PSCI
Michal Simek [Mon, 29 May 2017 07:11:32 +0000 (09:11 +0200)]
ARMv8: Add support for poweroff via PSCI

Add support for calling poweroff in case of psci is wired.
Based on the same solution as is used for reset.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
[trini: Move all logic in to fwcall.c as other ARMs implement poweroff
via PMIC]
Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agocmd/ethsw: Disable implicit enum conversion warning
Tom Rini [Sun, 28 May 2017 12:49:51 +0000 (08:49 -0400)]
cmd/ethsw: Disable implicit enum conversion warning

With clang-3.8 we see warnings like:
cmd/ethsw.c:304:6: warning: implicit conversion from
      enumeration type 'enum ethsw_keyword_opt_id' to different enumeration type
      'enum ethsw_keyword_id' [-Wenum-conversion]
                                        ethsw_id_pvid_no,
                                        ^~~~~~~~~~~~~~~~

Because we have one enum for ethsw_keyword_id and a second enum for
ethsw_keyword_opt_id.  This ends up being safe as ethsw_keyword_opt_id
explicitly starts after ethsw_keyword_id enum ends.   Disable the
warning here rather than collapse these into one enum and rely on
comments to denote where optional keywords begin.

Cc: Codrin Ciubotariu <codrin.ciubotariu@freescale.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
7 years agomalloc: Turn on DEBUG when enabling unit tests
Pantelis Antoniou [Thu, 25 May 2017 16:24:06 +0000 (19:24 +0300)]
malloc: Turn on DEBUG when enabling unit tests

Unit tests require mallinfo which in turn requires DEBUG on
dlmalloc to be enabled.

The dependancy on CONFIG_SANDBOX is wrong.

Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agoarm: Always keep the dtb section on objcopy
Pantelis Antoniou [Thu, 25 May 2017 16:23:58 +0000 (19:23 +0300)]
arm: Always keep the dtb section on objcopy

The dtb blob section must always be present in the resulting image.
Either if OF_EMBEDED is used or if unit tests include dtb blobs.

Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agoboard: ti: am571-idx: Add vcores support
Keerthy [Thu, 25 May 2017 10:07:34 +0000 (15:37 +0530)]
board: ti: am571-idx: Add vcores support

Update vcores for am571-idk board.

Reported-by: Steve Kipisz <s-kipisz2@ti.com>
Signed-off-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoscripts/Makefile.lib: Only apply u-boot.dtsi files in the target directory
Tom Rini [Wed, 24 May 2017 15:04:03 +0000 (11:04 -0400)]
scripts/Makefile.lib: Only apply u-boot.dtsi files in the target directory

We only want to apply files such as 'omap5-u-boot.dtsi', which resides
in arch/arm/dts/ to other files in arch/arm/dts/ and not say
test/overlay/.  Rework the make logic to check for -u-boot.dtsi files in
the same directory as their target dts.

Cc: Simon Glass <sjg@chromium.org>
Reported-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Tested-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agoARM: ti: Update layout for MMC and eMMC (env and dfu)
Jean-Jacques Hiblot [Wed, 24 May 2017 10:08:27 +0000 (12:08 +0200)]
ARM: ti: Update layout for MMC and eMMC (env and dfu)

The problems with the current DFU layout are:
MMC: The space allocated for u-boot is too small for the latest u-boot
     (>750KB). We need to increase it. eMMC uses a much bigger area (2MB).
eMMC: region "u-boot.img.raw" overlaps the environment area and the region
      "spl-os-image.raw".
both: region "spl-os-image.raw" is quite small and can't handle android
      kernels

Fixing this requires growing some regions and moving others.
Care has been taken to leave some room for further growth of
"spl-os-args.raw".
Also the "env" now appears in the dfu so that it's apparent that the
region is not free space that can be used to grow "u-boot.img.raw".
The MLO region is 0x100 sectors wide but the 0x100 are unused in case the
MLO comes too overflow this areas.
The total space allocated for those raw binaries is 16MB, of which 13+MB
are reserved for the kernel image.

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org>
7 years agocommon/spl/Kconfig: Use 'if SPL' / 'if TPL' guards
Tom Rini [Mon, 22 May 2017 19:21:57 +0000 (19:21 +0000)]
common/spl/Kconfig: Use 'if SPL' / 'if TPL' guards

Much of the entries here simply depend on SPL (or TPL).  Instead of this
redundancy use if SPL / if TPL to guard the rest of the choices and only
show them when we have the relevant option enabled.

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agobootstage: Record time taken to set up the live device tree
Simon Glass [Mon, 22 May 2017 11:05:36 +0000 (05:05 -0600)]
bootstage: Record time taken to set up the live device tree

This time is interesting as a comparision with the flat device tree time.
Add it to the record.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agobootstage: Support SPL
Simon Glass [Mon, 22 May 2017 11:05:35 +0000 (05:05 -0600)]
bootstage: Support SPL

At present bootstage only supports U-Boot proper. But SPL can also consume
boot time so it is useful to have the record start there.

Add bootstage support to SPL. Also support stashing the timing information
when SPL finishes so that it can be picked up and reported by U-Boot
proper. This provides a full boot time record, excluding only the time
taken by the boot ROM.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agobootstage: Adjust to use const * where possible
Simon Glass [Mon, 22 May 2017 11:05:34 +0000 (05:05 -0600)]
bootstage: Adjust to use const * where possible

There are a few places that should use const *, such as
bootstage_unstash(). Update these to make it clearer when parameters are
changed.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agobootstage: Tidy up error return values
Simon Glass [Mon, 22 May 2017 11:05:33 +0000 (05:05 -0600)]
bootstage: Tidy up error return values

We should return a proper error number instead of just -1. This helps the
caller to determine what when wrong. Update a few functions to fix this.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agobootstage: Record the time taken to set up driver model
Simon Glass [Mon, 22 May 2017 11:05:32 +0000 (05:05 -0600)]
bootstage: Record the time taken to set up driver model

Driver model is set up ones before relocation and once after. Record the
time taken in each case.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agobootstage: Init as early as possible
Simon Glass [Mon, 22 May 2017 11:05:31 +0000 (05:05 -0600)]
bootstage: Init as early as possible

At present we don't allow use of bootstage before driver model is running.
This means we cannot time the init of driver model itself.

Now that bootstage requires its own board-specific timer, we can move its
init to earlier in the sequence, both before and after relocation.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agobootstage: Support relocating boostage data
Simon Glass [Mon, 22 May 2017 11:05:30 +0000 (05:05 -0600)]
bootstage: Support relocating boostage data

Some boards cannot access pre-relocation data after relocation. Reserve
space for this and copy it during preparation for relocation.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agobootstage: Use debug() for stashing messages
Simon Glass [Mon, 22 May 2017 11:05:29 +0000 (05:05 -0600)]
bootstage: Use debug() for stashing messages

We don't normally want to see these messages. Change them to debug-only.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agobootstage: Show records with a zero time
Simon Glass [Mon, 22 May 2017 11:05:28 +0000 (05:05 -0600)]
bootstage: Show records with a zero time

We can now use the record count to determine whether a record is valid or
not. Drop the test for a zero time.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agobootstage: Use rec_count as the array index
Simon Glass [Mon, 22 May 2017 11:05:27 +0000 (05:05 -0600)]
bootstage: Use rec_count as the array index

At present bootstage has a large array with all possible bootstage IDs
recorded. It adds times to the array element indexed by the ID. This is
inefficient because many IDs are not used during boot. We can save space
by only recording those IDs which actually have timestamps.

Update the array to use a record count, which increments with each
addition of a new timestamp. This takes longer to record a time, since it
may involve an array search. Such a search may be particularly expensive
before relocation when the CPU is running slowly or the cache is off. But
at that stage there should be very few records.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agobootstage: Fix up code style and comments
Simon Glass [Mon, 22 May 2017 11:05:26 +0000 (05:05 -0600)]
bootstage: Fix up code style and comments

There are several code style and comment nits. Fix them and also remove
the comment about passing bootstage to the kernel being TBD. This is
already supported.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agobootstage: Convert to use malloc()
Simon Glass [Mon, 22 May 2017 11:05:25 +0000 (05:05 -0600)]
bootstage: Convert to use malloc()

At present bootstage uses the data section of the image to store its
information. There are a few problems with this:

- It does not work on all boards (e.g. those which run from flash before
relocation)
- Allocated strings still point back to the pre-relocation data after
relocation

Now that U-Boot has a pre-relocation malloc() we can use this instead,
with a pointer to the data in global_data. Update bootstage to do this and
set up an init routine to allocate the memory.

Now that we have a real init function, we can drop the fake 'reset' record
and add a normal one instead.

Note that part of the problem with allocated strings remains. They are
reallocated but this will only work where pre-relocation memory is
accessible after relocation.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agobootstage: Change CONFIG_BOOTSTAGE_USER_COUNT to an int
Simon Glass [Mon, 22 May 2017 11:05:24 +0000 (05:05 -0600)]
bootstage: Change CONFIG_BOOTSTAGE_USER_COUNT to an int

There is no good read to make this hex, and integer is more natural for
this type of setting. Update it.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agobootstage: Require timer_get_boot_us() to be defined
Simon Glass [Mon, 22 May 2017 11:05:23 +0000 (05:05 -0600)]
bootstage: Require timer_get_boot_us() to be defined

At present we provide a default version of this function for use by
bootstage. However it uses the system timer and therefore likely requires
driver model. This makes it impossible to time driver-model init.

Drop the function and require boards to provide their own. Add a sandbox
version also. There is a default implememtation in lib/time.c for boards
which use CONFIG_SYS_TIMER_COUNTER.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agobootstage: Provide a default timer function
Simon Glass [Mon, 22 May 2017 11:05:22 +0000 (05:05 -0600)]
bootstage: Provide a default timer function

If CONFIG_SYS_TIMER_COUNTER is used we can provide a default microsecond
timer implementation.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agoARM: k2g: Fix passing main pll info for higher speeds
Lokesh Vutla [Sat, 20 May 2017 00:19:27 +0000 (05:49 +0530)]
ARM: k2g: Fix passing main pll info for higher speeds

Main pll is marked as arm plls for higher speeds. Fix this.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
7 years agocmd/elf.c: Support passing arguments with bootelf
Tom Rini [Thu, 18 May 2017 21:03:07 +0000 (17:03 -0400)]
cmd/elf.c: Support passing arguments with bootelf

The bootelf command could, but does not, pass additional arguments along
on the command line.  Make do_bootelf consume bootelf/flags/address as
needed and then pass along anything else to the ELF application we've
launched.

Reported-by: Thomas Doerfler <thomas.doerfler@embedded-brains.de>
Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoreset: sti: add deassert counter in reset channel descriptor
Patrice Chotard [Thu, 18 May 2017 07:58:00 +0000 (09:58 +0200)]
reset: sti: add deassert counter in reset channel descriptor

This deassert counter allow to manage "shared" reset lines
encountered in some specific case. On STiH410 SoC, DWC3,
EHCI and OHCI are all using a respective PHY, but all of
these PHYs shared a "global" reset.

Currently, during command "usb stop", all host controller are
stopped (XHCI, EHCI and OHCI). XHCI is first shutdowned, which
means that PHY global reset is asserted. Then EHCI is shutdowned,
but its PHY reset has already been asserted which make handshake()
call failed in ehci_shutdown().

This counter allows to really assert a reset lines only when the
"last" user is asserting it.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agotest: py: hush: Add echo dependency
Michal Simek [Thu, 18 May 2017 07:23:15 +0000 (09:23 +0200)]
test: py: hush: Add echo dependency

Some tests depends on echo command to be present.

Reported-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agotest: py: Use global pytestmark for hush tests
Michal Simek [Thu, 18 May 2017 07:23:14 +0000 (09:23 +0200)]
test: py: Use global pytestmark for hush tests

All tests in test_hush_if_test depends on hush parser to be
present. This patch simplify test dependencies by using global
pytestmark.

Reported-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
7 years agoarm: am57xx: cl-som-am57x: adjust default env to the installation system
Uri Mashiach [Wed, 17 May 2017 14:29:28 +0000 (17:29 +0300)]
arm: am57xx: cl-som-am57x: adjust default env to the installation system

The SD card automatic installation system depends on the default
environment of the previous U-Boot.

Add the missing environment variables.

Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoARM: am57xx: cl-som-am57x: support for AM5718
Uri Mashiach [Wed, 17 May 2017 14:29:27 +0000 (17:29 +0300)]
ARM: am57xx: cl-som-am57x: support for AM5718

Disable SDRAM controller EMIF2 for single core SOC
Set SDRAM size size to 1GB

Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoarm: am57xx: cl-som-am57x: change the shell prompt
Uri Mashiach [Wed, 17 May 2017 14:29:26 +0000 (17:29 +0300)]
arm: am57xx: cl-som-am57x: change the shell prompt

Change the shell prompt to "U-Boot# ".

Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoarm: am57xx: cl-som-am57x: support for FS boot
Uri Mashiach [Wed, 17 May 2017 14:29:25 +0000 (17:29 +0300)]
arm: am57xx: cl-som-am57x: support for FS boot

Supported boot devices are raw QSPI and raw SD card.
Add support for a FAT16/32 file system for SD card.

The SOC's boot ROM only supports FAT file system.
Therefore remove the SPL support for the EXT file system.

Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agocommon: microblaze: Drop arch-specific declarations
Simon Glass [Wed, 17 May 2017 14:23:11 +0000 (08:23 -0600)]
common: microblaze: Drop arch-specific declarations

These are not needed and should not be in common.h. Drop them.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agocommon: arm: freescale: layerscape: Move header files out of common.h
Simon Glass [Wed, 17 May 2017 14:23:10 +0000 (08:23 -0600)]
common: arm: freescale: layerscape: Move header files out of common.h

We should not have an arch-specific header file in common.h. Adjust the
board files a little so it is not needed, and drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agocommon: arm: davinci: Move header file out of common
Simon Glass [Wed, 17 May 2017 14:23:09 +0000 (08:23 -0600)]
common: arm: davinci: Move header file out of common

We should not have an arch-specific header file in common.h. Instead, use
the asm/hardware.h header to provide the required declarations, and drop
the common.h changes.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agocommon: ep93xx: Move arch-specific declarations out of common
Simon Glass [Wed, 17 May 2017 14:23:08 +0000 (08:23 -0600)]
common: ep93xx: Move arch-specific declarations out of common

These declarations should not be in common. Remove those that are not
needed and move the others to an arch-specific location.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agocommon: freescale: Move arch-specific imx code to arch-imx
Simon Glass [Wed, 17 May 2017 14:23:07 +0000 (08:23 -0600)]
common: freescale: Move arch-specific imx code to arch-imx

These declarations should not be in common.h. Move them to an
arch-specific header.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agocommon: freescale: Move arch-specific declarations
Simon Glass [Wed, 17 May 2017 14:23:06 +0000 (08:23 -0600)]
common: freescale: Move arch-specific declarations

The declarations should not be in common.h. Move them to the arch-specific
headers.

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: Fixup thinko defined(FSL_LSCH3) -> defined(CONFIG_FSL_LSCH3)]
Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agocommon: powerpc: Move arch-specific headers
Simon Glass [Wed, 17 May 2017 14:23:05 +0000 (08:23 -0600)]
common: powerpc: Move arch-specific headers

Set up a new asm/ppc.h header file to hold this arch-specific stuff. It
should not be in common.h. It probably should be refactored to use
asm/arch instead, but that is a job for the maintainer.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agocommon: Move PPC4xx_SYS_INFO() et al to arch-specific header
Simon Glass [Wed, 17 May 2017 14:23:04 +0000 (08:23 -0600)]
common: Move PPC4xx_SYS_INFO() et al to arch-specific header

These definitions should not be in common.h. Move them to an arch-specific
header file.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agocommon: Drop determine_sysper() and determine_pci_clock_per()
Simon Glass [Wed, 17 May 2017 14:23:03 +0000 (08:23 -0600)]
common: Drop determine_sysper() and determine_pci_clock_per()

These arch-specific declarations should not be in common.h. Drop them.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agocommon: Drop cpu_init_f() declarations
Simon Glass [Wed, 17 May 2017 14:23:02 +0000 (08:23 -0600)]
common: Drop cpu_init_f() declarations

These arch-specific functions are not needed here.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agoarm: Remove include files from common.h
Simon Glass [Wed, 17 May 2017 14:23:01 +0000 (08:23 -0600)]
arm: Remove include files from common.h

With a small tweak we can avoid including these files for all boards.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoarm: Include asm/setup.h explictly
Simon Glass [Wed, 17 May 2017 14:23:00 +0000 (08:23 -0600)]
arm: Include asm/setup.h explictly

Include this header where needed so we do not need to rely on common.h.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agoarm: Add declarations to avoid needing to include headers
Simon Glass [Wed, 17 May 2017 14:22:59 +0000 (08:22 -0600)]
arm: Add declarations to avoid needing to include headers

At present common.h includes various ARM-specific headers. In preparation
for dropping this, add a few explicit declarations.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agoarm: Add explicit include of <asm/mach-types.h>
Simon Glass [Thu, 1 Jun 2017 01:47:48 +0000 (19:47 -0600)]
arm: Add explicit include of <asm/mach-types.h>

Rather than relying on common.h to provide this include, which is going
away at some point, include it explicitly in each file.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agonds32: Remove include files from common.h
Simon Glass [Wed, 17 May 2017 14:22:57 +0000 (08:22 -0600)]
nds32: Remove include files from common.h

With a few tweaks we can avoid including these files, which are only
needed by two C files.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agox86: Don't include asm/u-boot.h in common
Simon Glass [Wed, 17 May 2017 14:22:56 +0000 (08:22 -0600)]
x86: Don't include asm/u-boot.h in common

With a small fixup to u-boot-x86.h, this is not actually needed anywhere,
so drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agosandbox: Don't include asm/u-boot.h in common
Simon Glass [Wed, 17 May 2017 14:22:55 +0000 (08:22 -0600)]
sandbox: Don't include asm/u-boot.h in common

This is not actually needed anywhere, so drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agomips: Don't include asm/u-boot.h in common
Simon Glass [Wed, 17 May 2017 14:22:54 +0000 (08:22 -0600)]
mips: Don't include asm/u-boot.h in common

This is not actually needed anywhere, so drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
7 years agoarc: Don't include asm/u-boot.h in common
Simon Glass [Wed, 17 May 2017 14:22:53 +0000 (08:22 -0600)]
arc: Don't include asm/u-boot.h in common

This is not actually needed anywhere, so drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agonds32: Make u-boot-nds32.h a private header
Simon Glass [Wed, 17 May 2017 14:22:52 +0000 (08:22 -0600)]
nds32: Make u-boot-nds32.h a private header

Rather than including this arch-specific header file in common.h, include
it from within nds32's u-boot.h header.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agomips: Make u-boot-mips.h a private header
Simon Glass [Wed, 17 May 2017 14:22:51 +0000 (08:22 -0600)]
mips: Make u-boot-mips.h a private header

Rather than including this arch-specific header file in common.h, include
it from within mips's u-boot.h header.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
7 years agoarm: Make u-boot-arm.h a private header
Simon Glass [Wed, 17 May 2017 14:22:50 +0000 (08:22 -0600)]
arm: Make u-boot-arm.h a private header

Rather than including this arch-specific header file in common.h, include
it from within arm's u-boot.h header.

Also drop the comment about something to be fixed. It has been there
forever and it is not clear what it means.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agox86: Make u-boot-x86.h a private header
Simon Glass [Wed, 17 May 2017 14:22:49 +0000 (08:22 -0600)]
x86: Make u-boot-x86.h a private header

Rather than including this arch-specific header file in common.h, include
it from within x86's u-boot.h header.

Also drop the comment about something to be fixed. It is not clear what
needs fixing.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agosandbox: Make u-boot-sandbox.h a private header
Simon Glass [Wed, 17 May 2017 14:22:48 +0000 (08:22 -0600)]
sandbox: Make u-boot-sandbox.h a private header

Rather than including this arch-specific header file in common.h, include
it from within sandbox's u-boot.h header.

Also drop the comment about something to be fixed.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agoarc: Make u-boot-arc.h a private header
Simon Glass [Wed, 17 May 2017 14:22:47 +0000 (08:22 -0600)]
arc: Make u-boot-arc.h a private header

Rather than including this arch-specific header file in common.h, include
it from within arc's u-boot.h header.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agosamsung: Drop more references fo s3c24x0
Simon Glass [Wed, 17 May 2017 14:22:46 +0000 (08:22 -0600)]
samsung: Drop more references fo s3c24x0

This is dead code now. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agosamsung: nand: Drop s3c2410_nand driver
Simon Glass [Wed, 17 May 2017 14:22:45 +0000 (08:22 -0600)]
samsung: nand: Drop s3c2410_nand driver

This is not used anymore. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agosamsung: usb: Drop ohci-s3c24xx driver
Simon Glass [Wed, 17 May 2017 14:22:44 +0000 (08:22 -0600)]
samsung: usb: Drop ohci-s3c24xx driver

This is not used anymore. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agosamsung: mmc: Drop s3c_sdi driver
Simon Glass [Wed, 17 May 2017 14:22:43 +0000 (08:22 -0600)]
samsung: mmc: Drop s3c_sdi driver

This is no-longer used in U-Boot. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
7 years agosamsung: Drop s3c24x0 arch-specific code
Simon Glass [Wed, 17 May 2017 14:22:42 +0000 (08:22 -0600)]
samsung: Drop s3c24x0 arch-specific code

This is not used anymore. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agogpio: samsung: Drop s3c2440_gpio driver
Simon Glass [Wed, 17 May 2017 14:22:41 +0000 (08:22 -0600)]
gpio: samsung: Drop s3c2440_gpio driver

This is no longer used in U-Boot. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agoapi: Add a header for api_init()
Simon Glass [Wed, 17 May 2017 14:22:40 +0000 (08:22 -0600)]
api: Add a header for api_init()

Put this in its own header instead of using common.h.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agocommon: Move get_OPB_freq() and get_PCI_freq() to PPC header
Simon Glass [Wed, 17 May 2017 14:22:39 +0000 (08:22 -0600)]
common: Move get_OPB_freq() and get_PCI_freq() to PPC header

These should not be in common.h. Move the to an arch-specific header.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agocommon: Move pcie_setup_hoses() to PPC header
Simon Glass [Wed, 17 May 2017 14:22:38 +0000 (08:22 -0600)]
common: Move pcie_setup_hoses() to PPC header

Only one board needs this definition. Move it to an arch-specific header.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agocommon: Drop pci_master_init()
Simon Glass [Wed, 17 May 2017 14:22:37 +0000 (08:22 -0600)]
common: Drop pci_master_init()

This should not be in common.h. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agocommon: Move pci_target_init() to PPC header
Simon Glass [Wed, 17 May 2017 14:22:36 +0000 (08:22 -0600)]
common: Move pci_target_init() to PPC header

Only one boards needs this definition. Move it to an arch-specific header.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agocommon: Drop pci_pre_init() and is_pci_host()
Simon Glass [Wed, 17 May 2017 14:22:35 +0000 (08:22 -0600)]
common: Drop pci_pre_init() and is_pci_host()

These should not be in common.h. They are used in some legacy PowerPC
code. Just drop them.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agocommon: Drop inclusion of pci.h
Simon Glass [Wed, 17 May 2017 14:22:34 +0000 (08:22 -0600)]
common: Drop inclusion of pci.h

This should not be in common.h - remove it and update the only file that
needs it.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agot81xx: Migrate TI81XX/TI816X/TI814X symbols to Kconfig
Tom Rini [Tue, 16 May 2017 18:46:40 +0000 (14:46 -0400)]
t81xx: Migrate TI81XX/TI816X/TI814X symbols to Kconfig

The symbol CONFIG_TI81XX is used for the parts that are common to the
TI816x and TI814x SoCs and are not part of CONFIG_ARCH_OMAP2PLUS nor
CONFIG_AM33XX.  It however has so few uses that we can just modify the
code to check for both and drop the symbol. The symbols CONFIG_TI816X
and CONFIG_TI814X are for the repective SoCs.

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoti816x: Modernize the defconfig
Tom Rini [Tue, 16 May 2017 18:46:39 +0000 (14:46 -0400)]
ti816x: Modernize the defconfig

- Switch to using <configs/ti_armv7_omap.h> and family.  This lets us
  drop lots of custom defines.
- Ensure that our default environment uses DEFAULT_LINUX_BOOT_ENV so
  that Linux will boot correctly.
- Enable CONFIG_DISTRO_DEFAULTS
- Switch to using CONFIG_OF_CONTROL
- Various other cleanups to match other SoCs in the family line.

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoti816x: Import dts files from Linux Kernel v4.11
Tom Rini [Tue, 16 May 2017 18:46:38 +0000 (14:46 -0400)]
ti816x: Import dts files from Linux Kernel v4.11

This brings in the required dts/dtsi files for the TI8168-EVM from the
Linux Kernel v4.11 release.

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoti816x: Enable NAND
Tom Rini [Tue, 16 May 2017 18:46:37 +0000 (14:46 -0400)]
ti816x: Enable NAND

The TI8168-EVM comes with NAND on board.  Enable it and move environment
over there.

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoti816x_evm: Disable CONFIG_USE_PRIVATE_LIBGCC
Tom Rini [Tue, 16 May 2017 18:46:36 +0000 (14:46 -0400)]
ti816x_evm: Disable CONFIG_USE_PRIVATE_LIBGCC

On this platform, we can trace a general failure to boot to enabling /
disabling this option.  When this is enabled, we go off into the
weeds during SPL and are unable to talk with the SD card and
mmc_initialize() fails.

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoti816x: Rework DDR initialization sequence
Tom Rini [Tue, 16 May 2017 18:46:35 +0000 (14:46 -0400)]
ti816x: Rework DDR initialization sequence

The ti816x/am389x SoC is the first generation in what U-Boot calls the
"am33xx" family.  In the first generation of this family the DDR
initialization sequence is quite different from all of the subsequent
generations.  Whereas with ti814x (second generation) we can easily work
the minor differenced between that and am33xx (third generation), our
attempts to do this for ti816x weren't sufficient.  Rather than add a
large amount of #ifdef logic to make this different sequence work we add
a new file, ti816x_emif4.c to handle the various required undocumented
register writes and sequence and leverage what we can from
arch/arm/mach-omap2/am33xx/ddr.c still.  As DDR2 has similar problems
today but I am unable to test it, we drop the DDR2 defines from the code
rather than imply that it works by leaving it.  We also remove a bunch
of other untested code about changing the speed the DDR runs at.

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoarmv7: Mark the default lowlevel_init function as weak
Tom Rini [Tue, 16 May 2017 18:46:34 +0000 (14:46 -0400)]
armv7: Mark the default lowlevel_init function as weak

Rather than have a long and if check in the Makefile, mark the default
lowlevel_init function as weak (as we do on armv8) so that SoCs can
override it if needed, and it will still be discarded if unused.
Provide a weak s_init as well to allow for this to link and be
discarded.

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoconfigs: davinci: omapl138_lcdk: add random eth address support
Anna, Suman [Tue, 16 May 2017 17:50:18 +0000 (12:50 -0500)]
configs: davinci: omapl138_lcdk: add random eth address support

Any TFTP or DHCP boot on the Davinci OMAP-L138 LCDK board requires
that the 'ethaddr' variable be defined. There are no e-fuses to store
the ethernet mac address for this platform, and neither is a MAC
address reserved in any format. So enable random MAC address support
so that networking boot can be supported.

Signed-off-by: Suman Anna <s-anna@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
7 years agoEnable PXE boot on meson-gxbb.
Vagrant Cascadian [Fri, 5 May 2017 21:11:26 +0000 (14:11 -0700)]
Enable PXE boot on meson-gxbb.

Enable distro_bootcmd PXE functions on meson-gxbb systems.

Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agoehci-pci: Prepare for usage of readl()/writel() accessors
Alexey Brodkin [Mon, 5 Jun 2017 07:19:26 +0000 (10:19 +0300)]
ehci-pci: 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-pci.o
In file included from drivers/usb/host/ehci-pci.c:14:0:
drivers/usb/host/ehci-pci.c: In function 'ehci_pci_init':
drivers/usb/host/ehci.h:108:36: warning: implicit declaration of function 'readl' [-Wimplicit-function-declaration]
 #define ehci_readl(x)  cpu_to_le32(readl(x))
                                    ^
drivers/usb/host/ehci.h:23:26: note: in definition of macro 'HC_LENGTH'
 #define HC_LENGTH(p)  (((p) >> 0) & 0x00ff)
                          ^
include/linux/byteorder/generic.h:89:21: note: in expansion of macro '__cpu_to_le32'
 #define cpu_to_le32 __cpu_to_le32
                     ^~~~~~~~~~~~~
drivers/usb/host/ehci-pci.c:33:14: note: in expansion of macro 'ehci_readl'
    HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
              ^~~~~~~~~~
--------------------------------->8---------------------------

This the same fix as we have for "ehci-ppc4xx" in
83cb46c286b "ehci-ppc4xx: Prepare for usage of readl()/writel() accessors".

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Tom Rini <trini@konsulko.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
7 years agoMerge git://git.denx.de/u-boot-x86
Tom Rini [Mon, 5 Jun 2017 02:29:33 +0000 (22:29 -0400)]
Merge git://git.denx.de/u-boot-x86

7 years agox86: fsp: Remove the call to set up internal uart in fsp_init()
Bin Meng [Thu, 1 Jun 2017 10:41:14 +0000 (03:41 -0700)]
x86: fsp: Remove the call to set up internal uart in fsp_init()

First of all, it's inappropriate to call setup_internal_uart() in a
generic API fsp_init(), as CONFIG_INTERNAL_UART is an option that
is only available on BayTrail platform. Secondly even for BayTrail,
there is no need to call setup_internal_uart() at all, as Intel FSP
will do this for us.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agox86: baytrail: Fix boot hang with a debug build
Bin Meng [Thu, 1 Jun 2017 10:41:13 +0000 (03:41 -0700)]
x86: baytrail: Fix boot hang with a debug build

It was observed that when -DDEBUG is used to generate a debug build,
U-Boot does not boot on MinnowMax board. A workaround is to disable
CONFIG_DEBUG_UART. The real issue is that in order to have the debug
uart to work, BayTrail SoC needs to be configured so that its internal
uart is available to be used as the debug uart.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agox86: baytrail: Change lpe/lpss-sio/scc FSP properties to integer
Bin Meng [Wed, 31 May 2017 08:04:15 +0000 (01:04 -0700)]
x86: baytrail: Change lpe/lpss-sio/scc FSP properties to integer

At present lpe/lpss-sio/scc FSP properties are all boolean, but in
fact for "enable-lpe" it has 3 possible options. This adds macros
for these options and change the property from a boolean type to
an integer type, and change their names to explicitly indicate what
the property is really for.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agox86: baytrail: Use macros instead of magic numbers for FSP settings
Bin Meng [Wed, 31 May 2017 08:04:14 +0000 (01:04 -0700)]
x86: baytrail: Use macros instead of magic numbers for FSP settings

Introduce various meaningful macros for FSP settings and switch over
to use them instead of magic numbers.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agox86: baytrail: Remove "serial-debug-port-*" settings
Bin Meng [Wed, 31 May 2017 08:04:13 +0000 (01:04 -0700)]
x86: baytrail: Remove "serial-debug-port-*" settings

"serial-debug-port-address" and "serial-debug-port-type" settings
are actually reserved in the FSP UPD data structure. Remove them.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agox86: baytrail: Change "fsp, mrc-init-tseg-size" default value to 1
Bin Meng [Wed, 31 May 2017 08:04:12 +0000 (01:04 -0700)]
x86: baytrail: Change "fsp, mrc-init-tseg-size" default value to 1

The default value of "fsp,mrc-init-tseg-size" should be 1 (1MB) per
FSP default settings. 0 is not valid.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agoMerge git://git.denx.de/u-boot-fdt
Tom Rini [Sun, 4 Jun 2017 17:13:29 +0000 (13:13 -0400)]
Merge git://git.denx.de/u-boot-fdt

7 years agoMerge git://git.denx.de/u-boot-net
Tom Rini [Sat, 3 Jun 2017 22:05:28 +0000 (18:05 -0400)]
Merge git://git.denx.de/u-boot-net

7 years agoMerge git://git.denx.de/u-boot-fsl-qoriq
Tom Rini [Sat, 3 Jun 2017 22:05:04 +0000 (18:05 -0400)]
Merge git://git.denx.de/u-boot-fsl-qoriq

7 years agoMerge git://git.denx.de/u-boot-sunxi
Tom Rini [Sat, 3 Jun 2017 22:04:54 +0000 (18:04 -0400)]
Merge git://git.denx.de/u-boot-sunxi

7 years agoKconfig: Migrate FS_FAT / FAT_WRITE
Tom Rini [Fri, 2 Jun 2017 15:03:50 +0000 (11:03 -0400)]
Kconfig: Migrate FS_FAT / FAT_WRITE

Now that these symbols are in Kconfig, migrate all users.  Use imply on
a number of platforms that default to having this enabled.  As part of
this we must migrate some straglers for CMD_FAT and DOS_PARTITION.

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoboard: ti: enable support for writing to fat partition
Sekhar Nori [Fri, 2 Jun 2017 12:24:04 +0000 (17:54 +0530)]
board: ti: enable support for writing to fat partition

Enable support for writing to FAT partitions on
TI's boards.

Signed-off-by: Sekhar Nori <nsekhar@ti.com>