9
0
Fork 0
Commit Graph

9545 Commits

Author SHA1 Message Date
Sascha Hauer 7f900e0b60 ARM: i.MX51 babbage: Move over to multiboard
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-07-02 08:24:08 +02:00
Sascha Hauer 70741174c9 ARM: i.MX51 babbage: prepare for multiboard support
Merge two initcalls to one and add a protector for the board type.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-07-02 08:24:08 +02:00
Sascha Hauer 7d7a982541 ARM: i.MX51 babbage: add board name to flash header file
This is necessary because the C name for the flash header matches
the filename. For multiple board support we have to make the name
unique to prevent linker errors.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-07-02 08:24:08 +02:00
Sascha Hauer 41f53d8d17 ARM: i.MX: select SoC from board
In principle we could build barebox for multiple i.MX SoCs, so
select the correct SoC from the board selection.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-07-02 08:24:08 +02:00
Sascha Hauer c37be8632b ARM: i.MX: remove now unused ARCH_IMX_INTERNAL_BOOT_USE_IMXIMAGE
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-07-02 08:24:07 +02:00
Sascha Hauer 6bbb24cf8d ARM: Turn most board directories into regular build directories
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-07-02 08:24:07 +02:00
Sascha Hauer 746089c224 ARM: i.MX: use device_detect_by_name where applicable
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-07-02 08:24:07 +02:00
Sascha Hauer fd2e121b5b ARM: i.MX51 babbage: switch to multi image support
The image will be named:

barebox-freescale-imx51-babbage.img

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-07-02 08:24:07 +02:00
Sascha Hauer 9172539a60 ARM: dmo realq7: switch to multi image support
The image will be named after the official name of this board:

barebox-datamodul-edm-qmx6.img

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-07-02 08:24:07 +02:00
Sascha Hauer cd977b9364 ARM: i.MX53 loco: Switch to multi image support
This converts the Freescale i.MX53 loco aka qsb board to
multi image. The image will be named:

barebox-freescale-imx53-loco.img

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-07-02 08:24:07 +02:00
Sascha Hauer 09bc89f539 ARM: i.MX53 loco: Switch to imximage
Use the imximage tool to generate an imximage instead of the linker
based process.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-07-02 08:24:07 +02:00
Sascha Hauer 8afe2cb4d4 Merge branch 'for-next-manual/oftree-linux-sync' 2013-07-02 07:08:46 +02:00
Sascha Hauer 12657cb99e Merge branch 'for-next/usb' 2013-07-01 10:14:40 +02:00
Sascha Hauer 55e87e07c1 Merge branch 'for-next/ppc' 2013-07-01 10:14:40 +02:00
Sascha Hauer da05cbd69a Merge branch 'for-next/omap' 2013-07-01 10:14:40 +02:00
Sascha Hauer 1ca699d081 Merge branch 'for-next/of' 2013-07-01 10:14:40 +02:00
Sascha Hauer b83536bdb9 Merge branch 'for-next/mxs' 2013-07-01 10:14:40 +02:00
Sascha Hauer 939c2173a3 Merge branch 'for-next/multi-image' 2013-07-01 10:14:40 +02:00
Sascha Hauer 08c0e206b3 ARM: i.MX27 pcm038: switch to multi image
This also converts the Phytec phyCORE i.MX27 aka pcm038 to use
image compression. The image will be named

barebox-phytec-phycore-imx27.img

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-07-01 10:14:35 +02:00
Sascha Hauer bade1dbf46 ARM: i.MX: Add multi images support Makefile
This adds images/Makefile.imx which will contain the i.MX
specific image generation snippets.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-07-01 10:14:35 +02:00
Sascha Hauer 2078438662 Add multi images support
This adds the make infrastructure to build multiple SoC or
board specific images from a single barebox binary.

The basic idea is that we no longer have a single pbl, but instead
multiple pbls, one per image if necessary. Each pbl is defined
by its entry function so that each pbl can do exactly what a given
board needs. Additionally the pbls together with a self extracting
barebox binary can be encapsulated in specific image formats.

squashed in build fixes from Lucas Stach for make version >= 3.82:

Split Multimage Makefile rule in explicit and implicit parts

Fixes build with make version >=3.82

Frome the make 3.82 NEWS file:
* WARNING: Backward-incompatibility!
  In previous versions of make it was acceptable to list one or more explicit
  targets followed by one or more pattern targets in the same rule and it
  worked "as expected".  However, this was not documented as acceptable and if
  you listed any explicit targets AFTER the pattern targets, the entire rule
  would be mis-parsed.  This release removes this ability completely: make
  will generate an error message if you mix explicit and pattern targets in
  the same rule.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Lucas Stach <dev@lynxeye.de>
2013-07-01 10:13:12 +02:00
Sascha Hauer ae0589c5ef Merge branch 'for-next/mtd' 2013-07-01 09:37:38 +02:00
Sascha Hauer 85b427ffed Merge branch 'for-next/misc' 2013-07-01 09:37:37 +02:00
Sascha Hauer 2720526fa4 Merge branch 'for-next/mips' 2013-07-01 09:37:37 +02:00
Sascha Hauer f686bbd083 Merge branch 'for-next/mfd' 2013-07-01 09:37:37 +02:00
Sascha Hauer 87ed8c0456 Merge branch 'for-next/menu' 2013-07-01 09:37:37 +02:00
Sascha Hauer 44ebe21a33 Merge branch 'for-next/memtest' 2013-07-01 09:37:37 +02:00
Sascha Hauer be1ebac429 Merge branch 'for-next/mci'
Conflicts:
	arch/arm/boards/ccxmx51/ccxmx51js.c
	arch/arm/boards/dmo-mx6-realq7/board.c
2013-07-01 09:37:35 +02:00
Sascha Hauer 35faccbb1c Merge branch 'for-next/kconfig-update' 2013-07-01 09:37:28 +02:00
Sascha Hauer 989031b408 Merge branch 'for-next/imx53-oftree'
Conflicts:
	arch/arm/dts/Makefile
	arch/arm/mach-imx/imx53.c
2013-07-01 09:37:25 +02:00
Sascha Hauer e60e6d3ae8 Merge branch 'for-next/imx-realq7'
Conflicts:
	arch/arm/dts/Makefile
2013-07-01 09:37:15 +02:00
Sascha Hauer 33a6e99a38 Merge branch 'for-next/imx'
Conflicts:
	drivers/usb/imx/chipidea-imx.c
2013-07-01 09:37:04 +02:00
Sascha Hauer 1e382ad1c4 Merge branch 'for-next/debug' 2013-07-01 09:32:05 +02:00
Sascha Hauer 8e15ad2275 Merge branch 'for-next/config-h' 2013-07-01 09:32:05 +02:00
Sascha Hauer d2fcbe0690 Merge branch 'for-next/bootm' 2013-07-01 09:32:04 +02:00
Sascha Hauer 5d4d3abad1 Merge branch 'for-next/ata' 2013-07-01 09:32:04 +02:00
Sascha Hauer f0f71fa34d Release v2013.07.0
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-07-01 09:31:28 +02:00
Sebastian Hesselbarth 26e15b6ec8 clocksource: fix Marvell timer read-back value
Clocksource read callback expects incrementing timer values, while
internal timer on Marvell SoCs counts backwards. Fix value returned
by Marvell MVEBU and Orion clocksource drivers.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-06-29 10:43:02 +02:00
Sascha Hauer 80f51902a6 ARM: Marvell boards: Fix out of tree compilation
The Marvell boards accidently add a .c instead of a .o file
to the targets. This has the side effect of breaking out of tree
compilation.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2013-06-28 18:01:02 +02:00
Renaud Barbier 5c179dd08d ppc 85xx: early I2C support
Early I2C support is introduced to read SPD data from memory
modules prior to the loading of the I2C driver.

This code is based on the equivalent file fsl_i2c.c in directory
drivers/i2c from U-Boot version git-a71d45d.

Signed-off-by: Renaud Barbier <renaud.barbier@ge.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-06-27 08:38:37 +02:00
Renaud Barbier ae2ecf974f ppc 8xxx: core DDR driver functions
These files are the driver interface to handle the memory
initialisation from reading the SPD data to writing the memory
controller registers.

This code is based on the equivalent files main.c in directory
arch/powerpc/cpu/mpc8xxx/ddr and ddr-gen2.c in directory
arch/powerpc/cpu/mpc85xx. Both are from U-Boot version git-a71d45d.

Signed-off-by: Renaud Barbier <renaud.barbier@ge.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-06-27 08:38:04 +02:00
Renaud Barbier 4b65ac7e69 ppx 8xxx: DDR registers value calculation
The functions in this file calculate and store the value for each
register of the memory controller.

This code is based on the equivalent file in directory
arch/powerpc/cpu/mpc8xxx/ddr from U-Boot version git-a71d45d.

Signed-off-by: Renaud Barbier <renaud.barbier@ge.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-06-27 08:38:04 +02:00
Renaud Barbier 017da99b77 ppc 8xxx: DDR utility and memory options
This commit adds functions to calculate clock cycles, configure the
LAW registers and populate board memory options.

This code is based on the equivalent files in directory
arch/powerpc/cpu/mpc8xxx/ddr from U-Boot version git-a71d45d.

Signed-off-by: Renaud Barbier <renaud.barbier@ge.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-06-27 08:38:04 +02:00
Renaud Barbier 8567f00489 ppc 8xxx: DIMM parameters calculation
This code calculates the DIMM characteritics i.e DIMM
organization parameters and timings for DDR2 memory based on
SPD data.

It also provides a function to find out the lowest common DIMM
parameters to be used for all DIMMs.

This code is based on the equivalent files in directory
arch/powerpc/cpu/mpc8xxx/ddr from U-Boot version git-a71d45d.

Signed-off-by: Renaud Barbier <renaud.barbier@ge.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-06-27 08:38:04 +02:00
Renaud Barbier c6594ae1a3 ppc 8xxx: DDR headers
Structures are defined to record the common DIMM parameters
and memory options on a per DIMM basis.

This code is based on the equivalent files in directory
arch/powerpc/cpu/mpc8xxx/ddr from U-Boot version git-a71d45d.

Signed-off-by: Renaud Barbier <renaud.barbier@ge.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-06-27 08:38:04 +02:00
Renaud Barbier d8341ecadc ppc asm: DDR headers
Definitions and structures have been added to record DIMM parameters
and configure memory options.

The code is based on the equivalent files in the directory
arch/powerpc/include/asm from U-boot version git-a71d45d.

Signed-off-by: Renaud Barbier <renaud.barbier@ge.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-06-27 08:38:04 +02:00
Renaud Barbier e06aa06965 common: DDR2 SPD checksum.
The code calculates the DDR2 SPD checksum as per JEDEC standard
No 21-C Appendix X (revision 1.2)

The code is based on the equivalent files from U-Boot version
git-a71d45d.

Signed-off-by: Renaud Barbier <renaud.barbier@ge.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-06-27 08:38:04 +02:00
Sascha Hauer 82915c3a6a imx-image: fix path to imx-image binary
$(obj) doesn't necessarily contain the toplevel object path. Use
$(objtree) for this.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-06-26 23:43:19 +02:00
Sascha Hauer e1bbf6be90 ARM: Add image end section
In the upcoming multi image build process we will cat images together.
To find the concatenated image we need to reliably find the end of the
current binary. This adds a dummy section at the end of a pbl binary.
Its only purpose is to mark the end of the image. The multi image
patches will add something to this section so that it doesn't get
discarded by the linker.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-06-26 23:43:19 +02:00
Sascha Hauer 22159db6b0 ARM: build dtbs depending on CONFIG_OFTREE
The upcoming multi image support will need devicetree binary
blobs even when there is no builtin dtb. Instead of depending
on CONFIG_BUILTIN_DTB depend on CONFIG_OFTREE and let this option
select DTC.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2013-06-26 23:42:47 +02:00