summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge branch 'for-next/misc'Sascha Hauer2015-08-0635-206/+1138
|\ \ \ \ \ \
| * | | | | | mtd: nand_base: replace ifdef with IS_ENABLEAntony Pavlov2015-08-061-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | commands: Add dhrystoneDaniel Schultz2015-08-063-0/+452
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tool will help to measure the system performance. Some SoCs haven't the possibility to route their clocks to the output pins. So you can use dhrystone to get a feedback about the clock speed. Signed-off-by: Daniel Schultz <d.schultz@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | watchdog: add davinci watchdog driverJan Luebbe2015-08-033-0/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This driver is based on the Linux driver (v4.0). Signed-off-by: Jan Luebbe <jluebbe@debian.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | state: fix missing newline in error messageJan Luebbe2015-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan Luebbe <jluebbe@debian.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | state: handle write-protection in the raw backendJan Luebbe2015-08-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan Luebbe <jluebbe@debian.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | Limit data_abort_mask to !PBLSascha Hauer2015-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make memory_display usable in PBL Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM: don't allow Thumb2 on AT91Lucas Stach2015-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AT91 has a custom barebox head that doesn't support Thumb2. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM: rockchip: depend on OFTREELucas Stach2015-07-242-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current supported Rockchip board is initialized from a builtin DTB and I suppose all future boards will do the same. Fixes various missing functions and prototypes in Rockchip clk driver. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM: pxa: move mainstone TEXTBASE to KconfigLucas Stach2015-07-242-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So we can drop it from the defconfig and stop bothering the user with this choice by default. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | usb: gadget: serial: only call into CONSOLE_FULL code if it's thereLucas Stach2015-07-241-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: drivers/built-in.o: In function `gserial_connect': drivers/usb/gadget/u_serial.c:539: undefined reference to `console_set_active' Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | console: When deactivating a console, flush it firstSascha Hauer2015-07-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the last characters may not be sent before deactivating a console. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | mtd: of: put master offset into partition nameSascha Hauer2015-07-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partition names should be partition@<offset> with <offset> being the offset in the master mtd, and not a counting number. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM: i.MX6: clarify usage of /dev/imx-ocotpStefan Christ2015-07-201-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain the relationship between the OCOTP addresses from the i.MX6 Reference Manual and the file offset in '/dev/imx-ocotp'. Signed-off-by: Stefan Christ <s.christ@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | mtd: core: Check partitions for empty stringTeresa Remmet2015-07-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make setting partitions a litte bit more robust. Signed-off-by: Teresa Remmet <t.remmet@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | sandbox: Update defconfigSascha Hauer2015-07-201-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sandbox defconfig hasn't been updated for a long time. This enables tons of features since the binary size is not relevant at all for sandbox. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM: AM335x: dts: Fix wrong GPMC size mapping for omapsDaniel Schultz2015-07-163-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch is based on Linux upstream patch: commit e2c5eb78a3cc9b0d69ae924c33da50a4cd6d1fa4 Author: Tony Lindgren <tony@atomide.com> The GPMC binding is obviously very confusing as the values are all over the place. People seem to confuse the GPMC partition size for the chip select, and the device IO size within the GPMC partition easily. The ranges entry contains the GPMC partition size. And the reg entry contains the size of the IO registers of the device connected to the GPMC. Let's fix the issue according to the following table: Device GPMC partition size Device IO size connected in the ranges entry in the reg entry NAND 0x01000000 (16MB) 4 16550 0x01000000 (16MB) 8 smc91x 0x01000000 (16MB) 0xf smc911x 0x01000000 (16MB) 0xff OneNAND 0x01000000 (16MB) 0x20000 (128KB) 16MB NOR 0x01000000 (16MB) 0x01000000 (16MB) 32MB NOR 0x02000000 (32MB) 0x02000000 (32MB) 64MB NOR 0x04000000 (64MB) 0x04000000 (64MB) 128MB NOR 0x08000000 (128MB) 0x08000000 (128MB) 256MB NOR 0x10000000 (256MB) 0x10000000 (256MB) Let's also add comments to the fixed entries while at it. Signed-off-by: Daniel Schultz <d.schultz@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | regulator: Add support for regulator-boot-on device tree propertySascha Hauer2015-07-152-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | regulator: Factor out functions to work with regulator_internalSascha Hauer2015-07-151-41/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internally we only have a struct regulator_internal, so factor out regulator_enable_internal and regulator_disable_internal functions which can be called from regulator internal code. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | of/base: fix typoJan Luebbe2015-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan Luebbe <jluebbe@debian.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | spi: only register enabled child nodesJan Luebbe2015-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan Luebbe <jluebbe@debian.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | i2c: only register enabled child nodesJan Luebbe2015-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan Luebbe <jluebbe@debian.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM: am33xx: netboot use ramfsJan Remmet2015-07-082-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older tftp server don't send the file size. Then tftpfs needs temporary place to store the file. mount ramfs and then tftpfs in a own mount point Signed-off-by: Jan Remmet <j.remmet@phytec.de> Tested-by: Wadim Egorov <w.egorov@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | socfpga_mkimage: Fix/clarify error messageSascha Hauer2015-07-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The actual max_image_size may be smaller than the define MAX_IMAGE_SIZE due to the additional header needed, so print max_image_size in the error message. Also, when complaining about a too big image say how big the image actually is. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | build: update compiler*.h to newest versionsAlexey Galakhov2015-07-066-131/+314
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the support for gcc 5.x and clang. Signed-off-by: Alexey Galakhov <agalakhov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | | | Merge branch 'for-next/logo'Sascha Hauer2015-08-0628-22/+253
|\ \ \ \ \ \
| * | | | | | Add new barebox logo to the treeSascha Hauer2015-07-207-0/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the new barebox logo to the tree. This is added as svg image which is converted to different png images during build time. The logo can be found under /logo/barebox-logo-<width>.png in the running barebox. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | remove old barebox logoSascha Hauer2015-07-1521-22/+0
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the old barebox logo to make place for the new logo. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | | | Merge branch 'for-next/imx'Sascha Hauer2015-08-0669-231/+2635
|\ \ \ \ \ \
| * | | | | | ARM: [phyFLEX,phyCARD]-i.MX6: rename define in flash-headersStefan Christ2015-07-3112-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The files flash-header-*.imxfg contains two defines which are use in include files flash-header-phytec-*.h. The first define is SETUP_MDCFG0. In the second define name some RAM size value were used, e.g. SETUP_S_DL_512MB_1GB or SETUP_1GIB_2GIB_4GIB. It's better to name also the second define after the register names, here MMDC1_MDCTL and MMDC1_MDASP, because these values changes for every RAM configurations and it's consistent with the first define. Signed-off-by: Stefan Christ <s.christ@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM: imx6: rename SPI NOR device to /dev/spinor0Philipp Zabel2015-07-312-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Barebox currently names the SPI NOR device "/dev/sst25vf016b", but the barebox update handler still points to "/dev/m25p80", causing barebox_update to fail. Choose a descriptive name instead. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ata: sata-imx: Add delay to prevent link timeoutSascha Hauer2015-07-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the Utilite board this delay is necessary to prevent a link timeout. It seems the values written to GPR13 have to settle for some time before further accesses may be made. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM: i.MX6 cm-fx6: Fix area for get_ram_sizeSascha Hauer2015-07-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for bank2_size get_ram_size must be called with the CS1 area. With the recent fix to calculate CS1 start this now starts at 0x90000000 and no longer at 0x80000000. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM: i.MX6 cm-fx6: Fix Chip density for DDR_64BIT_2GB caseSascha Hauer2015-07-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DDR_64BIT_2GB corresponds to two chip selects (ncs = 2) with 1GiB each. In this case cs_density must be configured to 8Gb (1GiB). Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM: imx6-mmdc: Fix cs0_end calculationSascha Hauer2015-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current calculation does not take the 0x10000000 offset where SDRAM starts into account. For example with a 1GiB chip density the current code calculates cs1 start to 0x40000000, but it has to be 0x10000000 + 0x40000000 = 0x50000000. Add the missing 8 32MiB chunks. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM: initial cm-fx6 supportSascha Hauer2015-07-3113-0/+1042
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cm-fx6 board is a module from Compulab with different i.MX6 SoCs. This module is also found in the Utilite Mini Computer this patch also adds support for. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM: i.MX: make early UART functions independent of DEBUG_LLSascha Hauer2015-07-312-40/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have functions to setup the i.MX uart for early use, but these all depend on DEBUG_LL. Move them to imx-uart.h to make them usable for the regular PBL console. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | PBL: console: Make independent of DEBUG_LLSascha Hauer2015-07-313-19/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With more stuff being done in PBL regular console support gets more and more useful. This makes the PBL console independent of DEBUG_LL which is only meant for early debugging but not regular output. To use the regular PBL console a board must call pbl_set_putc() which stores a pointer to the putc function to be used. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM: i.MX: xload: implement esdhc xload for i.MX6Sascha Hauer2015-07-313-1/+277
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM: i.MX6: Add DDR setup code from U-BootSascha Hauer2015-07-292-0/+818
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several i.MX6 boards like to do their SDRAM setup in code rather than in DCD tables. Add the SDRAM setup code from U-Boot to make it easy to adopt the SDRAM setup from the U-Boot port of these boards. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM: i.MX: Add SPI xload codeSascha Hauer2015-07-294-0/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add PBL xload code to load an image from SPI NOR flash. Currently implemented for i.MX6. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | spi: i.MX: move register defines to include/Sascha Hauer2015-07-162-79/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The register defines will be used by the SPI xload code, so move them to a place where the xload code can include them. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | images: i.MX: Create target for SRAM imagesSascha Hauer2015-07-161-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some boards like to do their SDRAM setup in code rather than in hardcoded DCD tables. For these boards the bootloader has to be loaded to the internal SRAM which is often too small for a full featured barebox. This new SRAM image type target allows to overcome this limitation. The image created with the new imx-sram-img rule is a regular imx-image with the difference that the load size only spans the pblx image and not the whole image including the payload. The pbl image easily fits into SRAM. The strategy is that this initial code initializes the SDRAM, loads the whole image to SDRAM and jumps to it. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM: i.MX6: create cpu_is() functions for use in PBLSascha Hauer2015-07-161-24/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current cpu_is_mx6x() functions need the imx6_cpu_type variable which make them unsuitable for PBL. Add a set of cpu_mx6_is_mx6x() functions which can be called from PBL aswell. Unlike the cpu_is_mx6x() functions the cpu_mx6_is_mx6x() functions assume that they are called on i.MX6 only. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM: i.MX: compile boot.c for pbl aswellSascha Hauer2015-07-161-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As boot.c now contains code for the pbl compile compile it there awell. While at it move esdctl.c to obj-pbl-y. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | memsize: Compile for PBL aswellSascha Hauer2015-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detecting the memory size is a domain for PBL, so compile it for PBL aswell. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM: i.MX6: add function to get bootsource in pblSascha Hauer2015-07-162-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the pbl the regular bootsource_get cannot be used. Add a function which returns the bootsource directly with values from the hardware. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM: i.MX6: remove unnecessary includesSascha Hauer2015-07-168-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most files including imx6-mmdc.h do not actually use anything from it. Clean this up. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | ARM: i.MX6: Add i.MX6 entry functionSascha Hauer2015-07-162-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a i.MX6 specific entry function which automatically detects the SDRAM size. The prototype has already been present, but it was never implemented. Rename it to imx6q_ since the other variants need other functions. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | | scripts: imx-image: Make in-place capableSascha Hauer2015-07-161-23/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Read in the source image completely before starting to write the output image. This makes it possible to pass the same file as input and output. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>