Commit graph

6492 commits

Author SHA1 Message Date
Sascha Hauer
36bfa7b2a7 ARM linker script: Fix barebox_image_size
barebox_image_size was calculated wrong when PRE_IMAGE is defined.
In this case _text does not refer to the binary image start. We
have to use TEXT_BASE here.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-23 08:58:18 +01:00
Sascha Hauer
773e35bb94 Revert "ARM i.MX53:: Add i2cclk"
Actually a duplicate of an earlier patch from Eric Benard.

This reverts commit 109629c1dd.
2012-03-23 08:55:42 +01:00
Wolfram Sang
6cbecc4163 net: miidev: properly check for MII reset
Wait until the reset bit is actually cleared instead of some
arbitrary delay (which caused problems with a PHY which was in some
energy saving mode).

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-23 08:23:11 +01:00
Wolfram Sang
b7c9126750 net: miidev: Refactor timeout for aneg
First check the status at least once, then do timeout checks. Minor
cleanups also.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-23 08:23:11 +01:00
Wolfram Sang
76ed3bd9ef net: miidev: check for errors when accessing bus in restart_aneg
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-23 08:23:11 +01:00
guenter.gebhardt@rafi.de
109629c1dd ARM i.MX53:: Add i2cclk
when compiling for a imx53 with i2c enabled i got the following error:

drivers/built-in.o: In function `i2c_imx_set_clk':
/home/ggebhardt/repos/ecuv6_bl/barebox/drivers/i2c/busses/i2c-imx.c:282:
undefined reference to `imx_get_i2cclk'
make[4]: *** [.tmp_barebox1] Error 1
make[3]: *** [CMakeFiles/bootloader] Error 2
make[2]: *** [CMakeFiles/bootloader.dir/all] Error 2
make[1]: *** [CMakeFiles/bootloader.dir/rule] Error 2
make: *** [bootloader] Error 2

I copied the following from the corresponding imx51 implementation.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-22 07:15:03 +01:00
Sascha Hauer
d8ce4acc9f defenv: remove bogus defaultenv from defconfigs
When CONFIG_DEFAULT_ENVIRONMENT_GENERIC is set the Make system
will automatically compile in defaultenv/ into the environment. Some
boards explicitely add this path again in their defconfig which is
not needed. Remove it.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-20 14:15:36 +01:00
Sascha Hauer
62f9b9d623 Merge branch 'work/automount' into next 2012-03-20 14:15:14 +01:00
Alexander Shiyan
c5c5d33469 i.MX51: Fix name definition for SSI3
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-20 14:08:59 +01:00
Alexander Shiyan
5d62a8bd93 i.MX27: Add support for SDHC1,3
imx27_add_mmc0 really registered SDHC2. Fix this by adding a
imx27_add_mmc1 and use this in the pca100 board file. Also add
imx27_add_mmc2 helper for register SDHC3.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-20 14:08:59 +01:00
Alexander Shiyan
6dd7f8ee7b i.MX27: Define base address for SDHC1,2,3
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-20 14:08:59 +01:00
Alexander Shiyan
e316d92fa4 Remove duplicate voltage setup for imx-esdhc
We are already setup voltages from capabilities register.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-18 16:16:26 +01:00
Alexander Shiyan
a5433315df Use mx53-related functions for i.MX53 boards
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-18 16:15:19 +01:00
Alexander Shiyan
fdc9dd6fb6 Use register names for MC13892
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-18 16:13:34 +01:00
Alexander Shiyan
b705d3ca69 i.MX27: Use resigter name in imx27_add_fb
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-18 16:13:00 +01:00
Sascha Hauer
b3c1fda092 partition command: optionally do not automatically prepend the device name
We used to automatically prepend the device name before the partition
name. So when we added a partition named 'barebox' to a device named
'nor0' the partition was named 'nor0.barebox'.

The Kernel can mount its rootfs based on the mtd name, for example with
root=mtd:root. If for example we have multiple mtd devices (nor and nand)
'root' is a bad name for the partition, it should better be 'nor0.root'

This patch adds an additional commandline switch to addpart to optionally
skip the automatic device name adding. This makes it possible to define
our mtd partitions like this:

nor_parts="512k(nor0.barebox)ro,128k(nor0.bareboxenv),2M(nor0.kernel),-(nor0.root)"

This way the barebox partition names stay the same, but we can now
pass the exact name to the kernel (root=mtd:nor0.root).

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-18 15:03:31 +01:00
Sascha Hauer
7e614c143d usb command: by default scan only once for USB devices
We normally do not expect USB devices to be hotplugged. Instead of
rescanning each time the usb command is called, scan only once.
This makes the usb command safe for being called multiple times
without making already registered USB devices reinitialized. To
really scan multiple times a '-f' option is introduced.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-18 15:03:31 +01:00
Sascha Hauer
38a1971e5b FAT: Fix error path
- forward the return value of chk_mounted to detect whether mount succeeded
- free resources on mount failure

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-18 15:03:31 +01:00
Sascha Hauer
d94579abaf hush source: expand $PATH
The behaviour of other shells suggest that with source or '.'
the path should be resolved using the PATH environment variable. Do
the same in barebox.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-18 15:03:31 +01:00
Sascha Hauer
3f637f7dc4 fs open: pass error from stat
We used to simply answer with -ENOENT in open() when the
initial call to stat() failed. Instead, forward the error from
stat().

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-18 15:03:31 +01:00
Sascha Hauer
b5e5b06d8b Add automount support
This patch adds an automount command which makes it possible
to execute a script when a certain directory is first accessed.
It's the commands responsibility to make this directory available
(bringing devices up and mounting it). This results in automount
support which makes sure that from the shell every file can
be accessed without having to care for device bringup. Bringing
up devices may be expensive (USB, dhcp). The automount support
makes it easy for the environment to bringup devices when they
are actually needed.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-18 15:03:26 +01:00
Sascha Hauer
b55fbf7f5f fs: drop struct mtab_entry
every struct fs_device_d contains a struct mtab_entry, so they
have a 1:1 relationship. Instead of having to use container_of
to get from a struct mtab_entry to a struct fs_device_d we can
better embed the members of struct mtab_entry into struct fs_device_d
directly.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-17 18:16:03 +01:00
Sascha Hauer
4b4bfcc0bf fs: change get_fs_device_by_path prototype
get_fs_device_by_path returns a struct device_d instead of what the
name suggests a struct fs_device_d. Also it returns the rootpath
of the corresponding fs_device. This patch changes the name of
this function to get_fs_device_and_root_path to better reflect what
the function does and changes the return type to struct fs_device_d.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-17 18:16:03 +01:00
Alexander Shiyan
105c276faa i.MX51: Remove GPIO2.6 setup from lowlevel_init
Remove GPIO2.6 setup from lowlevel_init. It can be defined in board
initialization code if it necessary.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-17 17:20:58 +01:00
Jean-Christophe PLAGNIOL-VILLARD
5b0ffe91c4 defaultenv: add dhcp-barebox option
barebox will use DHCP and pass the result to the kernel
update the help

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-17 17:20:18 +01:00
Jean-Christophe PLAGNIOL-VILLARD
3374ddcc45 defaultenv: add bootp support
use rootpath as nfsroot and bootfile as kernelimage if present
when ip mode is dhcp

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-17 17:20:18 +01:00
Jean-Christophe PLAGNIOL-VILLARD
495dffdaa5 at91: set dhcp vendor id on Atmel Reference board
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-17 17:20:18 +01:00
Alexander Shiyan
4f600789c5 i.MX51: add support for UART3
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-17 17:18:28 +01:00
Teresa Gámez
5f97fbb3bc pcm049_xload_defconfig: activate Thumb-2 support
To reduce the size of the MLO we have to activate thumb-2 support.
Otherwise the board will not boot.

Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-15 20:55:07 +01:00
Teresa Gámez
1bdce4699f devices-gpmc-nand: Add OMAP4 gpmc nand timings
Add a OMAP4 specific GMPC nand config for pcm049 and phyCARD-A-XL2 to increase
performance. Also add the possiblility to pass a board GPMC nand config.

Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-15 20:55:07 +01:00
Teresa Gámez
b071db2367 pcm049: Update GPMC net conf
Updated GPMC settings for ethernet to increase performance.

Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-15 20:55:07 +01:00
Teresa Gámez
1e49da2905 pcm049: Update muxing
Update muxing setup for phyCORE-OMAP4.

Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-15 20:55:07 +01:00
Teresa Gámez
1486c07a97 pcm049: Update RAM timings
Updated RAM Timings for phyCORE-OMAP4.

Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-15 20:55:07 +01:00
Sascha Hauer
d2fe785465 Merge remote-tracking branch 'jean/at91-update' into next 2012-03-14 20:27:42 +01:00
Jan Weitzel
a2f567f3a9 ENV: remove kernelimage_type from env/config
drop kernelimage_type bootm now boots all of them.

Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-13 13:36:30 +01:00
Jan Weitzel
4088ab5588 NET: Add support for ks8851_mll
Add support for KS8851 16bit MLL chip from Micrel Inc.

Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-13 13:35:29 +01:00
Jan Weitzel
ef00106960 omap: add support for phycard-a-xl2
Support for omap4 based Phytec phyCARD-A-XL2 board

Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-13 13:35:25 +01:00
Robert Jarzmik
65acd3391d drivers/mtd: improve docg3 write speed
When programming or erasing a page, don't wait
systematically for 3s, but finish the operation as soon as
the hardware has finished, and timeout if 3 seconds have
passed.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-13 13:25:07 +01:00
Michael Grzeschik
baa23057c5 imx_nand_load_image: change all users to use barebox_image_size
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-13 13:22:27 +01:00
Enrico Scholz
3661e874aa net: dhcp: allow to set transmitted vendor id
For net boot setups it is useful to submit boot params like server or
bootfile over dhcp. To distinguish barebox from e.g. pxe machines,
a custom vendor id can be sent in dhcp discover/request messages.

E.g. the ISC dhcp server can be configured with

| if substring(option vendor-class-identifier,0,8) = "barebox:" {
|       next-server             192.168.3.24;
|       server-name             "192.168.3.24";
|       option tftp-server-name "192.168.3.24";
|       option root-path = concat("/srv/sysroots/by-mac/",
|          binary-to-ascii (16, 8, "-", substring (hardware, 1, 6)));
| }

to sent boot params which are valid for barebox hosts only.

Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Jean-Christophe PLAGNIOL-VILLARD:
 - update the use dhcp command option
 - support to set the vendor via env dhcp_vendor_id
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-12 22:44:06 +01:00
Jean-Christophe PLAGNIOL-VILLARD
b3910b1b3e at91sam9260ek/9g20ek: update defconfig
- enable MMU support
 - set max size to 256KiB

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2012-03-12 18:52:27 +08:00
Jean-Christophe PLAGNIOL-VILLARD
21fb88eae7 at91sam9m10g45ek: update defconfig
- use tslf
 - bootm: enable oftree and uimage support
 - enable mmu support
 - drop cfi support (no nor on the board)

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2012-03-12 18:47:15 +08:00
Jean-Christophe PLAGNIOL-VILLARD
28c8303d9e at91sam9m10g45ek: add leds support
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2012-03-12 18:47:15 +08:00
Jean-Christophe PLAGNIOL-VILLARD
f52461431a at91sam9m10g45ek: update partition layout
This will allow to boot from nand with the bootstrap.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2012-03-12 18:47:15 +08:00
Jean-Christophe PLAGNIOL-VILLARD
3558cd06b5 at91sam9261ek/9g10ek: update board supprt
update fancy prompt to be the same as the other Atmel board
 use the same feature on 9g10ek and 9261ek

 - use tlsf
 - enable MMU
 - set max size to 256KiB
 - bootm: add initrd support
 - nand: drop non used hw ecc and oob device

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2012-03-12 18:47:13 +08:00
Jean-Christophe PLAGNIOL-VILLARD
65480192e6 at91sam9261ek/9g10ek: add gpio Keyboard support
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2012-03-12 18:32:53 +08:00
Jean-Christophe PLAGNIOL-VILLARD
85f5d9645d at91sam9261ek/9g10ek: add dfu and usb serial support
if bp3 is pressed 5s during boot enable dfu otherwise usbserial

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2012-03-12 18:03:14 +08:00
Jean-Christophe PLAGNIOL-VILLARD
2607cac17b at91sam9261ek/9g10ek: add leds support
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2012-03-12 17:59:16 +08:00
Jean-Christophe PLAGNIOL-VILLARD
7c386efb39 at91sam9261ek/9g10ek: update partition layout
Update partition layout to be able to boot from nand with the bootstrap.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2012-03-12 17:59:07 +08:00
Jean-Christophe PLAGNIOL-VILLARD
aebd740757 at91sam9263ek: update defconfig
- set max size to 256KiB
 - enable MMU
 - bootm: enable oftree and initrd support
 - nand: drop non used hw ecc

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2012-03-12 17:59:07 +08:00