9
0
Fork 0
Commit Graph

11285 Commits

Author SHA1 Message Date
Sascha Hauer d9e2694a65 Merge branch 'for-next/clps711x' 2014-07-04 17:19:40 +02:00
Sascha Hauer 06b5693bdc Merge branch 'for-next/arm-versatile' 2014-07-04 17:19:40 +02:00
Sascha Hauer 9bcf0bcc06 Merge branch 'for-next/arm-errata'
Conflicts:
	arch/arm/boards/phytec-phyflex-imx6/lowlevel.c
2014-07-04 17:19:38 +02:00
Sascha Hauer 9af0ac86c9 Release v2014.07.0
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-07-04 16:58:13 +02:00
Sascha Hauer d44edfe4f9 ARM: i.MX6 Phytec phyFLEX: Add watchdog reset workaround
phyFLEX boards beginning with 1362.2 have a workaround for this
i.MX6 bug:

ERR006282 ROM code uses nonreset PFDs to generate clocks, which may
lead to random boot failures

On these boards the SD4_DAT3 pin os connected to the CMIC. The CMIC
will reset the board after 10s when the pin isn't toggled.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-07-04 07:44:38 +02:00
Renaud Barbier c8890e057a mtd: delete partition erase size initialisation
Delete the partition erase size initialisation to let the code
that follows determine the biggest partition erase size.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-07-03 09:00:06 +02:00
Sascha Hauer 621266d3a4 automount: check for recursive automount
automount_mount calls run_command which may trigger an automount
again. This results in an endless loop. A simple way to trigger
this is:

mkdir /x; automount /x false; cd /x; something

Use a static variable to detect if we are currently in automount_mount()
and bail out if we are.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-07-03 08:16:42 +02:00
Holger Schurig 477199c684 menutree: let it select GLOB and GLOB_SORT
The menutree doesn't select CONFIG_GLOB, but it depends on it. Without
it will just hang. So let it select it automatically. Also remove the
dependency of CONFIG_GLOB on CONFIG_HUSH, because glob() will run with
the simple shell as well.

Also let CONFIG_MENUTREE select on CONFIG_GLOB_SORT. While is not
strictly needed, many people use menu/00-foo menu/10-bar menu/20-barf
to sort their menu entries. So select it out of convenience.

Signed-off-by: Holger Schurig <holgerschurig@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-07-02 07:26:55 +02:00
Christian Hemp d1360672e8 imx6:phyFLEX: Fix ENTRY_FUNCTION
For some phyFLEX-i.MX6 modules the call __barebox_arm_head() was not removed.
With this function the barebox does not start.

Signed-off-by: Christian Hemp <christian.hemp@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-26 21:38:17 +02:00
Holger Schurig 8eaa3b0fd8 commands: include missing header
When compiled for ARCH=sandbox, we get a compiler warning
if we don't include the needed header file as well.

Signed-off-by: Holger Schurig <holgerschurig@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-26 21:16:13 +02:00
Sascha Hauer bbc70303c7 kernel-install: fix return value check for getline
getline returns the number of characters read, so check for
ret < 0 instead of ret.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-26 09:44:47 +02:00
Lucas Stach db158af8cd arm: tegra: enable ARM errata workarounds
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-26 08:05:21 +02:00
Lucas Stach 3acaa78fd8 arm: imx6: use imx6 specific cpu init function
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-26 08:05:21 +02:00
Lucas Stach 0dd421f272 arm: imx6: add cpu lowlevel init function
Enables all relevant errata workarounds for the
i.MX6 SoC.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-26 08:05:21 +02:00
Lucas Stach 2412f46dd3 arm: add errata workarounds
Header only implementation, so they can be pulled
into the individual SoC cpu init functions.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-26 08:05:21 +02:00
Sascha Hauer 40d89c4977 ifup: Add comment why xxx-discover files have to be skipped
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-23 10:05:40 +02:00
Sascha Hauer b61f924334 ARM: i.MX efika-sb: switch otg port to utmi mode
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-23 09:29:53 +02:00
Sascha Hauer 7aa5486aa0 ARM: imx_v7_defconfig: update
Enable blspec and menutree support which was lost.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-23 09:14:46 +02:00
Sascha Hauer 096e5c856b net: ifup: skip *-discover files for ifup -a
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-23 09:14:31 +02:00
Antony Pavlov b603e3472e ARM: versatilepb_defconfig: enable devicetree support
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-23 08:45:56 +02:00
Antony Pavlov 72621fddfc ARM: versatile: switch to devicetree support
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-23 08:45:56 +02:00
Antony Pavlov daa3e125ab i2c: versatile: add devicetree support
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-23 08:45:55 +02:00
Antony Pavlov bfdc69adaf ARM: versatile: drop redundant <mach/gpio.h>
The arch/arm/include/asm/gpio.h header file contains

  #ifndef CONFIG_GPIOLIB
  #include <mach/gpio.h>
  #else
  #include <asm-generic/gpio.h>
  #endif

We use CONFIG_GPIOLIB=y for the only mach-versatile
Versatile/PB board so there is no need of <mach/gpio.h>.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-23 08:45:55 +02:00
Sascha Hauer 429717b48c boot: Fix boot -m
We have to continue when bootentries_collect succeeds, not when it fails.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-19 09:43:09 +02:00
Antony Pavlov 636052ce1d commands: gpio_direction_output: add missed VALUE parameter to help message
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-17 20:35:40 +02:00
Philipp Zabel cfd028800e ARM: AM335x: Beaglebone: Fix memory setup for Beaglebone black
Commit 0d6392de4a introduced a stripped
down device tree used for both white and black Beaglebone variants
that included the 256 MiB memory node from am335x-bone-common.dtsi.
This leads to the following error in the MLO:

    mmu: Critical Error: Can't request SDRAM region for ttb at 9fff4000

This patch removes the (for the Beaglebone black) invalid memory size
from the common device tree and instead registers the memory bank
manually in the board file.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-17 20:33:53 +02:00
Herve Codina 3ee907d89e mtd: use long long dev param for size
Signed-off-by: Herve Codina <Herve.CODINA@celad.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-13 06:27:34 +02:00
Herve Codina f2e86a2964 param: Add support for long long read only dev param
Signed-off-by: Herve Codina <Herve.CODINA@celad.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-13 06:27:34 +02:00
Sascha Hauer aca00bb719 ARM: Phytec-phyCARD-imx27: Add missing compatible check
Only run pca100 code when it's actually a pca100. While at it
consolidate two initcalls.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-12 08:33:55 +02:00
Sascha Hauer 693b92d58a Merge branch 'pu/mii-tool' 2014-06-11 08:48:45 +02:00
Sascha Hauer 40a1897e88 mips: Fix dtb build rules
Add intermediate .S files to .SECONDARY. Otherwise make deletes them
and regenerates them each build.
Also remove KBUILD_DTBS since the make system descends in dts/ anyway.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-11 08:48:39 +02:00
Sascha Hauer 7eb8f2a59c mii-tool: Fix gigabit advertise / link partner ability mixup
bmcr2 contains the gigabit advertise bits and lpa2 contains the gigabit
link partner ability bits, not the other way round.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-11 08:47:40 +02:00
Sascha Hauer e5a0223b9e mii-tool: Fix gigabit link test
media_list tests for gigabit phys like this:

if (mask & BMCR_SPEED1000)

mask does not contain the value of the BMCR register though, so the
test is completely bogus. Test for mask2 instead which is only
nonzero when the phy has gigabit capabilities.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-11 08:47:40 +02:00
Sascha Hauer 68376f82e8 mii-tool: Fix string length
media_list writes into a static string. Worst case length of this string
is 125 bytes, but the function only allocates 100 bytes. Use 256 bytes which
is long enough for some extensions.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-11 08:47:40 +02:00
Antony Pavlov 8e89bc594a treewide: remove address of the Free Software Foundation
The FSF address has changed; The FSF site says that
address is

  Free Software Foundation
  51 Franklin Street, Fifth Floor
  Boston, MA 02110-1301
  USA

(see http://www.fsf.org/about/contact/)

Instead of updating it each time the address changes,
just drop it completely treewide.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-11 08:35:25 +02:00
Sascha Hauer 70579ca94f mtd: partition: implement lock/unlock
CFI Nor flashes need lock/unlock which is not implemented for partitions.
Fix this.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-10 13:55:23 +02:00
Sascha Hauer 02fed023e1 mtd: partition: Fix multi eraseregion chips
The current code counts the eraseregions a new partition spans and
sets the partitions number of eraseregions accordingly, but the code
forgets to allocate and fill in the eraseregions for the partition
mtd device. This makes the erase operation crash with a NULL pointer
exception.
This patch fixes this with the same approach the kernel uses: Set
the number of eraseregions to 1 unconditionally and the eraseregion
size to the maximum of the eraseregions found in the partition.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-10 13:52:03 +02:00
Antony Pavlov 436ea81f52 MIPS: dts: add .gitignore for generated files
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-10 09:08:57 +02:00
Antony Pavlov 6af1781bbb make .gitignore files visible to git
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-10 09:08:57 +02:00
Herve Codina d2d058365c mtd: fix mtd erasesize
Set mtd erasize using max erasesize from erase regions

Signed-off-by: Herve Codina <Herve.CODINA@celad.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-10 08:38:39 +02:00
Herve Codina 4d032fd6fa mtd: Fix writesize parameter value
Signed-off-by: Herve Codina <Herve.CODINA@celad.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-10 08:38:21 +02:00
Sascha Hauer 811a79e07e Merge branch 'pu/warnings' 2014-06-06 06:37:09 +02:00
Alexander Shiyan b085ae5e64 ARM: dts: Remove orphaned i.MX27 DT template
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-06 06:36:38 +02:00
Alexander Shiyan bad06f0a1a ARM: clep7212: Make partition names more generic
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-06 06:35:43 +02:00
Alexander Shiyan f662f9b622 ARM: clps711x: Remove unused UART bit definitions
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-06 06:35:43 +02:00
Alexander Shiyan c029f83899 ARM: clps711x: Prepare common init function to DT support
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-06 06:35:43 +02:00
Alexander Shiyan 905d36b841 2048: Reset score on startup
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-06 06:33:53 +02:00
Sascha Hauer 0d6392de4a ARM: AM335x: Beaglebone: Use stripped down devicetree for MLO
The beaglebone white and black have different devicetrees. Both
get linked into the MLO which makes it too big. Use a devicetree
generated from am335x-bone-common.dtsi which both board variants
can share. This reduces the binary size by about 30k.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-05 12:09:11 +02:00
Sascha Hauer 13eb0229c1 mips: Add builtin dtb to dtb-y
Otherwise a rebuild of the dtb file is triggered each build.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-05 10:21:42 +02:00
Sascha Hauer 68ad2e4daa gui: IMAGE_RENDERER does not depend on VIDEO
Image renderer may not be particularly useful without framebuffer
support, but technically it does not depend on VIDEO. Fixes:

warning: (CMD_SPLASH) selects IMAGE_RENDERER which has unmet direct dependencies (VIDEO)

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-05 10:18:34 +02:00