u-boot.git/common, branch v2012.10-rc1

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

2012-09-21T21:53:13+00:00

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

2012-09-21T16:29:38+00:00

Revert "memsize: Fix for bug in memory sizing code"

2012-09-21T15:14:05+00:00

After further investigation this change is not correct and results in
get_ram_size returning incorrectly large values.  Reported first by
Gerlando Falauto.

This reverts commit b8496cced856ff411f1eb2e4eff20f5abe7080b0.

Signed-off-by: Tom Rini

usb: do explicit unaligned accesses

2012-09-20T22:05:00+00:00

usb_hub_descriptor has to be packed as it's used for
communication with the device. Member wHubCharacteristics
violates the natural alignment rules.

Use explicit unaligned access functions for this member.
Fixes ARMv7 traping while using USB.

v2: fix typo found by Thomas Langer

v3: rebased on top of u-boot-usb/master

Signed-off-by: Lucas Stach

Merge branch 'ext4'

2012-09-20T18:27:35+00:00

Update Makefile change for LIBS -> LIBS-y change.

Conflicts:
	Makefile

Signed-off-by: Tom Rini

env: make "env default" selective, check and apply

2012-09-18T19:01:52+00:00

Change the syntax (user API) for "env default":
  -f: override write-once variables
  var... : accept individual variable(s)
  -a: all (resetting the whole env is NOT the default behavior)

Enable variable checking and make changes effective by
enabling do_apply argument to himport_r().

Signed-off-by: Gerlando Falauto

env: check and apply changes on delete/destroy

2012-09-18T19:01:52+00:00

Signed-off-by: Gerlando Falauto 
Reviewed-by: Marek Vasut

env: add check/apply logic to himport_r()

2012-09-18T19:01:52+00:00

Change hashtable so that a callback function will decide whether a
variable can be overwritten, and possibly apply the changes.

So add a new field to struct hsearch_data:

 o "apply" callback function to check whether a variable can be
    overwritten, and possibly immediately apply the changes;
    when NULL, no check is performed.

And a new argument to himport_r():
 o "do_apply": whether to call the apply callback function

NOTE: This patch does not change the current behavior.

Signed-off-by: Gerlando Falauto 
Reviewed-by: Marek Vasut

env: make himport_r() selective on variables

2012-09-18T19:01:52+00:00

Add 2 new arguments to himport_r():

 o "nvars", "vars": number and list of variables to take into account
   (0 means ALL)

NOTE: This patch does not change the current behaviour.

Signed-off-by: Gerlando Falauto 
Reviewed-by: Marek Vasut

env: unify logic to check and apply changes

2012-09-18T19:01:52+00:00

The logic of checking special parameters (e.g. baudrate, stdin, stdout,
for a valid value and/or whether can be overwritten) and applying the
new value to the running system is now all within a single function
env_check_apply() which can be called whenever changes are made
to the environment, no matter if by set, default or import.

With this patch env_check_apply() is only called by "env set",
retaining previous behavior.

Signed-off-by: Gerlando Falauto 
Reviewed-by: Marek Vasut