summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-next/sandbox'Sascha Hauer2012-10-0312-7/+302
|\ | | | | | | | | Conflicts: arch/sandbox/mach-sandbox/include/mach/linux.h
| * sandbox: add sdl video supportJean-Christophe PLAGNIOL-VILLARD2012-09-2510-5/+279
| | | | | | | | | | | | | | | | | | | | | | | | 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-03674-2568/+5
|\ \ | | | | | | | | | | | | | | | Conflicts: drivers/net/miidev.c include/miidev.h
| * | Treewide: remove address of the Free Software FoundationSascha Hauer2012-09-17676-2575/+5
| | | | | | | | | | | | | | | | | | | | | 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-0342-248/+9442
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: common/filetype.c include/filetype.h
| * | | png: add picoPNG lib supportJean-Christophe PLAGNIOL-VILLARD2012-09-125-0/+936
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an alternative to LodePNG take from http://forge.voodooprojects.org/ which is base on picoPNG C++ wrote by Lode Vandevenne. The same author as LodePNG. PicoPNG only support RGBA PNG8 The source code of picopng.c was just adapted to be compliant with C89 and drop the internal ZLIB support. Coding style untouched. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | add PNG supportJean-Christophe PLAGNIOL-VILLARD2012-09-128-3/+7793
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use LodePNG version 20120729 from http://lodev.org/lodepng/ The original coding style is keeped to simplify update. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | filetype: add PNG supportJean-Christophe PLAGNIOL-VILLARD2012-09-122-0/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | graphic_utils: add rgba supportJean-Christophe PLAGNIOL-VILLARD2012-09-122-0/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | this will allow to render rgba image with or without hw support Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | splash: add support to set a background colorJean-Christophe PLAGNIOL-VILLARD2012-09-121-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow to reset the screen to a default color when using transparent PNG. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | splash/bmp: switch to image_rendererJean-Christophe PLAGNIOL-VILLARD2012-09-126-42/+65
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | filetype: add BMP supportJean-Christophe PLAGNIOL-VILLARD2012-09-122-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | introduce image_renderer frameworkJean-Christophe PLAGNIOL-VILLARD2012-09-124-0/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow to support bmp and png Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | Introduce graphic utilsJean-Christophe PLAGNIOL-VILLARD2012-09-124-23/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to Factorise pixel rendering Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | bmp: Move bmp rendering to lib/bmp.cJean-Christophe PLAGNIOL-VILLARD2012-09-126-113/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | So we can add other format support Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | bmp: rename it to splashJean-Christophe PLAGNIOL-VILLARD2012-09-1223-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-035-4/+67
|\ \ \ \
| * | | | Add OpenRISC Image typeFranck Jullien2012-09-142-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch sync the image type list with the kernel in order to add openrisc support. Signed-off-by: Franck Jullien <franck.jullien@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | 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-0322-144/+403
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile
| * | | | | scripts: add tool to create image for SPI boot on AM35xxJan Luebbe2012-10-027-2/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-074-6/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/mtd'Sascha Hauer2012-10-036-27/+186
|\ \ \ \ \ \ \
| * | | | | | | mtd: nand: extend NAND flash detection to new MLC chipsMarcus Folkesson2012-09-162-19/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the newer MLC devices have a 6-byte ID sequence in which several field definitions differ from older chips in a manner that is not backward compatible. This method is already used in the Linux Kernel. Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | | drivers/nor/cfi_flash: use IS_ENABLED instead of an ifdefJan Luebbe2012-09-162-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | | drivers/nor/m25p80: add MTD supportJan Luebbe2012-09-162-1/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been tested by using UBI with a N25Q128 connected to a TI McSPI controller. Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | | drivers/nor/m25p80: add JEDEC ID for Micron/Numonyx SPI NOR flashJan Luebbe2012-09-061-0/+3
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | | | | Merge branch 'for-next/mmc'Sascha Hauer2012-10-031-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix endianness error on be targetFranck Jullien2012-09-141-4/+4
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use be(xx)_to_cpu function to switch endianness intelligently. Signed-off-by: Franck Jullien <franck.jullien@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | | | | Merge branch 'for-next/misc'Sascha Hauer2012-10-0310-26/+58
|\ \ \ \ \ \ \
| * | | | | | | Makefile: add target to produce a SPL compatible uImageJan Luebbe2012-09-292-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mostly useful during the initial port of barebox to a new board which is supported by u-boot. It also allows starting barebox from a SRAM-based u-boot SPL. A different load address can be set like this: make barebox.uimage UIMAGE_BASE=0x80000000 Also add barebox.ubl to CLEAN_FILES. Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | | 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>
| * | | | | | | genenv: Allow to also specify files for the environment instead of only ↵Jean-Christophe PLAGNIOL-VILLARD2012-09-111-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directories we may specify file in the defconfig Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | | libbb: remove vi tabwidth settingAlexander Aring2012-09-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove vi tabwidth and tabstop setting. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | | common: split out meminfo output and make it optionalJan Luebbe2012-09-065-23/+30
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | | | | Merge branch 'for-next/make'Sascha Hauer2012-10-032-14/+23
|\ \ \ \ \ \ \
| * | | | | | | 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>