oweals/u-boot.git
10 years agoMerge git://git.denx.de/u-boot-dm
Tom Rini [Tue, 28 Oct 2014 16:39:26 +0000 (12:39 -0400)]
Merge git://git.denx.de/u-boot-dm

10 years agoe1000: add i211 and unprogrammed i210/i211 support
Marcel Ziswiler [Sun, 7 Sep 2014 22:03:50 +0000 (00:03 +0200)]
e1000: add i211 and unprogrammed i210/i211 support

This patch adds support for i211 as well as unprogrammed aka tools only
i210/i211 chip support.

Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
10 years agoodroid: dts: fix name of included dtsi
Przemyslaw Marczak [Fri, 24 Oct 2014 15:45:09 +0000 (17:45 +0200)]
odroid: dts: fix name of included dtsi

Odroid is based on Exynos4412.

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
10 years agoodroid: dts: adjust sd cd-gpios for SD Card
Przemyslaw Marczak [Fri, 24 Oct 2014 15:45:08 +0000 (17:45 +0200)]
odroid: dts: adjust sd cd-gpios for SD Card

There is no gaps in exynos gpio enum after rework, so the gpio
numbers should be adjusted to the new numbering.

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
10 years agotrats2: dts: adjust gpio numbers after gpio rework
Przemyslaw Marczak [Fri, 24 Oct 2014 15:45:07 +0000 (17:45 +0200)]
trats2: dts: adjust gpio numbers after gpio rework

There is no gaps in exynos gpio enum after rework, so the gpio
numbers should be adjusted to the new numbering.

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
10 years agotrats: dts: adjust gpio numbers to new api
Przemyslaw Marczak [Fri, 24 Oct 2014 15:45:06 +0000 (17:45 +0200)]
trats: dts: adjust gpio numbers to new api

There is no gaps in exynos gpio enum after rework, so the gpio
numbers should be adjusted to the new numbering.

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
10 years agouniversal: dts: adjust gpio numbers to new api
Przemyslaw Marczak [Fri, 24 Oct 2014 15:45:05 +0000 (17:45 +0200)]
universal: dts: adjust gpio numbers to new api

There is no gaps in exynos gpio enum after rework, so the gpio
numbers should be adjusted to the new numbering.

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
10 years agouniversal: request soft i2c gpio
Przemyslaw Marczak [Fri, 24 Oct 2014 15:45:03 +0000 (17:45 +0200)]
universal: request soft i2c gpio

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
10 years agoexynos4210: dts: fix gpio offset in pinctrl-uboot
Przemyslaw Marczak [Fri, 24 Oct 2014 15:45:02 +0000 (17:45 +0200)]
exynos4210: dts: fix gpio offset in pinctrl-uboot

The gpy0 don't need any additional register offset,
but the gpx0 does, so now it is fixed.

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
10 years agoexynos4412: dts: adjust pinctrl-uboot to changed gpio order
Przemyslaw Marczak [Fri, 24 Oct 2014 15:45:01 +0000 (17:45 +0200)]
exynos4412: dts: adjust pinctrl-uboot to changed gpio order

The gpf0 offset was bad and it's now fixed.
After fix gpio order in *pinctrl.dts , the gpy0 offset is not required now.

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
10 years agoexynos4412: dts: fix bad gpio order in pinctrl
Przemyslaw Marczak [Fri, 24 Oct 2014 15:45:00 +0000 (17:45 +0200)]
exynos4412: dts: fix bad gpio order in pinctrl

The pinctrl dts was imported from the kernel, but the order
of GPM and GPY is wrong. The gpio enum in: asm/arch/gpio.h
is proper.

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
10 years agoexynos: common: enable generic fs operations
Przemyslaw Marczak [Fri, 24 Oct 2014 15:44:57 +0000 (17:44 +0200)]
exynos: common: enable generic fs operations

This config is required by Odroid, and could be also useful for the other
boards.

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
10 years agommc: s5p: set SD detection pin as input
Przemyslaw Marczak [Fri, 24 Oct 2014 15:44:56 +0000 (17:44 +0200)]
mmc: s5p: set SD detection pin as input

The SD Card slot detection pin should be configured as input.

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
10 years agogit-mailrc: add pmic custodian
Przemyslaw Marczak [Mon, 27 Oct 2014 13:10:34 +0000 (14:10 +0100)]
git-mailrc: add pmic custodian

This adds custodian to the pmic subsystem.

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Tom Rini <trini@ti.com>
10 years agogitignore: ignore atmel pmecc parameter tool
Andreas Bießmann [Sat, 25 Oct 2014 00:58:50 +0000 (02:58 +0200)]
gitignore: ignore atmel pmecc parameter tool

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
10 years agospl: move comment to the right place
Andreas Bießmann [Sat, 25 Oct 2014 00:54:55 +0000 (02:54 +0200)]
spl: move comment to the right place

Commit ae83d882f5fdf7aa7c5aec09cfafb593153c25d6 moved the fixed size mentioned
in the comment but missed the comment.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
10 years agoUse __stringify() instead of xstr()
Anatolij Gustschin [Fri, 24 Oct 2014 18:13:51 +0000 (20:13 +0200)]
Use __stringify() instead of xstr()

Some boards still use xstr(). Replace remaining occurrences
of xstr() by commonly used __stringify().

Signed-off-by: Anatolij Gustschin <agust@denx.de>
10 years agoppc4xx: update PMC440 board support
Matthias Fuchs [Fri, 24 Oct 2014 10:44:40 +0000 (12:44 +0200)]
ppc4xx: update PMC440 board support

- switch to GENERIC_BOARD
- fix env support from eeprom

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
10 years agoimage: Fix Android boot image support
Ahmad Draidi [Thu, 23 Oct 2014 17:50:07 +0000 (20:50 +0300)]
image: Fix Android boot image support

This patch makes the following changes:
- Set kernel entry point correctly
- Append bootargs from image to global bootargs instead
        of replacing them
- Return end address instead of size from android_image_get_end()
- Give correct parameter to genimg_get_format() in boot_get_ramdisk()
- Move ramdisk message printing from android_image_get_kernel() to
android_image_get_ramdisk()

Signed-off-by: Ahmad Draidi <ar2000jp@gmail.com>
Cc: Tom Rini <trini@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
10 years agoarm: db-mv784mp-gp/maxbcm Add placeholder bin_hdr file so that linking works
Stefan Roese [Thu, 23 Oct 2014 15:04:09 +0000 (17:04 +0200)]
arm: db-mv784mp-gp/maxbcm Add placeholder bin_hdr file so that linking works

This file should contain the bin_hdr generated by the original Marvell
U-Boot implementation. As this is currently not included in this
U-Boot version, we have added this placeholder, so that the U-Boot
image can be generated without errors.

If you have a known to be working bin_hdr for your board, then you
just need to replace this text file here with the binary header
and recompile U-Boot.

In a few weeks, mainline U-Boot will get support to generate the
bin_hdr with the DDR training code itself. By implementing this code
as SPL U-Boot. Then this file will not be needed any more and will
get removed.

Signed-off-by: Stefan Roese <sr@denx.de>
10 years agocmd_mem: call unmap_sysmem() after map_sysmem()
Masahiro Yamada [Thu, 23 Oct 2014 08:46:24 +0000 (17:46 +0900)]
cmd_mem: call unmap_sysmem() after map_sysmem()

Actually, unmap_sysmem() does nothing.  Just in case.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Simon Glass <sjg@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
10 years agocommon: command: trivial coding style fixes
Masahiro Yamada [Thu, 23 Oct 2014 08:27:30 +0000 (17:27 +0900)]
common: command: trivial coding style fixes

- Do not insert a whitespace between a function name and
   an open paranthesis
 - Fix comment style
 - Do not split an error message into multiple lines
   even if it exceeds 80 columns
 - Do not split "for" statement where it fits in 80 columns
 - Do not use assignment in if condition

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Simon Glass <sjg@chromium.org>
10 years agoCorrect two non-functional misspellings "overrided".
Robert P. J. Day [Tue, 21 Oct 2014 20:44:32 +0000 (16:44 -0400)]
Correct two non-functional misspellings "overrided".

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
10 years agoCorrect single misspelling of "consitant" in source tree.
Robert P. J. Day [Tue, 21 Oct 2014 20:35:28 +0000 (16:35 -0400)]
Correct single misspelling of "consitant" in source tree.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
10 years agodoc: fix README.standalone
Masahiro Yamada [Tue, 21 Oct 2014 15:41:49 +0000 (00:41 +0900)]
doc: fix README.standalone

Since commit fe1378a961e5 (ARM: use r9 for gd), r9 register
is used on ARM to hold global_data.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Jeroen Hofstee <jeroen@myspectrum.nl>
10 years agoe1000: fix sw fw sync on igb i210/i211
Marcel Ziswiler [Tue, 21 Oct 2014 12:26:36 +0000 (14:26 +0200)]
e1000: fix sw fw sync on igb i210/i211

I finally had a look at the datasheet and spotted an additional
register address difference between regular E1000 and i210/i211 chips.
This patch fixes this and now successfully works on programmed
i210/i211 as well as unprogrammed i211.

Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
10 years agoREADME.kconfig: fix typo
Igor Grinberg [Tue, 21 Oct 2014 10:27:45 +0000 (13:27 +0300)]
README.kconfig: fix typo

Fix typo in defconfig file format description.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agokconfig: add CONFIG_SUPPORT_TPL
Masahiro Yamada [Mon, 20 Oct 2014 08:45:57 +0000 (17:45 +0900)]
kconfig: add CONFIG_SUPPORT_TPL

CONFIG_TPL should not be enabled for boards that do not have TPL.
CONFIG_SUPPORT_TPL introduced by this commit should be "select"ed
by boards with TPL support and CONFIG_TPL should depend on it.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agokconfig: add CONFIG_SUPPORT_SPL
Masahiro Yamada [Mon, 20 Oct 2014 08:45:56 +0000 (17:45 +0900)]
kconfig: add CONFIG_SUPPORT_SPL

CONFIG_SPL should not be enabled for boards that do not have SPL.
CONFIG_SUPPORT_SPL introduced by this commit should be "select"ed
by boards with SPL support and CONFIG_SPL should depend on it.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Simon Glass <sjg@chromium.org>
10 years agocommon/cmd_io.c: Fix incorrect help for iod/iow
Bin Meng [Mon, 20 Oct 2014 08:14:53 +0000 (16:14 +0800)]
common/cmd_io.c: Fix incorrect help for iod/iow

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
10 years agonet/e1000: Fix EEPROM access error
York Sun [Fri, 17 Oct 2014 20:44:06 +0000 (13:44 -0700)]
net/e1000: Fix EEPROM access error

Commit 951860634fdb557bbb58e0f99215391bc0c29779 may have changed
the logic unintentially from "if (!(swfw_sync & (fwmask | swmask)))"
to "if ((swfw_sync & swmask) && !(swfw_sync & fwmask))". This change
breaks some e1000 NIC with a message "ERROR: Unable to read EEPROM!".

Signed-off-by: York Sun <yorksun@freescale.com>
CC: Marek Vasut <marex@denx.de>
CC: Tim Harvey <tharvey@gateworks.com>
Acked-by: Marcel Ziswiler <marcel@ziswiler.com>
10 years agoaboot: fix block addressing for don't care chunk type
Rob Herring [Thu, 16 Oct 2014 03:19:36 +0000 (11:19 +0800)]
aboot: fix block addressing for don't care chunk type

CHUNK_TYPE_DONT_CARE should skip over the specified number of blocks, but
currently fails to increment the device block address. This results in
filesystem images getting written incorrectly. Add the missing block
address incrementing.

Cc: Steve Rae <srae@broadcom.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Steve Rae <srae@broadcom.com>
10 years agoTI:OMAP4: enable EXT support in SPL for OMAP4 boards
Guillaume GARDET [Wed, 15 Oct 2014 15:53:15 +0000 (17:53 +0200)]
TI:OMAP4: enable EXT support in SPL for OMAP4 boards

Enable EXT support in SPL for OMAP4 boards.
Build tested for duovero, omap4_sdp4430 and omap4_panda.
Run time tested on omap4_panda.

Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Cc: Tom Rini <trini@ti.com>
10 years agospl: do not hang in spl_register_fat_device but return error value. It allows to...
Guillaume GARDET [Wed, 15 Oct 2014 15:53:14 +0000 (17:53 +0200)]
spl: do not hang in spl_register_fat_device but return error value. It allows to use both CONFIG_SPL_FAT_SUPPORT and CONFIG_SPL_EXT_SUPPORT.

Do not hang in spl_register_fat_device but return an error value.
It allows to use both CONFIG_SPL_FAT_SUPPORT and CONFIG_SPL_EXT_SUPPORT.
If FAT load fails, then EXT load is tried.

Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Cc: Tom Rini <trini@ti.com>
10 years agodoc: Update documentation according to the EXT SPL support patch set
Guillaume GARDET [Wed, 15 Oct 2014 15:53:13 +0000 (17:53 +0200)]
doc: Update documentation according to the EXT SPL support patch set

Update documentation according to the EXT SPL support patch set.

Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Cc: Tom Rini <trini@ti.com>
10 years agospl: Add EXT support to SPL
Guillaume GARDET [Wed, 15 Oct 2014 15:53:12 +0000 (17:53 +0200)]
spl: Add EXT support to SPL

Add EXT filesystem support to SPL.

Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
[trini: Fix a warning and checkpatch problems]
Signed-off-by: Tom Rini <trini@ti.com>
10 years agoRename some defines containing FAT in their name to be filesystem generic
Guillaume GARDET [Wed, 15 Oct 2014 15:53:11 +0000 (17:53 +0200)]
Rename some defines containing FAT in their name to be filesystem generic

Rename some defines containing FAT in their name to be filesystem generic:
MMCSD_MODE_FAT => MMCSD_MODE_FS
CONFIG_SPL_FAT_LOAD_ARGS_NAME => CONFIG_SPL_FS_LOAD_ARGS_NAME
CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME => CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION => CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION

Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Cc: Tom Rini <trini@ti.com>
10 years agotest: Add a simple test to detected warnings with uint64_t, uintptr_t
Simon Glass [Wed, 15 Oct 2014 10:38:39 +0000 (04:38 -0600)]
test: Add a simple test to detected warnings with uint64_t, uintptr_t

These types are problematic because they are typically declared in a
non-standard way in U-Boot. For example, U-Boot uses 'long long' for
int64_t even on a 64-bit machine whereas stdint.h uses 'long'.
Similarly, U-Boot always uses 'long' for intptr_t whereas stdint.h mostly
uses 'int'.

This simple test script runs a few toolchains on a few archs to check for
warnings.

Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agousb: Use correct printf() format string for uintptr_t
Simon Glass [Wed, 15 Oct 2014 10:38:38 +0000 (04:38 -0600)]
usb: Use correct printf() format string for uintptr_t

Use the inttypes header file to provide this.

Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agoscsi: Use correct printf() format string for uintptr_t
Simon Glass [Wed, 15 Oct 2014 10:38:37 +0000 (04:38 -0600)]
scsi: Use correct printf() format string for uintptr_t

Use the inttypes header file to provide this.

Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agox86: Use correct printf() format string for uintptr_t
Simon Glass [Wed, 15 Oct 2014 10:38:36 +0000 (04:38 -0600)]
x86: Use correct printf() format string for uintptr_t

Use the inttypes header file to provide this.

Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agoTidy up data sizes and function comment in display_options
Simon Glass [Wed, 15 Oct 2014 10:38:35 +0000 (04:38 -0600)]
Tidy up data sizes and function comment in display_options

Use inttypes.h and uint64_t to correct the code so that it will not issue
warnings on 64-bit machines where 'uint64_t' is 'unsigned long'.

Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agoUse uint64_t instead of u64 in put_dec()
Simon Glass [Wed, 15 Oct 2014 10:38:34 +0000 (04:38 -0600)]
Use uint64_t instead of u64 in put_dec()

Use the correct type required by do_div().

Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agoUse uint64_t for time types
Simon Glass [Wed, 15 Oct 2014 10:38:33 +0000 (04:38 -0600)]
Use uint64_t for time types

Unfortunately 'unsigned long long' and 'uint64_t' are not necessarily
compatible on 64-bit machines. Use the correct typedef instead of
writing the supposed type out in full.

Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agoext4: Use inttypes for printf() string
Simon Glass [Wed, 15 Oct 2014 10:38:32 +0000 (04:38 -0600)]
ext4: Use inttypes for printf() string

On 64-bit platforms (like sandbox) 64-bit integers may be 'long' rather
than 'long long'. Use the inttypes header to avoid compiler warnings.

Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agoAdd some standard headers external code might need
Gabe Black [Wed, 15 Oct 2014 10:38:31 +0000 (04:38 -0600)]
Add some standard headers external code might need

inttypes.h defines format specifiers for printf which work with data types of
particular sizes. stdlib.h is currently just a passthrough to malloc.h which
has declarations of the various *alloc functions.

Add the required #define to common.h so that these printf format specifiers
will be made available.

Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-by: Gabe Black <gabeblack@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>
Reviewed-by: Bill Richardson <wfrichar@google.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
(Replaced with a GPL version from glibc)

10 years agoProvide option to avoid defining a custom version of uintptr_t.
Gabe Black [Wed, 15 Oct 2014 10:38:30 +0000 (04:38 -0600)]
Provide option to avoid defining a custom version of uintptr_t.

There's a definition in stdint.h (provided by gcc) which will be more correct
if available.

Define CONFIG_USE_STDINT to use this feature, or USE_STDINT=1 on the 'make'
commmand.

This adjusts the settings for x86 and sandbox, with both have 64-bit options.

Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-by: Gabe Black <gabeblack@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>
Reviewed-by: Bill Richardson <wfrichar@google.com>
Rewritten to be an option, since stdint.h is often available only in glibc.
Changed to preserve a clear boundary between stdint and non-stdint
Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agoRevert "common, env: Fix support for environment in i2c eeprom"
Valentin Longchamp [Tue, 14 Oct 2014 09:16:33 +0000 (11:16 +0200)]
Revert "common, env: Fix support for environment in i2c eeprom"

Since i2c_init_all always sets the bus back to CONFIG_SYS_SPD_BUS_NUM
for compatibility reasons, it means that any eeprom not located on this
CONFIG_SYS_SPD_BUS_NUM is not accessible with the eeprom commands, even
if you change the bus number with an i2c dev command before.

Furthermore i2c_init_all should disappear and is currently only called
from the early board initialisation sequences, it is not suited for
other usage.

This reverts commit 01a0c64762e902971b34587a8a61b59e9ea51374.

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Acked-by: Matthias Fuchs <matthias.fuchs@esd.eu>
10 years agodoc: Fix comparison operator
Olaf Mandel [Fri, 10 Oct 2014 22:25:46 +0000 (00:25 +0200)]
doc: Fix comparison operator

Align the documentation with the include/linux/etherdevice.h ,
which is where this example comes from. The return value from
the check was inverted in the documentation.

Signed-off-by: Olaf Mandel <o.mandel@menlosystems.com>
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Tom Rini <trini@ti.com>
10 years agowireless_space: set myself as maintainer
Albert ARIBAUD [Wed, 8 Oct 2014 22:49:06 +0000 (00:49 +0200)]
wireless_space: set myself as maintainer

LaCie Wireless Space has no defined maintainer.
Set myself as maintainer, since I own one of these.

Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
10 years agocli: hush: Adjust 'run' command to run each line of the env var
Simon Glass [Tue, 7 Oct 2014 19:59:43 +0000 (13:59 -0600)]
cli: hush: Adjust 'run' command to run each line of the env var

The run command treats each argument an an environment variable. It gets the
value of each variable and executes it as a command. If an environment
variable contains a newline and the hush cli is used, it is supposed to
execute each line one after the other.

Normally a newline signals to hush to exit - this is used in normal command
line entry - after a command is entered we want to return to allow the user
to enter the next one. But environment variables obviously need to execute
to completion.

Add a special case for the execution of environment variables which
continues when a newline is seen, and add a few tests to check this
behaviour.

Note: it's not impossible that this may cause regressions in other areas.
I can't think of a case but with any change of behaviour with limited test
coverage there is always a risk. From what I can tell this behaviour has
been around since at least U-Boot 2011.03, although this pre-dates sandbox
and I have not tested it on real hardware.

Reported-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc5xxx
Tom Rini [Mon, 27 Oct 2014 15:03:00 +0000 (11:03 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc5xxx

10 years agoppc: Zap TQM8272 board
Marek Vasut [Wed, 22 Oct 2014 19:34:52 +0000 (21:34 +0200)]
ppc: Zap TQM8272 board

This board is old and is using CONFIG_I2C_X, which is wrong.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Tom Rini <trini@ti.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Heiko Schocher <hs@denx.de>
10 years agoppc: Zap TQM8260 board
Marek Vasut [Wed, 22 Oct 2014 19:34:51 +0000 (21:34 +0200)]
ppc: Zap TQM8260 board

This board is old and is using CONFIG_I2C_X, which is wrong.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Tom Rini <trini@ti.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Heiko Schocher <hs@denx.de>
10 years agoppc: Zap IDS8247 board
Marek Vasut [Wed, 22 Oct 2014 19:34:50 +0000 (21:34 +0200)]
ppc: Zap IDS8247 board

This board is old and is using CONFIG_I2C_X, which is wrong.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Tom Rini <trini@ti.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Heiko Schocher <hs@denx.de>
10 years agoppc: Zap HWW1U1A board
Marek Vasut [Wed, 22 Oct 2014 19:34:49 +0000 (21:34 +0200)]
ppc: Zap HWW1U1A board

This is the only used of CONFIG_SPI_X macro, just zap this.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Tom Rini <trini@ti.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Heiko Schocher <hs@denx.de>
10 years agoppc: Zap Hymod board
Marek Vasut [Wed, 22 Oct 2014 19:34:48 +0000 (21:34 +0200)]
ppc: Zap Hymod board

Remove this board as this is the only one last user of eeprom_probe(),
which is pretty non-standard stuff.

This patch also removes all the PHP, SQL and CSS stuff from U-Boot,
which probably makes U-Boot a bit less IoT ;-)

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Tom Rini <trini@ti.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Heiko Schocher <hs@denx.de>
10 years agoppc: Zap MHPC board
Marek Vasut [Wed, 22 Oct 2014 19:34:47 +0000 (21:34 +0200)]
ppc: Zap MHPC board

This board uses eeprom accessors in an incorrect way. The board
is old and unsupported, just zap it.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Tom Rini <trini@ti.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Heiko Schocher <hs@denx.de>
10 years agoppc: Zap ICU862 board
Marek Vasut [Wed, 22 Oct 2014 19:34:46 +0000 (21:34 +0200)]
ppc: Zap ICU862 board

This board is the only user of CONFIG_SYS_EEPROM_X40430 , remove
it so the EEPROM command code can be cleansed of the related code
as well.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Tom Rini <trini@ti.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Heiko Schocher <hs@denx.de>
10 years agoPowerPC: drop some 74xx_7xx boards and related code
Wolfgang Denk [Tue, 21 Oct 2014 13:23:32 +0000 (15:23 +0200)]
PowerPC: drop some 74xx_7xx boards and related code

The file  board/Marvell/include/mv_gen_reg.h  is incompatible with
the GPL (see for example the "MARVELL RESERVES THE RIGHT AT ITS SOLE
DISCRETION TO REQUEST THAT THIS CODE BE IMMEDIATELY RETURNED TO
MARVELL" clause).  As this cannot be fixed, we remove the file and all
code that depends on it.  Fortunately this only affects some very old
boards that have long reached EOL:
CPCI750
DB64360
DB64460
p3m750
p3m7448

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Roger Meier <r.meier@siemens.com>
10 years agoREADME.scrapyard: update commit IDs
Wolfgang Denk [Tue, 21 Oct 2014 13:42:01 +0000 (15:42 +0200)]
README.scrapyard: update commit IDs

Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agopowerpc: mpc5121ads: update board config info in README
Anatolij Gustschin [Tue, 21 Oct 2014 12:26:45 +0000 (14:26 +0200)]
powerpc: mpc5121ads: update board config info in README

The config targets described in README are not present
any more, update the info to currently used targets.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
10 years agopowerpc: digsy_mtc: convert to generic board
Anatolij Gustschin [Tue, 21 Oct 2014 11:47:04 +0000 (13:47 +0200)]
powerpc: digsy_mtc: convert to generic board

Signed-off-by: Anatolij Gustschin <agust@denx.de>
10 years agopowerpc: mecp5123: convert to generic board
Anatolij Gustschin [Tue, 21 Oct 2014 11:47:03 +0000 (13:47 +0200)]
powerpc: mecp5123: convert to generic board

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
10 years agopowerpc: ac14xx: convert to generic board
Anatolij Gustschin [Tue, 21 Oct 2014 11:47:02 +0000 (13:47 +0200)]
powerpc: ac14xx: convert to generic board

Signed-off-by: Anatolij Gustschin <agust@denx.de>
10 years agopowerpc: aria: convert to generic board
Anatolij Gustschin [Tue, 21 Oct 2014 11:47:01 +0000 (13:47 +0200)]
powerpc: aria: convert to generic board

Signed-off-by: Anatolij Gustschin <agust@denx.de>
10 years agopowerpc: pdm360ng: convert to generic board
Anatolij Gustschin [Tue, 21 Oct 2014 11:47:00 +0000 (13:47 +0200)]
powerpc: pdm360ng: convert to generic board

Signed-off-by: Anatolij Gustschin <agust@denx.de>
10 years agopowerpc: mpc5121ads: convert to generic board
Anatolij Gustschin [Tue, 21 Oct 2014 11:46:59 +0000 (13:46 +0200)]
powerpc: mpc5121ads: convert to generic board

Also enable CONFIG_DISPLAY_BOARDINFO to get checkboard() called.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
10 years agopowerpc: mpc512x: fix boot breakage
Anatolij Gustschin [Tue, 21 Oct 2014 11:46:58 +0000 (13:46 +0200)]
powerpc: mpc512x: fix boot breakage

Commit d6b11fd1 (powerpc: remove MBX and MBX860T boards support)
removed mbxbar field in "struct sysconf512x" by mistake and broke
booting on mpc5121 boards. Fix it.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-imx
Tom Rini [Mon, 27 Oct 2014 13:08:42 +0000 (09:08 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-imx

10 years agoMerge branch 'master' of git://git.denx.de/u-boot-ti
Tom Rini [Mon, 27 Oct 2014 13:05:43 +0000 (09:05 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-ti

10 years agoMerge branch 'master' of git://git.denx.de/u-boot-socfpga
Tom Rini [Mon, 27 Oct 2014 13:05:20 +0000 (09:05 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-socfpga

10 years agoarm: socfpga: config: Add USB support example
Marek Vasut [Fri, 24 Oct 2014 21:34:25 +0000 (23:34 +0200)]
arm: socfpga: config: Add USB support example

Add example configuration stub for the DWC2 USB controller.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Vince Bridgers <vbridger@altera.com>
Cc: Pavel Machek <pavel@denx.de>
10 years agotools/socfpgaimage.c: fix build on darwin
Andreas Bießmann [Fri, 24 Oct 2014 21:39:10 +0000 (23:39 +0200)]
tools/socfpgaimage.c: fix build on darwin

socfpgaimage utilizes htole32 and friends, unfortunately these functions are
not available on darwin. Fix it by using the cpu_to_le32 and friends defined
in compiler.h as other parts in mkimage do.

This patch fixes the following error:
---8<---
  HOSTCC  tools/socfpgaimage.o
tools/socfpgaimage.c:77:22: warning: implicit declaration of function 'htole32' is invalid in C99 [-Wimplicit-function-declaration]
        header.validation = htole32(VALIDATION_WORD);
                            ^
tools/socfpgaimage.c:80:22: warning: implicit declaration of function 'htole16' is invalid in C99 [-Wimplicit-function-declaration]
        header.length_u32 = htole16(length_bytes/4);
                            ^
tools/socfpgaimage.c:95:6: warning: implicit declaration of function 'le32toh' is invalid in C99 [-Wimplicit-function-declaration]
        if (le32toh(header.validation) != VALIDATION_WORD)
            ^
tools/socfpgaimage.c:97:6: warning: implicit declaration of function 'le16toh' is invalid in C99 [-Wimplicit-function-declaration]
        if (le16toh(header.checksum) != hdr_checksum(&header))
            ^
4 warnings generated.
...
  HOSTLD  tools/dumpimage
Undefined symbols for architecture x86_64:
  "_htole16", referenced from:
      _socfpgaimage_set_header in socfpgaimage.o
  "_htole32", referenced from:
      _socfpgaimage_set_header in socfpgaimage.o
  "_le16toh", referenced from:
      _verify_buffer in socfpgaimage.o
  "_le32toh", referenced from:
      _verify_buffer in socfpgaimage.o
ld: symbol(s) not found for architecture x86_64
--->8---

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Acked-by: Pavel Machek <pavel@denx.de>
10 years agoarm: socfpga: Zap CONFIG_EPHY[01]_PHY_ADDR macro
Marek Vasut [Wed, 22 Oct 2014 17:57:42 +0000 (19:57 +0200)]
arm: socfpga: Zap CONFIG_EPHY[01]_PHY_ADDR macro

This is not used anywhere, remove it.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Chin Liang See <clsee@altera.com>
Acked-by: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Vince Bridgers <vbridger@altera.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Pavel Machek <pavel@denx.de>
10 years agoarm: socfpga: Zap spl.h and ad-hoc related syms
Marek Vasut [Thu, 16 Oct 2014 10:25:40 +0000 (12:25 +0200)]
arm: socfpga: Zap spl.h and ad-hoc related syms

Switch to the common spl.h file and zap the arch/spl.h . Since the arch/spl.h
contained various ad-hoc symbols, zap those symbols as well and rework the
board configuration a little so it doesn't depend on them.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@altera.com>
Cc: Vince Bridgers <vbridger@altera.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Acked-by: Pavel Machek <pavel@denx.de>
10 years agoarm: socfpga: Move code from misc_init_r() to arch_early_init_r()
Marek Vasut [Sat, 18 Oct 2014 01:52:36 +0000 (03:52 +0200)]
arm: socfpga: Move code from misc_init_r() to arch_early_init_r()

Move this initialization code to proper place. The misc_init_r()
function is called way too late and the platform initialization
code should be executed much earlier.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@altera.com>
Cc: Vince Bridgers <vbridger@altera.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Acked-by: Pavel Machek <pavel@denx.de>
10 years agoMerge http://git.denx.de/u-boot-sunxi
Tom Rini [Sun, 26 Oct 2014 18:13:24 +0000 (14:13 -0400)]
Merge http://git.denx.de/u-boot-sunxi

10 years agoMerge branch 'master' of git://git.denx.de/u-boot-usb
Tom Rini [Sun, 26 Oct 2014 18:12:18 +0000 (14:12 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-usb

10 years agoMerge git://git.denx.de/u-boot-dm
Tom Rini [Sun, 26 Oct 2014 18:03:08 +0000 (14:03 -0400)]
Merge git://git.denx.de/u-boot-dm

Fix a trivial conflict over adding <dm.h>

Conflicts:
arch/arm/cpu/armv7/omap3/board.c

Signed-off-by: Tom Rini <trini@ti.com>
10 years agoi2c: designware: add an implement i2c protos
Jeroen Hofstee [Wed, 8 Oct 2014 20:58:09 +0000 (22:58 +0200)]
i2c: designware: add an implement i2c protos

Include the i2c header and change the non confirming
functions to do so.

Cc: Heiko Schocher <hs@denx.de>
Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
Acked-by: Heiko Schocher <hs@denx.de>
[trini: Fix i2c_get_bus_num prototype]
Signed-off-by: Tom Rini <trini@ti.com>
10 years agotegra: add proto for pin_mux_mmc
Jeroen Hofstee [Wed, 8 Oct 2014 20:58:08 +0000 (22:58 +0200)]
tegra: add proto for pin_mux_mmc

while at it, fix a typo

Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
10 years agospl: add prototype for jump_to_image_no_args
Jeroen Hofstee [Wed, 8 Oct 2014 20:58:07 +0000 (22:58 +0200)]
spl: add prototype for jump_to_image_no_args

Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
10 years agommc: add prototype for mmc_get_env_addr
Jeroen Hofstee [Wed, 8 Oct 2014 20:58:05 +0000 (22:58 +0200)]
mmc: add prototype for mmc_get_env_addr

Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
10 years agoide: add missing prototype
Jeroen Hofstee [Wed, 8 Oct 2014 20:58:04 +0000 (22:58 +0200)]
ide: add missing prototype

Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
10 years agogpio: add protype for name_to_gpio
Jeroen Hofstee [Wed, 8 Oct 2014 20:58:03 +0000 (22:58 +0200)]
gpio: add protype for name_to_gpio

Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
10 years agofdt_support: add prototypes for __weak functions
Jeroen Hofstee [Wed, 8 Oct 2014 20:58:02 +0000 (22:58 +0200)]
fdt_support: add prototypes for __weak functions

Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
10 years agoelf: add prototype for valid_elf_image
Jeroen Hofstee [Wed, 8 Oct 2014 20:58:01 +0000 (22:58 +0200)]
elf: add prototype for valid_elf_image

Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
10 years agobootm: add prototype for arch_preboot_os
Jeroen Hofstee [Wed, 8 Oct 2014 20:58:00 +0000 (22:58 +0200)]
bootm: add prototype for arch_preboot_os

Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
10 years agoarm: vectors: provide protypes from vectors.S
Jeroen Hofstee [Wed, 8 Oct 2014 20:57:59 +0000 (22:57 +0200)]
arm: vectors: provide protypes from vectors.S

Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
Acked-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
10 years agotwister: add missing includes
Jeroen Hofstee [Wed, 8 Oct 2014 20:57:58 +0000 (22:57 +0200)]
twister: add missing includes

Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
10 years agoomap3: board: add missing include and proto
Jeroen Hofstee [Wed, 8 Oct 2014 20:57:57 +0000 (22:57 +0200)]
omap3: board: add missing include and proto

Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
10 years agonet: davince: add missing include
Jeroen Hofstee [Wed, 8 Oct 2014 20:57:56 +0000 (22:57 +0200)]
net: davince: add missing include

Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
10 years agommc: bcm2835_sdhci: add missing include
Jeroen Hofstee [Wed, 8 Oct 2014 20:57:55 +0000 (22:57 +0200)]
mmc: bcm2835_sdhci: add missing include

Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
10 years agolib: bootm: add missing include
Jeroen Hofstee [Wed, 8 Oct 2014 20:57:54 +0000 (22:57 +0200)]
lib: bootm: add missing include

since the vxworks weaks are reimplement make
sure their prototypes are visible.

Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
10 years agoleds: missing include
Jeroen Hofstee [Wed, 8 Oct 2014 20:57:53 +0000 (22:57 +0200)]
leds: missing include

Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
10 years agoimx: add missing includes
Jeroen Hofstee [Wed, 8 Oct 2014 20:57:52 +0000 (22:57 +0200)]
imx: add missing includes

Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
10 years agocommon/cmd_elf.c: add missing include
Jeroen Hofstee [Wed, 8 Oct 2014 20:57:51 +0000 (22:57 +0200)]
common/cmd_elf.c: add missing include

Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
[trini: bootm.h must come after common.h]
Signed-off-by: Tom Rini <trini@ti.com>
10 years agoarch-mx: add missing include
Jeroen Hofstee [Wed, 8 Oct 2014 20:57:50 +0000 (22:57 +0200)]
arch-mx: add missing include

mxs_wait_mask_set and friends need a declaration
of struct mxs_register_32.

Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
10 years agostring.h: add missing prototypes
Jeroen Hofstee [Wed, 8 Oct 2014 20:57:49 +0000 (22:57 +0200)]
string.h: add missing prototypes

Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>