9
0
Fork 0
Commit Graph

1648 Commits

Author SHA1 Message Date
Wolfram Sang a58bfe06b5 arm: tx28: select OCOTP driver
Compile fixes unknown symbol 'mxs_ocotp_read' for tx28 defconfig. Since
the vendor stores the MAC address in OCOTP, we always want this driver.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-13 14:47:08 +02:00
Jean-Christophe PLAGNIOL-VILLARD a448a796da arm: fix zImage support when a oftree is concatenated
When a oftree is concatenated,the zImage is bigger than the size specified in
the zImage header. Detect it and copy it too.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-13 14:43:40 +02:00
Jean-Christophe PLAGNIOL-VILLARD 5efbed3b27 arm: add Android boot image support
The Android Image contains 3 components and params

 - kernel
 - initrd
 - second stage (optional)

 - tags addr
 - bootargs

In fast boot the initrd is mandatory, in barebox we are less restrictive
use the initrd only if present

add to env params:
aimage_noverwrite_bootargs
	Disable overwrite of the bootargs with the one present in aimage

aimage_noverwrite_tags
	Disable overwrite of the tags addr with the one present in aimage

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-13 12:08:42 +02:00
Robert P. J. Day 2c3db7776b Add support for OMAP4460 revision detection.
Without yet adding in the underlying code, extend the revision
checking code to return additional values for PandaBoard ES boards.
Much of the code was taken close to verbatim from U-Boot.
compile tested, and confirmed that this code behaves identically to
the original panda configure and build for the three pandas i have:

  * Rev A2 (boots)
  * Rev EA3 (boots)
  * Rev B1 ES (no output)

so while there's still work to be done, this at least represents the
necessary infrastructure to start *recognizing* panda ES boards.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Tested-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-13 12:04:03 +02:00
Sascha Hauer d66d79eefb Merge branch 'work/iomux-v3' into next
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-13 10:47:43 +02:00
Sascha Hauer ed921b0401 Merge branch 'work/usb' into next 2012-04-13 10:46:52 +02:00
Sascha Hauer caeed1efa7 ARM i.MX35 3-stack: Fix compilation
The mc13892 registers have been renamed to MC13XXX

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-13 09:30:00 +02:00
Alexander Shiyan f5e301340c i.MX51: Allow to pass cpu clock to lowlevel init
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-13 09:26:12 +02:00
Jean-Christophe PLAGNIOL-VILLARD 1fe7a18cb8 Atmel reference board: add oftree boot support
add oftree partition to store the dtb
set the oftree location
use a zImage by default now

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-13 00:22:57 +02:00
Sascha Hauer b346a85b94 ARM i.MX53 iomux: sync to kernel
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-12 22:08:43 +02:00
Sascha Hauer 2bdc9f57a8 ARM i.MX51 iomux: sync to kernel
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-12 22:08:43 +02:00
Sascha Hauer e32452d777 ARM i.MX iomux-v3: one bit more for pad_ctl
i.MX6 needs one bit more for PAD_CTRL, so make one free.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-12 22:08:07 +02:00
Sascha Hauer 652f5f5abe ARM i.MX iomux-v3: Sync to kernel
This means using an uint64_t instead of a struct pad_desc which allows
us to change pad settings using logic operations. Also with this we
can more easily keep the iomux tables in sync with the kernel.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-12 22:07:31 +02:00
Sascha Hauer e2936393fd ARM i.MX53 LOCO: Add USB support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-12 21:38:19 +02:00
Sascha Hauer 089c24e376 ARM i.MX53: Setup USB clocks
- get USB PHY clock from OSC (24MHz)
- adjust USB clock to 54MHz

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-12 21:38:19 +02:00
Alexander Shiyan 6c727af2c2 Final switch to use combined driver mc13xxx
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-11 09:51:01 +02:00
Alexander Shiyan f2215e9241 Remove unneded mc13xxx_get_revision function
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-11 09:51:01 +02:00
Alexander Shiyan 8aabd88416 Rename remainings structs and functions from mc13892_ to mc13xxx_
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-11 09:51:01 +02:00
Alexander Shiyan 2b03e508cc Rename mc13892 driver name to mc13xxx
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-11 09:51:01 +02:00
Alexander Shiyan a993c51609 Rename mc13892.c unit to mc13xxx.c
Also renamed config option name to MFD_MC13XXX.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-11 09:51:01 +02:00
Alexander Shiyan 9a643f143e ename mc13892.h header to mc13xxx.h
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-11 09:51:01 +02:00
Sascha Hauer fdc889de61 Merge branch 'master' into next 2012-04-11 09:08:49 +02:00
Sascha Hauer 7541ec644d Merge branch 'calao-board' of git://git.jcrosoft.org/barebox into next 2012-04-11 08:48:38 +02:00
Jean-Christophe PLAGNIOL-VILLARD f1b14ffe46 at91sam9m10g45ek: add boot menu support
by default we boot the same way as before

The menu add interactive interface to choice boot, reset or update the system.
We still can access the shell.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-11 08:46:53 +02:00
Jean-Christophe PLAGNIOL-VILLARD f151e54855 at91sam9m10g45ek: enable kernel console over framebuffer
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-11 08:46:53 +02:00
Jean-Christophe PLAGNIOL-VILLARD d36918adbc at91sam9m10g45ek: add gpio keys support
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-11 08:46:53 +02:00
Alexander Shiyan f8856d422e Define barebox_loc magic variable only once
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-10 11:24:07 +02:00
Marc Kleine-Budde 05e58adca0 pcm027: add board support
The pcm027 is a PXA270 based Phytec phyCORE board.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-10 10:39:57 +02:00
Jean-Christophe PLAGNIOL-VILLARD 14c0105df4 tny-a926x: enable MMU
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Gregory HERMANT <gregory.hermant@calao-systems.com>
2012-04-10 16:35:03 +08:00
Jean-Christophe PLAGNIOL-VILLARD a5bb2c2725 tny-a926x: add oftree config support
Boot zImage and update nand partition layout to store the oftree.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Gregory HERMANT <gregory.hermant@calao-systems.com>
2012-04-10 16:35:00 +08:00
Jean-Christophe PLAGNIOL-VILLARD 42bc1b1583 tny-a926x: udpate defconfig
drop:
 - zlib
 - oob device

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Gregory HERMANT <gregory.hermant@calao-systems.com>
2012-04-10 16:34:58 +08:00
Jean-Christophe PLAGNIOL-VILLARD 69a480467d tny-a926x: update DHCP vendor ID
Depending on machine id.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Gregory HERMANT <gregory.hermant@calao-systems.com>
2012-04-10 16:34:56 +08:00
Jean-Christophe PLAGNIOL-VILLARD 4a2b0c0464 usb-a926x: enable MMU
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Gregory HERMANT <gregory.hermant@calao-systems.com>
2012-04-10 16:34:54 +08:00
Jean-Christophe PLAGNIOL-VILLARD 4d7ead0920 usb-a926x: add oftree support
Boot via nfs instead of tftp and zImage.
Update nand partition layout to store the oftree.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Gregory HERMANT <gregory.hermant@calao-systems.com>
2012-04-10 16:34:52 +08:00
Jean-Christophe PLAGNIOL-VILLARD 6b5d5015ba usb-a926x: update DHCP vendor ID
Depending on machine id.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Gregory HERMANT <gregory.hermant@calao-systems.com>
2012-04-10 16:34:45 +08:00
Jean-Christophe PLAGNIOL-VILLARD fe3de245d1 at91rm9200ek: set maximum nor flash size
it's 8MiB.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-10 09:58:17 +02:00
Uwe Hermann e1ff3fc4da Fixup DRIVER_VIDEO_S3C24XX usage.
From c67445d601c9332fabb71df8e41367fc104e1ac1 Mon Sep 17 00:00:00 2001
From: Uwe Hermann <uwe@hermann-uwe.de>
Date: Fri, 6 Apr 2012 20:07:12 +0200

DRIVER_VIDEO_S3C was renamed to DRIVER_VIDEO_S3C24XX recently.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Juergen Beisert <jbe@pengutronix.de>
2012-04-10 09:57:22 +02:00
Jean-Christophe PLAGNIOL-VILLARD 351c02dee7 mx53loco: set dhcp vendor id
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-10 09:55:36 +02:00
Alexander Shiyan 1700a9bfe9 PCM-038: fix SRAM device name
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-10 09:40:22 +02:00
Wolfram Sang 8bcf2c465a arm: mxs: tx28: get MAC from OCOTP
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-05 18:26:18 +02:00
Wolfram Sang 4be0faccd7 arm: mxs: add ocotp driver
Read-only support for now to get MAC addresses.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-05 18:26:18 +02:00
Eric Bénard c22e213cbe at91sam9g45_devices: fix warning
this patch fix the following warnings :
arch/arm/mach-at91/at91sam9g45_devices.c:305:3: warning: initialization discards 'const' qualifier from pointer target type [enabled by default]
arch/arm/mach-at91/at91sam9g45_devices.c:309:3: warning: initialization discards 'const' qualifier from pointer target type [enabled by default]

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-05 18:22:18 +02:00
Eric Bénard c56bb68d95 fix mxs iomux error in mx23 case
e62edd3 mxs: Fix support for BITKEEPER() macro
added this macro in iomux-imxc.c but the macro is not present
in the i.MX23 case. Adding it in iomux-imx23.h fix both
imx23evk_defconfig and chumbyone_defconfig

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-05 18:22:18 +02:00
Eric Bénard 1674431831 imx27-regs: fix .h usage in assembly file
7ab0a0a i.MX27: Added helper for setup chipselect control register
added an helper which triggers the following error :
arch/arm/mach-imx/include/mach/imx27-regs.h:243: Error: bad instruction `static inline void imx27_setup_weimcs(size_t cs,unsigned upper,unsigned lower,unsigned addional)'

This patch fix this problem.

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-05 12:43:38 +02:00
Sascha Hauer 2a6460cbb6 Merge branch 'next' 2012-04-05 11:09:58 +02:00
Sascha Hauer bb548648c0 x86 linker script: Add missing _text
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-05 08:50:54 +02:00
Sascha Hauer 4d66ef54b6 mips: Fix compiler warnings
Fixes:

arch/mips/lib/lshrdi3.c:6: warning: no previous prototype for '__lshrdi3'
arch/mips/lib/ashrdi3.c:6: warning: no previous prototype for '__ashrdi3'
arch/mips/lib/ashldi3.c:6: warning: no previous prototype for '__ashldi3'

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-05 08:50:01 +02:00
Alexander Shiyan c1a85010e3 i.MX5x: Unused pll definitions removed
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-04 10:55:16 +02:00
Alexander Shiyan a50f9d5487 i.MX51: Removed 1000 MHz pll definition
i.MX51 operates at speeds up to 800 MHz.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-04 10:54:58 +02:00
Alexander Shiyan bba5f543de i.MX51: Use register names for imx_gpio_base
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-04 10:52:51 +02:00