summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeLines
* Merge branch 'master' of git://git.denx.de/u-boot-atmelTom Rini2015-02-10-431/+518
|\
| * arm, at91: taurus remove MACH_TYPE definitions in config fileHeiko Schocher2015-02-07-3/+0
| * arm, at91: add reset controller status registerHeiko Schocher2015-02-07-0/+2
| * arm, at91, taurus: enable WDTHeiko Schocher2015-02-07-0/+6
| * arm, at91, wdt: make timeout configurableHeiko Schocher2015-02-07-0/+7
| * common/board_f: add at91 wdtHeiko Schocher2015-02-07-1/+1
| * arm, at91, wdt: do not disable WDT in SPLHeiko Schocher2015-02-07-0/+4
| * ARM: at91: at91sam9x5: save environment to a FAT file in MMC cardWu, Josh2015-02-07-5/+6
| * ARM: at91: sama5d3xek: save enviroment as a FAT file in MMC cardWu, Josh2015-02-07-4/+6
| * ARM: at91: sama5d3_xplained: save environment in a FAT file in MMC cardWu, Josh2015-02-07-4/+5
| * ARM: at91: mmc portA support is only for at91sam9g20ek_2mmc boardWu, Josh2015-02-07-5/+7
| * mtd: atmel_nand: according to pmecc version to perform 0xff page correctionWu, Josh2015-02-07-0/+29
| * ARM: atmel: cleanup: remove at91cap9 related codeBo Shen2015-02-07-408/+4
| * ARM: atmel: sama5d4_xplained: enable spl supportBo Shen2015-02-07-0/+145
| * ARM: atmel: sama5d4ek: enable SPL supportBo Shen2015-02-07-0/+145
| * ARM: atmel: sama5d4: build related file when enable SPLBo Shen2015-02-07-0/+1
| * ARM: atmel: sama5d4: can access DDR in interleave modeBo Shen2015-02-07-1/+1
| * ARM: atmel: sama5d4: add interrupt redirect functionBo Shen2015-02-07-0/+12
| * ARM: atmel: sama5d4: add bus matrix init functionBo Shen2015-02-07-0/+35
| * ARM: atmel: sama5d4: add matrix1 base addr definitionBo Shen2015-02-07-0/+2
| * ARM: atmel: spl: can not disable osc for sama5d4Bo Shen2015-02-07-0/+2
| * ARM: atmel: spl: add saic to aic redirect functionBo Shen2015-02-07-0/+8
| * ARM: atmel: spl: add weak bus matrix init functionBo Shen2015-02-07-0/+7
| * ARM: atmel: sama5: add sfr register header fileBo Shen2015-02-07-0/+38
| * ARM: atmel: sama5: add bus matrix header fileBo Shen2015-02-07-0/+37
| * ARM: atmel: clock: make it possible to configure HMX32Bo Shen2015-02-07-0/+8
* | Merge branch 'master' of git://git.denx.de/u-boot-videoTom Rini2015-02-10-546/+575
|\ \
| * | lcd: split splash code into its own functionNikita Kiryanov2015-02-10-31/+48
| * | lcd: dt: extract simplefb supportNikita Kiryanov2015-02-10-53/+75
| * | lcd: rename bitmap_plot to better represent its functionalityNikita Kiryanov2015-02-10-3/+3
| * | lcd: various cleanupsNikita Kiryanov2015-02-10-143/+49
| * | lcd: remove unused includesNikita Kiryanov2015-02-10-18/+0
| * | lcd: introduce lcd_set_cmapNikita Kiryanov2015-02-10-24/+33
| * | lcd: logo: move generic cmap setting to lcd_logo_set_cmap()Nikita Kiryanov2015-02-10-21/+7
| * | lcd: mpc823: move mpc823-specific lcd_logo_set_cmap code to mpc8xx_lcd.cNikita Kiryanov2015-02-10-9/+16
| * | lcd: atmel: introduce lcd_logo_set_cmapNikita Kiryanov2015-02-10-21/+34
| * | lcd: mpc8xx: move mpc823-specific fb_put_byte to mpc8xx_lcd.cNikita Kiryanov2015-02-10-6/+12
| * | lcd: atmel: move atmel-specific fb_put_word to atmel_lcdfbNikita Kiryanov2015-02-10-10/+10
| * | lcd: split configuration_get_cmapNikita Kiryanov2015-02-10-19/+47
| * | lcd: move platform-specific structs to their own headersNikita Kiryanov2015-02-10-196/+247
| |/
* | Merge branch 'master' of git://www.denx.de/git/u-boot-imxTom Rini2015-02-10-329/+2863
|\ \
| * | mx53loco: Fix boot hang during reboot stress testFabio Estevam2015-02-10-1/+2
| * | arm: mxs: Add 'Wait for JTAG user' if booted in JTAG modeGraeme Russ2015-02-10-0/+22
| * | arm: mxs: Enable booting of mx28 without batteryGraeme Russ2015-02-10-2/+8
| * | arm: mxs: Add debug outputs and comments to mxs SPL source filesGraeme Russ2015-02-10-5/+127
| * | imx: mx6: Fixed AIPS3 base address issueYe.Li2015-02-10-3/+3
| * | imx: imximage: Add QuadSPI boot supportYe.Li2015-02-10-0/+4
| * | imx: mx6qsabreauto: Change to use common GPMI IO clock functionYe.Li2015-02-10-23/+2
| * | pmic:pfuz100 add switch mode and more registersPeng Fan2015-02-10-0/+53
| * | pmic:pfuze add macro for setting voltagePeng Fan2015-02-10-0/+2