Merge branch 'for-next/misc'

images: mxs: remove not used PREP_ definitions ...

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: Add ELTEC HiPerCam board support ...

This adds support for the i.MX6 based Eltec HiPerCam board.
This board comes with different i.MX6 flavours and different
memory sizes. Currently supported is the i.MX6dl version with
256MB DDR3 RAM.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

images: fix Tegra out-of-tree build ...

The BCTs are build objects and as such are located in the objtree instead of
the srctree. Fix out-of-tree build by defining a variable which refers to the
board directories in the objtree and use it for Tegra.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

images: move board variable to parent makefile ...

A lot of the image makefiles define an equal board variable, which
gives the impression that this variable is unique for this makefile.
As those files aren't freestanding makefiles but get included into a
parent makefile this is not actually true. Attempts to override this
variable will not work reliable as make is picking up a random instance.

Fix this confusion by moving this variable out of the individual makefiles.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'for-next/socfpga'

Merge branch 'for-next/misc'

boards: phytec-som-am335x: Add phycard-som support ...

Add support for the phyCARD SOM.

Signed-off-by: Wadim Egorov <w.egorov@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

boards: Add phytec-som-am335x ...

The main idea behind this patch is to avoid redundant board code.
Because of the module similarities of all am335x based phytec boards, we can
merge its code.
The phytec-som-am335x merges the code of all am335x based phytec SOMs.
So we will have only one "board" in the barebox for phyCORE, phyFLEX.

Signed-off-by: Wadim Egorov <w.egorov@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: socfpga: add Altera SoCFPGA Development Kit support ...

Add support for the Altera SoCFPGA Development Kit.
The setup is based on the GHRD from Altera.

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: do not specify -static and -pie at the same time ...

PIE is a form of dynamic linking and thus inherently incompatible
with -static. It worked ok as the current behavior of ld.bfd is
to not respect -static if -pie has been specified.

ld.gold and future versions of ld.bfd will fail to link if both
of those incompatible switches are specified at the same time.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'for-next/mxs'

ARM: MXS: Add duckbill board support ...

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: phyFLEX-i.MX6: Add support for 1GB on 1 bank ...

Add support phyFLEX-i.MX6 SOM with 1GB on one ram bank

Signed-off-by: Christian Hemp <c.hemp@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: MXS: imx28evk: Add lowlevel support ...

This switches the imx28evk to multiimage support and adds the
lowlevel initialization to make the bootlets unnecessary.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: imx233-olinuxino: generate complete bootstream ...

- Enable multi-image support to generate bootstream, sd-card and 2nd stage
  images.
- Handle pin-mux in lowlevel.c only.
- Use fine-tuned memory setup from u-boot.

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: MXS: Update Karo TX28 board support ...

- enable multiimage support to generate bootstream, sd-card and 2nd
  stage images
- Enable new defaultenv support
- Enable more features

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: MXS: Add multiimage support ...

The Freescale MXS SoCs have a multi staged boot process which needs
different images composed out of different binaries. The ROM executes
a so called bootstream which contains multiple executables. The first
one is executed in SRAM and the purpose of this binary is to setup
the internal PMIC and the SDRAM. The second image is usually the
bootloader itself. In case of barebox the bootstream is composed
out of the self extracting barebox image (pblx) and the prepare
stage for setting up the SDRAM.

The bootstream image itself is useful for USB boot, but for booting from
SD cards or NAND a BCB header has to be prepended to the image. In case
of SD boot the image has the .mxssd file extension in barebox.

Since the bootstream images are encrypted they are not suitable for
2nd stage execution. For this purpose the 2nd stage images are generated.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: i.MX: Add i.MX6sx sabresdb support ...

This adds support for the Freescale i.MX6sx sabresdb board.

Tested are:

- UART
- The three SD card slots
- USB host
- USB otg (host and device mode)
- FEC (both)

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

imx6: Add support for phyBOARD-SUBRA ...

Add support for phyBOARD-SUBRA which use a phyFLEX-i.MX6 (pfla02) module.
	- i.MX6 SOLO with 512MB RAM

Signed-off-by: Christian Hemp <c.hemp@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

imx6: add support for phyBOARD-ALCOR ...

Add support for phyBOARD-ALCOR which use a phyFLEX-i.MX6 (pfla02) module.
        - i.MX6 Quad with 1GB RAM on two banks

Signed-off-by: Christian Hemp <c.hemp@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'for-next/xz'

Merge branch 'for-next/nitrogen6x'

Add xz decompression support ...

This adds xz decompression support from the kernel. Both compressing
the barebox binary with xz and decompressing xz files on the commandline
is supported.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

phyCORE-AM335x: Add barebox image without SPI NOR ...

Boards like phyBOARD-WEGA RDK have an phyCORE-AM335x
connected with no SPI NOR flash. Added dts to support this.

Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: nitrogen6x: Add support for 2GB board variants ...

The nitrogen6x have variants with 2GB SDRAM. Add support for them. The
imxcfg files are from U-Boot.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

boards: Add phytec-phyflex-am335x ...

Add support for PHYTEC's phyFLEX-AM335x.

Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
[clean ups]
Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'for-next/omap'

Merge branch 'for-next/imx'

ARM: AM33xx: Add AFI GF board support ...

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>