summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Release v2014.08.0v2014.08.0Sascha Hauer2014-08-041-1/+1
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: AM335x: Beaglebone: enable ethernetJan Luebbe2014-08-041-1/+2
| | | | | | | | The ethernet mac and mdio nodes must be explicitly enabled to override the disabled setting in am33xx.dtsi. Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* of_partition: devfs_add_partition returns an error pointerSascha Hauer2014-08-011-0/+4
| | | | | | | | Check for the return value of devfs_add_partition with IS_ERR. Otherwise we dereference a NULL pointer when devfs_add_partition fails. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* images: get rid of remaining imximage-ySascha Hauer2014-07-301-5/+0
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: at91: clock: fix the pllb checkingBo Shen2014-07-291-1/+1
| | | | | | | | On at91sam9n12 soc, it has pllb, while on sama5d3 soc, it doesn't has pllb. Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* fs: ext4: le32_to_cpu() used on a 16-bit fieldSascha Hauer2014-07-251-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | From U-Boot commit: | commit 8b415f703f88d1d3b0466830047affbbf7f24913 | Author: Rommel Custodio <sessyargc+uboot@gmail.com> | Date: Sun Jul 21 10:53:25 2013 +0200 | | ext4fs: le32_to_cpu() used on a 16-bit field | | Fix reading ext4_extent_header struture on BE machines. Some 16 bit | fields where converted to 32 bit fields, due to the byte swap on BE | machines the containing value was corrupted. Therefore reading ext4 | filesystems on BE machines where broken before. | | Signed-off-by: Rommel Custodio <sessyargc+uboot@gmail.com> | [sent via git-send-email; rework commit message] | Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com> | Reviewed-by: Simon Glass <sjg@chromium.org> | Tested-by: Simon Glass <sjg@chromium.org> | Tested-by: Lukasz Majewski <l.majewski@samsung.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* fs: ext4: use EXT2_BLOCK_SIZE instead of fs->blkszSascha Hauer2014-07-251-1/+2
| | | | | | | | | | | | | | | | | | | | From U-Boot commit: | commit 470173274d9ceb18a7140ef93e20be6c2236e7d9 | Author: Ionut Nicu <ioan.nicu.ext@nsn.com> | Date: Mon Jan 13 11:59:24 2014 +0100 | | ext4fs: use EXT2_BLOCK_SIZE instead of fs->blksz | | Using fs->blksz in ext4fs_get_extent_block() is not | correct since fs->blksz is not initialized on the | read path. Use EXT2_BLOCK_SIZE() instead which will | produce the desired output. | | Signed-off-by: Ionut Nicu <ioan.nicu.ext@nsn.com> | Signed-off-by: Mathias Rulf <mathias.rulf@nsn.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* fs: ext4: fix "invalid extent block" errorSascha Hauer2014-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From U-Boot commit: | commit b5bbac1a9b07016602559ff483df265fef6c1f83 | Author: Ionut Nicu <ioan.nicu.ext@nsn.com> | Date: Mon Jan 13 12:00:08 2014 +0100 | | ext4fs: fix "invalid extent block" error | | For files where we actually have extent indexes following | an extent header (ext_block->eh_depth != 0), the do/while | loop from ext4fs_get_extent_block() does not select the | proper extent index structure. | | For example, if we have: | | ext_block->eh_depth = 1 | ext_block->eh_entries = 1 | fileblock = 0 | index[0].ei_block = 0 | | the do/while loop will exit with i set to 0 and the | ext4fs_get_extent_block() function will return 0, even if | there was a valid extent index structure following the | header. | | Signed-off-by: Ionut Nicu <ioan.nicu.ext@nsn.com> | Signed-off-by: Mathias Rulf <mathias.rulf@nsn.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* barebox: common: Add missing filetype descriptionWadim Egorov2014-07-241-0/+1
| | | | | | | Added missing filetype description for UBIFS. Signed-off-by: Wadim Egorov <w.egorov@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* mmu: flush ttb in map_io_sectionsLucas Stach2014-07-221-0/+1
| | | | | | | | We need to flush out the ttb in order to make the changes observable to the page walker. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* scripts/checkpatch.pl: don't search for Doxyfile when checking ↵Antony Pavlov2014-07-221-1/+1
| | | | | | | | | | | | | | | | | | | top_of_kernel_tree() Doxygen documentation is removed in the commit commit 98360be0fefd58bf27df03c47d887dd676a31d73 Author: Sascha Hauer <s.hauer@pengutronix.de> Date: Tue Jun 17 10:27:03 2014 +0200 Documentation: remove doxygen documentation But checkpatch.pl still trying to check 'Doxyfile' presence. There is not such 'Doxyfile' and checkpatch.pl exits with 'Must be run from the top-level dir. of a kernel tree' message. Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* arch/arm/lib/bootm: fix length check of kernel imagebasti@linux-source.de2014-07-221-1/+1
| | | | | Signed-off-by: Sebastian Block <basti@linux-source.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* tftp: more helpful help textPavel Machek2014-07-221-1/+2
| | | | | | | | It took me a while to figure out syntax of tftp command, document that server address is taken from environment. Signed-off-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: i.MX: esdctl: i.MX53 has esdctl v4, not v3Sascha Hauer2014-07-181-2/+2
| | | | | | | | On the i.MX53 this has the effect that in early init only half of the memory bank is detected and the barebox image is place in the middle of SDRAM. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* images: ignore and clean *.mlo/*.mlospiSascha Hauer2014-07-112-1/+3
| | | | | | Add *./mlo and *.mlospi to the clean rule and to .gitignore. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Revert "ARM: OMAP: Do not show MLO/SPI image options with OMAP_MULTI_BOARDS"Sascha Hauer2014-07-112-2/+1
| | | | | | | The assumption that OMAP_BUILD_IFT is unused for multi board support is wrong. It is indeed used, so revert the patch. This reverts commit d1ec6fb0c9bb66939e85964c2f5214b117c78ecf.
* PCM051: Update RAM timingsTeresa Gámez2014-07-091-15/+13
| | | | | | | | | Updated timings for new MT41J256M16HA15EIT RAM. Timings are backward compatible to the MT41J256M8HX15E RAMs Signed-off-by: Teresa Gámez <t.gamez@phytec.de> Signed-off-by: Wadim Egorov <w.egorov@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* barebox: common: added new filetypesWadim Egorov2014-07-092-0/+14
| | | | | | | | | - Added omap CH image header recognition * filetype_ch_image * filetype_ch_image_be Signed-off-by: Wadim Egorov <w.egorov@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Documentation: add uemd mb7707 barebox mini-howtoAntony Pavlov2014-07-091-0/+40
| | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* pci: pci_alloc_bus(): use xzalloc() instead of kzalloc()Antony Pavlov2014-07-091-8/+8
| | | | | | | | Also drop redundant xzalloc() result check as xzalloc() does not return in case of memory allocation error. Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* drivers/mtd: fix NULL pointer dereference in partition lock/unlockZahari Doychev2014-07-091-0/+6
| | | | | | | | Some mtd device does not support lock and unlock functions. Adding this check avoids crashing when mtd_part_lock/unlock are called for such devices. Signed-off-by: Zahari Doychev <zahari.doychev@linux.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Fix crc32 compile errorSascha Hauer2014-07-081-1/+1
| | | | | | | | | | | | | | | This fixes a compile error introduced with: | commit 37f47a2a8c2dba420a849625b2926dacdc23cf49 | Author: Robert P. J. Day <rpjday@crashcourse.ca> | Date: Mon Jul 7 05:36:33 2014 -0400 | | crc32: Proper name of command is "crc32". | | Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Do not use macros in command helpSascha Hauer2014-07-083-3/+3
| | | | | | | The help texts are parsed by sphinx which cannot handle macros, so replace them with their values. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* crc32: Proper name of command is "crc32".Robert P. J. Day2014-07-082-2/+2
| | | | | Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: OMAP: Do not show MLO/SPI image options with OMAP_MULTI_BOARDSSascha Hauer2014-07-072-1/+2
| | | | | | | The MLO/SPI image options have no effect with OMAP_MULTI_BOARDS enabled, so do not show them. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* at91mux: Fix both help info and Kconfig info.Robert P. J. Day2014-07-072-3/+3
| | | | | | | Correct options are, in fact, -p and -b. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Clean up Kconfig and source for a couple device tree commands.Robert P. J. Day2014-07-073-3/+4
| | | | | | | Correct options listings for a couple device tree-related commands. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* bootm.c: "-o" option should refer to "DTB", not "DTS"Robert P. J. Day2014-07-071-3/+3
| | | | | | | Fix option explanation, and a couple grammar fixes. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* rtc.h: drop unused U-Boot stuff; fix whitespaceAntony Pavlov2014-07-071-5/+1
| | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* kconfig: Fix compiler warningSascha Hauer2014-07-051-1/+1
| | | | | | | | gcc-4.9 is too silly to recognize that *jump cannot be used uninitialized and issues a warning. Explicitly initialize *jump to avoid the warning. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/net'Sascha Hauer2014-07-0410-5/+1552
|\
| * net: add ENC28J60 supportAntony Pavlov2014-07-024-0/+1334
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ENC28J60 is a stand-alone Ethernet controller with SPI Interface and integrated 10BASE-T PHY. This driver was ported from linux-3.15. The most notable barebox driver version changes: * add device tree support; * drop netif_msg_*() debug level checking; * use IF_ENABLED for checking CONFIG_ENC28J60_WRITEVERIFY; * add mii_bus support. Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * net.h: add ETH_ALEN constant; fix whitespacesAntony Pavlov2014-07-021-3/+5
| | | | | | | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * net: phy: add support for Marvell PHY driversSebastian Hesselbarth2014-06-253-0/+205
| | | | | | | | | | | | | | | | This adds initial support for Marvell PHY specific drivers. As a first PHY, a driver for MV88E1121R is ported over from Linux. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * net: orion-gbe: extend RGMII detection to delayed modesSebastian Hesselbarth2014-06-251-1/+4
| | | | | | | | | | | | | | | | | | RGMII PHY modes include delayed interface modes RGMII_ID, RGMII_TXID, and RGMII_RXID. Also check for those modes when setup RGMII mode in port serial ctrl register. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * net: orion: generate unique port device namesSebastian Hesselbarth2014-06-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Marvell Orion ethernet IP originally is multi-port capable, but SoCs using the IP usually have multiple single-port controllers built in. Currently, orion-gbe driver registers each port device with a constant name, which causes a name conflict with multiple controller instances. This patch uniquifies port device name generation by prepending controller's base register address to resolve the name conflict. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * of: net: respect phy-connection-type propertySebastian Hesselbarth2014-06-251-0/+2
| | | | | | | | | | | | | | | | | | ePAPR defines phy-connection-type as standard property for PHY interface between Ethernet device and PHY device. Add corresponding property check to of_get_phy_mode. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/misc'Sascha Hauer2014-07-0461-314/+128
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/boards/chumby_falconwing/falconwing.c arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c arch/x86/mach-x86.dox scripts/setupmbr/setupmbr.c
| * | ls: sort files with -lSascha Hauer2014-07-031-26/+28
| | | | | | | | | | | | | | | | | | | | | | | | Always collect directory entries in a string_list and evaluate it later. This makes sure that the files are printed alphabetically even when -l is given. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | string_list: Add string_list_for_each_entry macroSascha Hauer2014-07-032-3/+6
| | | | | | | | | | | | | | | | | | To ease iterating over a string_list. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | lz4: fix another possible overrunHolger Schurig2014-07-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: this is the same as 4148c1f67abf823099b2d7db6851e4aea407f5ee in linux-git. There is one other possible overrun in the lz4 code as implemented by Linux at this point in time (which differs from the upstream lz4 codebase, but will get synced at in a future kernel release.) As pointed out by Don, we also need to check the overflow in the data itself. While we are at it, replace the odd error return value with just a "simple" -1 value as the return value is never used for anything other than a basic "did this work or not" check. Reported-by: "Don A. Bailey" <donb@securitymouse.com> Reported-by: Willy Tarreau <w@1wt.eu> Signed-off-by: Holger Schurig <holgerschurig@gmail.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | lz4: ensure length does not wrapHolger Schurig2014-07-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: this is the same as 206204a1162b995e2185275167b22468c00d6b36 in linux-git. Given some pathologically compressed data, lz4 could possibly decide to wrap a few internal variables, causing unknown things to happen. Catch this before the wrapping happens and abort the decompression. Reported-by: "Don A. Bailey" <donb@securitymouse.com> Signed-off-by: Holger Schurig <holgerschurig@gmail.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | lzo: properly check for overrunsHolger Schurig2014-07-021-22/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: this is the same as 206a81c18401c0cde6e579164f752c4b147324ce in linux-git. The lzo decompressor can, if given some really crazy data, possibly overrun some variable types. Modify the checking logic to properly detect overruns before they happen. Reported-by: "Don A. Bailey" <donb@securitymouse.com> Tested-by: "Don A. Bailey" <donb@securitymouse.com> Signed-off-by: Holger Schurig <holgerschurig@gmail.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | mii-tool: make the 'No MII transceiver present!' message more clearAntony Pavlov2014-07-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppose you have two network controllers. The first one is ENC28J60 (it is in low power mode after start) the second one is always-enabled eth1. As ENC28J60 is in low power mode before enc28j60_eth_open() is called. ENC28J60's mii traceiver is in low power mode too so the mii traceiver's register are inaccessable. Here is a sample log just after barebox start: barebox:/ miitool miibus0: registered phy as /dev/phy0 No MII transceiver present!. miibus1: registered phy as /dev/phy1 phy1: eth1: negotiated 100baseTx-FD, link ok barebox:/ miitool No MII transceiver present!. phy1: eth1: negotiated 100baseTx-FD, link ok The 'No MII transceiver present!.' message is confusing here. This patch fixes the problem so the miitool output looks like this: barebox:/ miitool phy0: spieth0: No MII transceiver present!. phy1: eth1: negotiated 100baseTx-FD, link ok Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | boot: fix typoRolf Evers-Fischer2014-07-011-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Rolf Evers-Fischer <rolf.evers.fischer@delphi.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | scripts: tegra: add gitignoreLucas Stach2014-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | Keep the git status area clean of generated binaries. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | sdma.h: Typo, "interupt" -> "interrupt"Robert P. J. Day2014-06-301-2/+2
| | | | | | | | | | | | | | | | | | | | | Fix only two "interupt" misspellings in entire barebox codebase. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | Fix misspellings of "persistant" -> "persistent" in various placesRobert P. J. Day2014-06-307-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | Fix misspellings of "persistent", including the renaming of a function to "register_persistant_environment". Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | sandbox: add bit manipulation stuffHolger Schurig2014-06-261-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | The functions are already in the sandbox, just the #defines are missing. Signed-off-by: Holger Schurig <holgerschurig@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | common: resource: print conflicts as warningAlexander Aring2014-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Crazy things happen if there are resource conflicts and a device probe runs dev_request_mem_region. The dev_request_mem_region returns a start pointer which is zero. The probe function doesn't check on this and probing the device on zero base address. To debug this in debug log level there are many other outputs. This patch replace the debug print to a warning printout. A conflict should normally never happen. If there is a conflict it's much easier to see it with this patch. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>