u-boot.git/common, branch v2014.10-rc3

Merge branch 'master' of git://git.denx.de/u-boot-usb

2014-10-06T19:49:50+00:00

Merge branch 'topic/arm/socfpga-20141006' of git://git.denx.de/u-boot-socfpga

2014-10-06T19:17:13+00:00

Fix a trivial conflict in dw_mmc.c after talking with Marek.

Conflicts:
	drivers/mmc/dw_mmc.c

Signed-off-by: Tom Rini

tools: socfpga: Add socfpga preloader signing to mkimage

2014-10-06T15:38:17+00:00

Like many platforms, the Altera socfpga platform requires that the
preloader be "signed" in a certain way or the built-in boot ROM will
not boot the code.

This change automatically creates an appropriately signed preloader
from an SPL image.

The signed image includes a CRC which must, of course, be generated
with a CRC generator that the SoCFPGA boot ROM agrees with otherwise
the boot ROM will reject the image.

Unfortunately the CRC used in this boot ROM is not the same as the
Adler CRC in lib/crc32.c. Indeed the Adler code is not technically a
CRC but is more correctly described as a checksum.

Thus, the appropriate CRC generator is added to lib/ as crc32_alt.c.

Signed-off-by: Charles Manning 
Signed-off-by: Marek Vasut 
Cc: Chin Liang See 
Cc: Dinh Nguyen 
Cc: Albert Aribaud 
Cc: Tom Rini 
Cc: Wolfgang Denk 
Cc: Pavel Machek 
Acked-by: Pavel Machek 

V2: - Zap unused constant
    - Explicitly print an error message in case of error
    - Rework the hdr_checksum() function to take the *header directly
      instead of a plan buffer pointer

usb: kbd: Allow "usb reset" to continue when an usb kbd is used

2014-10-06T12:50:43+00:00

Use the new force parameter to make the stdio_deregister succeed, replacing
stdin with a nulldev, and assume that the usb keyboard will come back after
the reset.

Signed-off-by: Hans de Goede

stdio: Add force parameter to stdio_deregister

2014-10-06T12:50:43+00:00

In some cases we really want to move forward with a deregister, add a force
parameter to allow this, and replace the dev with a nulldev in this case.

Signed-off-by: Hans de Goede

usb: kbd: Remove check for already being registered

2014-10-06T12:50:43+00:00

We now always properly deregister the keyboard before calling
drv_usb_kbd_init(), so we can drop the check for already being registered.

Signed-off-by: Hans de Goede

usb: kbd: On a "usb reset" call usb_kbd_deregister() before calling usb_stop()

2014-10-06T12:50:43+00:00

We need to call usb_kbd_deregister() before calling usb_stop().

usbkbd's stdio_dev->priv points to the usb_device, and usb_kbd_testc
dereferences usb_device->privptr.

usb_stop zeros usb_device, leaving usb_device->privptr NULL, causing
bad things (tm) to happen once control returns to the main loop and
usb_kbd_testc gets called.

Calling usb_kbd_deregister() avoids this. Note that we do not allow
the "usb reset" to continue when the deregister fails. This will be fixed
in a later patch.

For the same reasons always fail "usb stop" if the usb_kbd_deregister() fails,
even in the force path. This can happen when CONFIG_SYS_STDIO_DEREGISTER is
not set.

Signed-off-by: Hans de Goede

usb: kbd: Do not treat -ENODEV as an error for usb_kbd_deregister

2014-10-06T12:50:42+00:00

ENODEV menas no usb keyboard was registered, threat this as a successful
usb_kbd_deregister.

Signed-off-by: Hans de Goede

usb: kbd: Fix unaligned buffer usage in usb_kbd_setled()

2014-10-06T12:50:42+00:00

Signed-off-by: Hans de Goede

cmd_mmc: fix bootpart-resize maxarg to 4

2014-10-03T14:26:50+00:00

sub-command 'bootpart-resize' check for argc == 4,
it will retrun CMD_RET_FAILURE when argc value not matched.

but bootpart-resize's maxarg is 3, which means you never execute
this sub-command successfully.

fix it by change bootpart-resize maxarg to 4.

Signed-off-by: wally.yeh 
Cc: Wolfgang Denk 
Cc: Pierre Aubert 
Acked-by: Pantelis Antoniou