summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
* mtd: move & update nand_ecclayout structure (plus board changes)Prabhakar Kushwaha2013-11-21-12/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nand_ecclayout is present in mtd.h at Linux. Move this structure to mtd.h to comply with Linux. Also, increase the ecc placement locations to 640 to suport device having writesize/oobsize of 8KB/640B. This means that the maximum oobsize has gone up to 640 bytes and consequently the maximum ecc placement locations have also gone up to 640. Changes from Prabhabkar's version (squashed into one patch to preserve bisectability): - Added _LARGE to MTD_MAX_*_ENTRIES This makes the names match current Linux source, and resolves a conflict between http://patchwork.ozlabs.org/patch/280488/ and http://patchwork.ozlabs.org/patch/284513/ The former was posted first and is closer to matching Linux, but unlike Linux it does not add _LARGE to the names. The second adds _LARGE to one of the names, and depends on it in a subsequent patch (http://patchwork.ozlabs.org/patch/284512/). - Made max oobfree/eccpos configurable, and used this on tricorder, alpr, ASH405, T4160QDS, and T4240QDS (these boards failed to build for me without doing so, due to a size increase). On tricorder SPL, this saves 2576 bytes (and makes the SPL build again) versus the new default of 640 eccpos and 32 oobfree, and saves 336 bytes versus the old default of 128 eccpos and 8 oobfree. Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com> CC: Vipin Kumar <vipin.kumar@st.com> [scottwood@freescale.com: changes as described above] Signed-off-by: Scott Wood <scottwood@freescale.com> Cc: Thomas Weber <weber@corscience.de> Cc: Matthias Fuchs <matthias.fuchs@esd-electronics.com> Cc: Stefan Roese <sr@denx.de> Cc: York Sun <yorksun@freescale.com> Cc: Tom Rini <trini@ti.com> Reviewed-by: Stefan Roese <sr@denx.de>
* cm_t35: use scf0403 driverNikita Kiryanov2013-11-12-0/+3
| | | | | | | | Use scf0403 driver to add scf0403x LCD support for cm-t35 and cm-t3730 boards. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
* lcd: add DataImage SCF0403x LCD panel supportNikita Kiryanov2013-11-12-0/+11
| | | | | | | | | | | | Add SPI-based driver for DataImage SCF0403852GGU04 and SCF0403526GGU20 LCD panels. Cc: Tom Rini <trini@ti.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Acked-by: Anatolij Gustschin <agust@denx.de> Signed-off-by: Anatolij Gustschin <agust@denx.de>
* spi: define SPI_XFER_ONCENikita Kiryanov2013-11-12-0/+1
| | | | | | | | | | | | | The flag combination "SPI_XFER_BEGIN | SPI_XFER_END" is a common use case of spi_xfer, and it can easily cause an already long line (spi_xfer takes 5 parameters) to go over the 80 character limit. define SPI_XFER_ONCE to be a shorter version of the above flag combination. Cc: Tom Rini <trini@ti.com> Cc: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com> Cc: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
* spi: omap3: add support for more word lengthsNikita Kiryanov2013-11-12-0/+16
| | | | | | | | | | | | | | | | | | Current implementation only supports 8 bit word lengths, even though omap3 can handle anything between 4 and 32. Update the spi interface to support changing the SPI word length, and implement it in omap3_spi driver to support the full range of possible word lengths. This implementation is backwards compatible by defaulting to the old behavior of 8 bit word lengths. Also, it required a change to the omap3_spi non static I/O functions, but since they are not used anywhere else, no collateral changes are required. Cc: Tom Rini <trini@ti.com> Cc: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com> Cc: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
* MPC824x: remove obsolete "PN62" boardWolfgang Denk2013-11-11-285/+0
| | | | | | | | | | | The MPC824x processors have long reached EOL, and the PN62 board has not seen any board-specific updates for more than a decade. It is now causing build issues. Instead of wasting time on things nobody is interested in any more, we rather drop this board. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Wolfgang Grandegger <wg@grandegger.com> cc: Tom Rini <trini@ti.com>
* Merge branch 'master' of git://git.denx.de/u-boot-mipsTom Rini2013-11-11-18/+188
|\
| * malta: define CONFIG_MEMSIZE_IN_BYTESGabor Juhos2013-11-09-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The memsize environment variable must contain the memory size in bytes on the Malta board. Otherwise Linux will use wrong memory size which causes a kernel panic. Define CONFIG_MEMSIZE_IN_BYTES in malta.h to avoid that. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> Cc: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com> Cc: Paul Burton <paul.burton@imgtec.com>
| * malta: store environment in flashPaul Burton2013-11-09-6/+9
| | | | | | | | | | | | | | | | | | Allow the environment to be stored in the monitor flash of a Malta board. The environment is stored in the final 128KB of the flash, which both leaves the majority of the flash available for U-boot code and also matches the location which YAMON uses. Signed-off-by: Paul Burton <paul.burton@imgtec.com>
| * malta: enable RTC supportPaul Burton2013-11-09-0/+5
| | | | | | | | | | | | | | | | | | This is actually required in order for a Linux kernel to boot successfully on a physical Malta board. Without enabling the RTC, a Malta Linux kernel will get stuck in its estimate_frequencies function on boot. Signed-off-by: Paul Burton <paul.burton@imgtec.com>
| * malta: remove cache size definitionsPaul Burton2013-11-09-4/+0
| | | | | | | | | | | | | | | | | | | | These will now be detected at runtime, allowing a single U-boot configuration to function correctly with different bitstreams. Without this you may need to re-configure, re-build and re-flash U-boot to your Malta if you flash a new bitstream with a different cache configuration to your old bitstream. Signed-off-by: Paul Burton <paul.burton@imgtec.com>
| * malta: enable CONFIG_PCNET_79C973, PCNET_HAS_PROM, CONFIG_CMD_DHCPPaul Burton2013-11-09-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | This model of the pcnet is used in current Malta boards, at least in the Malta-R rev 3. Enable support for it. The Malta also has the ethernet controller PROM containing its MAC address, so enable support for that in order to read that MAC address. DHCP is a very useful feature to have available for many networks, enable support for it also. Signed-off-by: Paul Burton <paul.burton@imgtec.com>
| * malta: support for coreFPGA6 boardsPaul Burton2013-11-09-1/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for running on Malta boards using coreFPGA6 core cards, including support for the msc01 system controller used with them. The system controller is detected at runtime allowing one U-boot binary to run on a Malta with either. Due to the PCI I/O base differing between Maltas using gt64120 & msc01 system controllers, the UART setup is modified slightly. A second UART is added so that there is one pointing at the correct address for each system controller. The Malta board then defines its own default_serial_console function to select the correct one at runtime. The incorrect UART will simply not function. Tested on: - A coreFPGA6 Malta running interAptiv and proAptiv bitstreams, both with and without an L2 cache. - QEMU. Signed-off-by: Paul Burton <paul.burton@imgtec.com>
| * qemu-malta: rename to just "malta"Paul Burton2013-11-09-6/+6
| | | | | | | | | | | | | | | | | | This is in preparation for adapting this board to function correctly on a physical MIPS Malta board. The board is moved into an "imgtec" vendor directory at the same time in order to ready us for any other boards supported by Imagination in the future. Signed-off-by: Paul Burton <paul.burton@imgtec.com>
| * pci.h: allow inclusion in assembly sourcePaul Burton2013-11-09-1/+5
| | | | | | | | | | | | | | | | | | This patch simply #ifdef's out the C-specific parts of pci.h when it is included by an assembly file. This will allow the macros it contains to be used from assembly source as will be done in a followup commit adding support for more modern MIPS Malta boards. Signed-off-by: Paul Burton <paul.burton@imgtec.com>
* | Merge branch 'iu-boot/master' into 'u-boot-arm/master'Albert ARIBAUD2013-11-09-544/+534
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/cpu/arm926ejs/mxs/Makefile board/compulab/cm_t35/Makefile board/corscience/tricorder/Makefile board/ppcag/bg0900/Makefile drivers/bootcount/Makefile include/configs/omap4_common.h include/configs/pdnb3.h Makefile conflicts are due to additions/removals of object files on the ARM branch vs KBuild introduction on the main branch. Resolution consists in adjusting the list of object files in the main branch version. This also applies to two files which are not listed as conflicting but had to be modified: board/compulab/common/Makefile board/udoo/Makefile include/configs/omap4_common.h conflicts are due to the OMAP4 conversion to ti_armv7_common.h on the ARM side, and CONFIG_SYS_HZ removal on the main side. Resolution is to convert as this icludes removal of CONFIG_SYS_HZ. include/configs/pdnb3.h is due to a removal on ARM side. Trivial resolution is to remove the file. Note: 'git show' will also list two files just because they are new: include/configs/am335x_igep0033.h include/configs/omap3_igep00x0.h
| * Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'Albert ARIBAUD2013-11-07-0/+303
| |\
| | * Revert "configs: imx: Make CONFIG_SYS_PROMPT uniform across FSL boards"Stefano Babic2013-11-04-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 178b8e15ade96c7bd59b9704b91ca51d27c391cd. Patch was merged too fast, without checking that another patch is fixing the reported issue globally - reverted. Signed-off--by: Stefano Babic <sbabic@denx.de>
| | * configs: imx: Make CONFIG_SYS_PROMPT uniform across FSL boardsFabio Estevam2013-10-31-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | There is no real benefit in adding the board name into U-boot's prompt. Use the simple "=> " prompt across FSL boards. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br>
| | * ARM: mxs: Add PPC-AG BG0900 boardMarek Vasut2013-10-17-0/+97
| | | | | | | | | | | | | | | | | | | | | | | | This board supports FEC Ethernet, SPI NOR and NAND flash. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Stefano Babic <sbabic@denx.de> Cc: Christoph Baumann <c.baumann@ppc-ag.de>
| | * udoo: Add initial support for mx6q udoo boardFabio Estevam2013-10-17-0/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add basic support for mx6q udoo board. For further information about Udoo board: http://www.udoo.org/ Tested booting a mainline device tree kernel and a Yocto rootfs from mmc. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
| * | Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'Albert ARIBAUD2013-11-05-2/+37
| |\ \
| | * | ARM: ATMEL: eb_cpux9k2: fix TEXT_BASE for ramboot targetJens Scharsig (BuS Elektronik)2013-11-04-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since more functions are enabled, the eb_cpux9k2_ram target does not boot. This patch changed the TEXT_BASE, that the code fits between TEXT_BASE and ram end. Signed-off-by: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| | * | arm: atmel: get rid of too many ifdefferyBo Shen2013-11-04-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of too many ifdeffery in usb ohci driver Add following two configuration for USB clock selecting - CONFIG_USB_ATMEL_CLK_SEL_PLLB: using PLLB as usb ohci input clock - CONFIG_USB_ATMEL_CLK_SEL_UPLL: using UPLL as usb ohci input clock Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| | * | arm: atmel: at91sam9n12ek: add usb host supportBo Shen2013-11-04-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add usb host support for at91sam9n12ek board. Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| * | | TI:omap5: Add rdaddr, use consistent loadaddr valuesTom Rini2013-11-01-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rdaddr was missing which is a common location for loading ramdisks to. loadaddr was higher than it needs to be, so use the same value other TI platforms use. Signed-off-by: Tom Rini <trini@ti.com>
| * | | cm_t35: turn on GPIO commandsNikita Kiryanov2013-11-01-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Turn on GPIO commands for cm-t35 and cm-t3730. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
| * | | cm_t35: reduce default bootdelay to 3 secondsNikita Kiryanov2013-11-01-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current default bootdelay of 10 seconds is too long. Reduce default bootdelay to 3 seconds. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
| * | | dra7xx_evm: Enabled UART-boot mode and add dra7xx_evm_uart3 buildMinal Shah2013-11-01-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UART booting is supported on this SoC, but via UART3 rather than UART1. Because of this we must change the board to use UART3 for all console access (only one UART is exposed on this board and a slight HW mod is required to switch UARTs). Signed-off-by: Minal Shah <minal.shah@ti.com> [trini: Make apply to mainline, reword commit] Signed-off-by: Tom Rini <trini@ti.com>
| * | | TI:armv7: Change CONFIG_SYS_SPL_ARGS_ADDR to a higher addressTom Rini2013-11-01-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With changes to increase the size of the device tree (required to move more data out of the kernel and into DT), loading the args at the old address leads to us overwriting things later on. To correct this, load the args file to where we load the device tree anyhow. This is also safe for non-DT booting as in either case we use r2 to pass in the location of things. Signed-off-by: Tom Rini <trini@ti.com>
| * | | am335x: Enable CONFIG_OMAP_WATCHDOG supportTom Rini2013-11-01-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a board-specific portion for calling watchdog enable itself, in main U-Boot. Signed-off-by: Tom Rini <trini@ti.com>
| * | | tricorder: support 256MiB SDRAM on revision > DAndreas Bießmann2013-11-01-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
| * | | tricorder: read kernel directly from NANDAndreas Bießmann2013-11-01-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
| * | | tricorder: switch to alternative memtestThomas Weber2013-11-01-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase the tested memory region for mtest and define CONFIG_SYS_MEMTEST_SCRATCH for CONFIG_SYS_ALT_MEMTEST Signed-off-by: Thomas Weber <thomas.weber@corscience.de> Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
| * | | tricorder: Make u-boot fasterThomas Weber2013-11-01-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Silent u-boot and no bootdelay Signed-off-by: Thomas Weber <thomas.weber@corscience.de> Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
| * | | tricorder: add led supportAndreas Bießmann2013-11-01-0/+14
| | | | | | | | | | | | | | | | Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
| * | | tricorder: panic() on unknown boardAndreas Bießmann2013-11-01-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Also hang() the board on panic(). Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
| * | | tricorder: add tricordereeprom commandAndreas Bießmann2013-11-01-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The new tricordereeprom command can read and write the eeprom for hardware detection on tricorder devices. Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
| * | | tricorder: add mtdparts to environmentAndreas Bießmann2013-11-01-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before we always ran 'mtdparts default' which also set the mtdparts and mtdids environment. But if we changed that values by intention we will overwrite them with our default values. This is obviously bad! Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
| * | | tricorder: add cmdline historyAndreas Bießmann2013-11-01-15/+57
| | | | | | | | | | | | | | | | Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
| * | | tricorder: use generic provided loadaddrAndreas Bießmann2013-11-01-1/+4
| | | | | | | | | | | | | | | | Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
| * | | tricorder: update flash partitioningAndreas Bießmann2013-11-01-18/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new flash layout respects posible bad blocks in sectors reserved for e.g. SPL, u-boot, kernel, env a.s.o. Additionally this patch prepares for U-Boot Falcon mode for boot time saving. Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
| * | | tricorder: remove lcdmode from bootargsThomas Weber2013-11-01-4/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Weber <thomas.weber@corscience.de> Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
| * | | arm, da85x: update for the ipam390 boardHeiko Schocher2013-11-01-13/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - switch to correct ecc layout used by the RBL enable CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC - update default environment - change A2CR to correct value for UART boot mode - adapt cs3cfg timings for nand - change LED bootmode signalization Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Tom Rini <trini@ti.com>
| * | | ARM: OMAP4: Convert to ti_armv7_common.hLokesh Vutla2013-11-01-165/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update omap4_common.h to use ti_armv7_common.h Testing: * Boot tested on OMAP4430 ES2.1 OMAP4460 ES1.1 SDP, OMAP4 PANDA/PANDA ES * Verified ./MAKEALL -s omap Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
| * | | OMAP3: igep00x0: rename config file to omap3_igep00x0.hJavier Martinez Canillas2013-11-01-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There seems to be a naming convention for the configuration files for boards using the same SoC family. This makes easier to do changes that affect different boards based on the same SoC. Since the IGEPv2 board and the IGEP COM Module use a TI OMAP35xx/DM37xx processor, is better to rename its board config to use this naming scheme. Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Acked-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
| * | | ARM: IGEP0033: rename config file to am335x_igep0033.hJavier Martinez Canillas2013-11-01-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There seems to be a naming convention for the configuration files for boards using the same SoC family. This makes easier to do changes that affect different boards based on the same SoC. Since the IGEP COM AQUILA use a TI AM335x processor is better to rename its board config to use this naming scheme. Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Acked-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
| * | | TI:am33xx: Add bootcount support to ti_am335x_common.hTom Rini2013-11-01-0/+7
| |/ / | | | | | | | | | | | | | | | | | | Enable the bootcount driver for am335x in general. We leave adding a bootlimit and altbootcmd to the environment to the board ports. Signed-off-by: Tom Rini <trini@ti.com>
| * | arm: Remove IXP425 boards pdnb3 and scpuStefan Roese2013-10-17-322/+0
| |/ | | | | | | | | | | | | | | | | | | Remove Prodrive pdnb3 board (including the scpu variant) support from mainline. As its unmaintained and not needed any more for quite some time. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Martijn de Gouw <martijn.de.gouw@prodrive.nl> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
* | Merge branch 'master' of git://www.denx.de/git/u-boot-usbTom Rini2013-11-08-18/+28
|\ \