9
0
Fork 0
Commit Graph

10443 Commits

Author SHA1 Message Date
Sascha Hauer d3c96d6522 Merge branch 'for-next/mci'
Conflicts:
	arch/arm/boards/tqma53/board.c
2014-02-03 09:55:52 +01:00
Sascha Hauer 4a53361beb Merge branch 'for-next/iomem'
Conflicts:
	arch/arm/mach-imx/external-nand-boot.c
2014-02-03 09:55:41 +01:00
Sascha Hauer c224cd3161 Merge branch 'for-next/imx'
Conflicts:
	arch/arm/boards/dmo-mx6-realq7/lowlevel.c
2014-02-03 09:55:13 +01:00
Sascha Hauer 3cbd92bf6e Merge branch 'for-next/gpio' 2014-02-03 09:52:34 +01:00
Sascha Hauer f4cece7db5 Merge branch 'for-next/clps711x' 2014-02-03 09:52:34 +01:00
Sascha Hauer ca10989374 Merge branch 'for-next/bootm' 2014-02-03 09:52:34 +01:00
Sascha Hauer fd6fe68e95 Merge branch 'for-next/arm' 2014-02-03 09:52:34 +01:00
Sascha Hauer bd8ba3c6a3 Release v2014.02.0
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-02-03 09:48:34 +01:00
Sascha Hauer cc66cf109b ARM: i.MX: Add lowlevel gpio functions
Some boards need gpio functions very early and also sometimes
is useful to toggle gpios during early code debug. This adds a header
file for setting i.MX gpios early.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-02-01 18:51:32 +01:00
Sascha Hauer 021890a39e ARM: i.MX: Karo TX25: Switch to multiboard support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-02-01 18:51:28 +01:00
Sascha Hauer 0e80f5b4cc ARM: i.MX: cleanup bootmode selection
Which bootmode is selected has no longer to be chosen by Kconfig. The
boards can decide themselves which bootmode they want to support. This
makes it unnecesary to ask the user which bootmode shall be supported,
so the "Select boot mode" becomes invisible and both support will be
compiled in as needed by the boards. NAND_IMX_BOOT goes away and the
already existing ARCH_IMX_EXTERNAL_BOOT_NAND can now be used for the
boards to depend on external nand boot.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 21:30:32 +01:00
Sascha Hauer 23f23a7224 ARM: i.MX25: Karo TX25: Switch to devicetree support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 21:30:32 +01:00
Sascha Hauer 2cca917c48 ARM: dts: Karo TX25: add barebox specifics
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 21:30:32 +01:00
Sascha Hauer 895f43dc9a ARM: dts: Karo TX25: add phy supply for fec
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 21:30:32 +01:00
Sascha Hauer 5519f7dd72 ARM: dts: Karo TX25: add missing nfc properties
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 21:30:32 +01:00
Sascha Hauer ae0afcb155 ARM: dts: Karo TX25: Add phy-reset-gpio
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 21:30:32 +01:00
Sascha Hauer 7b7f56fe69 ARM: dts: Karo TX25: Add pinctrl nodes
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 21:30:32 +01:00
Sascha Hauer a1b5185793 ARM: dts: i.MX25: Add iram to devicetree
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 21:30:31 +01:00
Sascha Hauer 936161bff9 ARM: dts: Add i.MX25 Karo TX25 dts
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 21:30:31 +01:00
Sascha Hauer 45c5110587 ARM: i.MX25: Add missing GPT clock lookups
Only one GPT will be used, but with devicetree support we can't predict
which one it is, so we need the clock lookup for all GPTs to ensure
that the timer gets its clock.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 21:29:34 +01:00
Sascha Hauer fe0a08f1a1 ARM: dts: i.MX25: remove disabled status of usbmisc unit
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 18:51:53 +01:00
Sascha Hauer 8d60419b0c ARM: dts: i.MX25: Add mmc aliases
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 18:51:53 +01:00
Sascha Hauer 0ac7bd5e90 ARM: dts: Add i.MX25 devicetree files
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 18:51:53 +01:00
Sascha Hauer 8e174d41f0 mci: imx-esdhc: Add i.MX25 compatible entry
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 18:51:53 +01:00
Sascha Hauer 7ebb5fbb58 ARM: i.MX: external NAND boot: make dtb boarddata work
If we are running from NFC SRAM and we are passed boarddata
containing a devicetree pointer then it point to an address relative
to the NFC SRAM start. First thing we do is to copy the initial
binary to SDRAM and jump there. The devicetree pointer has to be
adjusted by this offset.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 18:51:53 +01:00
Sascha Hauer 3711a1d8e7 ARM: i.MX: external NAND boot: use image size from image header
When compiling with multiimage support ld_var(_barebox_image_size) only
contains the length of the PBL image, but not including the appended
compressed data. With this patch the image size is read from the barebox
header instead which contains the correct size, either from the linker
or from the fix_size tool.
This makes the external_nand_boot compatible with multiimage support.

Tested on Phytec phyCARD-i.MX27 with and without PBL.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 18:51:53 +01:00
Sascha Hauer bf6846cacc images: fix image size in pblx
The pblx is a self extracting barebox binary. This doesn't have
the size of the image correctly set because the linker doesn't
generate it for relocatable binaries.
This currently only works on ARM, but this is the only architecture
supporting multi images anyway. TO make it work on other architectures
fix_size would have to be extended to recognize other images.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 18:51:53 +01:00
Sascha Hauer e3ed260db7 scripts: fix_size: check magic
Instead of passing the offset to the fix_size tool check the image to
fixup for a valid header so that only recognized files are fixed up.
This makes the usage of this tool safer.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 18:51:49 +01:00
Sascha Hauer b5aea925a3 ARM: i.MX: edmqmx6: update defconfig
on the edmqmx6 barebox is loaded into SRAM, so it must not get
too big. Disable some stuff to make the image fit into SRAM again.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 18:46:57 +01:00
Sascha Hauer 223af73a24 ARM: i.MX: edmqmx6: Copy fdt to SDRAM
barebox only recognizes boarddata as dtb if it is inside SDRAM, so
copy the dtb there if necessary.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 18:46:53 +01:00
Alexander Shiyan 9ef62b72ef scripts: imx-usb-loader: Fix memory leak
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-29 21:38:10 +01:00
Alexander Shiyan 303c3d1e24 gadget: at91: Fix uninitialized variable
Variable udc is used unitialized for DBG(xxx).

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-29 21:38:10 +01:00
Alexander Shiyan 7c1a6a3c91 ppc 8xxx: Fix logic
Expression (pdimm->data_width >= 32) || (pdimm->data_width <= 40)
always evaluates to true, so probably we need to use "&&" here.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-29 21:38:10 +01:00
Alexander Shiyan 717b8bbcfd MIPS: mach-ar231x: Fix uninitialized variable
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-29 21:38:09 +01:00
Sascha Hauer 2af8bdd369 ARM: i.MX53: tqma53: Switch to devicetree and multiboard support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-29 11:51:23 +01:00
Sascha Hauer e0316b4dd7 ARM: dts: i.MX53: tqma53: Add barebox specifics
- add chosen node with
  - environment
  - linux,stdout-path
- add dsr value to eMMC
- add provide-mac-address property to iim node
- set memory size in memory node to 0 since we have two different
  memory sizes which have to be handled.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-29 11:51:23 +01:00
Sascha Hauer 92cfd4dc8e ARM: dts: Add TQ tqma53/mba53 dts files
Directly taken from Linux-3.13.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-29 11:51:23 +01:00
Sascha Hauer 4da8bcc25b ARM: imx_v7_defconfig: Enable new boards
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-29 11:51:23 +01:00
Sascha Hauer 747b71b1fc ARM: phyCARD-i.MX27: Switch to devicetree probe support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-29 11:51:19 +01:00
Sascha Hauer 078a29da28 mci: imx: Add devicetree probe support
Only simple probing, no properties supported yet.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-29 11:31:31 +01:00
Sascha Hauer dcb8a8b1a6 ARM: dts: phycard-i.MX27: Add sdhc2 pinctrl
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-29 11:31:31 +01:00
Sascha Hauer ab0ee012a1 ARM: dts: phycard-i.MX27: Add environment and NAND partitioning
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-29 11:31:31 +01:00
Sascha Hauer c812fd20fe ARM: phycard-i.MX27: Add stdout-path property
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-29 11:31:31 +01:00
Sascha Hauer f8ad3a8859 ARM: phycard-i.MX27: Add NAND support to dts
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-29 11:31:31 +01:00
Sascha Hauer 14bb8cc21b ARM: i.MX clocksource: return successful for multiple instances
With multiple instances we returned -EBUSY which will provoke a
log message. Return successful instead since the i.MX27 has multiple
GPTs in the devicetree.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-29 11:31:31 +01:00
Sascha Hauer d25cba0090 pinctrl: Add pinctrl driver for i.MX1/21/27
This turns the legacy iomux-v1 support into a full pinctrl
driver.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-29 11:31:31 +01:00
Sascha Hauer c5b7986089 ARM: i.MX: external NAND boot: pass boarddata
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-29 11:31:31 +01:00
Sascha Hauer 0895a9ad1c ARM: dts: Add Phytec phyCARD-i.MX27 devicetree files
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-29 11:31:31 +01:00
Sascha Hauer 1f8618db7f ARM: dts: Add i.MX27 devicetree files
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-29 11:31:31 +01:00
Sascha Hauer 35ae916ecf ARM: i.MX: external NAND boot: do not depend on cpu_is_*
With multiboard support the cpu_is_* macros are no longer compile time
generated and do not work in early code, so pass a v1 variable around.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-29 11:31:30 +01:00