]> git.dujemihanovic.xyz Git - u-boot.git/log
u-boot.git
10 years agousb: add basic USB configs in Kconfig
Masahiro Yamada [Fri, 7 Nov 2014 09:48:31 +0000 (18:48 +0900)]
usb: add basic USB configs in Kconfig

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Marek Vasut <marex@denx.de>
10 years agoARM: UniPhier: add EHCI host pin settings for PH1-Pro4
Masahiro Yamada [Fri, 7 Nov 2014 09:33:52 +0000 (18:33 +0900)]
ARM: UniPhier: add EHCI host pin settings for PH1-Pro4

These IO pins are necessary for port power control and
over current detect.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoARM: UniPhier: move DDR related configuration to Kconfig
Masahiro Yamada [Thu, 6 Nov 2014 11:16:42 +0000 (20:16 +0900)]
ARM: UniPhier: move DDR related configuration to Kconfig

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoARM: UniPhier: reset on-board devices on start-up
Masahiro Yamada [Wed, 5 Nov 2014 05:25:15 +0000 (14:25 +0900)]
ARM: UniPhier: reset on-board devices on start-up

If a support card is attached to the main board, the on-board
SMSC9118 LAN controller is available.  It must be kept in reset
state for a while on start-up.

When the board is kicked via a debbuger rather than pushing the
hardware reset button, on-board chips are not reset; in this case
the reset signals should be asserted by software.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoserial: UniPhier: borrow macros from linux/serial_reg.h
Masahiro Yamada [Thu, 30 Oct 2014 03:11:14 +0000 (12:11 +0900)]
serial: UniPhier: borrow macros from linux/serial_reg.h

The same bit-field macros are defined in include/linux/serial_reg.h
so let's include it and delete duplicated defines.

Also, remove unnecessary inclusion of <common.h>.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoPrepare v2015.01-rc1
Tom Rini [Mon, 10 Nov 2014 21:19:51 +0000 (16:19 -0500)]
Prepare v2015.01-rc1

Signed-off-by: Tom Rini <trini@ti.com>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-i2c
Tom Rini [Mon, 10 Nov 2014 14:20:52 +0000 (09:20 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-i2c

10 years agoMerge branch 'master' of git://git.denx.de/u-boot-blackfin
Tom Rini [Mon, 10 Nov 2014 14:20:38 +0000 (09:20 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-blackfin

10 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Tom Rini [Sat, 8 Nov 2014 01:35:20 +0000 (20:35 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

10 years agoAdded support for comments in input to mkenvimage.
Dominik Muth [Thu, 28 Aug 2014 10:25:27 +0000 (12:25 +0200)]
Added support for comments in input to mkenvimage.

This patch adds support for comments in the input to mkenvimage, i.e. in
the environment source: All lines starting with a # in the firs column
will be ignored.

Additionally empty lines will also be ignored.

Signed-off-by: Dominik Muth <dominik.muth@bkvibro.com>
10 years agoZFS: Clean up cppcheck warnings where relevant, leaked memory etc
Jorgen Lundman [Fri, 7 Nov 2014 01:08:35 +0000 (10:08 +0900)]
ZFS: Clean up cppcheck warnings where relevant, leaked memory etc

In a message from Wolfgang Denk highlighting warnings from cppcheck,
the patch will address those that are correctly diagnosed. Some are
false-positives:

> [fs/zfs/zfs.c:937]: (error) Memory leak: l
dmu_read() allocates "l" if successful, so error-case should not free
it.
> [fs/zfs/zfs.c:1141]: (error) Memory leak: dnbuf
dmu_read() allocates "dnbuf" if successful, so error-case should not
free it.
> [fs/zfs/zfs.c:1372]: (error) Memory leak: osp
zio_read() allocates "osp" if successful, so error-case should
not free it.
> [fs/zfs/zfs.c:1726]: (error) Memory leak: nvlist
int_zfs_fetch_nvlist() allocates "nvlist" if successful, so error-case
should not free it.

Signed-off-by: Jorgen Lundman <lundman@lundman.net>
10 years agoboard/esd/common/auto_update.c: fix Uninitialized variable
Wolfgang Denk [Thu, 6 Nov 2014 13:03:05 +0000 (14:03 +0100)]
board/esd/common/auto_update.c: fix Uninitialized variable

cppcheck reports:

[board/esd/common/auto_update.c:458]: (error) Uninitialized variable: cnt

The variable is not really used anywhere, so remove it.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Acked-by: Matthias Fuchs <matthias.fuchs@esd.eu>
10 years agoARM: MXS: fix Uninitialized variable error
Wolfgang Denk [Thu, 6 Nov 2014 13:03:04 +0000 (14:03 +0100)]
ARM: MXS: fix Uninitialized variable error

cppcheck reports:

[arch/arm/cpu/arm926ejs/mxs/timer.c:96]: (error) Uninitialized
variable: now

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
10 years agoi2c: rcar_i2c: Fix order of restart and clear status
Nobuhiro Iwamatsu [Tue, 4 Nov 2014 04:28:50 +0000 (13:28 +0900)]
i2c: rcar_i2c: Fix order of restart and clear status

In case of repeated START condition, the restart has to be kicked
before clear status (MSR register). If it is kicked after clear status,
R-Car I2C may transfer data (TXD register) or receive data (RXD register)
instead of transferring slave address (MAR register).

Signed-off-by: Ryo Kataoka <ryo.kataoka.wt@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
10 years agodrivers/i2c/fsl_i2c: Change CONFIG_I2C_TIMEOUT to 100ms
Shaveta Leekha [Mon, 3 Nov 2014 05:13:14 +0000 (10:43 +0530)]
drivers/i2c/fsl_i2c: Change CONFIG_I2C_TIMEOUT to 100ms

Some slow I2C devices like Power Monitor(ZM7304) at times
do not work well with low timeout value, so I2C bus get stuck
during read cycle with this device, changing it to 100ms from
10ms works fine

A lot of other i2c drivers like mxc and i2c drivers of BOOTROM
also use relax timeouts to give sufficient ticks to work well
with slower devices

Signed-off-by: Shaveta Leekha <shaveta@freescale.com>
Signed-off-by: Poonam Aggrwal <poonam.aggrwal@freescale.com>
10 years agoppc4xx: Handle i2c stuck on combined xfer
Dirk Eibach [Wed, 29 Oct 2014 14:56:44 +0000 (15:56 +0100)]
ppc4xx: Handle i2c stuck on combined xfer

ppc4xx i2c master gets stuck on errors while repeated start is
active. Can be easily reproduced by "i2c md" on an unpopulated
i2c address. There is not stop condition given, scl remains
pulled low.
The only way out seems to be doing a stop manually and then a
soft reset.

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
Reviewed-by: Stefan Roese <sr@denx.de>
10 years agoppc4xx: Fix i2c repeated start
Dirk Eibach [Wed, 29 Oct 2014 14:56:43 +0000 (15:56 +0100)]
ppc4xx: Fix i2c repeated start

Debugging some i2c trouble I saw on my scope that repeated
start is not working properply. The 4xx even held clock pulled down
after transfers. Having a look in the driver I realized
that IIC_CNTL_RPST is set on that part of the transfer that should
begin with a repeated start. But repeated start is about not sending a
stop condition, so IIC_CNTL_RPST has to be set on the last transfer
before the repeated start happens.

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
Reviewed-by: Stefan Roese <sr@denx.de>
10 years agobfin: the max bfin sdh block count is 127
Sonic Zhang [Fri, 15 Aug 2014 09:08:50 +0000 (17:08 +0800)]
bfin: the max bfin sdh block count is 127

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
10 years agobfin: make the CPU macro of LDR target more genenric
Sonic Zhang [Tue, 12 Aug 2014 10:45:26 +0000 (18:45 +0800)]
bfin: make the CPU macro of LDR target more genenric

Remove BFIN from the CPU macro in Makefile.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
10 years agoboard/matrix_vision/mvblx/sys_eeprom.c: fix buffer overflow
Wolfgang Denk [Thu, 6 Nov 2014 13:03:02 +0000 (14:03 +0100)]
board/matrix_vision/mvblx/sys_eeprom.c: fix buffer overflow

Fix error detected by cppcheck:

[board/matrix_vision/mvblx/sys_eeprom.c:353]: (error) Buffer is
accessed out of bounds.

Signed-off-by: Wolfgang Denk <wd@denx.de>
cc: Michael Jones <michael.jones@matrix-vision.de>
Acked-by: Michael Jones <michael.jones@matrix-vision.de>
10 years agocommon/cmd_fitupd.c: restore corrupted file
Wolfgang Denk [Thu, 6 Nov 2014 13:03:01 +0000 (14:03 +0100)]
common/cmd_fitupd.c: restore corrupted file

This file got corrupted by the automatic editin of commit 1a45966 "Add
GPL-2.0+ SPDX-License-Identifier to source files"; restore the
opiginal content and manually insert the SPDX ID.

The bug was detected by running cppcheck, which reported:
[common/cmd_fitupd.c:8]: (error) Invalid number of character ({) when
these macros are defined: 'CONFIG_UPDATE_TFTP'.

Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agodrivers/net/uli526x.c: fix syntax error
Wolfgang Denk [Thu, 6 Nov 2014 13:03:00 +0000 (14:03 +0100)]
drivers/net/uli526x.c: fix syntax error

Fix error detected by cppcheck:

[drivers/net/uli526x.c:551]: (error) printf format string requires 3
parameters but only 2 are given.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Roy Zang <tie-fei.zang@freescale.com>
10 years agoboard/cogent/lcd.c: fix syntax error
Wolfgang Denk [Thu, 6 Nov 2014 13:02:58 +0000 (14:02 +0100)]
board/cogent/lcd.c: fix syntax error

Fix error detected by cppcheck:

[board/cogent/lcd.c:237]: (error) Invalid number of character (()
when these macros are defined:
'CONFIG_SHOW_ACTIVITY;CONFIG_STATUS_LED'.

Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agocppcheck cleanup: fix nullPointer errors
Wolfgang Denk [Thu, 6 Nov 2014 13:02:57 +0000 (14:02 +0100)]
cppcheck cleanup: fix nullPointer errors

There are a number of places where U-Boot intentionally and legally
accesses physical address 0x0000, for example when installing
exception vectors on systems where these are located in low memory.

Add "cppcheck-suppress nullPointer" comments to silence cppcheck
where this is intentional and legal.

Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agodoc: fix documentation of out-of-tree build
Timo Ketola [Thu, 6 Nov 2014 12:39:05 +0000 (14:39 +0200)]
doc: fix documentation of out-of-tree build

Correct environment variable for output directory is KBUILD_OUTPUT.

Signed-off-by: Timo Ketola <timo@exertus.fi>
10 years agotools/env: Fix environment size and CRC on 64-bit hosts
Dominic Sacré [Tue, 4 Nov 2014 23:30:18 +0000 (00:30 +0100)]
tools/env: Fix environment size and CRC on 64-bit hosts

On architectures where 'long' is 64 bit, the u-boot environment
as seen by the fw_env tools was missing 4 bytes.
This patch fixes getenvsize(), and thus also ensures that the
environment's CRC32 checksum is calculated correctly.

Signed-off-by: Dominic Sacré <dominic.sacre@gmx.de>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Tom Rini <trini@ti.com>
10 years agoMAINTAINERS: CFI flash maintainership only includes the CFI related files
Stefan Roese [Fri, 31 Oct 2014 12:57:42 +0000 (13:57 +0100)]
MAINTAINERS: CFI flash maintainership only includes the CFI related files

All the other files in drivers/mtd/* are not really CFI related. So lets
only include the files that are CFI specific.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Jagan Teki <jagannadh.teki@gmail.com>
Acked-by: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
Acked-by: Heiko Schocher <hs@denx.de>
10 years agokbuild: sync misc scripts with Linux 3.18-rc1
Masahiro Yamada [Thu, 30 Oct 2014 02:06:13 +0000 (11:06 +0900)]
kbuild: sync misc scripts with Linux 3.18-rc1

This commit imports some updates in misc scripts from Linux 3.18-rc1.

[1] commit cbb4d3e6510b99522719c5ef0 by Horia Geanta
scripts/kernel-doc: handle object-like macros

[2] commit 164f0d2efaaef83 by Michal Marek
kbuild: Fix handling of backslashes in *.cmd files

[3] commit 270a00963cd367214e by Randy Dunlap
scripts/kernel-doc: recognize __meminit

[4] commit a4954fd7724c0f55361eb5 by Masahiro Yamada
  kbuild: remove obj-n and lib-n handling

[5] commit 5b2389b45d1a9c12b9f by Masahiro Yamada
kbuild: simplify build, clean, modbuiltin shorthands

Signed-off-by: Horia Geanta <horia.geanta@freescale.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agokconfig: sync kconfig files with Linux 3.18-rc1
Masahiro Yamada [Thu, 30 Oct 2014 02:06:12 +0000 (11:06 +0900)]
kconfig: sync kconfig files with Linux 3.18-rc1

This commit imports Kconfig updates from Linux 3.18-rc1.

'kvmconfig' and 'tinyconfig' help message have been commented out
since they are unavailable at least now;  in the future perhaps
we can implement 'tinyconfig' to disable most of CONFIG_CMD_* to
create a very small U-Boot image.

[1] commit 3aaefce10351 by Josh Triplett
x86, platform, kconfig: move kvmconfig functionality to a helper

[2] commit 0da1d4a0b951 by Josh Triplett
x86: Add "make tinyconfig" to configure the tiniest possible kernel

[3] commit c40724d3f381 by Brian Norris
  kconfig: lxdialog: fix spelling

[4] commit 7285996aa000 by Brian Norris
  kconfig: nconfig: fix multi-byte UTF handling

Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agokbuild: sync top Makefile with Linux 3.18-rc1
Masahiro Yamada [Thu, 30 Oct 2014 02:06:11 +0000 (11:06 +0900)]
kbuild: sync top Makefile with Linux 3.18-rc1

Since Linux 3.15, relative path feature and related fixes,
cleanups have been merged to the top Makefile.

The relative path feature looks stable enough, so let's import it
to U-Boot along with various cleanups.

Commits imported from Linux (some need adjustment) are:

[1] commit 7e1c04779efd by Michal Marek
  kbuild: Use relative path for $(objtree)

[2] commit 890676c65d69 by Michal Marek
  kbuild: Use relative path when building in the source tree

[3] commit 9da0763bdd82 by Michal Marek
  kbuild: Use relative path when building in a subdir of the source tree

[4] commit c2e28dc975ea by Michal Marek
  kbuild: Print the name of the build directory

[5] commit 066b7ed95580 by Michal Marek
  kbuild: Do not print the build directory with make -s

[6] commit 3f1d9a6cec01 by Michal Marek
  kbuild: make -s should be used with kernelrelease/kernelversion/image_name

[7] commit 7ff525712acf by Masahiro Yamada
  kbuild: fake the "Entering directory ..." message more simply

[8] commit 745a254322c8 by Masahiro Yamada
  kbuild: use $(Q) for sub-make target

[9] commit aa55c8e2f7a3 by Masahiro Yamada
  kbuild: handle C=... and M=... after entering into build directory

[10] commit ab7474ea5361 by Borislav Petkov
  Kbuild: Ignore GREP_OPTIONS env variable

To use relative path feature, tools/Makefile and scripts/Makefile.autoconf
must be tweaked.

Signed-off-by: Michal Marek <mmarek@suse.cz>
Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agokbuild: improve multi-objs dependency and cleanups
Masahiro Yamada [Thu, 30 Oct 2014 02:06:10 +0000 (11:06 +0900)]
kbuild: improve multi-objs dependency and cleanups

Since Linux 3.18-rc1, Kbuild is able to handle multi-objs
dependency correctly, which also allows us futher cleanups
of some makefiles.

This commit imports those commits:

[1] commit c8589d1e9e01 by Masahiro Yamada
kbuild: handle multi-objs dependency appropriately

[2] commit 97e3226e6e98 by Masahiro Yamada
kbuild: handle the dependency of multi-objs hostprogs appropriately

[3] commit 022af62d0190 by Masahiro Yamada
kbuild: refactor script/kconfig/Makefile

[4] commit 221ecca6cafe by Masahiro Yamada
kbuild: remove redundant clean-files from scripts/kconfig/Makefile

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agokbuild: bug fixes and cleanups of Makefile.host
Masahiro Yamada [Thu, 30 Oct 2014 02:06:09 +0000 (11:06 +0900)]
kbuild: bug fixes and cleanups of Makefile.host

This commit imports updates of scripts/Makefile.host
from Linux 3.18-rc1.

Imported commits are:

[1] commit d8d9efe22709 by Masahiro Yamada
  kbuild: fix a typo in scripts/Makefile.host

[2] commit edb950c17de0 by Masahiro Yamada
  kbuild: fix a bug of C++ host program handling

[3] commit 62e2210798ed by Masahiro Yamada
  kbuild: drop shared library support from Makefile.host

[4] commit 663935593915 by Masahiro Yamada
  kbuild: clean up scripts/Makefile.host

[5] commit 1791ff7179f6 by Masahiro Yamada
  kbuild: clean-up and bug fix of scripts/Makefile.host

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agokbuild: remove "clobber" target
Masahiro Yamada [Thu, 30 Oct 2014 01:58:32 +0000 (10:58 +0900)]
kbuild: remove "clobber" target

Now we stick to Linux Kernel's build system, so squash
"clobber" to "clean" target.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agohush: make run_command() return an error on parsing failure
Rabin Vincent [Wed, 29 Oct 2014 22:21:41 +0000 (23:21 +0100)]
hush: make run_command() return an error on parsing failure

run_command() returns success even if the command had a syntax error;
correct this behaviour.

Signed-off-by: Rabin Vincent <rabin@rab.in>
Acked-by: Simon Glass <sjg@chromium.org)
10 years agohush: fix segfault on syntax error
Rabin Vincent [Wed, 29 Oct 2014 22:21:40 +0000 (23:21 +0100)]
hush: fix segfault on syntax error

Hush segfaults if it sees a syntax error while attempting to parse a
command:

 $ ./u-boot -c "'"
 ...
 syntax error
 Segmentation fault (core dumped)

This is due to a NULL pointer dereference of in_str->p in static_peek().
The problem is that the exit condition for the loop in
parse_stream_outer() checks for rcode not being -1, but rcode is only
ever 0 or 1.

Signed-off-by: Rabin Vincent <rabin@rab.in>
Acked-by: Simon Glass <sjg@chromium.org)
Tested-by: Simon Glass <sjg@chromium.org)
10 years agohush: return consistent codes from run_command()
Rabin Vincent [Wed, 29 Oct 2014 22:21:39 +0000 (23:21 +0100)]
hush: return consistent codes from run_command()

Attempting to run:
 - an empty string
 - a string with just spaces

returns different error codes, 1 for the empty string and 0
for the string with just spaces.  Make both of them return
0 for consistency.

Signed-off-by: Rabin Vincent <rabin@rab.in>
Acked-by: Simon Glass <sjg@chromium.org)
10 years agosandbox: init cli for -c
Rabin Vincent [Wed, 29 Oct 2014 22:21:38 +0000 (23:21 +0100)]
sandbox: init cli for -c

sandbox crashes if a variable is set in the -c command, because
hush's top_vars is not allocated.  Call cli_init() from sandbox
to ensure this is done before we execute the -c command.

 $ ./u-boot -c 'a=1'
 ...
 Segmentation fault (core dumped)

Signed-off-by: Rabin Vincent <rabin@rab.in>
Acked-by: Simon Glass <sjg@chromium.org)
Tested-by: Simon Glass <sjg@chromium.org)
10 years agodlmalloc: ensure gd is set for early alloc
Rabin Vincent [Wed, 29 Oct 2014 22:21:37 +0000 (23:21 +0100)]
dlmalloc: ensure gd is set for early alloc

Attempting to run the sandbox leads to a segfault, because some dynamic
libraries (outside of u-boot) attempt to use malloc() to allocate memory
before u-boot's gd variable is initialized.

Check for gd not being NULL in the SYS_MALLOC_F_LEN handling, so that
malloc() doesn't crash when called at this point.

 $ gdb -q --args ./u-boot
 (gdb) r
 Program received signal SIGSEGV, Segmentation fault.
 0x0000000000412b9b in malloc (bytes=bytes@entry=37) at common/dlmalloc.c:2184
 2184 if (!(gd->flags & GD_FLG_RELOC)) {
 (gdb) p gd
 $1 = (gd_t *) 0x0
 (gdb) bt
 #0  0x0000000000412b9b in malloc (bytes=bytes@entry=37) at common/dlmalloc.c:2184
 #1  0x00007ffff75bf8e1 in set_binding_values (domainname=0x7ffff11f4f12 "libgpg-error", dirnamep=0x7fffffffe168, codesetp=0x0)
     at bindtextdom.c:228
 #2  0x00007ffff75bfb4c in set_binding_values (codesetp=0x0, dirnamep=0x7fffffffe168, domainname=<optimized out>) at bindtextdom.c:350
 #3  __bindtextdomain (domainname=<optimized out>, dirname=0x7ffff11f4f00 "/usr/share/locale") at bindtextdom.c:348
 #4  0x00007ffff11eca17 in ?? () from /lib/x86_64-linux-gnu/libgpg-error.so.0
 #5  0x00007ffff7dea9fa in call_init (l=<optimized out>, argc=argc@entry=1, argv=argv@entry=0x7fffffffe208,
     env=env@entry=0x7fffffffe218) at dl-init.c:78
 #6  0x00007ffff7deaae3 in call_init (env=0x7fffffffe218, argv=0x7fffffffe208, argc=1, l=<optimized out>) at dl-init.c:36
 #7  _dl_init (main_map=0x7ffff7ffe1a8, argc=1, argv=0x7fffffffe208, env=0x7fffffffe218) at dl-init.c:126
 #8  0x00007ffff7ddd1ca in _dl_start_user () from /lib64/ld-linux-x86-64.so.2

Signed-off-by: Rabin Vincent <rabin@rab.in>
Acked-by: Simon Glass <sjg@chromium.org>
10 years agopower_spi.c: Rewrite pmic_reg function
Tom Rini [Sat, 25 Oct 2014 11:38:31 +0000 (07:38 -0400)]
power_spi.c: Rewrite pmic_reg function

The pmic_spi_free function isn't ever used, and as the frameworks stand
today, cannot be, so remove it.  Integrate the probe function into
pmic_reg as it's not really a "probe" today.  Finally, add an err label
for the common failure cases.

Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Stefano Babic <sbabic@denx.de>
Signed-off-by: Tom Rini <trini@ti.com>
Acked-by: Stefano Babic <sbabic@denx.de>
10 years agoimage-fdt: boot_get_fdt() return value when no DTB exists
Noam Camus [Wed, 22 Oct 2014 14:17:49 +0000 (17:17 +0300)]
image-fdt: boot_get_fdt() return value when no DTB exists

I believe that when no DTB is around we should return 1.
This why I fixed such scenarious to not return zero anymore.
Else kernel might get NULL pointer to DTB which doesn't exists.

Signed-off-by: Noam Camus <noamc@ezchip.com>
10 years agopowerpc: o2dnt: convert to generic board
Anatolij Gustschin [Tue, 21 Oct 2014 20:31:26 +0000 (22:31 +0200)]
powerpc: o2dnt: convert to generic board

Signed-off-by: Anatolij Gustschin <agust@denx.de>
10 years agonet: smc911x: Keep MAC programmed
Marek Vasut [Sat, 11 Oct 2014 16:42:58 +0000 (18:42 +0200)]
net: smc911x: Keep MAC programmed

Make sure to keep the MAC address programmed in the SMC911x ADDRH
and ADDRL registers. Linux can read those registers to determine
the MAC address on EEPROM-less configurations.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Tom Rini <trini@ti.com>
10 years agosort drivers/mmc/Makefile
Pavel Machek [Tue, 9 Sep 2014 13:16:10 +0000 (15:16 +0200)]
sort drivers/mmc/Makefile

Sort drivers/mmc makefile, as requested by wd.

Signed-off-by: Pavel Machek <pavel@denx.de>
Acked-by: Chin Liang See <clsee@altera.com>
10 years agogeneric-board: make compile-time noise for non-generic boards
Masahiro Yamada [Thu, 6 Nov 2014 18:32:07 +0000 (03:32 +0900)]
generic-board: make compile-time noise for non-generic boards

Commit 0f605c1501f6 (Start the deprecation process for generic board)
added a run-time warning message.  Let's be noisier for non-generic
boards to inform the dead line of the conversion.

This commit intentionally outputs a warning message to stdout.
We still have many unconverted boards.  If we print the message
to stderr, MAKEALL and buildman will report tons of broken boards
and really important information will be buried.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Marek Vasut <marex@denx.de>
Acked-by: Simon Glass <sjg@chromium.org>
Cc: Tom Rini <trini@ti.com>
10 years agoMerge git://git.denx.de/u-boot-ti
Tom Rini [Fri, 7 Nov 2014 21:18:35 +0000 (16:18 -0500)]
Merge git://git.denx.de/u-boot-ti

10 years agoomap3: cm-t3517: add LCD/DVI and splash support
Igor Grinberg [Mon, 3 Nov 2014 09:32:27 +0000 (11:32 +0200)]
omap3: cm-t3517: add LCD/DVI and splash support

Add support for splash screen on both DVI and SCF0403 LCD.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Reviewed-by: Tom Rini <trini@ti.com>
10 years agoomap3: cm-t3517: add Ethernet support
Igor Grinberg [Mon, 3 Nov 2014 09:32:26 +0000 (11:32 +0200)]
omap3: cm-t3517: add Ethernet support

Add both EMAC and SMC911x support.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Reviewed-by: Tom Rini <trini@ti.com>
10 years agoomap3: cm-t3517: add USB support
Igor Grinberg [Mon, 3 Nov 2014 09:32:25 +0000 (11:32 +0200)]
omap3: cm-t3517: add USB support

Add both host and mUSB support.
Currently, the selection between host USB and mUSB is done through the
config file.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Reviewed-by: Tom Rini <trini@ti.com>
10 years agoomap3: cm-t3517: add basic board support
Igor Grinberg [Wed, 5 Nov 2014 12:25:35 +0000 (14:25 +0200)]
omap3: cm-t3517: add basic board support

CompuLab cm-t3517 is Computer on Module (CoM) based on AM3517 SoC.
Features: up to 256MB DDR2, up to 512MB NAND, USB hub, mUSB, WiFi, BT,
Analog audio codec, touch screen controller, LED.

Add basic support including:
LED, Serial console, NAND, MMC, GPIO, I2C, 256MB DRAM.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
10 years agoomap: hsmmc: assume cd gpio is active low
Igor Grinberg [Mon, 3 Nov 2014 09:32:23 +0000 (11:32 +0200)]
omap: hsmmc: assume cd gpio is active low

Switch the default CD GPIO polarity to active low.

The current hsmmc driver assumption that the CD GPIO is active high, but
in the real hardware, usually the opposite holds.
The usual SD card socket has a mechanical switch which is grounded as
soon as a card is inserted.
Of course there might be some board logic which inverts the signal, but
as far as current users are concerned, there is no such logic.

Current U-Boot users either not using the CD functionality, or have a
different way (e.g. external to SoC GPIO controller) for checking the
card presence.

This patch also brings the polarity assumption in line with the Linux
kernel and adds appropriate comments.

This patch also might spare issues once the TWL GPIO driver will be
converted to the DM.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
Cc: Dmitry Lifshitz <lifshitz@compulab.co.il>
Reviewed-by: Tom Rini <trini@ti.com>
10 years agoomap3: cm-t35: move get_board_serial() fallback
Igor Grinberg [Mon, 3 Nov 2014 09:32:22 +0000 (11:32 +0200)]
omap3: cm-t35: move get_board_serial() fallback

The fallback is used for cases when CONFIG_SERIAL_TAG defined, but the
eeprom is not used.
The fallback is useful for more than one CompuLab board, so move it to a
common location.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Reviewed-by: Tom Rini <trini@ti.com>
10 years agoomap3: cm-t35: move the SMC911x code
Igor Grinberg [Mon, 3 Nov 2014 09:32:21 +0000 (11:32 +0200)]
omap3: cm-t35: move the SMC911x code

Extract the SMC911x initialization code to a common location where it
can be reused by other compulab omap3 based boards.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Reviewed-by: Tom Rini <trini@ti.com>
10 years agoomap3: cm-t35: extract the splash code from board
Igor Grinberg [Mon, 3 Nov 2014 09:32:20 +0000 (11:32 +0200)]
omap3: cm-t35: extract the splash code from board

The splash screen loading code can be reused by other compulab boards.
For now extract it to a common location for further reuse.

This also switches the splash code dependency from CONFIG_LCD to
CONFIG_SPLASH_SCREEN as it should normally be.

In addition this patch fixes the accidental dependency of the
get_board_mem_timings() function on CONFIG_LCD, by just moving the
splash code and leaving the above function intact.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Reviewed-by: Tom Rini <trini@ti.com>
10 years agoomap3: cm-t35: move the USB hub reset code
Igor Grinberg [Mon, 3 Nov 2014 09:32:19 +0000 (11:32 +0200)]
omap3: cm-t35: move the USB hub reset code

Extract the USB hub reset code to a common location where it can be
reused by other compulab boards.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Reviewed-by: Tom Rini <trini@ti.com>
10 years agocompulab: refactor board revision handling
Igor Grinberg [Mon, 3 Nov 2014 09:32:18 +0000 (11:32 +0200)]
compulab: refactor board revision handling

Move board revision handling code to a common location
for further reuse.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Reviewed-by: Tom Rini <trini@ti.com>
10 years agoam335x: make get_board_rev() function weak
Igor Grinberg [Wed, 5 Nov 2014 11:29:54 +0000 (13:29 +0200)]
am335x: make get_board_rev() function weak

Current get_board_rev() function returns a hard coded value which is
obviously incorrect for the majority of boards.
Allow boards to provide a correct implementation by making this
function weak.
In addition open code the trivial and useless BOARD_REV_ID define and
adjust the comment.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Cc: Tom Rini <trini@ti.com>
10 years agoarm: am335x: net: pxm2: disable rgmii internal delay mode
Heiko Schocher [Wed, 5 Nov 2014 09:23:21 +0000 (10:23 +0100)]
arm: am335x: net: pxm2: disable rgmii internal delay mode

disable internal delay through gmii_sel register, as this
is done in the ar8031 phy.

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Tom Rini <trini@ti.com>
10 years agoks2_evm: board: remove sprintf for simple string
Khoronzhuk, Ivan [Tue, 4 Nov 2014 18:48:47 +0000 (20:48 +0200)]
ks2_evm: board: remove sprintf for simple string

There is no reason to sprintf simple string.

Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
10 years agoks2_evm: config: enable fatload command
Khoronzhuk, Ivan [Tue, 4 Nov 2014 16:06:27 +0000 (18:06 +0200)]
ks2_evm: config: enable fatload command

The keystone2 evm can boot from USB partition with FAT32 FS, so
enable generic load command and fatload command usage.

Acked-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Reviewed-by: Tom Rini <trini@ti.com>
10 years agokeystone2: config: align names of images with MCSDK
Khoronzhuk, Ivan [Tue, 4 Nov 2014 14:52:35 +0000 (16:52 +0200)]
keystone2: config: align names of images with MCSDK

The Multicore Software Development Kit (MCSDK) provides foundational
software for TI KeyStone II device platforms. It's supposed to be used
with uboot, and it's convenient to have the same names for images, so
correct environment image names according to the last MCSDK3.

Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Reviewed-by: Tom Rini <trini@ti.com>
10 years agokeystone2: config: restructure handling of default env settings
Murali Karicheri [Tue, 4 Nov 2014 14:52:34 +0000 (16:52 +0200)]
keystone2: config: restructure handling of default env settings

Currently to customize env for various ks2 boards, individual
variables such as NAME_FS etc are defined and included in the
common config.h to define CONFIG_EXTRA_ENV_SETTINGS. This
doesn't scale well if a variable is not applicable on a
specific board. Using this scheme, we have to define variables
with empty value and it's ugly. Instead, to allow board specific
customization of default env variable, define a common
CONFIG_EXTRA_ENV_KS2_SETTINGS for all common variables and define
board specific variables in individual board specific config.h
using CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS. Use the common and board
specific variables to define CONFIG_EXTRA_ENV_SETTINGS. This way
more variables can be added in future for individual boards
without affecting the other config.h files.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Reviewed-by: Tom Rini <trini@ti.com>
10 years agodma: keystone_nav: remove spurious qm_cfg verification
Khoronzhuk, Ivan [Mon, 3 Nov 2014 23:39:27 +0000 (01:39 +0200)]
dma: keystone_nav: remove spurious qm_cfg verification

The verification qm_cfg existence is done at ksnav_init().
So, there is no need to verify it after initialization.

Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Reviewed-by: Tom Rini <trini@ti.com>
10 years agokeystone2: change default boot mode to ubi
Murali Karicheri [Mon, 3 Nov 2014 16:09:52 +0000 (18:09 +0200)]
keystone2: change default boot mode to ubi

To allow out of box demo, change default boot mode to ubi
boot now that NAND is functional in latest EVMs.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Reviewed-by: Tom Rini <trini@ti.com>
10 years agoks2_evm: configs: fix UBI volume name
Khoronzhuk, Ivan [Mon, 3 Nov 2014 16:09:51 +0000 (18:09 +0200)]
ks2_evm: configs: fix UBI volume name

The UBI volume name has to be prefixed with "ubi:".

Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Reviewed-by: Tom Rini <trini@ti.com>
10 years agoARM: TI: omap3: remove raw initrd support in omap3_igep00x0 config file since it...
Guillaume GARDET [Mon, 3 Nov 2014 13:26:18 +0000 (14:26 +0100)]
ARM: TI: omap3: remove raw initrd support in omap3_igep00x0 config file since it is now in ti_armv7_common.h

Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Cc: Tom Rini <trini@ti.com>
Reviewed-by: Tom Rini <trini@ti.com>
10 years agoARM: TI: Enable raw initrd support
Guillaume GARDET [Mon, 3 Nov 2014 13:26:17 +0000 (14:26 +0100)]
ARM: TI: Enable raw initrd support

Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Cc: Tom Rini <trini@ti.com>
Reviewed-by: Tom Rini <trini@ti.com>
10 years agonet: phy: marvell: add errata w/a for 88E151* chips
Hao Zhang [Thu, 30 Oct 2014 16:59:43 +0000 (18:59 +0200)]
net: phy: marvell: add errata w/a for 88E151* chips

As per Marvell Release Notes - Alaska 88E1510/88E1518/88E1512/88E1514
Rev A0, Errata Section 3.1 Marvell PHY has an errata which requires
that certain registers get written in order to restart
autonegotiation.

Signed-off-by: Hao Zhang <hzhang@ti.com>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Reviewed-by: Stefan Roese <sr@denx.de>
10 years agoMerge branch 'rmobile' of git://www.denx.de/git/u-boot-sh
Tom Rini [Wed, 5 Nov 2014 18:11:18 +0000 (13:11 -0500)]
Merge branch 'rmobile' of git://www.denx.de/git/u-boot-sh

10 years agoks2_evm: readme: add k2l evm board information
Khoronzhuk, Ivan [Wed, 29 Oct 2014 11:21:22 +0000 (13:21 +0200)]
ks2_evm: readme: add k2l evm board information

Currently Keystone2 Lamar evm (K2L) board is added, so update
Keystone2 readme file to have such one.

Acked-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
10 years agoboard: k2l_evm: add network support
Hao Zhang [Wed, 29 Oct 2014 11:09:34 +0000 (13:09 +0200)]
board: k2l_evm: add network support

This patch adds network support code and enables keystone_net
driver usage for k2l_evm evaluation board.

Acked-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Hao Zhang <hzhang@ti.com>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
10 years agonet: keystone_net: add Keystone2 K2L SoC support
Khoronzhuk, Ivan [Wed, 29 Oct 2014 11:09:33 +0000 (13:09 +0200)]
net: keystone_net: add Keystone2 K2L SoC support

The Keystone2 Lamar SoC uses the same keystone net driver.
This patch adds opportunity to use it by K2L SoCs.

Acked-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
10 years agonet: keystone_serdes: add keystone K2L SoC support
Khoronzhuk, Ivan [Wed, 29 Oct 2014 11:09:32 +0000 (13:09 +0200)]
net: keystone_serdes: add keystone K2L SoC support

Keystone2 Lamar SoC uses the same keystone SerDes driver.
All Keystone2 EVM boards currently use SerDes driver, so move
CONFIG_TI_KEYSTONE_SERDES to common configuration file.

Acked-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
10 years agoARM: keystone2: keysonte_nav: add support for K2L SoC
Khoronzhuk, Ivan [Wed, 29 Oct 2014 11:09:31 +0000 (13:09 +0200)]
ARM: keystone2: keysonte_nav: add support for K2L SoC

The Keystone2 Lamar SoC uses the same keystone navigator.
Move queue numbers to common hardware file, as all Keystone2 SoCs
have the same ones.

Acked-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
10 years agoEnable Android Fastboot support on am335x_evm board
Dileep Katta [Tue, 28 Oct 2014 23:37:11 +0000 (05:07 +0530)]
Enable Android Fastboot support on am335x_evm board

Signed-off-by: Dileep Katta <dileep.katta@linaro.org>
[trini: Rework so that am335x_evm_usbspl still builds]
Signed-off-by: Tom Rini <trini@ti.com>
10 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-imx
Tom Rini [Wed, 5 Nov 2014 17:48:09 +0000 (12:48 -0500)]
Merge branch 'master' of git://www.denx.de/git/u-boot-imx

10 years agotwl4030: More voltages on VAUX2 and VAUX3
Paul Kocialkowski [Tue, 28 Oct 2014 15:10:59 +0000 (16:10 +0100)]
twl4030: More voltages on VAUX2 and VAUX3

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
10 years agoam335x_evm: Convert NOR_BOOT to Kconfig
Tom Rini [Mon, 27 Oct 2014 20:15:08 +0000 (16:15 -0400)]
am335x_evm: Convert NOR_BOOT to Kconfig

Signed-off-by: Tom Rini <trini@ti.com>
10 years agoam335x_evm: Add NOR to Kconfig
Tom Rini [Mon, 27 Oct 2014 20:15:07 +0000 (16:15 -0400)]
am335x_evm: Add NOR to Kconfig

Make enabling support for NOR (and describe where it's seen) be done via
Kconfig.

Signed-off-by: Tom Rini <trini@ti.com>
10 years agoarm: mx6: cm_fx6: detect 1GB DRAM correctly on solo
Nikita Kiryanov [Wed, 29 Oct 2014 15:56:22 +0000 (17:56 +0200)]
arm: mx6: cm_fx6: detect 1GB DRAM correctly on solo

The 1GB DRAM configuration on mx6 solo uses 2 chip selects, but
the code tests 1GB DRAM configuration as if it is all present on one
chip select, and thus cannot see the full range of available memory.

Refactor the check to detect 1GB DRAM correctly.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
10 years agoarm: mx6: cm_fx6: change issd gpio order
Nikita Kiryanov [Wed, 29 Oct 2014 15:56:21 +0000 (17:56 +0200)]
arm: mx6: cm_fx6: change issd gpio order

Change the order in which GPIOs are toggled in SATA init sequence to
accomodate both SanDisk and Phison SSDs.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
10 years agoMerge git://www.denx.de/git/u-boot-sunxi
Tom Rini [Wed, 5 Nov 2014 12:23:32 +0000 (07:23 -0500)]
Merge git://www.denx.de/git/u-boot-sunxi

10 years agoMerge git://www.denx.de/git/u-boot-ppc4xx
Tom Rini [Wed, 5 Nov 2014 12:12:16 +0000 (07:12 -0500)]
Merge git://www.denx.de/git/u-boot-ppc4xx

10 years agodm: sunxi: Request USB vbus gpio
Hans de Goede [Fri, 31 Oct 2014 16:04:52 +0000 (17:04 +0100)]
dm: sunxi: Request USB vbus gpio

This is necessary for the device-model enabled builds to work properly.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Simon Glass <sjg@chromium.org>
10 years agodm: sunxi: Request card detect gpio
Hans de Goede [Fri, 31 Oct 2014 15:55:02 +0000 (16:55 +0100)]
dm: sunxi: Request card detect gpio

This is necessary for the device-model enabled builds to work properly.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Simon Glass <sjg@chromium.org>
10 years agodm: sunxi: Add support for serial using driver model
Simon Glass [Fri, 31 Oct 2014 02:25:50 +0000 (20:25 -0600)]
dm: sunxi: Add support for serial using driver model

Add a driver for the designware serial UART used on sunxi. This just
redirects to the normal ns16550 driver.

Add a stdout-path to the device tree so that the correct UART is chosen.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agodm: sunxi: Modify the GPIO driver to support driver model
Simon Glass [Fri, 31 Oct 2014 02:25:49 +0000 (20:25 -0600)]
dm: sunxi: Modify the GPIO driver to support driver model

This adds driver model support to the sunxi GPIO driver, using the device
tree to trigger binding of the driver. The driver will still operate
without driver model too.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agodm: sunxi: Make sure that GPIOs are requested
Simon Glass [Fri, 31 Oct 2014 02:25:48 +0000 (20:25 -0600)]
dm: sunxi: Make sure that GPIOs are requested

The scsi_init() function uses a GPIO so should request it. There is no
way to return an error here, and the request may be made multiple times,
so just ignore errors for now.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agodm: sunxi: Add pinmux functions which take a bank parameter
Simon Glass [Fri, 31 Oct 2014 02:25:47 +0000 (20:25 -0600)]
dm: sunxi: Add pinmux functions which take a bank parameter

With driver model we will have access to a bank pointer, so we want to
use it rather than converting back to a number, and then back to a
bank pointer. Add functions to provide this feature.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agodm: sunxi: Add a new config for an FDT-based pcDuino3
Simon Glass [Fri, 31 Oct 2014 02:25:46 +0000 (20:25 -0600)]
dm: sunxi: Add a new config for an FDT-based pcDuino3

For now we won't want to mess with the existing configurations. Create a
new one which will enable device tree and driver model. Note that this
brings the device tree binary into u-boot-sunxi-with-spl.bin.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agodm: sunxi: dts: Add sun7i device tree files
Simon Glass [Fri, 31 Oct 2014 02:25:45 +0000 (20:25 -0600)]
dm: sunxi: dts: Add sun7i device tree files

These are from Linux 3.17-rc7 (commit fe82dcec). U-Boot only uses a small
portion of these, but we may as well have something to look forward to.

The total compiled size is about 25KB.

Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agosunxi: kconfig: Add %_felconfig rule to enable FEL build of sunxi platforms.
Ian Campbell [Fri, 24 Oct 2014 20:20:50 +0000 (21:20 +0100)]
sunxi: kconfig: Add %_felconfig rule to enable FEL build of sunxi platforms.

    $ make BOARD_felconfig
is more convenient than
    $ make BOARD_defconfig
    $ echo CONFIG_SPL_FEL=y >> .config
    $ echo CONFIG_SPL_FEL=y >> spl/.config

Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agosunxi: kconfig: Introduce CONFIG_TARGET_<BOARD>
Ian Campbell [Fri, 24 Oct 2014 20:20:49 +0000 (21:20 +0100)]
sunxi: kconfig: Introduce CONFIG_TARGET_<BOARD>

This was done automatically with the following bits of scripting.

The Kconfig choice content was generated with this script snippet:
    for i in $(git grep -l CONFIG_ARCH_SUNXI configs/*) ; do
        TARGET=$(sed -n -e 's/CONFIG_SYS_EXTRA_OPTIONS="\([^,"]\+\).*/\1/p' $i);
        MACH=$(sed -n -e 's/.*CONFIG_\(MACH_SUN.I\)=./\1/p' $i)
        echo "config TARGET_$TARGET"
        echo " bool \"$TARGET\""
        echo " depends on $MACH"
        echo
    done

defconfigs were updated with a sed script (t):
    # Extract board from first entry of CONFIG_SYS_EXTRA_OPTIONS,
    /^CONFIG_SYS_EXTRA_OPTIONS/ {
        s/^\(CONFIG_SYS_EXTRA_OPTIONS="\)\([^,"]\+\),\?\(.*\)/\1\3\nCONFIG_TARGET_\2=y/;

        # Print and delete first line (CONFIG_SYS_EXTRA_OPTIONS), leaving
        # CONFIG_TARGET_<BOARD> in pattern space
        P;D;
    };

    # Move CONFIG_TARGET_<BOARD> to hold space
    /^CONFIG_TARGET/{h;n}

    # Print CONFIG_TARGET_<BOARD> after CONFIG_MACH_<SOC> in either SPL or
    # normal mode.
    /^CONFIG_MACH/{p;g;p;n};
    /^\+S:CONFIG_MACH/{p;g;s/^CONFIG_TARGET/+S:&/;p;n};

    # Print any remaining lines normally
    p;
Run as:
    sed -i -n -f t $(git grep -l CONFIG_ARCH_SUNXI configs/*)
and then manually removing the one instance of CONFIG_SYS_EXTRA_OPTIONS="" from
Colombus_defconfig

board/sunxi/Makefile was updated with:
    sed -e 's/^\(obj-\$(CONFIG_\)\(.*\)\().*+= dram_.*\)/\1TARGET_\2\3/g' board/sunxi/Makefile
and manually retabbing a few lines to line up again.

The board descriptions could certainly be improved.

Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agosunxi: Drop FEL variants of defconfigs.
Ian Campbell [Fri, 24 Oct 2014 20:20:48 +0000 (21:20 +0100)]
sunxi: Drop FEL variants of defconfigs.

This can now be configured via Kconfig, e.g. with:

    $ make BOARD_defconfig
    $ echo CONFIG_SPL_FEL=y >> .config
    $ echo CONFIG_SPL_FEL=y >> spl/.config

Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agosunxi: Use CONFIG_MACH_SUN?I from Kconfig instead of CONFIG_SUN?I
Ian Campbell [Fri, 24 Oct 2014 20:20:47 +0000 (21:20 +0100)]
sunxi: Use CONFIG_MACH_SUN?I from Kconfig instead of CONFIG_SUN?I

Mostly automatic with:
    sed -i -e 's/CONFIG_\(SUN[45678]I\)/CONFIG_MACH_\1/g' $(git grep -l CONFIG_SUN[45678]I)
followed by removing the relevant #defines from include/configs/sun?i.h by
hand.

Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agosunxi: Kconfig: Make SPL_FEL a toplevel Kconfig option
Ian Campbell [Fri, 24 Oct 2014 20:20:46 +0000 (21:20 +0100)]
sunxi: Kconfig: Make SPL_FEL a toplevel Kconfig option

It's unfortunate that this needs to be present in both .config and spl/.config
since it makes it slightly hard to enable FEL mode for a regular defconfig. It
can be done with:
    echo CONFIG_SPL_FEL=y >> .config
    echo CONFIG_SPL_FEL=y >> spl/.config

Ideally only one of those would be needed.

Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agosunxi: kconfig: Rename TARGET_SUN[45678]I to MACH_SUN[45678]I.
Ian Campbell [Fri, 24 Oct 2014 20:20:45 +0000 (21:20 +0100)]
sunxi: kconfig: Rename TARGET_SUN[45678]I to MACH_SUN[45678]I.

Now we have CONFIG_ARCH_SUNXI as the toplevel, CONFIG_MACH_SUN[45678]I as the
per-SoC option and leave CONFIG_TARGET_BLAH free for individual boards in the
future.

Done automatically with:
    sed -i -e 's/TARGET_\(SUN[45678]I\)/MACH_\1/g' $(git grep -l TARGET_SUN[45678]I)

Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agosunxi: kconfig: Add top-level ARCH_SUNXI
Ian Campbell [Fri, 24 Oct 2014 20:20:44 +0000 (21:20 +0100)]
sunxi: kconfig: Add top-level ARCH_SUNXI

And make TARGET_SUN[45678]I a choice variable under this.

configs updated with:
    sed -i -e 's/^\(\+S:\)\?CONFIG_TARGET_SUN.I=y/\1CONFIG_ARCH_SUNXI=y\n&/g' configs/*

Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agoARM: sunxi: Fix Ippo-q8h-v5 defconfig filename
Chen-Yu Tsai [Fri, 24 Oct 2014 08:07:25 +0000 (16:07 +0800)]
ARM: sunxi: Fix Ippo-q8h-v5 defconfig filename

The defconfig for Ippo-q8h-v5 was incorrectly committed as
"Ippo_q8h". This patch renames it correctly, as well as
correct a typo in my name in the maintainers listing.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agoppc: Fix ppc4xx CONFIG_SYS_GENERIC_BOARD
Dirk Eibach [Mon, 3 Nov 2014 09:56:31 +0000 (10:56 +0100)]
ppc: Fix ppc4xx CONFIG_SYS_GENERIC_BOARD

I realized that with v2014.10 u-boot is not starting up on
ppc4xx boards with CONFIG_SYS_GENERIC_BOARD set.

I bisected it down to this:
d54d7eb support blackfin board initialization in generic board_f

With
d29437a ppc: Make ppc4xx ready for CONFIG_SYS_GENERIC_BOARD
I set gd to a defined value for ppc4xx in cpu_init_f().
I did not realize that the gd struct has also to be memset()
to zero at this point.

But at least commit d54d7eb assumes it is:
@@ -516,11 +528,13 @@ static int reserve_malloc(void)
 /* (permanently) allocate a Board Info struct */
 static int reserve_board(void)
 {
- gd->start_addr_sp -= sizeof(bd_t);
- gd->bd = (bd_t *)map_sysmem(gd->start_addr_sp, sizeof(bd_t));
- memset(gd->bd, '\0', sizeof(bd_t));
- debug("Reserving %zu Bytes for Board Info at: %08lx\n",
- sizeof(bd_t), gd->start_addr_sp);
+ if (!gd->bd) {
+ gd->start_addr_sp -= sizeof(bd_t);
+ gd->bd = (bd_t *)map_sysmem(gd->start_addr_sp, sizeof(bd_t));
+ memset(gd->bd, '\0', sizeof(bd_t));
+ debug("Reserving %zu Bytes for Board Info at: %08lx\n",
+       sizeof(bd_t), gd->start_addr_sp);
+ }
  return 0;
 }
 #endif

This might also be an issue on other architectures, so maintainers should
check.

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
Signed-off-by: Stefan Roese <sr@denx.de>
10 years agoMerge git://git.denx.de/u-boot-sh
Tom Rini [Tue, 4 Nov 2014 23:24:44 +0000 (18:24 -0500)]
Merge git://git.denx.de/u-boot-sh