Merge branch 'for-next/net'

Merge branch 'for-next/mxs'

Merge branch 'for-next/mtd' ...

Conflicts:
	drivers/mtd/core.c

Merge branch 'for-next/misc'

Merge branch 'for-next/imx-bbu-nand-fcb' ...

Conflicts:
	common/Kconfig

Merge branch 'for-next/dts'

Merge branch 'for-next/doc'

Merge branch 'for-next/cfi-flash'

Merge branch 'for-next/blspec'

Merge branch 'for-next/bbu'

Merge branch 'for-next/am335x'

usb: musb: Use proper timeout loop ...

Poll for a well defined time in musb_init. The current counting loop
takes too short for some devices. Tested on OMAP3 with a rather slowish
memory stick.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Release v2015.07.0 ...

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: beagleboard: register update handlers for NAND ...

To make updating barebox to nand easy. To bootstrap from a SD
card:

barebox_update -t nand-xload /boot/MLO
barebox_update -t nand /boot/barebox.bin

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

treewide: replace __inline__ with inline ...

inline is preferred over __inline__

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

blackfin: replace extern inline with static inline ...

Replaced in the kernel a long time ago, not compatible with gcc5.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ppc: replace extern inline with static inline ...

Replaced in the kernel a long time ago, not compatible with gcc5.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

sandbox: asm/byteorder.h: fix guard macro name ...

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

treewide: fix 'new blank line at EOF' formatting error ...

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

read_file_2(): drop unnecessary 'else' ...

Signed-off-by: Alexander Smirnov <alllecs@yandex.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

parameter: always build MAC dev param functions ...

The MAC dev parameter functions would only be built when CONFIG_NET is
set. This was okay as long as only network devices were using MAC dev
params. This has changed with the merge of the state framework, so
always compile them in if CONFIG_PARAMETER is set.

Fixes:
common/built-in.o: In function `state_mac_create':
common/state.c:387: undefined reference to `dev_add_param_mac'

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

net: Move library functions to net/lib.c ...

Some network related functions are also needed when networking
is disabled. Move these to a separate file which is always compiled.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: start: Fix code reordering problem ...

This adds a barrier after setup_c(). This is necessary because otherwise
some global variable assignments may be reordered by the compiler to be
executed before setup_c which cannot work.
This was observed when doing other unrelated changes to the start function,
it seems in current mainline state the compiler does not actually reorder
the code.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: AM335x: replace specific barebox update handler with generic one ...

The AM335x SPI NOR barebox update handlers only writes a file to a device,
so use the generic handler for this purpose.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

bbu: Add a standard file-to-device-copy handler ...

The most standard update handler will simply copy a file to a device.
This can be shared across several users, so add a standard handler for
this operation.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

dns: handle incoming packets in the separate dns_recv() function ...

The separation of incoming packets handling makes it much easier
to run barebox dns client on top of picotcp network stack in the future.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mx53-qsb: Fix boot hang during reboot stress test ...

Fix the DDR init sequence the same way as done by aee0013e53b339a5
from U-boot in order to prevent the boot hang under reboot stress test.

Quoting this commit log:

"Currently by running the following test:

=> setenv bootcmd reset
=> save
=> reset

, we observe a hang after approximately 20-30 minutes of stress reboot test.

Investigation of this issue revealed that when a single DDR chip select is used,
the hang does not happen. It only happens when the two chip selects are active.

MX53 reference manual states at "28.6.2 Memory ZQ calibration sequence":

"The controller must keep the memory lines quiet (except for CK) for the ZQ
calibration time as defined in the Jedec (512 cycles for ZQCL after reset, 256
for other ZQCL and 64 for ZQCS)."

According to the SDE_0 and SDE_1 bit descriptions from register ESDCTL_ESDCTL:

"Writing 1 to SDE0 or SDE1 will initiate power up delays as JEDEC defines.
Power up delays are a function of the configured memory type (DDR2/DDR3/LPDDR2)"

So make sure to activate one chip select at time (CS0 first and then CS1 later),
so that the required JEDEC delay is respected for each chip select.

With this change applied the board has gone through three days of reboot stress
test without any hang."

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

tftp_recv(): handle opcode field in a more natural way ...

RFC1350 uses the 'opcode' term for the first 2-bytes field
of TFTP packet. But the U-boot tftp code uses the 'proto' term
for the same thing.

The patch takes back original term and makes opcode calculation
more clear.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

tftp_recv(): according to RFC1350 minimal tftp packet length is 4 bytes ...

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

fs/tftp: handle incoming packets in the separate tftp_recv() function ...

The separation of incoming packets handling makes it much easier
to run barebox tftp client on top of picotcp network stack in the future.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>