summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
* Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'Albert ARIBAUD2013-09-05-1/+7
|\ | | | | | | | | | | | | | | Conflicts: drivers/serial/serial.c The conflict above was a trivial case of adding one init function in each branch, and manually resolved in merge.
| * ARM: mxs: tools: Add mkimage support for MXS bootstreamMarek Vasut2013-08-31-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add mkimage support for generating and verifying MXS bootstream. The implementation here is mostly a glue code between MXSSB v0.4 and mkimage, but the long-term goal is to rectify this and merge MXSSB with mkimage more tightly. Once this code is properly in U-Boot, MXSSB shall be deprecated in favor of mkimage-mxsimage support. Note that the mxsimage generator needs libcrypto from OpenSSL, I therefore enabled the libcrypto/libssl unconditionally. MXSSB: http://git.denx.de/?p=mxssb.git;a=summary The code is based on research presented at: http://www.rockbox.org/wiki/SbFileFormat Signed-off-by: Marek Vasut <marex@denx.de> Cc: Tom Rini <trini@ti.com> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Otavio Salvador <otavio@ossystems.com.br>
| * ARM: mxs: Add mx28evk_auart_console targetAndreas Wass2013-08-21-1/+6
| | | | | | | | | | | | | | | | The target uses AUART 3 instead of the DUART for console output. Signed-off-by: Andreas Wass <andreas.wass@dalelven.com> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Marek Vasut <marex@denx.de>
* | Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'Albert ARIBAUD2013-09-04-77/+974
|\ \
| * | siemens-am33x-common.h: Always build CONFIG_OMAP_GPIO supportTom Rini2013-08-28-2/+0
| | | | | | | | | | | | | | | | | | The MMC driver relies on this block now. Signed-off-by: Tom Rini <trini@ti.com>
| * | arm, am335x: add support for 3 siemens boardsHeiko Schocher2013-08-28-0/+866
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add support for the am335x based boards from siemens: dxr2: - DDR3 128MiB - NAND 256MiB - Ethernet with external Switch SMSC LAN9303 - no PMIC - internal Watchdog - DFU support pxm2: - DDR2 512 MiB - NAND 1024 MiB - PMIC - PHY atheros ar803x - USB Host - internal Watchdog - DFU support rut: - DDR3 256 MiB - NAND 256 MiB - PMIC - PHY natsemi dp83630 - external Watchdog - DFU support Signed-off-by: Heiko Schocher <hs@denx.de> Signed-off-by: Roger Meier <r.meier@siemens.com> Signed-off-by: Samuel Egli <samuel.egli@siemens.com> Cc: Pascal Bach <pascal.bach@siemens.com> Cc: Tom Rini <trini@ti.com>
| * | video: add formike lcd panel initHeiko Schocher2013-08-28-0/+4
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Anatolij Gustschin <agust@denx.de> Cc: Tom Rini <trini@ti.com> Acked-by: Anatolij Gustschin <agust@denx.de>
| * | dra7xx_evm: Re-order and comment the networking related config optionsTom Rini2013-08-28-10/+8
| | | | | | | | | | | | Signed-off-by: Tom Rini <trini@ti.com>
| * | omap5_uevm: Better comment why we have TCA642X and the reset timeTom Rini2013-08-28-0/+3
| | | | | | | | | | | | Signed-off-by: Tom Rini <trini@ti.com>
| * | TI:omap5: Clarify comments about SPL and DDR timings in common configTom Rini2013-08-28-3/+12
| | | | | | | | | | | | Signed-off-by: Tom Rini <trini@ti.com>
| * | TI:am33xx: Move SPL YMODEM support to the per-board configTom Rini2013-08-28-1/+0
| | | | | | | | | | | | Signed-off-by: Tom Rini <trini@ti.com>
| * | TI:armv7: Re-order slightly the generic CONFIG options, expand related commentsTom Rini2013-08-28-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-group the general options to note things that can be removed safely to reduce binary size when not required, and expand the comment about what commands we do include to note it could be replaced with a specific list of required one. While at it, move the CMD parts of various blocks IP to the end of the list for consistency. Signed-off-by: Tom Rini <trini@ti.com>
| * | am335x_evm: Regroup USB optionsTom Rini2013-08-28-39/+41
| | | | | | | | | | | | Signed-off-by: Tom Rini <trini@ti.com>
| * | am335x_evm: Add comment by SPL SPI supportTom Rini2013-08-28-0/+2
| | | | | | | | | | | | Signed-off-by: Tom Rini <trini@ti.com>
| * | TI:am335x: Better comment and organize the networking related optionsTom Rini2013-08-28-8/+14
| | | | | | | | | | | | | | | | | | While in here, drop CONFIG_BOOTP_DEFAULT as it is unused in the code. Signed-off-by: Tom Rini <trini@ti.com>
| * | omap5: Expand CONFIG_SPL_MAX_SIZE and comment upon SRAM_SCRATCH_SPACE_ADDRTom Rini2013-08-28-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | After examining both TRMs and doing some experimentation, we can rely on using the start of the download area for CONFIG_SPL_TEXT_BASE and then move SRAM_SCRATCH_SPACE_ADDR up, just like am335x. This is required for peripheral boot modes such as UART. Signed-off-by: Tom Rini <trini@ti.com>
| * | TI:armv7: Move CONFIG_SPL_LIBDISK_SUPPORT to MMC sectionTom Rini2013-08-28-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | We only need this library when we're doing "disk" access to MMC/SD. Update comment around the rest of CONFIG_SPL_LIB* to note that the others are always required. Signed-off-by: Tom Rini <trini@ti.com>
| * | am33xx: Correct and expand comments on CONFIG_SPL_MAX_SIZETom Rini2013-08-28-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | We had been allowing the max size to be larger than actually allowed by the ROM. Expand the commentary here to explain why we set these locations. Signed-off-by: Tom Rini <trini@ti.com>
| * | ARM: igep00x0.h: Enable raw initrd supportJavier Martinez Canillas2013-08-28-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Now that IGEP base boards default environment use the bootz command to boot a zImage instead of a uImage, it makes sense to add support to supply a raw initrd image to the kernel if needed. Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
| * | sdp4430: Initialize board id using CONFIG_MACH_TYPEOleksandr Tyshchenko2013-08-28-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Use CONFIG_MACH_TYPE generic macro to set the machine type number in the common arm code instead of setting it in the board code. Signed-off-by: Oleksandr Tyshchenko <oleksandr.tyshchenko@ti.com>
* | | Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'Albert ARIBAUD2013-09-04-35/+55
|\ \ \
| * | | arm: atmel: cpux9k2: board update and enhancementJens Scharsig (BuS Elektronik)2013-08-22-30/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix adresses in env settings in config header - add missing CONFIG_STANDALONE_LOAD_ADDR to eb_cpux9k2 config header - remove jffs2 support, board doesn't use this anymore - add ubifs support - change sizes and start for partitions Signed-off-by: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| * | | arm: atmel: remove the config.mk fileBo Shen2013-08-22-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove the config.mk file move text base define to board config file for following boards - at91sam9m10g45ek - at91sam9x5ek Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| * | | arm: atmel: sama5d3: fix typo error for CONFIG_ENV_IS_NOWHEREBo Shen2013-08-22-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fix typo error for CONFIG_ENV_IS_NOWHERE from CONIG_ENV_IS_NOWHERE Signed-off-by: Bo Shen <voice.shen@gmail.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| * | | arm: sama5d3: remove unused defineBo Shen2013-08-22-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CONFIG_MAX_NAND_CHIPS never used, remove it No where define LCD_TEST_PATTERN, so no need undefine Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| * | | linux/compat.h: move dev_err, dev_info and dev_dbg from usb driver to compat.hWu, Josh2013-08-22-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since kernel code current use many dev_xxx() instead of using printk. To compatible, move those dev_xxx from usb driver to linux/compat.h. Then all driver code can use dev_err, dev_info and dev_vdbg. This patch also removed duplicated macro definitions in usb driver. Signed-off-by: Josh Wu <josh.wu@atmel.com> Acked-by: Scott Wood <scottwood@freescale.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| * | | ARM: at91: atmel_nand: pmecc driver will select the galois table by sector sizeWu, Josh2013-08-22-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define the galois index table offset in chip head file. So user do not need to set by himself. Driver will set it correctly according to sector_size. Signed-off-by: Josh Wu <josh.wu@atmel.com> Acked-by: Scott Wood <scottwood@freescale.com> [rebased on master] Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| * | | arm: atmel: add nand trimffs subcommand for at91sam9n12 and at91sam9x5Bo Shen2013-08-22-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as the at91sam9n12 and at91sam9x5 soc support PMECC, when use u-boot to flash the rootfs, in order to avoid flash one sector with all 0xff into NAND, so use nand trimffs subcommand to avoid it Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| * | | arm: atmel: add gmac support for sama5d3xek boardBo Shen2013-08-22-0/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | add gmac support for sama5d3xek board, the gmac embedded in: - sama5d33, sama5d34, sama5d35 Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
* | | Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'Albert ARIBAUD2013-09-03-5/+10
|\ \ \
| * | | ARM: tegra: support raw ramdisksStephen Warren2013-08-19-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way, we don't have to run mkimage on them. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Warren <twarren@nvidia.com>
| * | | ARM: tegra: Enable data cache on DalmoreThierry Reding2013-08-19-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabling the data cache is no longer required to boot Dalmore, so enable it. This results in notably better performance when loading and booting the Linux kernel. Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
| * | | ARM: tegra: Make cache line size SoC specificThierry Reding2013-08-19-2/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently all Tegra SoCs are assumed to have 32 byte cache lines. This isn't true for Tegra114, however, which uses 4 Cortex-A15 cores and therefore uses a cache line size of 64 bytes. Move the cache line size setting to the per-SoC common configuration file. Signed-off-by: Thierry Reding <treding@nvidia.com> Tested-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
* | | omap5: Correct include order, drop CONFIG_SYS_PROMPT defineTom Rini2013-08-27-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | With the new include structure for TI platforms, we need to not define our own CONFIG_SYS_PROMPT and also need to include <configs/omap5_common.h> much sooner, so do both of these. Also drop the unused CONFIG_NET_MULTI Signed-off-by: Tom Rini <trini@ti.com>
* | | dfu, nand, ubi: add partubi alt settings for updating ubi partitionHeiko Schocher2013-08-26-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updating an ubi partition needs a completely erased mtd partition, see: http://lists.infradead.org/pipermail/linux-mtd/2011-May/035416.html So, add partubi alt setting for the dfu_alt_info environment variable to mark this partition as an ubi partition. In case we update an ubi partition, we erase after flashing the image into the partition, the remaining sektors. Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Pantelis Antoniou <panto@antoniou-consulting.com> Cc: Tom Rini <trini@ti.com> Cc: Lukasz Majewski <l.majewski@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Marek Vasut <marex@denx.de> Cc: Wolfgang Denk <wd@denx.de> Cc: Scott Wood <scottwood@freescale.com>
* | | ARM: OMAP5-uevm: Add USB ehci support for the uEVMDan Murphy2013-08-26-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the USB ehci support for the OMAP5 uEVM. Configure the uEVM mux data Add the flags to build the appropriate modules Add the usb call backs to initialize the EHCI controller Signed-off-by: Dan Murphy <dmurphy@ti.com>
* | | Merge branch 'master' of git://git.denx.de/u-boot-mpc85xxTom Rini2013-08-21-43/+148
|\ \ \
| * | | powerpc: Fix CamelCase checkpatch warningsPrabhakar Kushwaha2013-08-20-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 85xx, 86xx PowerPC folders have code variables with CamelCase naming conventions. because of this code checkpatch script generates "WARNING: Avoid CamelCase". Convert variables name to normal naming convention and modify board, driver files with updated the new structure. Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com> Acked-by: York Sun <yorksun@freescale.com>
| * | | powerpc: p1022ds: add TPL for p1022ds nand bootYing Zhang2013-08-20-16/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TPL is introduced in the patch "NAND: TPL : introduce the TPL based on the SPL", here enable TPL for p1022ds nand boot. Signed-off-by: Ying Zhang <b40530@freescale.com> Acked-by: York Sun <yorksun@freescale.com>
| * | | powerpc : p1022ds : Enable p1022ds to start from eSPI with SPLYing Zhang2013-08-20-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable p1022ds to start from eSPI with SPL. Signed-off-by: Ying Zhang <b40530@freescale.com> Acked-by: York Sun <yorksun@freescale.com>
| * | | powerpc: p1022ds: Enable P1022DS to boot from SD Card with SPLYing Zhang2013-08-20-7/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable p1022ds to start from eSDHC with SPL. Signed-off-by: Ying Zhang <b40530@freescale.com> Acked-by: York Sun <yorksun@freescale.com>
| * | | powerpc: mpc85xx: Support booting from SD Card with SPLYing Zhang2013-08-20-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code from the internal on-chip ROM. It loads the final uboot image into DDR, then jump to it to begin execution. The SPL's size is sizeable, the maximum size must not exceed the size of L2 SRAM. It initializes the DDR through SPD code, and copys final uboot image to DDR. So there are two stage uboot images: * spl_boot, 96KB size. The env variables are copied to L2 SRAM, so that ddr spd code can get the interleaving mode setting in env. It loads final uboot image from offset 96KB. * final uboot image, size is variable depends on the functions enabled. Signed-off-by: Ying Zhang <b40530@freescale.com> Acked-by: York Sun <yorksun@freescale.com>
| * | | powerpc: deleted unused symbol CONFIG_SPL_NAND_MINIMAL and enabled some ↵Ying Zhang2013-08-20-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functionality for common SPL 1. The symbol CONFIG_SPL_NAND_MINIMAL is unused, so deleted it. 2. Some functions were unused in the minimal SPL, but it is useful in the common SPL. So, enabled some functionality for common SPL. Signed-off-by: Ying Zhang <b40530@freescale.com> Acked-by: York Sun <yorksun@freescale.com>
* | | | ppc4xx: Remove support for PPC405CR CPUsMatthias Fuchs2013-08-20-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes support for the APM 405CR CPU. This CPU is EOL and no board uses this chip. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
* | | | ppc4xx: Remove CANBT boardMatthias Fuchs2013-08-20-215/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This board and especially the CPU (PPC405CR) is EOL. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Acked-by: Wolfgang Denk <wd@denx.de>
* | | | i2c:samsung: Adjust Trats, GONI and Universal_c210 boards to work with new ↵Łukasz Majewski2013-08-20-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I2C framework New I2C framework, introduced after v2013.07 final release, imposed I2C code adjustment for some Samsung boards - namely Trats, GONI and Universal_c210. Those boards were using schematic based I2C enumeration (I2C_5, I2C_9). However, new I2C framework imposes usage of logical I2C adapters numbering (e.g. I2C_0, I2C_1, etc). Additionally, I2C_GET_* macros were replaced with i2c_*_bus_num() functions. Trats board gained definition of second soft I2C adapter. Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> Cc: Minkyu Kang <mk7.kang@samsung.com> Cc: Heiko Schocher <hs@denx.de>
* | | | i2c:multibus:fix: Correct I2C_MULTI_BUS value when support for many buses is ↵Łukasz Majewski2013-08-20-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enabled The I2C_MULTI_BUS needs to be defined for correct I2C operation with many software emulated I2C controllers. This fix restores correct value of the I2C_MULTI_BUS changed by following commit: SHA1: 385c9ef5a7215b2b0c22836fee6c692dfc8559d7 i2c: add i2c_core and prepare for new multibus support Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> Cc: Heiko Schocher <hs@denx.de>
* | | SPDX-License-Identifier: convert BSD-3-Clause filesWolfgang Denk2013-08-19-21/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> [trini Don't remove some copyrights by accident] Signed-off-by: Tom Rini <trini@ti.com>
* | | SPDX-License-Identifier: convert PIBS licensed filesWolfgang Denk2013-08-19-24/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adapts the files that were derived from PIBS (PowerPC Initialization and Boot Software) codeto using SPDX License Identifiers. So far, SPDX has not assigned an official License ID for the PIBS license yet, so this should be considered preliminary. Note that the following files contained incorrect license information: arch/powerpc/cpu/ppc4xx/4xx_uart.c arch/powerpc/cpu/ppc4xx/start.S arch/powerpc/include/asm/ppc440.h These files included, in addition to the GPL-2.0 / ibm-pibs dual license as inherited from PIBS, a GPL-2.0+ license header which was obviously incorrect. This has been removed. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Stefan Roese <sr@denx.de> Signed-off-by: Wolfgang Denk <wd@denx.de> Conflicts: Licenses/README Acked-by: Stefan Roese <sr@denx.de>
* | | SPDX-License-Identifier: convert GPL-2.0+ / BSD-2-Clause dual-licensed filesWolfgang Denk2013-08-19-44/+1
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
generated by cgit v1.1 at 2024-11-01 11:21:29 +0000