Commit 05d134b084590684bcf4d832c0035952727b7cd9
Merge remote-tracking branch 'u-boot/master'
Conflicts: boards.cfg Conflicts were trivial once u-boot-arm/master boards.cfg was reformatted (commit 6130c146) to match u-boot/master's own reformatting (commit 1b37fa83).
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 228 changed files Side-by-side Diff
- .gitignore
- Makefile
- README
- arch/arc/include/asm/config.h
- arch/arm/include/asm/config.h
- arch/arm/include/asm/u-boot.h
- arch/arm/lib/board.c
- arch/avr32/include/asm/u-boot.h
- arch/avr32/lib/board.c
- arch/blackfin/include/asm/net.h
- arch/blackfin/include/asm/u-boot.h
- arch/blackfin/lib/board.c
- arch/m68k/include/asm/u-boot.h
- arch/m68k/lib/board.c
- arch/microblaze/include/asm/u-boot.h
- arch/microblaze/lib/board.c
- arch/mips/include/asm/config.h
- arch/mips/include/asm/u-boot.h
- arch/mips/lib/board.c
- arch/nds32/include/asm/u-boot.h
- arch/nds32/lib/board.c
- arch/nios2/include/asm/u-boot.h
- arch/nios2/lib/board.c
- arch/openrisc/include/asm/u-boot.h
- arch/openrisc/lib/board.c
- arch/powerpc/cpu/mpc85xx/Makefile
- arch/powerpc/cpu/mpc85xx/cmd_errata.c
- arch/powerpc/cpu/mpc85xx/cpu.c
- arch/powerpc/cpu/mpc85xx/cpu_init.c
- arch/powerpc/cpu/mpc85xx/cpu_init_early.c
- arch/powerpc/cpu/mpc85xx/fdt.c
- arch/powerpc/cpu/mpc85xx/speed.c
- arch/powerpc/cpu/mpc85xx/spl_minimal.c
- arch/powerpc/cpu/mpc85xx/start.S
- arch/powerpc/cpu/mpc85xx/t4240_ids.c
- arch/powerpc/cpu/mpc85xx/t4240_serdes.c
- arch/powerpc/cpu/mpc85xx/u-boot-nand.lds
- arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds
- arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
- arch/powerpc/cpu/mpc85xx/u-boot.lds
- arch/powerpc/cpu/mpc86xx/start.S
- arch/powerpc/cpu/mpc8xxx/cpu.c
- arch/powerpc/include/asm/config_mpc85xx.h
- arch/powerpc/include/asm/fsl_errata.h
- arch/powerpc/include/asm/fsl_secure_boot.h
- arch/powerpc/include/asm/immap_85xx.h
- arch/powerpc/include/asm/processor.h
- arch/powerpc/include/asm/u-boot.h
- arch/powerpc/lib/board.c
- arch/sandbox/config.mk
- arch/sandbox/dts/.gitignore
- arch/sandbox/include/asm/config.h
- arch/sh/include/asm/u-boot.h
- arch/sh/lib/board.c
- arch/sparc/cpu/leon2/cpu_init.c
- arch/sparc/cpu/leon3/cpu_init.c
- arch/sparc/include/asm/u-boot.h
- arch/sparc/lib/board.c
- board/amcc/acadia/acadia.c
- board/amcc/acadia/u-boot-nand.lds
- board/amcc/bamboo/u-boot-nand.lds
- board/amcc/canyonlands/u-boot-nand.lds
- board/amcc/kilauea/u-boot-nand.lds
- board/amcc/sequoia/u-boot-nand.lds
- board/armadeus/apf27/fpga.c
- board/astro/mcf5373l/fpga.c
- board/balloon3/balloon3.c
- board/bct-brettl2/bct-brettl2.c
- board/bf518f-ezbrd/bf518f-ezbrd.c
- board/bf526-ezbrd/bf526-ezbrd.c
- board/bf527-ezkit/bf527-ezkit.c
- board/bf537-minotaur/bf537-minotaur.c
- board/bf537-pnav/bf537-pnav.c
- board/bf537-srv1/bf537-srv1.c
- board/bf537-stamp/bf537-stamp.c
- board/buffalo/lsxl/lsxl.c
- board/cm-bf527/cm-bf527.c
- board/cm-bf537e/cm-bf537e.c
- board/cm-bf537u/cm-bf537u.c
- board/dave/PPChameleonEVB/u-boot.lds
- board/dnp5370/dnp5370.c
- board/esd/pmc440/fpga.c
- board/esd/pmc440/u-boot-nand.lds
- board/freescale/b4860qds/b4860qds.c
- board/freescale/common/Makefile
- board/freescale/common/sys_eeprom.c
- board/freescale/common/zm7300.c
- board/freescale/common/zm7300.h
- board/freescale/p1_p2_rdb/Makefile
- board/freescale/p1_p2_rdb/ddr.c
- board/freescale/p1_p2_rdb/spl.c
- board/freescale/p1_p2_rdb/spl_minimal.c
- board/freescale/p1_p2_rdb/tlb.c
- board/freescale/qemu-ppce500/qemu-ppce500.c
- board/freescale/t104xrdb/t104xrdb.c
- board/freescale/t4rdb/Makefile
- board/freescale/t4rdb/ddr.c
- board/freescale/t4rdb/ddr.h
- board/freescale/t4rdb/eth.c
- board/freescale/t4rdb/law.c
- board/freescale/t4rdb/pci.c
- board/freescale/t4rdb/t4240rdb.c
- board/freescale/t4rdb/t4_pbi.cfg
- board/freescale/t4rdb/t4_rcw.cfg
- board/freescale/t4rdb/t4rdb.h
- board/freescale/t4rdb/tlb.c
- board/gen860t/fpga.c
- board/ip04/ip04.c
- board/keymile/kmp204x/kmp204x.c
- board/keymile/kmp204x/kmp204x.h
- board/keymile/kmp204x/pbi.cfg
- board/keymile/kmp204x/pci.c
- board/keymile/kmp204x/qrio.c
- board/keymile/kmp204x/rcw_kmp204x.cfg
- board/matrix_vision/mvsmr/fpga.c
- board/muas3001/muas3001.c
- board/mvblue/mvblue.c
- board/sandbox/Makefile
- board/sandbox/README.sandbox
- board/sandbox/sandbox.c
- board/sandbox/sandbox/Makefile
- board/sandbox/sandbox/README.sandbox
- board/sandbox/sandbox/sandbox.c
- board/spear/x600/fpga.c
- board/tcm-bf518/tcm-bf518.c
- board/tcm-bf537/tcm-bf537.c
- board/teejet/mt_ventoux/mt_ventoux.c
- board/xilinx/zynq/board.c
- boards.cfg
- common/board_f.c
- common/cmd_bdinfo.c
- common/cmd_bootm.c
- common/cmd_nvedit.c
- common/cmd_time.c
- common/hush.c
- common/main.c
- disk/part_efi.c
- doc/README.generic-board
- doc/README.gpt
- drivers/fpga/spartan2.c
- drivers/fpga/spartan3.c
- drivers/fpga/virtex2.c
- drivers/fpga/xilinx.c
- drivers/fpga/zynqpl.c
- drivers/i2c/mvtwsi.c
- drivers/i2c/zynq_i2c.c
- drivers/mmc/fsl_esdhc.c
- drivers/net/designware.c
- drivers/net/dm9000x.c
- drivers/net/fm/Makefile
- drivers/net/fm/memac_phy.c
- drivers/net/ftmac110.c
- drivers/net/phy/atheros.c
- drivers/net/phy/phy.c
- drivers/net/phy/vitesse.c
- drivers/pci/fsl_pci_init.c
- drivers/power/tps6586x.c
- drivers/qe/qe.c
- drivers/serial/ns16550.c
- drivers/serial/serial.c
- drivers/usb/host/ehci-fsl.c
- drivers/video/atmel_hlcdfb.c
- drivers/video/mxc_ipuv3_fb.c
- fs/ext4/ext4_common.c
- fs/ext4/ext4_write.c
- fs/fat/fat_write.c
- fs/ubifs/super.c
- include/asm-generic/u-boot.h
- include/common.h
- include/config_fallbacks.h
- include/configs/B4860QDS.h
- include/configs/BSC9132QDS.h
- include/configs/MPC8536DS.h
- include/configs/MPC8572DS.h
- include/configs/MPC8641HPCN.h
- include/configs/P1_P2_RDB.h
- include/configs/P2041RDB.h
- include/configs/T1040QDS.h
- include/configs/T104xRDB.h
- include/configs/T208xQDS.h
- include/configs/T208xRDB.h
- include/configs/T4240EMU.h
- include/configs/T4240QDS.h
- include/configs/T4240RDB.h
- include/configs/bct-brettl2.h
- include/configs/bf518f-ezbrd.h
- include/configs/bf526-ezbrd.h
- include/configs/bf527-ezkit.h
- include/configs/bf537-minotaur.h
- include/configs/bf537-pnav.h
- include/configs/bf537-srv1.h
- include/configs/bf537-stamp.h
- include/configs/cm-bf527.h
- include/configs/cm-bf537e.h
- include/configs/cm-bf537u.h
- include/configs/corenet_ds.h
- include/configs/dnp5370.h
- include/configs/ids8313.h
- include/configs/ip04.h
- include/configs/km/kmp204x-common.h
- include/configs/p1_p2_rdb_pc.h
- include/configs/qemu-ppce500.h
- include/configs/sama5d3_xplained.h
- include/configs/sandbox.h
- include/configs/t4qds.h
- include/configs/tcm-bf518.h
- include/configs/tcm-bf537.h
- include/ext4fs.h
- include/fat.h
- include/net.h
- include/ns16550.h
- include/spartan2.h
- include/spartan3.h
- include/usb/ehci-fsl.h
- include/virtex2.h
- include/xilinx.h
- include/zynqpl.h
- lib/sha256.c
- nand_spl/board/freescale/p1_p2_rdb/Makefile
- nand_spl/board/freescale/p1_p2_rdb/nand_boot.c
- net/eth.c
- spl/Makefile
- tools/env/aes.c
- tools/logos/syteco.bmp
- tools/patman/README
- tools/patman/commit.py
- tools/patman/gitutil.py
- tools/patman/patchstream.py
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7
-
mentioned in commit 7a33c7