summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* dummy malloc: Add licence headerHEADmasterSascha Hauer2013-03-081-0/+23
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* usb: ehci: initialize ehci_dataSascha Hauer2013-03-081-1/+1
| | | | | | | Without it fields of ehci_data may be unitialized and the driver crashes. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* fix another brown paper bag bug introduced with compile time loglevelSascha Hauer2013-03-061-4/+1
| | | | | | | | | | __pr_printk is a define which uses a local variable 'ret'. This means that whenever someone does a pr_*("ret: %d\n", ret); ret will be 0. Fix this by writing this without a local variable. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'pu/omap3'Sascha Hauer2013-03-067-95/+35
|\
| * ARM: OMAP: beagle: Add missing MMC iomux setupSascha Hauer2013-03-041-0/+11
| | | | | | | | | | | | | | | | When the board is booted from NAND we have to setup the iomux to make the SD card work. Unfortunately this still is not enough :( The SD card still will only work when booting from it. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM: OMAP3: invalidate L2 cache using ROM APISascha Hauer2013-03-047-95/+24
| | | | | | | | | | | | | | Code taken from U-Boot. This makes the beagle board much more reliable. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | w1: Fix compiler warningAlexander Shiyan2013-03-061-1/+1
| | | | | | | | | | | | | | | | | | This patch fixes following warning: drivers/w1/w1.c: In function 'w1_found': drivers/w1/w1.c:471: warning: integer constant is too large for 'long' type Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | mtd: nand: Fix compiler warningAlexander Shiyan2013-03-061-1/+1
| | | | | | | | | | | | | | | | | | This patch fixes following warning: drivers/mtd/nand/nand_write.c: In function 'nand_do_write_ops': drivers/mtd/nand/nand_write.c:272: warning: 'ret' may be used uninitialized in this function Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | defaultenv-2: add boot sequenceJean-Christophe PLAGNIOL-VILLARD2013-03-056-31/+115
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to boot a sequence of boot entries until one succeeds. boot sources can be passed in $global.boot.default, which is now treated as a list. Also a list of boot entries can be specified as arguments to the boot script. The entries can be: - a plain filename from /env/boot/ - a full path to an arbitrary file - a directory containing boot entries With this this command: boot net nand-ubi /env/boot.d would first use the /env/boot/net entry, if this fails the /env/boot/nand-ubi entry and if this also fails the files from /env/boot.d/ (which could also be links to boot scripts) To make the above the default, global.boot.default would be specified as: global.boot.default="net nand-ubi /env/boot.d" Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* libubi: Use global mtd_all_ff functionSascha Hauer2013-03-041-12/+1
| | | | | | We introduced a global function for this, so use it. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* switch more boards to lwl-yJean-Christophe PLAGNIOL-VILLARD2013-03-044-10/+7
| | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/vexpress'Sascha Hauer2013-03-0428-7/+950
|\
| * vexpress: detect the board periph mapping and detecting the sp804 mappingJean-Christophe PLAGNIOL-VILLARD2013-02-135-23/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | at 0x10011000 for a9 legacy otherwise at 0x1c110000 as the new board also support Cortex-A9 so this is working qemu/arm-softmmu/qemu-system-arm -M vexpress-a15 -m 1024 -smp 1 -kernel build/vexpress/barebox -pflash build/vexpress/flash -nographic -cpu cortex-a9 Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * sp804: introduce amba_is_arm_sp804 to detect if the sp804 is present at the ↵Jean-Christophe PLAGNIOL-VILLARD2013-02-122-3/+33
| | | | | | | | | | | | | | address Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * amba: introduce amba_device_get_pid/cidJean-Christophe PLAGNIOL-VILLARD2013-02-122-7/+31
| | | | | | | | | | | | | | so we can use it on vexpress to detect the hardware mapping Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * arm: add vexpress board supportJean-Christophe PLAGNIOL-VILLARD2013-02-1221-0/+723
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | detect the cpu model to dynamise the periphs mapping currently only tested on qemu but should work on real hardware Cortex-A9 if you use 1GiB of ram you can run the same barebox on Cortex-A15 or Cortex-A9 otherwise use vexpress_ca9_defconfig where the TEXT_BASE is at 0x63f00000 when we will add the relocation support this defconfig will be drop qemu/arm-softmmu/qemu-system-arm -M vexpress-a9 -m 1024 -smp 1 -kernel build/vexpress/barebox -pflash build/vexpress/flash0 -nographic Cortex-A15 qemu/arm-softmmu/qemu-system-arm -M vexpress-a15 -m 1024 -smp 1 -kernel build/vexpress/barebox -pflash build/vexpress/flash0 -nographic Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * arm: add macro cpu_is_xxxJean-Christophe PLAGNIOL-VILLARD2013-02-111-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so we can detect ARM920 ARM926 ARM1176 PXA250 PXA255 PXA270 Cortex-A8 Cortex-A5 Cortex-A7 Cortex-A9 Cortex-A15 Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * clocksource: add ARM AMBA SP804 supportJean-Christophe PLAGNIOL-VILLARD2013-02-113-0/+99
| | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/usb'Sascha Hauer2013-03-048-35/+202
|\ \
| * | USB i.MX: Add chipidea gadget supportSascha Hauer2013-02-153-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | This adds USB gadget support to the i.MX chipidea driver. Basically we have to add a register function to the fsl udc driver and call this from the chipidea driver if device mode is selected. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | USB i.MX6: Add HSIC supportSascha Hauer2013-02-141-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HSIC needs some special setup for i.MX6. Most ugly detail is that the HSIC needs help of the IOMUX to configure a pullup on the strobe line. This has to be done after the ehci controller has started. Fortunately there is only one muxing possibility for the HSIC ports on i.MX6, so we can simply control the iomux from the usbmisc driver. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | USB i.MX chipidea: implement post init supportSascha Hauer2013-02-143-19/+89
| | | | | | | | | | | | | | | | | | | | | Some controllers need an init hook after the USB controller is started, so implement the post init hook for i.MX. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | USB ehci: Add platform specific init callsSascha Hauer2013-02-142-0/+19
| | | | | | | | | | | | | | | | | | | | | Some USB cores need a platform specific init hook, add it to the ehci driver. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | USB chipidea i.MX: Fix PTS mask for HSICSascha Hauer2013-02-142-1/+2
| | | | | | | | | | | | | | | | | | bit25 is part of the PTS bits, so mask it out before rewriting it. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM i.MX6: Fix HSIC pad definitionsSascha Hauer2013-02-141-8/+11
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/mxs'Sascha Hauer2013-03-0419-211/+827
|\ \ \
| * | | driver/serial: add driver for the mxs application uartMarc Kleine-Budde2013-03-033-0/+243
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | driver/serial: Kconfig: explicitly state that existing mxs driver is for the ↵Marc Kleine-Budde2013-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | debug uart Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: cfa10036: Remove the boot partition and boot from extMaxime Ripard2013-03-032-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for ext filesystems has been introduced recently. We can now boot directly from our rootfs, loading the kernel and device tree images from /boot. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | cfa10036: Update the environmentMaxime Ripard2013-02-272-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we added a new partition in the board, the partitions number of the boot and rootfs partition have changed as well. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | cfa-10036: Use the second MMC partition to store the environmentMaxime Ripard2013-02-271-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the only storage medium on the cfa-10036 is the MMC card, we need to have a registered environment partition on it if we want to be able to modify at runtime. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | falconwing: switch to generic peristent envEric Bénard2013-02-211-38/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | imx23-olinuxino: swith to generic peristent envEric Bénard2013-02-211-42/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | env: add register_persistent_environmentEric Bénard2013-02-212-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - heavily copied from register_persistant_environment which was Signed-off-by: Juergen Beisert <jbe@pengutronix.de> Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | mx23-evk: update defconfigEric Bénard2013-02-111-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - enable USB gadget and DFU - enable MCI and probe at boot - enable EXT4 and FAT filesystems Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | mx23-evk: add USB gadget supportEric Bénard2013-02-111-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - enable the USB OTG device in gadget mode - tested on i.MX23 EVH rev B1 with DFU Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | mx23-evk: fix MCI supportEric Bénard2013-02-111-4/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - this patch fix MCI support and enable using the SDCard to store the environment. - it is fully copied from imx23-olinuxino.c - tested on i.MX23 EVK RevB1 Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | mx28evk: add m25p80 flash via ssp2Michael Grzeschik2013-02-111-0/+29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | SPI: Add i.MX 23/28 SPI driver supportMichael Grzeschik2013-02-114-0/+297
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM mxs: ssp move to common register layoutMichael Grzeschik2013-02-112-117/+119
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | This patch moves the register defines and bit definitions into one include file. As the defines are common for ssp and mci devices they can be shared. Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/mtd'Sascha Hauer2013-03-0432-123/+157
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/configs/eukrea_cpuimx27_defconfig drivers/mtd/core.c
| * | | mtd nor: remove unnecessary 'depend' in KconfigSascha Hauer2013-02-181-8/+0
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | nor flash: integrate into mtdSascha Hauer2013-02-1423-71/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CFI Flash is currently handled outside the mtd layer which makes it a special case. Integrate it into mtd so that we get rid of this special status. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | mtd: implement mtd_lock and mtd_unlockSascha Hauer2013-02-142-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | Needed for NOR flashes. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | mtd: Use mtd_* functions where appropriateSascha Hauer2013-02-144-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of dereferencing struct mtd_info members directly use the wrapper functions which have an additional check if the callback exists if it is optional, like mark_bad or is_bad. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | mtd: Add mtd_* functionsSascha Hauer2013-02-142-9/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Kernel has mtd_read, mtd_write, mtd_erase and mtd_block_markbad. Add these functions to barebox aswell to make future mtd synchronizations with the kernel easier. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | mtd: rename mtd file operations callback functionsSascha Hauer2013-02-141-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are currently named mtd_read/write/erase. Functions with the same name exist as global functions in the kernel. Rename them to mtd_op_* to avoid name clashes with future mtd updates. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | libmtd: rename functions from mtd_* to libmtd_*Sascha Hauer2013-02-144-16/+16
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | The kernel nowadays has mtd_read/write and other functions. In barebox we also have these functions, but with a different prototype, namely they correspond to the libmtd userspace functions. Rename these functions to libmtd_* to avoid name clashes with future mtd updates. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/misc'Sascha Hauer2013-03-04182-812/+398
|\ \ \
| * | | usb: fix build for big-endian platformAntony Pavlov2013-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was introduced in commit 51885a7d7321c3e6395c36bc4fe8dde7e78cf562 Author: Sascha Hauer <s.hauer@pengutronix.de> Date: Thu Jun 28 09:56:23 2012 +0200 Change byte order detection mechanism to kernel style Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>