summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://git.denx.de/u-boot-mpc85xxTom Rini2013-09-13-2/+2
|\
| * powerpc/p2041: fix I2C controller's offsetShaohui Xie2013-09-10-2/+2
| | | | | | | | | | | | | | | | Without this patch, SPD access will fail which leads to DDR init fail. Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com> Tested-by: Chris Packham <judge.packham@gmail.com> Acked-by: York Sun <yorksun@freescale.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini2013-09-12-1/+288
|\ \ | |/ |/|
| * Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'Albert ARIBAUD2013-09-11-1/+288
| |\ | | | | | | | | | | | | Conflicts: tools/Makefile
| | * drivers:power:max77686: add function to set voltage and modePiotr Wilczek2013-08-30-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch add new functions to pmic max77686 to set voltage and mode. Signed-off-by: Piotr Wilczek <p.wilczek@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> Acked-by: Tom Rini <trini@ti.com> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
| | * exynos5250: Add arndale board supportChander Kashyap2013-08-30-0/+255
| | | | | | | | | | | | | | | | | | | | | | | | Arndale board is based on samsung's exynos5250 soc. Signed-off-by: Inderpal Singh <inderpal.singh@linaro.org> Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
| | * arm: goni: remove config.mk fileMinkyu Kang2013-08-28-0/+3
| | | | | | | | | | | | | | | | | | | | | Since config.mk is deprecated, remove this file, and move CONFIG_SYS_TEXT_BASE define to config file. Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
| | * arm: smdkc100: remove config.mk fileMinkyu Kang2013-08-28-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Since config.mk is deprecated, remove this file, and move CONFIG_SYS_TEXT_BASE define to config file. Signed-off-by: Minkyu Kang <mk7.kang@samsung.com> Cc: Wolfgang Denk <wd@denx.de>
| | * CONFIG: EXYNOS5: Replace misnomer SMDK5250 with EXYNOS5250 and update MakefilesChander Kashyap2013-08-27-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Update the Makefiles so that all boards can use the same spl generation tool Signed-off-by: Inderpal Singh <inderpal.singh@linaro.org> Acked-by: Simon Glass <sjg@chromium.org> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
* | | Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xxTom Rini2013-09-09-1/+9
|\ \ \
| * | | ppc4xx: Fix GPIO handling in lwmon5 and lcd4_lwmon5 BSPStefan Roese2013-09-07-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LCD4 needs a slightly different GPIO configuration than the original LWMON5 variant. GPIO49 needs to be configured to a default output value of 0 (permanent voltage supply). Additionally lcd4 also needs to enable the LSB transmitter. Signed-off-by: Stefan Roese <sr@denx.de>
* | | | Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini2013-09-06-126/+1067
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | socfpga: Adding configuration for development kitChin Liang See2013-09-06-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separating the configuration file for Virtual Target and real hardware Cyclone V development kit Signed-off-by: Chin Liang See <clsee@altera.com> Reviewed-by: Pavel Machek <pavel@denx.de> Cc: Wolfgang Denk <wd@denx.de> Cc: Pavel Machek <pavel@denx.de> Cc: Dinh Nguyen <dinguyen@altera.com> Cc: Tom Rini <trini@ti.com> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
| * | Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'Albert ARIBAUD2013-09-05-1/+0
| |\ \
| | * | ARM: atmel: sama5d3: drop unused CONFIG_NET_MULTIBo Shen2013-09-04-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop unused CONFIG_NET_MULTI Signed-off-by: Bo Shen <voice.shen@gmail.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| * | | 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>
* | | | cam_enc_4xx: Move CONFIG_SPL_PAD_TO to a config headerMasahiro Yamada2013-09-06-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For most boards which define CONFIG_SPL_PAD_TO, it is defined in config header files. Currently, there exists only one exception, cam_enc_4xx board. This patch moves CONFIG_SPL_PAD_TO definition from board/ait/cam_enc_4xx/config.mk to include/configs/cam_enc_4xx.h. With this modification, we can delete a glue code in the top level config.mk: ifneq ($(CONFIG_SPL_PAD_TO),) CPPFLAGS += -DCONFIG_SPL_PAD_TO=$(CONFIG_SPL_PAD_TO) endif Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Heiko Schocher <hs@denx.de>
* | | | ahci: convert to use libata functions and definitionsRob Herring2013-09-06-23/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libata already has similar functions as implemented in the ahci code. Refactor the code to use the libata variants and remove the dependency on ata.h. Convert some defines to use the version from libata.h. Also, remove some unnecessary memset's of bss data. This is a step toward hopefully merging ahci.c and dw_ahsata.c which are essentially the same driver. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Reviewed-by: Tom Rini <trini@ti.com>
generated by cgit v1.1 at 2024-11-09 21:09:02 +0000