summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-next/sandbox'Sascha Hauer2012-10-039-7/+196
|\ | | | | | | | | Conflicts: arch/sandbox/mach-sandbox/include/mach/linux.h
| * sandbox: add sdl video supportJean-Christophe PLAGNIOL-VILLARD2012-09-257-5/+173
| | | | | | | | | | | | | | | | | | | | | | | | This will allow speed up the dev on framebuffer. By default the resolution is VGA but this can be changed via cmdline. We use a pthread to Flip the screen every 100ms as we can not detect when barebox update it as barebox simpliy write in a buffer. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * sandbox: add missed case statementAlexander Aring2012-09-111-1/+7
| | | | | | | | | | | | | | | | Add missed case statement to ignore 'i' parameter in first getopt loop. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * sandbox: fix posix_typesAlexander Aring2012-09-111-0/+14
| | | | | | | | | | | | | | | | Fix setting of size_t ssize_t and ptrdiff_t for 32 bit and 64 bit systems. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * sandbox-unaligned: better usement of ifdefAlexander Aring2012-09-111-1/+1
| | | | | | | | | | | | | | | | | | GCC versions below 4.6 don't set __BYTE_ORDER__ with __ORDER_LITTLE_ENDIAN__. So it's better to use __BYTE_ORDER and __LITTLE_ENDIAN instead. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/remove-fsf-address'Sascha Hauer2012-10-03424-1671/+4
|\ \ | | | | | | | | | | | | | | | Conflicts: drivers/net/miidev.c include/miidev.h
| * | Treewide: remove address of the Free Software FoundationSascha Hauer2012-09-17424-1671/+4
| | | | | | | | | | | | | | | | | | | | | The FSF address has changed in the past. Instead of updating it each time the address changes, just drop it completely treewide. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/png'Sascha Hauer2012-10-0319-23/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: common/filetype.c include/filetype.h
| * | | bmp: rename it to splashJean-Christophe PLAGNIOL-VILLARD2012-09-1219-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | so be can add more format support Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | Merge branch 'for-next/openrisc'Sascha Hauer2012-10-033-4/+60
|\ \ \ \
| * | | | Add __ashrdi3 and remove link to libgccFranck Jullien2012-09-143-4/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a previous patch, Sascha needed to add __ashrdi3 and then linked to libgcc. This patch add the ashrdi3 function in the arch/openrisc/lib directory and remove the libgcc dependency. Signed-off-by: Franck Jullien <franck.jullien@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | | Merge branch 'for-next/omap'Sascha Hauer2012-10-0315-141/+241
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile
| * | | | | scripts: add tool to create image for SPI boot on AM35xxJan Luebbe2012-10-022-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Booting from SPI on an AM35xx (and possibly other TI SOCs) requires a special format: - 32 bit image size in big-endian - 32 bit load address in big-endian - binary image converted from little- to big-endian The mk-am35xx-spi-image tool converts barebox.bin to this format. Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | gpio: reduce verbosity while probingJan Luebbe2012-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | ARM OMAP: switch to gpiolib supportTeresa Gámez2012-09-244-93/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Teresa Gámez <t.gamez@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | pcm049 phycard l + xl2: update partion sizesJan Weitzel2012-09-146-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use 512k NAND Partion for barebox in enviroment and boards code pcm049: use 4MB for kernel Signed-off-by: Jan Weitzel <j.weitzel@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | xload: add SPI as a boot modeJan Luebbe2012-09-112-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | xload: make internal functions staticJan Luebbe2012-09-112-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | xload: get barebox size from barebox_arm_headJan Weitzel2012-09-072-5/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add functions to read the barebox_arm_head, check barebox magicword and read out the barebox image size. Create a inital partion of 1Mb to access the barebox image on nand. Signed-off-by: Jan Weitzel <j.weitzel@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | omap3: remove unused coded for clock configurationJan Luebbe2012-09-062-30/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | | | Merge branch 'for-next/mxs'Sascha Hauer2012-10-0311-0/+464
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/boards/crystalfontz-cfa10036/cfa10036.c
| * | | | | | arm: cfa10036: Add the OCOTP deviceMaxime Ripard2012-09-281-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM mxs: Clear USB boot mode during startupSascha Hauer2012-09-161-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the i.MX28 boots from USB, the ROM code sets this bit. When after a reset the ROM code detects that this bit is set it will boot from USB again. This means that if we boot once from USB the chip will continue to boot from USB until the next power cycle. To prevent this (and boot from the configured bootsource instead) clear this bit here. This bit is not documented in the datasheets, it was figured out the hard way. Whether this is the same on i.MX23 is currently not known. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | boards: Add support for imx233-olinuxino boardFadil Berisha2012-09-109-0/+436
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | imx23-olinuxino is a board designed by Olimex. It has the following features: - Freescale iMX233 ARM926J processor at 454MHz -64 MB RAM -SD-card connector -TV PAL/NTSC video output -2 USB High Speed Hosts -Ethernet 100 Mbit -Stereo Audio Input -Stereo Headphones Audio Output More information at: http://www.olimex.com/dev/imx233-olinuxino-maxi.html Signed-off-by: Fadil Berisha <f.koliqi@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | | | Merge branch 'for-next/misc'Sascha Hauer2012-10-031-0/+4
|\ \ \ \ \ \
| * | | | | | ARM i.MX: add debug for iomux-v3Sascha Hauer2012-09-281-0/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | iomux setup often is the source of great fun. Add some debug printf for it. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | | | Merge branch 'for-next/make'Sascha Hauer2012-10-031-9/+12
|\ \ \ \ \ \
| * | | | | | ARM Makefile: switch to kbuild command definition for mkublheaderJan Luebbe2012-09-061-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | kbuild: keep the barebox binary accessibleJan Luebbe2012-09-061-5/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building a special image from the original (compressed or not) binary, to not overwrite KBUILD_BINARY. This allows producing multiple images (such as MLO, UBL, ...) from the (z)barebox.bin. In the case where no special image is used, KBUILD_IMAGE is set to KBUILD_BINARY. This patch was developed together with Sascha Hauer. Thanks! Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | | | Merge branch 'for-next/karo-tx53'Sascha Hauer2012-10-039-0/+514
|\ \ \ \ \ \
| * | | | | | ARM i.MX TX53: Add defconfigSascha Hauer2012-09-161-0/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM i.MX: Add Ka-Ro TX53 board supportSascha Hauer2012-09-168-0/+438
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | | | Merge branch 'for-next/boot-sequence-dhcp'Sascha Hauer2012-10-0331-164/+164
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: drivers/net/miidev.c
| * | | | | | dhcp: switch to global var supportJean-Christophe PLAGNIOL-VILLARD2012-10-0210-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way you can specify as previously set the dhcp parameter via global.dhcp.xxx and get the result via global.dhcp.xxx This is need for the defaultenv-2 to add the bootp suppport. Use it on defaultenv too to have only one set of var. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | | | | | defaultenv: switch hostname to global.hostnameJean-Christophe PLAGNIOL-VILLARD2012-10-0222-148/+148
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Udpate dhcp with it too. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | | | | | Merge branch 'for-next/arm'Sascha Hauer2012-10-038-24/+36
|\ \ \ \ \ \
| * | | | | | ARM lowlevel: Use get_runtime_offsetSascha Hauer2012-09-095-23/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current approach to get the offset between link and runtime address is fragile. It requires a big fat comment to put no code above it and it requires an extra linker section. Instead use a small assembler function. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM: Add assembler function to get runtime offsetSascha Hauer2012-09-093-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function returns the offset between the address barebox is linked at and the address barebox is currently running at. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM lowlevel: Update function documentationSascha Hauer2012-09-093-1/+10
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | | | Merge branch 'for-next/amba'Sascha Hauer2012-10-032-6/+10
|\ \ \ \ \ \
| * \ \ \ \ \ Merge tag 'amba_bus' of git://git.jcrosoft.org/barebox into for-next/ambaSascha Hauer2012-09-112-6/+10
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arm: Introduce ARM AMBA bus This allow to detect the amba device and use the right driver for it at runtime. With pl011 amba support (ARM & ST Variant) Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * | | | | amba-pl011: switch to amba busJean-Christophe PLAGNIOL-VILLARD2012-09-112-6/+10
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | switch as the same time the nomadik and versatile arch that use the driver. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | | | | | Merge branch 'for-next/net'Sascha Hauer2012-10-037-72/+82
|\ \ \ \ \ \
| * | | | | | net: introduce phylibJean-Christophe PLAGNIOL-VILLARD2012-09-254-55/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adapt phylib from linux switch all the driver to it reimplement mii bus This will allow to have - phy drivers - to only connect the phy at then opening of the device - if the phy is not ready or not up fail on open Same behaviour as in linux and will allow to share code and simplify porting. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | | | | | net fec_mpc5200: Use same platform_data as i.MX fec driverSascha Hauer2012-09-232-17/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | drivers/net: add driver for the EMAC device found in some TI SoCsJan Luebbe2012-09-171-0/+48
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | | | Merge branch 'for-next/driver'Sascha Hauer2012-10-0320-291/+221
|\ \ \ \ \ \
| * | | | | | gpio: reduce verbosity while probingJan Luebbe2012-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM i.MX: Add devicetree support for clocksource driverSascha Hauer2012-09-231-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM i.MX: add devicetree support for gpio driverSascha Hauer2012-09-231-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>