summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2014-09-21Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'Albert ARIBAUD
2014-09-19ARM: at91sam9rlek: convert to generic board supportWu, Josh
Signed-off-by: Josh Wu <[email protected]> Signed-off-by: Andreas Bießmann <[email protected]>
2014-09-19ARM: at91sam9n12ek: convert to generic board supportWu, Josh
Signed-off-by: Josh Wu <[email protected]> Signed-off-by: Andreas Bießmann <[email protected]>
2014-09-19ARM: atmel: sama5d3xek: enable NOR flash supportBo Shen
Signed-off-by: Bo Shen <[email protected]> Signed-off-by: Andreas Bießmann <[email protected]>
2014-09-17am335x_evm: Add boot script support to am335x_evmGuillaume GARDET
This patch adds boot script support to am335x_evm Signed-off-by: Guillaume GARDET <[email protected]> Cc: Tom Rini <[email protected]>
2014-09-17OMAP4: Use generic 'load' command instead of 'fatload' for 'loadbootscript' ↵Guillaume GARDET
and 'loadbootenv' as already done for 'loadimage' and 'loaduimage'. This patch uses generic 'load' command instead of 'fatload' for 'loadbootscript' and 'loadbootenv' as already done for 'loadimage' and 'loaduimage' for OMAP4 boards. This allows to use EXT partition instead of FAT, while keeping FAT compatibility. Signed-off-by: Guillaume GARDET <[email protected]> Cc: Tom Rini <[email protected]>
2014-09-17Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini
2014-09-17Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'Albert ARIBAUD
2014-09-16compiler*.h: sync include/linux/compiler*.h with Linux 3.16Masahiro Yamada
Copy them from Linux v3.16 tag. My main motivation of this commit is to add compiler-clang.h. Signed-off-by: Masahiro Yamada <[email protected]> Cc: Jeroen Hofstee <[email protected]>
2014-09-16implement the Android sparse image formatSteve Rae
update to provide usable implementation to U-Boot Signed-off-by: Steve Rae <[email protected]>
2014-09-16kbuild: force to define __UBOOT__ in all the C sourcesMasahiro Yamada
U-Boot has imported various source files from other projects, mostly Linux. Something like #ifdef __UBOOT__ [ modification for U-Boot ] #else [ original code ] #endif is an often used strategy for clarification of adjusted parts, that is, easier re-sync in future. Instead of defining __UBOOT__ in each source file, passing it from the top Makefile would be easier. Signed-off-by: Masahiro Yamada <[email protected]> Acked-by: Marek Vasut <[email protected]> Acked-by: Heiko Schocher <[email protected]>
2014-09-16Merge branch 'master' of git://git.denx.de/u-boot-armStefano Babic
2014-09-16imx:mx6slevk: change CONFIG_SYS_FSL_ESDHC_ADDRPeng Fan
Define CONFIG_SYS_FSL_ESDHC_ADDR using USDHC2_BASE_ADDR which is used in board_mmc_init. Signed-off-by: Peng Fan <[email protected]>
2014-09-16imx:mx6qarm2: change CONFIG_SYS_FSL_ESDHC_ADDRPeng Fan
Define CONFIG_SYS_FSL_ESDHC_ADDR using USDHC4_BASE_ADDR. USDHC3 and USDHC4 are both initialized in board_mmc_init. There is no restriction on USDHC3 addr or USDHC4 addr should be assigned to CONFIG_SYS_FSL_ESDHC_ADDR. So, just choose USDHC4_BASE_ADDR to avoid errors when fsl_esdhc_mmc_init is invoked. Signed-off-by: Peng Fan <[email protected]>
2014-09-16imx:mx6sxsabresd: change CONFIG_SYS_FSL_ESDHC_ADDRPeng Fan
Define CONFIG_SYS_FSL_ESDHC_ADDR using USDHC4_BASE_ADDR which is used in board_mmc_init. If board_mmc_init failed, cpu_mmc_init->fsl_esdhc_mmc_init will use CONFIG_SYS_FSL_ESDHC_ADDR to initialize sdhc. So set this macro to correct value. Signed-off-by: Peng Fan <[email protected]>
2014-09-16arm: vf610: add NAND support for vf610twrStefan Agner
This adds NAND support for the Vybrid tower system (TWR-VF65GS10) provided by the vf610_nfc driver. Full 16-Bit bus width is supported. Also an aditional config vf610twr_nand is introduced which gets the environment from NAND. However, booting U-Boot from NAND is not yet possible due to missing boot configuration block (BCB). Signed-off-by: Stefan Agner <[email protected]>
2014-09-13Merge branch 'master' of git://git.denx.de/u-boot-dmTom Rini
2014-09-12Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini
2014-09-11imx: mx6slevk: Change to use generic boardYe.Li
Enable CONFIG_SYS_GENERIC_BOARD for imx6slevk to use generic board. Signed-off-by: Ye.Li <[email protected]>
2014-09-11imx: mx6q/dlarm2: Change to use generic boardYe.Li
Enable the CONFIG_SYS_GENERIC_BOARD for imx6q/dl arm2 board to use generic board. Signed-off-by: Ye.Li <[email protected]>
2014-09-10dm: tegra: Enable driver model for serialSimon Glass
Use driver model for serial ports. Since Tegra now uses driver model for serial, adjust the definition of V_NS16550_CLK so that it is clear that this is only used for SPL. Signed-off-by: Simon Glass <[email protected]>
2014-09-10tegra: dts: Add serial port detailsSimon Glass
Some Tegra device tree files do not include information about the serial ports. Add this and also add information about the input clock speed. The console alias needs to be set up to indicate which port is used for the console. Also add a binding file since this is missing. Series-changes; 5 - Add full serial port nodes from Linux tree (commit fc9d4dbe) - Use /chosen/stdout-path instead of /aliases/console to specify the console Signed-off-by: Simon Glass <[email protected]>
2014-09-10dm: serial: Add driver model support for ns16550Simon Glass
Add driver model support so that ns16550 can support operation both with and without driver model. The driver needs a clock frequency so cannot stand alone unfortunately. The clock frequency must be provided by a separate driver. Signed-off-by: Simon Glass <[email protected]>
2014-09-10dm: serial: Move baud rate calculation to ns16550.cSimon Glass
Move the function that calculates the baud rate divisor into ns16550.c so it can be used by that file. Signed-off-by: Simon Glass <[email protected]>
2014-09-10sandbox: Convert serial driver to use driver modelSimon Glass
Adjust the sandbox serial driver to use the new driver model uclass. The driver works much as before, but within the new framework. Signed-off-by: Simon Glass <[email protected]>
2014-09-10dm: Add a uclass for serial devicesSimon Glass
Serial devices support simple byte input/output and a few operations to find out whether data is available. Add a basic uclass for serial devices to be used by drivers that are converted to driver model. Signed-off-by: Simon Glass <[email protected]>
2014-09-10dm: Adjust lists_bind_fdt() to return the bound deviceSimon Glass
Allow the caller to find out the device that was bound in response to this call. Signed-off-by: Simon Glass <[email protected]>
2014-09-10dm: fdt: Add a function to look up a chosen nodeSimon Glass
Within /chosen we may have a node which points to another node, similar to how /aliases works. Add a helper function to do this lookup. Signed-off-by: Simon Glass <[email protected]>
2014-09-10tegra: Convert tegra GPIO driver to use driver modelSimon Glass
This is an implementation of GPIOs for Tegra that uses driver model. It has been tested on trimslice and also using the new iotrace feature. The implementation uses a top-level GPIO device (which has no actual GPIOS). Under this all the banks are created as separate GPIO devices. The GPIOs are named as per the Tegra datasheet/header files: A0..A7, B0..B7, ..., Z0..Z7, AA0..AA7, etc. Since driver model is not yet available before relocation, or in SPL, a special function is provided for seaboard's SPL code. Signed-off-by: Simon Glass <[email protected]>
2014-09-10dm: tegra: Set up a pre-reloc malloc()Simon Glass
Allocate 1KB so that driver model can operate before relocation. Signed-off-by: Simon Glass <[email protected]>
2014-09-10dm: Make driver model available before board_init()Simon Glass
For some boards board_init() will change GPIOs, so we need to have driver model available before then. Adjust the board init to arrange this, but enable it for driver model only, just to be safe. This does create additional #ifdef logic, but it is safer than trying to make a pervasive change which may cause some boards to break. Signed-off-by: Simon Glass <[email protected]>
2014-09-10Merge branch 'master' of git://www.denx.de/git/u-boot-microblazeTom Rini
2014-09-10microblaze: remove #ident directive to fix build errorMasahiro Yamada
The microblaze-generic board fails to build at least with the kernel.org crosstool: https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.9.0/ x86_64-gcc-4.9.0-nolibc_microblaze-linux.tar.xz $ make CROSS_COMPILE=microblaze-linux- microblaze-generic_defconfig all [ snip ] CC disk/part.o CC disk/part_dos.o LD disk/built-in.o CC drivers/block/systemace.o {standard input}: Assembler messages: {standard input}:2495: Error: operation combines symbols in different segments {standard input}:2496: Error: operation combines symbols in different segments {standard input}:2499: Error: operation combines symbols in different segments {standard input}:2500: Error: operation combines symbols in different segments {standard input}:2505: Error: operation combines symbols in different segments {standard input}:2506: Error: operation combines symbols in different segments {standard input}:2515: Error: operation combines symbols in different segments {standard input}:2516: Error: operation combines symbols in different segments {standard input}:2519: Error: operation combines symbols in different segments {standard input}:2520: Error: operation combines symbols in different segments {standard input}:2529: Error: operation combines symbols in different segments {standard input}:2530: Error: operation combines symbols in different segments {standard input}:2533: Error: operation combines symbols in different segments {standard input}:2534: Error: operation combines symbols in different segments {standard input}:2539: Error: operation combines symbols in different segments {standard input}:2540: Error: operation combines symbols in different segments {standard input}:2549: Error: operation combines symbols in different segments {standard input}:2550: Error: operation combines symbols in different segments make[3]: *** [drivers/block/systemace.o] Error 1 make[2]: *** [drivers/block] Error 2 make[1]: *** [drivers] Error 2 make: *** [__build_one_by_one] Error 2 It looks like the cause of this error message is the "#ident" directive. Signed-off-by: Masahiro Yamada <[email protected]> Cc: Michal Simek <[email protected]> Signed-off-by: Michal Simek <[email protected]>
2014-09-09mx6sxsabresd: Add PCI supportFabio Estevam
Tested with an Intel Wireless PCI 7260HMW card: U-Boot 2014.10-rc1-16576-g4a8a8a8-dirty (Aug 23 2014 - 16:05:11) CPU: Freescale i.MX6SX rev1.0 at 792 MHz Reset cause: WDOG Board: MX6SX SABRE SDB I2C: ready DRAM: 1 GiB MMC: FSL_SDHC: 0 00:01.0 - 16c3:abcd - Bridge device 01:00.0 - 8086:08b1 - Network controller Signed-off-by: Fabio Estevam <[email protected]>
2014-09-09mx6qsabreauto: Remove imx6q-sabreauto.dtsFabio Estevam
Commit fa9c021632473 ("mx6: add example DTB for mx6qsabreauto") introduced 'imx6q-sabreauto.dts' but it adds no real value as the dts file only contains the 'model' and 'compatible' strings. After this commit the final binary is also changed from 'u-boot.imx' to 'u-boot-dtb.imx', which may confuse users. So revert it until a more complete and useful device tree could be provided. Signed-off-by: Fabio Estevam <[email protected]> Acked-by: Otavio Salvador <[email protected]>
2014-09-09imx: nitrogen6x: Replace 'fatload' by 'load' command in env settings to be ↵Guillaume GARDET
filesystem independent nitrogen6x.h file defines CONFIG_CMD_FS_GENERIC, so we are able to use generic 'load' command instead of 'fatload'. It allows to use ext filesystem and keep compatibilty with fat filesystem. Signed-off-by: Guillaume GARDET <[email protected]> Cc: Stefano Babic <[email protected]> Acked-By: Eric Nelson <[email protected]>
2014-09-09imx: ventana: add pci fixup for PLX PEX860x switch GPIOTim Harvey
Most Gateworks Ventana boards use a PLX PEX860x PCIe switch for PCIe expansion. These boards use GPIO on the PLX device as PERST# for the downstream ports thus we assert this when the PLX is enumerated. Signed-off-by: Tim Harvey <[email protected]>
2014-09-09pci: add support for board_pci_fixup_dev functionTim Harvey
Some board-level drivers may wish to have per-device fixup functions for PCI devices. Signed-off-by: Tim Harvey <[email protected]>
2014-09-09arm: mx6: cm_fx6: add sata supportNikita Kiryanov
Add support for SATA. Cc: Igor Grinberg <[email protected]> Cc: Stefano Babic <[email protected]> Cc: Tom Rini <[email protected]> Signed-off-by: Nikita Kiryanov <[email protected]>
2014-09-09arm: mx6: cm_fx6: use eepromNikita Kiryanov
Use Compulab eeprom module to obtain revision number, serial number, and mac address from the EEPROM. Cc: Igor Grinberg <[email protected]> Cc: Stefano Babic <[email protected]> Cc: Tom Rini <[email protected]> Signed-off-by: Nikita Kiryanov <[email protected]>
2014-09-09arm: mx6: cm_fx6: add i2c supportNikita Kiryanov
Add support for all 3 I2C busses on Compulab CM-FX6 CoM. Cc: Igor Grinberg <[email protected]> Cc: Stefano Babic <[email protected]> Cc: Tom Rini <[email protected]> Acked-by: Igor Grinberg <[email protected]> Signed-off-by: Nikita Kiryanov <[email protected]>
2014-09-09arm: mx6: cm_fx6: add usb supportNikita Kiryanov
Add USB and USB OTG host support for Compulab CM-FX6 CoM. Cc: Igor Grinberg <[email protected]> Cc: Stefano Babic <[email protected]> Cc: Tom Rini <[email protected]> Signed-off-by: Nikita Kiryanov <[email protected]>
2014-09-09arm: mx6: cm_fx6: add ethernet supportNikita Kiryanov
Add ethernet support for Compulab CM-FX6 CoM Cc: Igor Grinberg <[email protected]> Cc: Stefano Babic <[email protected]> Cc: Tom Rini <[email protected]> Acked-by: Igor Grinberg <[email protected]> Signed-off-by: Nikita Kiryanov <[email protected]>
2014-09-09arm: mx6: cm_fx6: add nand supportNikita Kiryanov
Add NAND support for Compulab CM-FX6 CoM. Cc: Igor Grinberg <[email protected]> Cc: Stefano Babic <[email protected]> Cc: Tom Rini <[email protected]> Acked-by: Igor Grinberg <[email protected]> Signed-off-by: Nikita Kiryanov <[email protected]>
2014-09-09arm: mx6: add support for Compulab cm-fx6 CoMNikita Kiryanov
Add initial support for Compulab CM-FX6 CoM. Support includes MMC, SPI flash, and SPL with dynamic DRAM detection. Cc: Igor Grinberg <[email protected]> Cc: Stefano Babic <[email protected]> Cc: Tom Rini <[email protected]> Cc: Marek Vasut <[email protected]> Cc: Simon Glass <[email protected]> Acked-by: Marek Vasut <[email protected]> Signed-off-by: Nikita Kiryanov <[email protected]>
2014-09-09sata: dwc_ahsata: implement sata_port_statusNikita Kiryanov
Define the new common function sata_port_status() which can be used to query the sata driver for the state of ports, and implement it for dwc_ahsata. Cc: Stefano Babic <[email protected]> Cc: Tom Rini <[email protected]> Cc: Marek Vasut <[email protected]> Reviewed-by: Marek Vasut <[email protected]> Signed-off-by: Nikita Kiryanov <[email protected]>
2014-09-09compulab: eeprom: add support for defining eeprom i2c busNikita Kiryanov
Create CONFIG_SYS_I2C_EEPROM_BUS #define to tell the EEPROM module what I2C bus the EEPROM is located at. Make cl_eeprom_read() switch to that bus when reading EEPROM. Cc: Igor Grinberg <[email protected]> Cc: Dmitry Lifshitz <[email protected]> Cc: Tom Rini <[email protected]> Cc: Marek Vasut <[email protected]> Acked-by: Igor Grinberg <[email protected]> Acked-by: Dmitry Lifshitz <[email protected]> Reviewed-by: Marek Vasut <[email protected]> Signed-off-by: Nikita Kiryanov <[email protected]>
2014-09-09clang: workaround for generated constantsJeroen Hofstee
KBuild abuses the asm statement to write to a file and clang chokes about these invalid asm statements. Hack it even more by fooling this is actual valid asm code. cc: Masahiro Yamada <[email protected]> cc: Tom Rini <[email protected]> Signed-off-by: Jeroen Hofstee <[email protected]>
2014-09-09Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'Albert ARIBAUD
2014-09-09Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'Albert ARIBAUD