9
0
Fork 0
Commit Graph

1322 Commits

Author SHA1 Message Date
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
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
Jean-Christophe PLAGNIOL-VILLARD c21492c293 AT91: at91sam9x5: add chip and board file
Fow now use Soft ECC for nand util we add the PMECC.

On-chip and board related peripherals definitions.
Basic implementation for VB board.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-02 10:31:23 +02:00
Jean-Christophe PLAGNIOL-VILLARD 8d8d6f6ac9 ARM: at91/pio: add new PIO3 features
This patch adds the support for new PIO controller found on some at91sam SOCs.
 - more peripheral multiplexing
 - more features to configure on a PIO (pull-down, Schmitt trigger, debouncer)

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-02 10:31:23 +02:00
Jean-Christophe PLAGNIOL-VILLARD 28bdc0e3da ARM: at91: allow to pass the interface id to at91_add_device_eth
On the sam9x5 series we now support 1 or 2 macb.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-02 10:31:23 +02:00
Jean-Christophe PLAGNIOL-VILLARD 15732c1a5a ARM: at91: add sam9x5 series CPU definition and cpu_is_xxx macro
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-02 10:31:23 +02:00
Jean-Christophe PLAGNIOL-VILLARD 42e119b915 at91rm9200ek: update defconfig
- enable MMU
 - drop MTD as we do not have nand
 - use tlsf
 - bootm enable initrd

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-02 10:31:23 +02:00
Jean-Christophe PLAGNIOL-VILLARD 74cfe1b8ad at91rm9200ek: add usb serial support
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-02 10:31:23 +02:00
Jean-Christophe PLAGNIOL-VILLARD 5fd011bb70 at91rm9200ek: add leds support
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-02 10:31:23 +02:00
Jean-Christophe PLAGNIOL-VILLARD 36f788fd80 at91rm9200ek: add ohci support
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-02 10:31:23 +02:00
Jean-Christophe PLAGNIOL-VILLARD 679e08e701 at91rm9200ek: adjust kernel partition to be able to flash mainline kernel
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-02 10:26:14 +02:00
Jean-Christophe PLAGNIOL-VILLARD 55be59fdaa at91rm9200ek: update config for network
set vendor-id to barebox-at91rm9200ek and the kernel over nfs

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-02 10:26:14 +02:00
Jean-Christophe PLAGNIOL-VILLARD 3600ded7fd at91: set ip mode to dhcp-barebox
As the mainline kernel does not enable the bootp support by default

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-02 10:26:14 +02:00
Jean-Christophe PLAGNIOL-VILLARD 4972614e62 at91rm9200ek: enable at91_ether and net support
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-02 10:26:14 +02:00
Alexander Shiyan a9f18a2378 i.MX51: Fix NANDF_RDY_INT pin definition
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-02 10:13:24 +02:00
Esben Haabendal 805adf7fd3 mx28-evk: Enable LCD support and bmp command
Signed-off-by: Esben Haabendal <esben.haabendal@prevas.dk>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-02 10:12:09 +02:00
Allan Heldgaard 8fe12d91ff mx28-evk: Add LCD support
Derived from TX28 board code (tx28-stk5.c).

Signed-off-by: Allan Heldgaard <allan.heldgaard@prevas.dk>
Signed-off-by: Esben Haabendal <esben.haabendal@prevas.dk>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-02 10:12:09 +02:00
Esben Haabendal b1df39c28c mxs: Add remaining i.MX28 iomux configurations
Signed-off-by: Esben Haabendal <esben.haabendal@prevas.dk>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-02 10:11:38 +02:00
Esben Haabendal 05839011c1 mxs: Cleanup use of blank lines in i.MX28 iomux configurations
Signed-off-by: Esben Haabendal <esben.haabendal@prevas.dk>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-02 10:11:38 +02:00
Esben Haabendal 0e600f36eb mxs: Fix i.MX28 PWM3 iomux configuration
Signed-off-by: Esben Haabendal <esben.haabendal@prevas.dk>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-02 10:11:38 +02:00
Esben Haabendal e62edd3de9 mxs: Fix support for BITKEEPER() macro
There was no check for BE, so any BITKEEPER(1) iomux configurations
were not being applied.

Signed-off-by: Esben Haabendal <esben.haabendal@prevas.dk>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-02 10:11:38 +02:00
Alexander Shiyan 904ebefe21 i.MX27: Export boot source to magic variables
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-02 10:07:48 +02:00
Alexander Shiyan 1960730768 i.MX51: Added definition for 600 mHz PLL setup.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-02 10:03:06 +02:00
Alexander Shiyan 7ab0a0ac05 i.MX27: Added helper for setup chipselect control register
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-02 10:02:38 +02:00
Alexander Shiyan 9d9724e178 Completely migrate option ISP1504 to ULPI
Since we do not have ISP1504-related functions, we migrated to ULPI.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-02 09:32:54 +02:00