9
0
Fork 0
Commit Graph

10903 Commits

Author SHA1 Message Date
Sascha Hauer f8327af20c Merge branch 'for-next/ioresource' 2014-05-05 11:05:51 +02:00
Sascha Hauer b568687bc3 Merge branch 'for-next/imx' 2014-05-05 11:05:51 +02:00
Sascha Hauer 80f15899b1 Merge branch 'for-next/ifup' 2014-05-05 11:05:51 +02:00
Sascha Hauer 2274c6ea77 Merge branch 'for-next/env' 2014-05-05 11:05:50 +02:00
Sascha Hauer d27b97820c Merge branch 'for-next/dts' 2014-05-05 11:05:50 +02:00
Sascha Hauer c61ba238f7 Release v2014.05.0
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-05-05 10:33:13 +02:00
Sascha Hauer 6bef4dd595 dts: update to v3.15-rc3
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-05-05 10:03:29 +02:00
Uladzimir Bely 825fca396f imx6: ocotp: Add On-Chip OTP registers write support
FUSEs (OTP registers) can be written via /dev/imx-ocotp character device.

For example, writing MAC 12:34:56:78:9A:BC can be performed as
    > mw -l -d /dev/imx-ocotp 0x8c 0x00001234
    > mw -l -d /dev/imx-ocotp 0x88 0x56789ABC
and reading as
    > md -l -s /dev/imx-ocotp 0x88+8
    00000088: 56789ABC 00001234
, where 0x88 (0x22*4) and 0x8C (0x23*4) are offsets of MAC OTP registers.

Notice: FUSEs are PROM, so "0" (unprogrammed) bits
can be replaced with "1" (but not vice versa) only once.

Also, for MAC there are convinient parameters:
    > ocotp0.permanent_write_enable=1
    > ocotp0.mac_addr=12:34:56:78:9A:BC
    imx_ocotp 21bc000.ocotp: reloading shadow registers...
    imx_ocotp 21bc000.ocotp: reloading shadow registers...
    > echo $ocotp0.mac_addr
    12:34:56:78:9A:BC

Signed-off-by: Uladzimir Bely <u.bely@sam-solutions.net>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-05-05 09:35:05 +02:00
Christian Hemp e0afbe3f84 imx:mmdc:Move imx6-reg include to imx6-mmdc header
Move the imx6-reg.h include to the imx6-mmdc header.

Signed-off-by: Christian Hemp <c.hemp@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-05-05 09:02:10 +02:00
Christian Hemp 3e571c1f86 imx6: Add support for phyCARD-i.MX6
Add support for Phytec phyCARD-i.MX6.
	- 1GB RAM on two banks
	- 1GB RAM on one bank
	- 2GB RAM on two banks

Signed-off-by: Christian Hemp <c.hemp@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-30 19:45:11 +02:00
Lucas Stach 159f1ea7ce ARM: boards: Makefile: fix whitespace
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-30 15:33:27 +02:00
Michael D. Burkey a8334c68c9 Fix bug in export 64 bit unsigned environment variable.
This patch corrects exporting unsigned 64-bit environment variables.
I had left out a signed off line before.

Signed-off-by: Michael Burkey <mdburkey at gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-30 08:55:47 +02:00
Sascha Hauer eecac38c2c mtd: nand-mxs: Return bitflips
The read_page hook shall return the number of bitflips. Implement
that.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-29 16:12:33 +02:00
Eric Bénard ccc4eac632 RiOTboard: add new board
this board is produced by Embest/Element 14 and is based on i.MX6 Solo
The following features are tested :
- UART2 (console)
- eMMC
- SDCard
- uSDCard
- Ethernet
- USB Host (through 4 ports hub)
- I2C 1/2/3
- 2 LEDs

Boot on eMMC and through USB loader are tested.

For more informations on this board : http://www.riotboard.org/

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-29 09:12:35 +02:00
Sascha Hauer 41ae766fb9 ARM: dove: Use upstream dtsi file
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
2014-04-29 09:07:21 +02:00
Sascha Hauer 7b4fb140fc ARM: Tegra20: Use upstream dtsi files
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-29 09:07:21 +02:00
Sascha Hauer 99a720c5e2 ARM: AM33xx: Use upstream dtsi file
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-29 09:07:21 +02:00
Sascha Hauer d557214815 ARM: i.MX27: Use upstream dtsi file
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-29 09:07:21 +02:00
Sascha Hauer cb228a82aa ARM: i.MX25: Use upstream dtsi file
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-29 09:07:21 +02:00
Sascha Hauer 3fafc8e5c7 mtd: nand-bb: use list_for_each_entry_safe
We need list_for_each_entry_safe in dev_remove_bb_dev since the
list entries are removed during iteration over the list.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reported-by: Alexander Aring <alex.aring@gmail.com>
2014-04-29 08:05:17 +02:00
Sascha Hauer 4905948695 genenv: fix tempdir creation when target is a relative path
when $target is a path relative to $objtree the script fails.
This is because we cd to $basedir and then copy to $tempdir which
then is no longer valid. Fix this by converting $tempdir to an
absolute path first.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Tested-by: Christoph Fritz <chf.fritz@googlemail.com>
2014-04-29 07:57:24 +02:00
Sascha Hauer bb7cf71cff ARM: i.MX53: Use upstream dtsi files
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-28 14:18:29 +02:00
Sascha Hauer 95b13377be ARM: i.MX6: Use upstream dtsi files
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-28 14:18:29 +02:00
Sascha Hauer 04a3e57996 ARM: dts: i.MX51: Use upstream dts files
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-28 14:18:29 +02:00
Sascha Hauer f9b8b4ac81 dts: i.MX51 efika sb: Roll back pingroup changes
The pingrp defines never made it upstream, so roll back the changes
and use the individual pin defines for the Efika sb instead.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-28 14:18:28 +02:00
Sascha Hauer 5d0362c5d3 dts: Use dt-bindings from kernel
barebox used to have its own include/dt-bindings with files copied
from the corresponding kernel files. Use upstream dt-bindings directly
instead.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-28 14:18:25 +02:00
Christian Hemp 724ea7e6c3 imx6: read back memory size
To reduce the devicetree files for one board with different memory sizes the
memory size can be read back from i.MX6.

Signed-off-by: Christian Hemp <c.hemp@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-28 12:02:55 +02:00
Sascha Hauer 3781d93b06 OF: barebox-env: Use bb device on NAND
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-28 11:49:01 +02:00
Sascha Hauer 1a8800458b mtd: nand: create bb devices automatically
When a mtd device can have bad blocks we want to create a
bb device, so do this automatically. This allows us to
drop bb device creation from the environment.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-28 11:45:09 +02:00
Sascha Hauer 33d4f7cb3d mtd: refactor bb device creation
This refactors the code so that we get a mtd_add_bb which can
be used to create a bb dev on a mtd_info.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-28 11:43:09 +02:00
Sascha Hauer b32cd8df87 mtd: nand: bb: use mtd api directly
The devfs layer just adds an addition indirection between mtd
and the bb devices with no purpose. Drop it.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-28 11:41:15 +02:00
Sascha Hauer ebb8a4b594 env: erase/protect in envfs_save
So that the envfs_save is more useful outside of the saveenv command

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-28 11:41:02 +02:00
Sascha Hauer 54bea204e2 environment: drop envfs_register_partition
The purpose of envfs_register_partition is to print an error
message when the partition does not exist. Print an error message
from generic code instead and drop this function.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-28 11:37:42 +02:00
Sascha Hauer a115d5f943 serial: ns16550: omap: set register shift from code
The upstream dts files do not contain the register shift. As
we have Omap specific init code anyway we can just set the register
shift from there instead of relying on the devicetree properties.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-28 09:08:46 +02:00
Sascha Hauer 00ce25c6dc Add devicetree source files as of Linux-3.15-rc2
This adds the Linux dts files to barebox. The dts files are
generated from Ian Campbells device-tree-rebasing.git:

git://xenbits.xen.org/people/ianc/device-tree-rebasing.git

The dts are found in dts/ in the barebox repository and
will be updated from upstream regularly, probably for each upstream
-rc.

To keep the synchronization with upstream easy no changes to
the original files are allowed under dts/. Instead changes to
upstream dts files will be done using overlays in arch/$ARCH/dts/.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-28 09:08:46 +02:00
Christian Hemp 3858b933b5 imx6:mmdc: Move register defines to header file
Move mmdc register defines to mmdc header file.

Signed-off-by: Christian Hemp <c.hemp@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-28 08:09:31 +02:00
Lucas Stach fca64d3fda ARM: nitrogen6x: remove VPU/IPU QoS from DCD
Not needed anymore, as barebox sets this up itself now.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-28 08:08:41 +02:00
Juergen Borleis fb67ada79a default environment: force a specific return value
Since commit a162dfe503 the ifup command runs
this file as a script. Due to a hush misbehave it could happen it returns
an error code by accident.

For example if the last instructions in this file are:

 if [ false ]; then
    echo "friesel"
 fi

the hush returns 1 after running this script instead of 0 and in this case
the ifup command fails.

I know, the correct fix would be to fix the hush, because it is a generic
issue...but how?

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-24 09:03:31 +02:00
Juergen Borleis 3018f13670 net/ifup.c: avoid setting the MAC twice
The command always sets the MAC address of the interface in the code path.
For the static network configuration case it sets it again, due to the
environment variable keyword ("ethaddr") is listed again in the table.
Remove this keyword from the table, because the MAC is already set.

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-24 09:03:31 +02:00
Juergen Borleis 4428de2aad net/ifup.c: don't fail silently
Since commit a162dfe503 the ifup command is
implemented in C and runs up to two external scripts.
If one of these scripts return with an error code, the command terminates
silently. This can confuse a user because there is no hint about the reason
why it fails. Add error messages to avoid this case.

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-24 09:03:31 +02:00
Alexander Shiyan 8a343b9b00 spi: i.MX: Optimise driver private structure
No need to store init() function in the driver private structure
since it called only once during startup.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-23 12:32:35 +02:00
Alexander Shiyan 6a40096a6c spi: i.MX: Simplify cspi_0_0_init()
Use SPI module software reset to simplify cspi_0_0_init().

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-23 12:32:35 +02:00
Silvio Fricke 0af79fbb67 make: fix searchpath of generated autoconf.h
If barebox is builded out-of-tree we don't find the autogenerated
autoconf.h because we search in the srctree.

With this patch we don't get this error message:

cc1: fatal error: /[...]/barebox/include/generated/autoconf.h: No such file or directory

Signed-off-by: Silvio Fricke <silvio.fricke@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-23 12:14:21 +02:00
Antony Pavlov 877a50c599 commands: loady: fix Y-Modem/G option name in help message
Actually loady command uses '-g' option for Y-Modem/G mode
selection; see loady() function:

    while ((opt = getopt(argc, argv, "b:t:g")) > 0) {
        switch (opt) {
    ...
        case 'g':
            is_ymodemg = 1;
            break;

By mistake help message show '-y' option for Y-Modem/G mode
selection.

This patch fixes the problem.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-23 11:19:51 +02:00
Owen Kirby 7311cc9bd2 Fix AT91 UDC driver on boards without vbus.
From 4ea2bd2e1ca18136d7cfd61643bc8d8187b1495f Mon Sep 17 00:00:00 2001
From: Owen Kirby <osk@exegin.com>
Date: Wed, 16 Apr 2014 17:45:18 -0700
Subject: [PATCH] Fix AT91 UDC driver on boards without vbus.

While porting Barebox to one of our boards, we found that the AT91 UDC driver
will fail to connect to USB hosts, and will spam the console with errors if
the VBUS pin isn't connected.

Signed-off-by: Owen Kirby <osk@exegin.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-23 09:24:06 +02:00
Lucas Stach b7f627bb34 commands: uimage: remove redundant error message
uimage_verify already prints an error message if the CRC
is wrong. Romove the never reached redundant message in
the caller.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-23 09:21:17 +02:00
Lucas Stach 4ab9051bd3 don't cast negative error codes to unsigned size_t
The cast prevents us from doing proper error checking.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-23 09:21:17 +02:00
Sascha Hauer 521ffee526 video: imx-ipu-v3: remove unneeded 'dmfc' check
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Suggested-by: Fabio Estevam <festevam@gmail.com>
2014-04-23 09:19:44 +02:00
Lucas Stach 3e74fd9d05 video: displaytimings: remove two broken error messages
The error messages would dereference the just checked NULL
ptr. As those messages don't add much value without further
info just remove them.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-23 09:05:52 +02:00
Lucas Stach 4d5ad7c9c6 imx-image: don't leak file handle
Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-04-23 09:05:52 +02:00