project/bcm63xx/u-boot.git
12 years agocommon.h: remove value from bool defines
Igor Grinberg [Sun, 25 Dec 2011 20:53:52 +0000 (20:53 +0000)]
common.h: remove value from bool defines

Several boolean defines have a value assigned.
Remove the value as defining the symbol is enough.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agoenv: factor out the env_get_char_spec() function
Igor Grinberg [Mon, 26 Dec 2011 03:33:10 +0000 (03:33 +0000)]
env: factor out the env_get_char_spec() function

env_get_char_spec() function is duplicated across multiple environment
files.
Remove the duplication by providing a default implementation.
Add "weak" declaration, so the default implementation can be overridden.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
12 years agofpga: Spartan-3: let print the progress if configured
Stefano Babic [Wed, 28 Dec 2011 06:47:02 +0000 (06:47 +0000)]
fpga: Spartan-3: let print the progress if configured

CONFIG_SYS_FPGA_PROG_FEEDBACK was already introduced to print
the current status of FPGA loading - an undef in the code made this
CONFIG_ useless.

Signed-off-by: Stefano Babic <sbabic@denx.de>
12 years agoFPGA: use debug() instead of module debug printf
Stefano Babic [Wed, 28 Dec 2011 06:47:01 +0000 (06:47 +0000)]
FPGA: use debug() instead of module debug printf

Replace also __FUNCTION__ with standard __func__

Signed-off-by: Stefano Babic <sbabic@denx.de>
12 years agofpga: add definition for Xilinx Spartan-6 XC6SLX4
Stefano Babic [Wed, 28 Dec 2011 06:47:00 +0000 (06:47 +0000)]
fpga: add definition for Xilinx Spartan-6 XC6SLX4

Signed-off-by: Stefano Babic <sbabic@denx.de>
12 years agophy: add phy_smsc_init() declaration
Vladimir Zapolskiy [Thu, 29 Dec 2011 15:18:37 +0000 (15:18 +0000)]
phy: add phy_smsc_init() declaration

This trivial change removes a compilation warning:
  ----8<----
  phy.c: In function 'phy_init':
  phy.c:448:2: warning: implicit declaration of function 'phy_smsc_init'
  ----8<----

Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
12 years agofw_env.h: added a few missing defines
Frans Meulenbroeks [Thu, 1 Dec 2011 03:30:04 +0000 (03:30 +0000)]
fw_env.h: added a few missing defines

The README file lists 4 defined that were not actually present in the .h
file but that were needed to get things working with settings compiled in.
They are
Added these to the .h file
(the values above are the ones from the README file)

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
12 years agofat: reset VFAT short alias checksum on first match
Sergei Shtylyov [Mon, 2 Jan 2012 06:54:29 +0000 (06:54 +0000)]
fat: reset VFAT short alias checksum on first match

The VFAT short alias checksum read from a long file name is only overwritten
when another long file name appears in a directory list. Until then it renders
short file names invisible that have the same checksum. Reset the checksum on
first match.

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Martin Mueller <martin.mueller5@de.bosch.com>
12 years agogit-mailrc: Add self to davinci/omap, add ti
Tom Rini [Wed, 14 Dec 2011 06:15:16 +0000 (06:15 +0000)]
git-mailrc: Add self to davinci/omap, add ti

Adding a 'ti' alias since not all parts are "omap" or "davinci" and
adding myself to that alias as co-custodian of u-boot-ti

Signed-off-by: Tom Rini <trini@ti.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agoMerge branch 'next' of ../next
Wolfgang Denk [Fri, 23 Dec 2011 19:53:58 +0000 (20:53 +0100)]
Merge branch 'next' of ../next

* 'next' of ../next:
  mkenvimage: Add version info switch (-V)
  mkenvimage: Fix getopt() error handling
  mkenvimage: Fix some typos
  phy: add Micrel KS8721BL phy definition
  net: introduce per device index
  mvgbe: remove setting of ethaddr within the driver
  x86: Add support for specifying an initrd with the zboot command
  x86: Refactor the zboot innards so they can be reused with a vboot image
  x86: Add infrastructure to extract an e820 table from the coreboot tables
  x86: Add support for booting Linux using the 32 bit boot protocol
  x86: Clean up the x86 zimage code in preparation to extend it
  x86: Import code from coreboot's libpayload to parse the coreboot table
  x86: Initial commit for running as a coreboot payload
  CHECKPATCH: ./board/esd/hh405/logo_320_240_8bpp.c
  CHECKPATCH: ./board/esd/hh405/logo_1024_768_8bpp.c
  CHECKPATCH: ./board/esd/hh405/logo_320_240_4bpp.c
  CHECKPATCH: ./board/esd/hh405/logo_640_480_24bpp.c
  CHECKPATCH: ./board/esd/apc405/logo_640_480_24bpp.c
  CHECKPATCH: ./board/esd/voh405/logo_320_240_4bpp.c
  CHECKPATCH: ./board/esd/voh405/logo_640_480_24bpp.c
  CHECKPATCH: ./board/esd/hh405/fpgadata.c
  CHECKPATCH: ./board/esd/pci405/fpgadata.c
  CHECKPATCH: ./board/esd/tasreg/fpgadata.c
  CHECKPATCH: ./board/esd/apc405/fpgadata.c
  CHECKPATCH: ./board/esd/voh405/fpgadata.c
  CHECKPATCH: ./board/esd/ash405/fpgadata.c
  CHECKPATCH: ./board/esd/dasa_sim/fpgadata.c
  CHECKPATCH: ./board/esd/ar405/fpgadata_xl30.c
  CHECKPATCH: ./board/esd/ar405/fpgadata.c
  CHECKPATCH: ./board/esd/plu405/fpgadata.c
  CHECKPATCH: ./board/esd/wuh405/fpgadata.c
  CHECKPATCH: ./board/esd/cpci405/fpgadata_cpci405.c
  CHECKPATCH: ./board/esd/cpci405/fpgadata_cpci405ab.c
  CHECKPATCH: ./board/esd/cpci405/fpgadata_cpci4052.c
  CHECKPATCH: ./board/esd/canbt/fpgadata.c
  CHECKPATCH: ./board/esd/du405/fpgadata.c
  CHECKPATCH: ./board/esd/cpciiser4/fpgadata.c
  CHECKPATCH: ./board/dave/PPChameleonEVB/fpgadata.c
  avr32:mmu.c: fix printf() length modifier
  fat.c: fix printf() length modifier
  cmd_sf.c: fix printf() length modifier
  Make printf and vprintf safe from buffer overruns
  vsprintf: Move function documentation into header file
  Add safe vsnprintf and snprintf library functions
  Move vsprintf functions into their own header

Conflicts:
tools/mkenvimage.c

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agoPrepare v2011.12
Wolfgang Denk [Fri, 23 Dec 2011 19:25:35 +0000 (20:25 +0100)]
Prepare v2011.12

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agodoc/mkimage.1: Fix -D/-f options formatting
Horst Kronstorfer [Fri, 23 Dec 2011 05:40:20 +0000 (05:40 +0000)]
doc/mkimage.1: Fix -D/-f options formatting

Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
12 years agopost/lib_powerpc/multi.c: fix stack overflow error
Wolfgang Denk [Fri, 23 Dec 2011 01:29:12 +0000 (01:29 +0000)]
post/lib_powerpc/multi.c: fix stack overflow error

The code and comment disagreed: the comment claimed that r6...r31
were copied, and consequently the arrays for "src" and "dst" were
declared with 26 entries, but the actual code ("lmw r5,0(r3)" and
"stmw r5,0(r4)") copied _27_ words (r5 through r31), which resulted
in false "POST cpu Error at multi test" messages.

Fix the comment and the array sizes.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Kim Phillips <kim.phillips@freescale.com>
Cc: Andy Fleming <afleming@gmail.com>
Acked-by: Anatolij Gustschin <agust@denx.de>
Tested-by: Anatolij Gustschin <agust@denx.de>
12 years agopost/lib_powerpc/multi.c: code cleanup
Wolfgang Denk [Fri, 23 Dec 2011 01:29:11 +0000 (01:29 +0000)]
post/lib_powerpc/multi.c: code cleanup

Clean up and document the code:

- get rid of unneeded code block
- add comment which code is generated

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Kim Phillips <kim.phillips@freescale.com>
Cc: Andy Fleming <afleming@gmail.com>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agopost/lib_powerpc/multi.c: make checkpatch clean
Wolfgang Denk [Fri, 23 Dec 2011 01:29:10 +0000 (01:29 +0000)]
post/lib_powerpc/multi.c: make checkpatch clean

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Kim Phillips <kim.phillips@freescale.com>
Cc: Andy Fleming <afleming@gmail.com>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoPPC: fix "Warning: FOO uses hard float, BAR uses soft float".
Wolfgang Denk [Thu, 22 Dec 2011 04:29:41 +0000 (04:29 +0000)]
PPC: fix "Warning: FOO uses hard float, BAR uses soft float".

It appears that with recent versions of GCC the explicit
"-mhard-float" command line option takes precedence over the
``asm(".gnu_attribute 4, 2");'' in the source file, so this no longer
helps to avoid the warnings we get when linking code that uses FP
instructions with other code that was built using soft-float.

We can remove the ".gnu_attribute" (which appears to carry no other
information, at least so far) from the object files, but we also have
to make sure we don't pull in the __gcc_qsub() and __gcc_qmul()
functions from the standard libgcc, as these would again "infect" our
linking.  We copy this code from:
gcc-4.2.2/gcc/config/rs6000/darwin-ldouble.c
This old version was chosen because it was still available under a
compatible license (GCC v2+).   The file was stripped down to the
needed parts, and reformatted so it passes checkpatch with only one
warning (do not add new typedefs).

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Stefan Roese <sr@denx.de>
Cc: Andy Fleming <afleming@gmail.com>
Cc: Kim Phillips <kim.phillips@freescale.com>
Tested-by: Stefan Roese <sr@denx.de>
Tested-by: Anatolij Gustschin <agust@denx.de>
12 years agoPrint program basename instead of whole path in usage()
Horst Kronstorfer [Wed, 21 Dec 2011 10:39:39 +0000 (10:39 +0000)]
Print program basename instead of whole path in usage()

Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
12 years agotegra2: Fix out-of-tree build for Ventana.
Thierry Reding [Wed, 16 Nov 2011 23:48:22 +0000 (23:48 +0000)]
tegra2: Fix out-of-tree build for Ventana.

Since Ventana is derived from Seaboard and requires seaboard.c to build,
make sure board/nvidia/seaboard is created in the build tree.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Acked-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Wolfgang Denk <wd@denx.de>
12 years agoPrepare v2011.12-rc3
Wolfgang Denk [Wed, 21 Dec 2011 19:39:46 +0000 (20:39 +0100)]
Prepare v2011.12-rc3

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agoarm: Tegra: fix undefined instruction hang immediately after reset
Tom Warren [Tue, 6 Dec 2011 13:00:19 +0000 (13:00 +0000)]
arm: Tegra: fix undefined instruction hang immediately after reset

commit 0d479b53 (Aneesh V) added code for OMAP4 that doesn't
execute on Tegra, due to the AVP (ARM7TDI) not having a CP15.
Result was an undefined instruction hang just after reset.

Signed-off-by: Tom Warren <twarren@nvidia.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Tom Rini <trini@ti.com>
Acked-by: Aneesh V <aneesh@ti.com>
12 years agodoc/mkimage.1: Fix some typos
Horst Kronstorfer [Wed, 21 Dec 2011 04:31:23 +0000 (04:31 +0000)]
doc/mkimage.1: Fix some typos

Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agomkenvimage: Add version info switch (-V)
Horst Kronstorfer [Mon, 5 Dec 2011 00:55:26 +0000 (00:55 +0000)]
mkenvimage: Add version info switch (-V)

Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
12 years agomkenvimage: Fix getopt() error handling
Horst Kronstorfer [Mon, 5 Dec 2011 00:55:24 +0000 (00:55 +0000)]
mkenvimage: Fix getopt() error handling

Since the original implementation indicates explicit error handling
we turn off getopt()'s internal error messaging to avoid duplicate
error messages.  Additionally we add ':' (missing option argument)
error handling.

Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
12 years agomkenvimage: Fix some typos
Horst Kronstorfer [Mon, 5 Dec 2011 00:55:23 +0000 (00:55 +0000)]
mkenvimage: Fix some typos

Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
12 years agophy: add Micrel KS8721BL phy definition
Vladimir Zapolskiy [Tue, 6 Dec 2011 02:47:57 +0000 (02:47 +0000)]
phy: add Micrel KS8721BL phy definition

This adds support for the Micrel KS8721BL/SL PHY.

The definition is taken from the correspondent datasheet.

Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
12 years agokm/common: add toolchain variable
Holger Brunck [Wed, 14 Dec 2011 06:11:50 +0000 (06:11 +0000)]
km/common: add toolchain variable

Add a variable "toolchain" and configure the rootpath
for the nfsargs with this variable.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Wolfgang Denk <wd@denx.de>

12 years agoMakefile: fix distclean and *_config rules to be less noise
Lauri Hintsala [Tue, 20 Dec 2011 04:23:57 +0000 (04:23 +0000)]
Makefile: fix distclean and *_config rules to be less noise

Signed-off-by: Lauri Hintsala <lauri.hintsala@bluegiga.com>
12 years agoboard/eltec/elppc/misc.c: Fix GCC 4.6 build warning
Anatolij Gustschin [Tue, 20 Dec 2011 07:51:09 +0000 (07:51 +0000)]
board/eltec/elppc/misc.c: Fix GCC 4.6 build warning

Fix:
misc.c: In function 'misc_init_r':
misc.c:119:3: warning: dereferencing type-punned pointer
will break strict-aliasing rules [-Wstrict-aliasing]

Signed-off-by: Anatolij Gustschin <agust@denx.de>
12 years agodrivers/net/e1000.c: Fix GCC 4.6 build warnings
Anatolij Gustschin [Tue, 20 Dec 2011 07:36:39 +0000 (07:36 +0000)]
drivers/net/e1000.c: Fix GCC 4.6 build warnings

Fix:
e1000.c: In function 'e1000_read_mac_addr':
e1000.c:1149:2: warning: dereferencing type-punned pointer
will break strict-aliasing rules [-Wstrict-aliasing]

e1000.c:1149:2: warning: dereferencing type-punned pointer
will break strict-aliasing rules [-Wstrict-aliasing]

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Kyle Moffett <Kyle.D.Moffett@boeing.com>
Acked-by: Kyle Moffett <Kyle.D.Moffett@boeing.com>
12 years agoboard/esd/cpci750/mv_eth.c: Fix GCC 4.6 build warnings
Anatolij Gustschin [Tue, 20 Dec 2011 05:16:45 +0000 (05:16 +0000)]
board/esd/cpci750/mv_eth.c: Fix GCC 4.6 build warnings

Fix:
mv_eth.c: In function 'mv64360_eth_real_open':
mv_eth.c:425:6: warning: variable 'port_status' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64360_eth_stop':
mv_eth.c:643:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64360_eth_xmit':
mv_eth.c:719:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64360_eth_receive':
mv_eth.c:804:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64360_eth_get_stats':
mv_eth.c:903:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64360_eth_update_stat':
mv_eth.c:931:24: warning: variable 'dummy' set but not used [-Wunused-but-set-variable]
mv_eth.c:930:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64360_eth_print_stat':
mv_eth.c:1012:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'eth_clear_mib_counters':
mv_eth.c:2069:15: warning: variable 'dummy' set but not used [-Wunused-but-set-variable

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Reinhard Arlt <reinhard.arlt@esd.eu>
12 years agousb: s3c_udc_otg: fix GCC 4.6 build warnings
Anatolij Gustschin [Mon, 19 Dec 2011 04:20:35 +0000 (04:20 +0000)]
usb: s3c_udc_otg: fix GCC 4.6 build warnings

Fix:
In file included from s3c_udc_otg.c:216:0:
s3c_udc_otg_xfer_dma.c: In function 'complete_tx':
s3c_udc_otg_xfer_dma.c:280:33: warning: variable 'is_short' set but not used
s3c_udc_otg_xfer_dma.c:280:6: warning: variable 'ep_tsr' set but not used
s3c_udc_otg_xfer_dma.c: In function 's3c_udc_irq':
s3c_udc_otg_xfer_dma.c:469:16: warning: variable 'flags' set but not used
s3c_udc_otg_xfer_dma.c:468:18: warning: variable 'gintmsk' set but not used
s3c_udc_otg_xfer_dma.c: In function 's3c_queue':
s3c_udc_otg_xfer_dma.c:582:14: warning: variable 'gintsts' set but not used
s3c_udc_otg_xfer_dma.c:581:16: warning: variable 'flags' set but not used
s3c_udc_otg_xfer_dma.c: In function 's3c_ep0_read':
s3c_udc_otg_xfer_dma.c:778:6: warning: variable 'ret' set but not used
s3c_udc_otg_xfer_dma.c: In function 's3c_udc_set_halt':
s3c_udc_otg_xfer_dma.c:1020:16: warning: variable 'flags' set but not used
s3c_udc_otg_xfer_dma.c: In function 's3c_ep0_setup':
s3c_udc_otg_xfer_dma.c:1258:13: warning: initialization from incompatible
pointer type [enabled by default]
s3c_udc_otg_xfer_dma.c:1239:16: warning: variable 'is_in' set but not used
s3c_udc_otg_xfer_dma.c:1239:9: warning: variable 'bytes' set but not used
s3c_udc_otg.c: In function 'usb_gadget_register_driver':
s3c_udc_otg.c:292:16: warning: variable 'flags' set but not used
s3c_udc_otg.c: In function 'usb_gadget_unregister_driver':
s3c_udc_otg.c:338:16: warning: variable 'flags' set but not used
s3c_udc_otg.c: In function 's3c_ep_enable':
s3c_udc_otg.c:582:16: warning: variable 'flags' set but not used
s3c_udc_otg.c: In function 's3c_ep_disable':
s3c_udc_otg.c:646:16: warning: variable 'flags' set but not used
s3c_udc_otg.c: In function 's3c_dequeue':
s3c_udc_otg.c:704:16: warning: variable 'flags' set but not used

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Remy Bohmer <linux@bohmer.net>
12 years agoboard/samsung/universal_c210/universal.c: Fix build warning
Anatolij Gustschin [Mon, 19 Dec 2011 04:20:04 +0000 (04:20 +0000)]
board/samsung/universal_c210/universal.c: Fix build warning

Fix:
universal.c: In function 's5pc210_phy_control':
universal.c:273:7: warning: 'ret' may be used uninitialized
in this function [-Wuninitialized]

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Acked-by: Minkyu Kang <mk7.kang@samsung.com>
12 years agoFAT: fix some issues in FAT write support code
Anatolij Gustschin [Thu, 15 Dec 2011 03:12:14 +0000 (03:12 +0000)]
FAT: fix some issues in FAT write support code

Writing a file to the FAT partition didn't work while a
test using a CF card. The test was done on mpc5200 based
board (powerpc). There is a number of problems in FAT
write code:

Compiler warning:
fat_write.c: In function 'file_fat_write':
fat_write.c:326: warning: 'counter' may be used uninitialized
in this function
fat_write.c:326: note: 'counter' was declared here

'l_filename' string is not terminated, so a file name
with garbage at the end is used as a file name as shown
by debug code.

Return value of set_contents() is not checked properly
so actually a file won't be written at all (as checked
using 'fatls' after a write attempt with 'fatwrite'
command).

do_fat_write() doesn't return the number of written bytes
if no error happened. However the return value of this
function is used to show the number of written bytes
in do_fat_fswrite().

The patch adds some debug code and fixes above mentioned
problems and also fixes a typo in error output.

NOTE: after a successful write to the FAT partition (under
U-Boot) the partition was checked under Linux using fsck.
The partition needed fixing FATs:
-bash-3.2# fsck -a /dev/sda1
fsck 1.39 (29-May-2006)
dosfsck 2.11, 12 Mar 2005, FAT32, LFN
FATs differ but appear to be intact. Using first FAT.
Performing changes.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Donggeun Kim <dg77.kim@samsung.com>
Cc: Aaron Williams <Aaron.Williams@cavium.com>
Acked-by: Donggeun Kim <dg77.kim@samsung.com>
12 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Tue, 20 Dec 2011 22:14:37 +0000 (23:14 +0100)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

* 'master' of /home/wd/git/u-boot/custodians:
  common/cmd_pxe.c: Fix GCC 4.6 build warnings
  AVR32: fix timer_init() function

12 years agoMerge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
Wolfgang Denk [Tue, 20 Dec 2011 22:14:32 +0000 (23:14 +0100)]
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
  common/cmd_pxe.c: Fix GCC 4.6 build warnings
  AVR32: fix timer_init() function

12 years agodrivers/net/e1000_spi.c: Fix build warnings
Anatolij Gustschin [Tue, 20 Dec 2011 02:29:03 +0000 (02:29 +0000)]
drivers/net/e1000_spi.c: Fix build warnings

Fix:
e1000_spi.c: In function 'spi_free_slave':
e1000_spi.c:115: warning: unused variable 'hw'
e1000_spi.c: In function 'do_e1000_spi':
e1000_spi.c:472: warning: 'checksum' may be used uninitialized in this function
e1000_spi.c:472: note: 'checksum' was declared here

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Kyle Moffett <Kyle.D.Moffett@boeing.com>
Acked-by: Kyle Moffett <Kyle.D.Moffett@boeing.com>
12 years agonet: Fix arguments in tftpput command
Simon Glass [Mon, 19 Dec 2011 16:10:43 +0000 (16:10 +0000)]
net: Fix arguments in tftpput command

The switch to strict_strtoul() was not done correctly - this fixes
the compile error when CONFIG_CMD_TFTPPUT is active.

There appears to very little use of strict_strtoul() in commands, so
it might be easier to switch to simple_strtoul(). If not, we should
decide the best way to use strict_strtoul(). For now I have added a
friendly message which will of course increase code size.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agoAVR32: fix timer_init() function
Sven Schnelle [Tue, 4 Oct 2011 19:53:32 +0000 (21:53 +0200)]
AVR32: fix timer_init() function

timer_init() now returns an int (the error code) instead of void.
This makes compilation fail with:

interrupts.c:111: error: conflicting types for 'timer_init'
/home/svens/u-boot/u-boot/include/common.h:246: error: previous
declaration of 'timer_init' was here
make[1]: *** [interrupts.o] Error 1

Signed-off-by: Sven Schnelle <svens@stackframe.org>
Acked-by: Andreas Bießmann <andreas.devel@googlemail.com>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
12 years agonet: introduce per device index
Michael Walle [Thu, 27 Oct 2011 11:31:35 +0000 (11:31 +0000)]
net: introduce per device index

Instead of counting the device index everytime a functions needs it, store
it in the eth_device struct. eth_register() keeps track of the indices and
updates the device's index number. This simplifies some functions in
net/eth.c.

Additionally, a network driver can now query its index, eg. to get the
correct environment ethaddr name.

Signed-off-by: Michael Walle <michael@walle.cc>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Cc: Mike Frysinger <vapier@gentoo.com>
Cc: Wolfgang Denk <wd@denx.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agomvgbe: remove setting of ethaddr within the driver
Michael Walle [Thu, 17 Nov 2011 12:52:29 +0000 (12:52 +0000)]
mvgbe: remove setting of ethaddr within the driver

A network driver should not touch the environment at all. This patch fixes
this behaviour by removing the code for setting a default/randomized MAC
address.

Signed-off-by: Michael Walle <michael@walle.cc>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Prafulla Wadaskar <prafulla@marvell.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Cc: Valentin Longchamp <valentin.longchamp@keymile.com>
Cc: Eric Cooper <ecc@cmu.edu>
Cc: Jason Cooper <u-boot@lakedaemon.net>
Cc: Siddarth Gore <gores@marvell.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Simon Guinot <simon.guinot@sequanux.org>
Acked-by: Prafulla Wadaskar <prafulla@marvell.com>
12 years agocommon/cmd_pxe.c: Fix GCC 4.6 build warnings
Heiko Schocher [Mon, 12 Dec 2011 20:37:17 +0000 (20:37 +0000)]
common/cmd_pxe.c: Fix GCC 4.6 build warnings

Fix:
cmd_pxe.c: In function 'parse_pxefile_top':
cmd_pxe.c:941:5: warning: 'err' may be used uninitialized in this
  function [-Wuninitialized]
cmd_pxe.c:921:6: note: 'err' was declared here

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Jason Hobbs <jason.hobbs@calxeda.com>
Acked-by: Jason Hobbs <jason.hobbs@calxeda.com>
12 years agoAVR32: fix timer_init() function
Sven Schnelle [Tue, 4 Oct 2011 19:53:32 +0000 (21:53 +0200)]
AVR32: fix timer_init() function

timer_init() now returns an int (the error code) instead of void.
This makes compilation fail with:

interrupts.c:111: error: conflicting types for 'timer_init'
/home/svens/u-boot/u-boot/include/common.h:246: error: previous
declaration of 'timer_init' was here
make[1]: *** [interrupts.o] Error 1

Signed-off-by: Sven Schnelle <svens@stackframe.org>
Acked-by: Andreas Bießmann <andreas.devel@googlemail.com>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
12 years agoPXA: Kill last remnants of set_GPIO_mode function
Marek Vasut [Mon, 12 Dec 2011 05:34:03 +0000 (05:34 +0000)]
PXA: Kill last remnants of set_GPIO_mode function

GPIO configuration shall never be done inside a driver, never.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
12 years agoARM: tny_a9260: re-add MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260
Anatolij Gustschin [Sat, 19 Nov 2011 01:59:13 +0000 (01:59 +0000)]
ARM: tny_a9260: re-add MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260

MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260 were removed
from mach-types.h. Add them to the board config file.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Acked-by: Simon Glass <sjg@chromium.org>
12 years agoARM: sbc35_a9g20: re-add MACH_TYPE_SBC35_A9G20
Anatolij Gustschin [Sat, 19 Nov 2011 01:59:12 +0000 (01:59 +0000)]
ARM: sbc35_a9g20: re-add MACH_TYPE_SBC35_A9G20

MACH_TYPE_SBC35_A9G20 was removed from mach-types.h.
Add it to the board config file.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Acked-by: Simon Glass <sjg@chromium.org>
12 years agoarm, fdt: update ethernet mac address before booting Linux
Heiko Schocher [Wed, 14 Sep 2011 19:16:30 +0000 (19:16 +0000)]
arm, fdt: update ethernet mac address before booting Linux

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Gerald van Baren <gvb.uboot@gmail.com>
Acked-by: Wolfgang Denk <wd@denx.de>
12 years agoadd print_cpuinfo to s3c24x0
David Müller (ELSOFT AG) [Fri, 3 Dec 2010 05:12:50 +0000 (05:12 +0000)]
add print_cpuinfo to s3c24x0

Hello

This patch adds support for "print_cpuinfo" on Samsung s3c24x0
based targets. If activated by "#define CONFIG_DISPLAY_CPUINFO", the
chip ID and the 3 main cpu frequencies will be displayed.

Dave

Signed-off-by: David Müller <d.mueller@elsoft.ch>
12 years agoomap4_panda: Initialize the USB phy
Chris Lalancette [Tue, 13 Dec 2011 09:41:12 +0000 (09:41 +0000)]
omap4_panda: Initialize the USB phy

During misc_init_r, make sure to setup the clocks
properly for the USB hub on the pandaboard.  With
this in place, the USB hub and the ethernet works
on the pandaboard.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Acked-by: Aneesh V <aneesh@ti.com>
12 years agodavinci: Fixed wrong timebase clock frequency.
Manfred Rudigier [Wed, 14 Dec 2011 15:20:08 +0000 (16:20 +0100)]
davinci: Fixed wrong timebase clock frequency.

Signed-off-by: Manfred Rudigier <manfred.rudigier@omicron.at>
12 years agoarm926ejs: remove noop flush_dcache_all function
Ilya Yanok [Sun, 11 Dec 2011 13:09:28 +0000 (13:09 +0000)]
arm926ejs: remove noop flush_dcache_all function

Commit 2f3427c added noop cache functions implementation for arm926ejs
to fix compilation of drivers depending on these functions (DaVinci
EMAC in particular).

Unfortunately, the bug was introduced: noop implementation calls
dcache_disable which calls flush_dcache_all which in turn calls
dcache_disable thus creating an infinite loop.

This patch removes noop implementation for flush_dcache_all, we already
have default one in arch/arm/lib/cache.c and it should be used instead.

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Tested-by: Matthias Weisser <weisserm@arcor.de>
12 years agoM28: Fix tab indent in u-boot.bd
Marek Vasut [Tue, 13 Dec 2011 09:18:07 +0000 (09:18 +0000)]
M28: Fix tab indent in u-boot.bd

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Detlev Zundel <dzu@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
12 years agoFix building for mx51evk board
Anatolij Gustschin [Mon, 12 Dec 2011 01:25:46 +0000 (01:25 +0000)]
Fix building for mx51evk board

Fix:
mx51evk.c:206:6: error: conflicting types for 'board_ehci_hcd_init'
/u-boot/include/usb/ehci-fsl.h:254:5: note: previous declaration of
'board_ehci_hcd_init' was here

We also fix board_ehci_hcd_init() for mx53loco board.
Building for mx53loco worked since <usb/ehci-fsl.h> is
not included here.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
12 years agoPrepare v2011.12-rc2
Wolfgang Denk [Mon, 19 Dec 2011 11:12:54 +0000 (12:12 +0100)]
Prepare v2011.12-rc2

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agoCoding Style cleanup
Wolfgang Denk [Mon, 19 Dec 2011 11:03:40 +0000 (12:03 +0100)]
Coding Style cleanup

Fix trailing white space, indentation by spaces instead of TABs,
excessive blank lines, trailing blank lines.

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agodrivers/usb/gadget/pxa27x_udc.c: Coding Style cleanup
Wolfgang Denk [Mon, 19 Dec 2011 10:52:36 +0000 (11:52 +0100)]
drivers/usb/gadget/pxa27x_udc.c: Coding Style cleanup

Commit bdbcdc89 "pxa: convert pxa27x_udc to use read and write
functions" added a number of C++ comments.  Fix these.

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agocommon/cmd_nvedit.c: Fix size calculation in do_env_import()
Horst Kronstorfer [Fri, 16 Dec 2011 23:33:10 +0000 (23:33 +0000)]
common/cmd_nvedit.c: Fix size calculation in do_env_import()

do_env_import() missed the final '\0' terminator when calculating the
size of an environment data block.  This led to an erroneous 'bad CRC,
import failed' message for a checksum protected environment (-c.)

Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
12 years agox86: Add support for specifying an initrd with the zboot command
Gabe Black [Mon, 5 Dec 2011 12:09:27 +0000 (12:09 +0000)]
x86: Add support for specifying an initrd with the zboot command

This change finishes plumbing the initrd support built into the zboot
mechanism out to the command interface.

It also fixes a bug in the command declaration where the kernel size could
be passed as an optional second parameter but not enough arguments were
allowed.

Signed-off-by: Gabe Black <gabeblack@chromium.org>
12 years agox86: Refactor the zboot innards so they can be reused with a vboot image
Gabe Black [Mon, 5 Dec 2011 12:09:26 +0000 (12:09 +0000)]
x86: Refactor the zboot innards so they can be reused with a vboot image

If vboot successfully verifies a kernel, it will leave it in place and
basically ready to boot. The zeropage table which is part of the x86 boot
protocol is at the end of the kernel, though, instead of the beginning, and
because the image is already in place there's no need to copy it around.
This change refactors the code which implements the zboot command so that
the configuration of the zeropage table and loading the pieces of the
kernel into memory are done separately. Also, because the command line goes
before the zeropage table in vboot which is somewhat incompatible with the
normal protocol, where to put the command line is a now a parameter instead
of being hard coded.

Signed-off-by: Gabe Black <gabeblack@chromium.org>
12 years agox86: Add infrastructure to extract an e820 table from the coreboot tables
Gabe Black [Mon, 5 Dec 2011 12:09:25 +0000 (12:09 +0000)]
x86: Add infrastructure to extract an e820 table from the coreboot tables

Also approximate the size of RAM using the largest RAM address available
in the tables. There may be areas which are marked as reserved which are
actually at the end of RAM.

Signed-off-by: Gabe Black <gabeblack@chromium.org>
12 years agox86: Add support for booting Linux using the 32 bit boot protocol
Gabe Black [Mon, 5 Dec 2011 12:09:24 +0000 (12:09 +0000)]
x86: Add support for booting Linux using the 32 bit boot protocol

This change conditionally modifies the zboot command so that it can use the
32 bit boot protocol. This is necessary because the 16 bit realmode entry
point assumes that it can call BIOS services which neither coreboot nor
u-boot provide.

Signed-off-by: Gabe Black <gabeblack@chromium.org>
12 years agox86: Clean up the x86 zimage code in preparation to extend it
Gabe Black [Mon, 5 Dec 2011 12:09:23 +0000 (12:09 +0000)]
x86: Clean up the x86 zimage code in preparation to extend it

This change cleans up some formatting issues in the zimage handling code, and
converts it from using offsets added to a base pointer to using the available
structure definitions which were already being included.

Signed-off-by: Gabe Black <gabeblack@chromium.org>
12 years agox86: Import code from coreboot's libpayload to parse the coreboot table
Gabe Black [Mon, 5 Dec 2011 12:09:22 +0000 (12:09 +0000)]
x86: Import code from coreboot's libpayload to parse the coreboot table

This change also forces the lib_sysinfo structure to be in the .data
section. Otherwise it ends up in the .bss section. U-boot assumes that it
doesn't need to copy it over during relocation, and instead fills that
whole section with zeroes. If we really were booting from ROM that would be
appropriate, but we need some information from the coreboot tables (memory
size) before then and have to fill that structure before relocation. We
skirt u-boot's assumption by putting this in .data where it assumes there
is still read only but non-zero data.

Signed-off-by: Gabe Black <gabeblack@chromium.org>
12 years agox86: Initial commit for running as a coreboot payload
Gabe Black [Tue, 29 Nov 2011 18:05:07 +0000 (18:05 +0000)]
x86: Initial commit for running as a coreboot payload

Add a target for running u-boot as a coreboot payload in boards.cfg, a
board, CPU and a config. This is a skeleton implementation which always
reports the size of memory as 64 MB.

Signed-off-by: Gabe Black <gabeblack@chromium.org>
12 years agoCHECKPATCH: ./board/esd/hh405/logo_320_240_8bpp.c
Marek Vasut [Thu, 15 Dec 2011 03:45:55 +0000 (03:45 +0000)]
CHECKPATCH: ./board/esd/hh405/logo_320_240_8bpp.c

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Stefan Roese <sr@denx.de>
12 years agoCHECKPATCH: ./board/esd/hh405/logo_1024_768_8bpp.c
Marek Vasut [Thu, 15 Dec 2011 03:45:54 +0000 (03:45 +0000)]
CHECKPATCH: ./board/esd/hh405/logo_1024_768_8bpp.c

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Stefan Roese <sr@denx.de>
12 years agoCHECKPATCH: ./board/esd/hh405/logo_320_240_4bpp.c
Marek Vasut [Thu, 15 Dec 2011 03:45:53 +0000 (03:45 +0000)]
CHECKPATCH: ./board/esd/hh405/logo_320_240_4bpp.c

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Stefan Roese <sr@denx.de>
12 years agoCHECKPATCH: ./board/esd/hh405/logo_640_480_24bpp.c
Marek Vasut [Thu, 15 Dec 2011 03:45:52 +0000 (03:45 +0000)]
CHECKPATCH: ./board/esd/hh405/logo_640_480_24bpp.c

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Stefan Roese <sr@denx.de>
12 years agoCHECKPATCH: ./board/esd/apc405/logo_640_480_24bpp.c
Marek Vasut [Thu, 15 Dec 2011 03:45:51 +0000 (03:45 +0000)]
CHECKPATCH: ./board/esd/apc405/logo_640_480_24bpp.c

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Stefan Roese <sr@denx.de>
12 years agoCHECKPATCH: ./board/esd/voh405/logo_320_240_4bpp.c
Marek Vasut [Thu, 15 Dec 2011 03:45:50 +0000 (03:45 +0000)]
CHECKPATCH: ./board/esd/voh405/logo_320_240_4bpp.c

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Stefan Roese <sr@denx.de>
12 years agoCHECKPATCH: ./board/esd/voh405/logo_640_480_24bpp.c
Marek Vasut [Thu, 15 Dec 2011 03:45:49 +0000 (03:45 +0000)]
CHECKPATCH: ./board/esd/voh405/logo_640_480_24bpp.c

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Stefan Roese <sr@denx.de>
12 years agoCHECKPATCH: ./board/esd/hh405/fpgadata.c
Marek Vasut [Thu, 15 Dec 2011 03:26:59 +0000 (03:26 +0000)]
CHECKPATCH: ./board/esd/hh405/fpgadata.c

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCHECKPATCH: ./board/esd/pci405/fpgadata.c
Marek Vasut [Thu, 15 Dec 2011 03:26:58 +0000 (03:26 +0000)]
CHECKPATCH: ./board/esd/pci405/fpgadata.c

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCHECKPATCH: ./board/esd/tasreg/fpgadata.c
Marek Vasut [Thu, 15 Dec 2011 03:26:57 +0000 (03:26 +0000)]
CHECKPATCH: ./board/esd/tasreg/fpgadata.c

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCHECKPATCH: ./board/esd/apc405/fpgadata.c
Marek Vasut [Thu, 15 Dec 2011 03:26:56 +0000 (03:26 +0000)]
CHECKPATCH: ./board/esd/apc405/fpgadata.c

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCHECKPATCH: ./board/esd/voh405/fpgadata.c
Marek Vasut [Thu, 15 Dec 2011 03:26:55 +0000 (03:26 +0000)]
CHECKPATCH: ./board/esd/voh405/fpgadata.c

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCHECKPATCH: ./board/esd/ash405/fpgadata.c
Marek Vasut [Thu, 15 Dec 2011 03:26:54 +0000 (03:26 +0000)]
CHECKPATCH: ./board/esd/ash405/fpgadata.c

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCHECKPATCH: ./board/esd/dasa_sim/fpgadata.c
Marek Vasut [Thu, 15 Dec 2011 03:26:53 +0000 (03:26 +0000)]
CHECKPATCH: ./board/esd/dasa_sim/fpgadata.c

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCHECKPATCH: ./board/esd/ar405/fpgadata_xl30.c
Marek Vasut [Thu, 15 Dec 2011 03:26:52 +0000 (03:26 +0000)]
CHECKPATCH: ./board/esd/ar405/fpgadata_xl30.c

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCHECKPATCH: ./board/esd/ar405/fpgadata.c
Marek Vasut [Thu, 15 Dec 2011 03:26:51 +0000 (03:26 +0000)]
CHECKPATCH: ./board/esd/ar405/fpgadata.c

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCHECKPATCH: ./board/esd/plu405/fpgadata.c
Marek Vasut [Thu, 15 Dec 2011 03:26:50 +0000 (03:26 +0000)]
CHECKPATCH: ./board/esd/plu405/fpgadata.c

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCHECKPATCH: ./board/esd/wuh405/fpgadata.c
Marek Vasut [Thu, 15 Dec 2011 03:26:49 +0000 (03:26 +0000)]
CHECKPATCH: ./board/esd/wuh405/fpgadata.c

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCHECKPATCH: ./board/esd/cpci405/fpgadata_cpci405.c
Marek Vasut [Thu, 15 Dec 2011 03:26:48 +0000 (03:26 +0000)]
CHECKPATCH: ./board/esd/cpci405/fpgadata_cpci405.c

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCHECKPATCH: ./board/esd/cpci405/fpgadata_cpci405ab.c
Marek Vasut [Thu, 15 Dec 2011 03:26:47 +0000 (03:26 +0000)]
CHECKPATCH: ./board/esd/cpci405/fpgadata_cpci405ab.c

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCHECKPATCH: ./board/esd/cpci405/fpgadata_cpci4052.c
Marek Vasut [Thu, 15 Dec 2011 03:26:46 +0000 (03:26 +0000)]
CHECKPATCH: ./board/esd/cpci405/fpgadata_cpci4052.c

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCHECKPATCH: ./board/esd/canbt/fpgadata.c
Marek Vasut [Thu, 15 Dec 2011 03:26:45 +0000 (03:26 +0000)]
CHECKPATCH: ./board/esd/canbt/fpgadata.c

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCHECKPATCH: ./board/esd/du405/fpgadata.c
Marek Vasut [Thu, 15 Dec 2011 03:26:44 +0000 (03:26 +0000)]
CHECKPATCH: ./board/esd/du405/fpgadata.c

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCHECKPATCH: ./board/esd/cpciiser4/fpgadata.c
Marek Vasut [Thu, 15 Dec 2011 03:26:43 +0000 (03:26 +0000)]
CHECKPATCH: ./board/esd/cpciiser4/fpgadata.c

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCHECKPATCH: ./board/dave/PPChameleonEVB/fpgadata.c
Marek Vasut [Thu, 15 Dec 2011 03:26:42 +0000 (03:26 +0000)]
CHECKPATCH: ./board/dave/PPChameleonEVB/fpgadata.c

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoavr32:mmu.c: fix printf() length modifier
Andreas Bießmann [Thu, 15 Dec 2011 08:56:55 +0000 (09:56 +0100)]
avr32:mmu.c: fix printf() length modifier

avr32 uses unsigned long addresses, fix the printf() length modifier for that
fact.

Before this patch following warning occours:

---8<---
mmu.c: In function 'mmu_init_r':
mmu.c:25: warning: format '%08x' expects type 'unsigned int', but argument 2 has type 'uintptr_t'
--->8---

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
cc: Mike Frysinger <vapier@gentoo.org>
cc: Thomas Chou <thomas@wytron.com.tw>
cc: Reinhard Meyer <u-boot@emk-elektronik.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agofat.c: fix printf() length modifier
Andreas Bießmann [Thu, 15 Dec 2011 08:56:54 +0000 (09:56 +0100)]
fat.c: fix printf() length modifier

The DIRENTSPERBLOCK utilizes sizeof() which will return a size_t which has no
fixed size. Therefor use correct length modifer for printf() statement to
prevent compiler warnings.

This patch fixes following warning:

---8<---
fat.c: In function 'do_fat_read':
fat.c:879: warning: format '%d' expects type 'int', but argument 4 has type 'long unsigned int'
--->8---

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
cc: Mike Frysinger <vapier@gentoo.org>
cc: Thomas Chou <thomas@wytron.com.tw>
cc: rjones@nexus-tech.net
cc: kharris@nexus-tech.net
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agocmd_sf.c: fix printf() length modifier
Andreas Bießmann [Thu, 15 Dec 2011 08:56:53 +0000 (09:56 +0100)]
cmd_sf.c: fix printf() length modifier

size_t is not always 'unsigned int', use corret length modifer.

This patch fixes following warning:

---8<---
cmd_sf.c: In function 'spi_flash_update_block':
cmd_sf.c:130: warning: format '%#x' expects type 'unsigend int', but argument 4 has type 'size_t'
cmd_sf.c:135: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'size_t'
--->8---

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
cc: Mike Frysinger <vapier@gentoo.org>
cc: Thomas Chou <thomas@wytron.com.tw>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agoMake printf and vprintf safe from buffer overruns
Sonny Rao [Mon, 10 Oct 2011 09:22:31 +0000 (09:22 +0000)]
Make printf and vprintf safe from buffer overruns

From: Sonny Rao <sonnyrao@chromium.org>

utilize the added vscnprintf functions to avoid buffer overruns
The implementation is fairly dumb in that it doesn't detect
that the buffer is too small, but at least will not cause crashes.

Signed-off-by: Sonny Rao <sonnyrao@chromium.org>
12 years agovsprintf: Move function documentation into header file
Simon Glass [Wed, 2 Nov 2011 09:52:09 +0000 (09:52 +0000)]
vsprintf: Move function documentation into header file

Now that this is not in common.h, perhaps it is acceptable to move this
documentation into the header file.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agoAdd safe vsnprintf and snprintf library functions
Sonny Rao [Wed, 2 Nov 2011 09:52:08 +0000 (09:52 +0000)]
Add safe vsnprintf and snprintf library functions

From: Sonny Rao <sonnyrao@chromium.org>

These functions are useful in U-Boot because they allow a graceful failure
rather than an unpredictable stack overflow when printf() buffers are
exceeded.

Mostly copied from the Linux kernel. I copied vscnprintf and
scnprintf so we can change printf and vprintf to use the safe
implementation but still return the correct values.

(Simon Glass <sjg@chromium.org> modified this commit a little)

Signed-off-by: Sonny Rao <sonnyrao@chromium.org>
12 years agoMove vsprintf functions into their own header
Simon Glass [Wed, 2 Nov 2011 09:52:07 +0000 (09:52 +0000)]
Move vsprintf functions into their own header

common.h is very large, so before changing the vsprintf functions, move the
prototypes into their own header file.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agotools/setlocalversion: Update from the Linux Kernel
Kyle Moffett [Fri, 16 Dec 2011 11:14:40 +0000 (11:14 +0000)]
tools/setlocalversion: Update from the Linux Kernel

Several bugfixes have occurred upstream since this script was imported
into U-Boot.  In particular, the script currently in U-Boot does not
describe commit f8bbb4dad0e9d91b7a51d6cc54dcf66d142f50fe correctly,
resulting in a version of "2011.09" instead of "2011.09-01460-gf8bbb4d".

With that commit checked out, the command "git name-rev --tags HEAD"
gives this result:
  HEAD tags/v2011.12-rc1~30^2

Then the "changes" regex does not match because of the trailing '^2':
  grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$'

The new version of tools/setlocalversion in the kernel correctly handles
those situations by using different plumbing commands.

The version from the kernel is not directly usable as it does not append
the full GIT version that U-Boot expects unless the right config options
are set (CONFIG_LOCALVERSION_AUTO=y).  Other than a few minor changes
for Kconfig, the imported version is very similar to Linux v3.2-rc4.

Signed-off-by: Kyle Moffett <Kyle.D.Moffett@boeing.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Mike Frysinger <vapier@gentoo.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-usb
Wolfgang Denk [Sat, 17 Dec 2011 19:51:16 +0000 (20:51 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-usb

* 'master' of git://git.denx.de/u-boot-usb:
  USB: Use (get|put)_unaligned for accessing wMaxPacketSize
  usb:gadget:s5p Enable the USB Gadget framework at Exynos4210 (C210 Universal)
  README: add documentation for CONFIG_USB_ULPI*
  USB: ULPI: increase error case verbosity
  USB: ULPI: clean a mixup of return types
  USB: ULPI: switch argument type from u8 to unsigned

12 years agoUSB: Use (get|put)_unaligned for accessing wMaxPacketSize
Tom Rini [Thu, 15 Dec 2011 15:40:51 +0000 (08:40 -0700)]
USB: Use (get|put)_unaligned for accessing wMaxPacketSize

In 9792987721c7980453fe6447c3fa6593b44f8458 Stefan describes a usecase
where the previous behavior of leaving wMaxPacketSize be unaligned
caused fatal problems.  The initial fix for this problem was incomplete
however as it showed another cases of non-aligned access that previously
worked implicitly.  This switches to making sure that all access of
wMaxPacketSize are done via (get|put)_unaligned.

In order to maintain a level of readability to the code in some cases
we now use a variable for the value of wMaxPacketSize and in others, a
macro.

Cc: Minkyu Kang <mk7.kang@samsung.com>
Cc: Remy Bohmer <linux@bohmer.net>
OpenRISC:
Tested-by: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Beagleboard xM, Pandaboard run-tested, s5p_goni build-tested.
Signed-off-by: Tom Rini <trini@ti.com>
12 years agousb:gadget:s5p Enable the USB Gadget framework at Exynos4210 (C210 Universal)
Lukasz Majewski [Thu, 15 Dec 2011 09:32:12 +0000 (10:32 +0100)]
usb:gadget:s5p Enable the USB Gadget framework at Exynos4210 (C210 Universal)

This commit enables support for USB Gadgets on the Exynos4210 (C210 Universal)
reference target.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
CC: Remy Bohmer <linux@bohmer.net>
12 years agoREADME: add documentation for CONFIG_USB_ULPI*
Igor Grinberg [Mon, 12 Dec 2011 10:08:35 +0000 (12:08 +0200)]
README: add documentation for CONFIG_USB_ULPI*

Add documentation for CONFIG_USB_ULPI and CONFIG_USB_ULPI_VIEWPORT
configuration options.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>