summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.denx.de/u-boot-mpc85xxWolfgang Denk2011-10-2129-86/+602
|\
| * mpc85xx: Add inline GPIO acessor functionsKyle Moffett2011-10-211-0/+123
| * powerpc/85xx: wait for alignment before resetting SERDES RX lanes (SERDES9)Timur Tabi2011-10-204-19/+35
| * powerpc/85xx: Fix P2020DS bootingKumar Gala2011-10-181-0/+12
| * powerpc/85xx: Update USB device tree status based on pin settingsShengzhou Liu2011-10-181-0/+23
| * fdt: Add new fdt_set_node_status & fdt_set_status_by_alias helpersShengzhou Liu2011-10-184-49/+101
| * powerpc/85xx: Add support for RMan LIODN initializationKumar Gala2011-10-1811-0/+115
| * powerpc/85xx: Update device tree handling for SRIOKumar Gala2011-10-182-10/+93
| * powerpc/85xx: Update setting of SRIO LIODNsKumar Gala2011-10-187-6/+72
| * fm: Don't allow disabling of FM1-DTSEC1Kumar Gala2011-10-184-0/+20
| * fm-eth: Don't mark the MAC we use for MDIO as disabled in device treeKumar Gala2011-10-181-2/+8
* | Merge branch 'master' of git://git.denx.de/u-boot-coldfireWolfgang Denk2011-10-2129-1352/+168
|\ \
| * | ColdFire: Clean Makefile _config rulesstany MARCEL2011-10-191-2/+8
| * | ColdFire: Move boards with simple _config rules to boards.cfgstany MARCEL2011-10-194-107/+24
| * | ColdFire: Fix compilation with CONFIG_SYS_DRAMSZ1 definedstany MARCEL2011-10-191-0/+3
| * | ColdFire: Merge differentiated linking files into a sigle one by boardstany MARCEL2011-10-1910-574/+0
| * | ColdFire: Add $(obj) before cpu lib to correct buildstany MARCEL2011-10-195-5/+5
| * | ColdFire: Cleanup lds files for multiple defined symbolsstany MARCEL2011-10-1912-685/+149
| |/
* | Merge branch 'master' of /home/wd/git/u-boot/masterWolfgang Denk2011-10-2198-186/+4369
|\ \
| * | cosmetic: Fixup fixup_silent_linux() for checkpatchDoug Anderson2011-10-201-12/+13
| * | Correct dependency rule to fix SPL buildSimon Glass2011-10-181-1/+2
| |/
| * Move timestamp and version files into 'generated' subdirSimon Glass2011-10-178-13/+8
| * sandbox: Makefile changes to build sandbox architectureSimon Glass2011-10-171-0/+8
| * Add generic gpio.h in asm-genericSimon Glass2011-10-171-0/+74
| * Adjust dependency rules to permit per-file flagsSimon Glass2011-10-174-13/+42
| * sandbox: Use uintptr_t for 32/64-bit compatibilitySimon Glass2011-10-172-5/+5
| * sandbox: Add basic config fileSimon Glass2011-10-171-0/+85
| * sandbox: Add serial uartSimon Glass2011-10-172-0/+64
| * sandbox: Add main programSimon Glass2011-10-172-1/+34
| * sandbox: Add OS dependent layerSimon Glass2011-10-174-5/+135
| * sandbox: Force command sections to be 4-byte alignedSimon Glass2011-10-171-1/+2
| * sandbox: Disable standalone/API supportSimon Glass2011-10-171-3/+6
| * sandbox: Disable built-in mallocSimon Glass2011-10-171-0/+2
| * sandbox: Add bootm supportSimon Glass2011-10-171-4/+3
| * sandbox: Add board info for architectureSimon Glass2011-10-171-4/+30
| * sandbox: Add sandbox boardSimon Glass2011-10-173-0/+92
| * sandbox: Add architecture lib filesSimon Glass2011-10-173-0/+366
| * sandbox: Add cpu filesSimon Glass2011-10-174-0/+164
| * sandbox: Add compiler defines to support a 64-bit x86_64 platformSimon Glass2011-10-171-1/+15
| * sandbox: Add architecture image supportSimon Glass2011-10-172-0/+4
| * Fix use of int as pointer in image.cSimon Glass2011-10-171-2/+2
| * sandbox: Add architecture header filesSimon Glass2011-10-1715-0/+739
| * arm: ca9x4_ct_vxp: enable PXE BOOTP options supportJason Hobbs2011-10-171-0/+3
| * arm: ca9x4_ct_vxp: enable pxe command supportJason Hobbs2011-10-171-0/+4
| * Convert ca9x4_ct_vxp to standard env variablesJason Hobbs2011-10-171-6/+6
| * net: bootp: add PXE/RFC 4578 DHCP options supportJason Hobbs2011-10-171-0/+40
| * Add pxe commandJason Hobbs2011-10-175-0/+1604
| * lib: add uuid_str_to_bin for use with bootp and PXE uuidJason Hobbs2011-10-173-0/+90
| * README: document standard image variablesJason Hobbs2011-10-171-0/+19
| * Replace space and tab checks with isblankJason Hobbs2011-10-176-16/+23
OpenPOWER on IntegriCloud