9
0
Fork 0
Commit Graph

10516 Commits

Author SHA1 Message Date
Uwe Kleine-König 8abaf1ad71 net: provide alternatives to {ntoh, hton}[sl] funtions with cleaner semantics
ntohl always converts 32 bits even on archs where sizeof(long) == 8.
"ntoh32" is a much more intuitive name here. Also the name of the 64 bit
variant that is also added isn't questionable.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-02-10 09:02:20 +01:00
Uwe Kleine-König b104688cbb net: new function net_read_uint64
This is needed for nfs3 support as some types became bigger compared to
nfs2.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-02-10 09:02:20 +01:00
Uwe Kleine-König e668dc5336 nfs: drop an unneeded variable from nfs_do_open()
While at it also fix the type of flen holding a string length
(int -> size_t).

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-02-10 09:02:20 +01:00
Uwe Kleine-König 0f2c0a7edd nfs: simplify rpc_lookup_req
Instead of letting rpc_lookup_req set mount_port and nfs_port, let it
return the port found and let the caller use that information.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-02-10 09:02:20 +01:00
Uwe Kleine-König 2897531de6 nfs: shorten and simplify rpc_add_credentials a bit
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-02-10 09:02:20 +01:00
Uwe Kleine-König f91c16b8e2 nfs: skip over stale rpc packets
When a former transaction was aborted by hitting Ctrl-C the old reply might
still hang in the ethernet controller making all further transactions fail.

So just skip over old replies.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-02-10 09:02:20 +01:00
Uwe Kleine-König e674513448 nfs: fix mount prog version in portmap lookup
We're speaking rpc mount version 2 (i.e. the same version as the
implemented nfs protocol), so also specify that in the lookup.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-02-10 09:02:20 +01:00
Uwe Kleine-König 47eb6b50bb net: net_read_uint32: assert that only 32 bit are read
On some architectures (e.g. alpha, amd64, arm64, ia64, s390x, mips64)
sizeof(ulong) is 8 which made net_read_uint32 actually read too much and
even returned the wrong value on big endian machines.
(Note the second issue isn't that critical though, because the only
architecture from the list above that uses big endian byte order is s390x
...)

Also change the argument to void * because the pointer is not necessarily
properly aligned.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-02-10 09:02:20 +01:00
Cristiano De Alti 4f2f9150b7 cfi_flash.c: correct calculation of region erasesize and offset for multiple (size_ratio > 1) chips in parallel
Signed-off-by: Cristiano De Alti <cristiano_dealti@hotmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-02-04 08:21:51 +01:00
Sascha Hauer 1debe41a93 ARM: omap3: Add missing include
omap3-generic.h needs memcpy, include linux/string.h for this.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-02-03 15:12:56 +01:00
Sascha Hauer 1130a8b16f ARM: i.MX21 ads: remove garbage at end of #ifdef
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-02-03 15:12:29 +01:00
Sascha Hauer 2a1f5f802e ARM: rename boards to more consistent naming
This renames the Freescale and Phytec board directories and defconfig
files to a common naming scheme. The board directories are named
<vendor>-<board> and the defconfig files are named
<vendor>-<board>_defconfig. Also the DataModul realq7 is renamed to its
Marketing Name eDM-QMX6.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-02-03 15:09:14 +01:00
Sascha Hauer 46c034db92 Merge branch 'for-next/tegra' 2014-02-03 09:55:55 +01:00
Sascha Hauer adbf51abde Merge branch 'for-next/pxa' 2014-02-03 09:55:55 +01:00
Sascha Hauer ada75addee Merge branch 'for-next/ppc' 2014-02-03 09:55:55 +01:00
Sascha Hauer d08d73ba95 Merge branch 'for-next/net' 2014-02-03 09:55:55 +01:00
Sascha Hauer 52c43f5731 Merge branch 'for-next/mtd' 2014-02-03 09:55:55 +01:00
Sascha Hauer 601bf0fcc6 Merge branch 'for-next/misc' 2014-02-03 09:55:54 +01:00
Sascha Hauer 701d565c2a Merge branch 'for-next/mips' 2014-02-03 09:55:54 +01:00
Sascha Hauer d3c96d6522 Merge branch 'for-next/mci'
Conflicts:
	arch/arm/boards/tqma53/board.c
2014-02-03 09:55:52 +01:00
Sascha Hauer 4a53361beb Merge branch 'for-next/iomem'
Conflicts:
	arch/arm/mach-imx/external-nand-boot.c
2014-02-03 09:55:41 +01:00
Sascha Hauer c224cd3161 Merge branch 'for-next/imx'
Conflicts:
	arch/arm/boards/dmo-mx6-realq7/lowlevel.c
2014-02-03 09:55:13 +01:00
Sascha Hauer 3cbd92bf6e Merge branch 'for-next/gpio' 2014-02-03 09:52:34 +01:00
Sascha Hauer f4cece7db5 Merge branch 'for-next/clps711x' 2014-02-03 09:52:34 +01:00
Sascha Hauer ca10989374 Merge branch 'for-next/bootm' 2014-02-03 09:52:34 +01:00
Sascha Hauer fd6fe68e95 Merge branch 'for-next/arm' 2014-02-03 09:52:34 +01:00
Sascha Hauer bd8ba3c6a3 Release v2014.02.0
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-02-03 09:48:34 +01:00
Michael Grzeschik a4d39ca0f1 sandbox: update to new environment
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-02-03 08:58:54 +01:00
Michael Grzeschik 5dd2ee50d5 sandbox: update defconfig to use new environment
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-02-03 08:58:53 +01:00
Alexander Shiyan 8462cd6c32 Make generated variables static
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-02-03 08:58:22 +01:00
Sascha Hauer cc66cf109b ARM: i.MX: Add lowlevel gpio functions
Some boards need gpio functions very early and also sometimes
is useful to toggle gpios during early code debug. This adds a header
file for setting i.MX gpios early.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-02-01 18:51:32 +01:00
Sascha Hauer 021890a39e ARM: i.MX: Karo TX25: Switch to multiboard support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-02-01 18:51:28 +01:00
Sascha Hauer 0e80f5b4cc ARM: i.MX: cleanup bootmode selection
Which bootmode is selected has no longer to be chosen by Kconfig. The
boards can decide themselves which bootmode they want to support. This
makes it unnecesary to ask the user which bootmode shall be supported,
so the "Select boot mode" becomes invisible and both support will be
compiled in as needed by the boards. NAND_IMX_BOOT goes away and the
already existing ARCH_IMX_EXTERNAL_BOOT_NAND can now be used for the
boards to depend on external nand boot.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 21:30:32 +01:00
Sascha Hauer 23f23a7224 ARM: i.MX25: Karo TX25: Switch to devicetree support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 21:30:32 +01:00
Sascha Hauer 2cca917c48 ARM: dts: Karo TX25: add barebox specifics
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 21:30:32 +01:00
Sascha Hauer 895f43dc9a ARM: dts: Karo TX25: add phy supply for fec
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 21:30:32 +01:00
Sascha Hauer 5519f7dd72 ARM: dts: Karo TX25: add missing nfc properties
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 21:30:32 +01:00
Sascha Hauer ae0afcb155 ARM: dts: Karo TX25: Add phy-reset-gpio
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 21:30:32 +01:00
Sascha Hauer 7b7f56fe69 ARM: dts: Karo TX25: Add pinctrl nodes
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 21:30:32 +01:00
Sascha Hauer a1b5185793 ARM: dts: i.MX25: Add iram to devicetree
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 21:30:31 +01:00
Sascha Hauer 936161bff9 ARM: dts: Add i.MX25 Karo TX25 dts
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 21:30:31 +01:00
Sascha Hauer 45c5110587 ARM: i.MX25: Add missing GPT clock lookups
Only one GPT will be used, but with devicetree support we can't predict
which one it is, so we need the clock lookup for all GPTs to ensure
that the timer gets its clock.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 21:29:34 +01:00
Sascha Hauer fe0a08f1a1 ARM: dts: i.MX25: remove disabled status of usbmisc unit
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 18:51:53 +01:00
Sascha Hauer 8d60419b0c ARM: dts: i.MX25: Add mmc aliases
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 18:51:53 +01:00
Sascha Hauer 0ac7bd5e90 ARM: dts: Add i.MX25 devicetree files
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 18:51:53 +01:00
Sascha Hauer 8e174d41f0 mci: imx-esdhc: Add i.MX25 compatible entry
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 18:51:53 +01:00
Sascha Hauer 7ebb5fbb58 ARM: i.MX: external NAND boot: make dtb boarddata work
If we are running from NFC SRAM and we are passed boarddata
containing a devicetree pointer then it point to an address relative
to the NFC SRAM start. First thing we do is to copy the initial
binary to SDRAM and jump there. The devicetree pointer has to be
adjusted by this offset.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 18:51:53 +01:00
Sascha Hauer 3711a1d8e7 ARM: i.MX: external NAND boot: use image size from image header
When compiling with multiimage support ld_var(_barebox_image_size) only
contains the length of the PBL image, but not including the appended
compressed data. With this patch the image size is read from the barebox
header instead which contains the correct size, either from the linker
or from the fix_size tool.
This makes the external_nand_boot compatible with multiimage support.

Tested on Phytec phyCARD-i.MX27 with and without PBL.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 18:51:53 +01:00
Sascha Hauer bf6846cacc images: fix image size in pblx
The pblx is a self extracting barebox binary. This doesn't have
the size of the image correctly set because the linker doesn't
generate it for relocatable binaries.
This currently only works on ARM, but this is the only architecture
supporting multi images anyway. TO make it work on other architectures
fix_size would have to be extended to recognize other images.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 18:51:53 +01:00
Sascha Hauer e3ed260db7 scripts: fix_size: check magic
Instead of passing the offset to the fix_size tool check the image to
fixup for a valid header so that only recognized files are fixed up.
This makes the usage of this tool safer.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-31 18:51:49 +01:00