Commit bfcc40bb09b05c90cc3b1496abb270eb8aa72134
Exists in
master
and in
54 other branches
Merge branch 'next' of ../next
* 'next' of ../next: mkenvimage: Add version info switch (-V) mkenvimage: Fix getopt() error handling mkenvimage: Fix some typos phy: add Micrel KS8721BL phy definition net: introduce per device index mvgbe: remove setting of ethaddr within the driver x86: Add support for specifying an initrd with the zboot command x86: Refactor the zboot innards so they can be reused with a vboot image x86: Add infrastructure to extract an e820 table from the coreboot tables x86: Add support for booting Linux using the 32 bit boot protocol x86: Clean up the x86 zimage code in preparation to extend it x86: Import code from coreboot's libpayload to parse the coreboot table x86: Initial commit for running as a coreboot payload CHECKPATCH: ./board/esd/hh405/logo_320_240_8bpp.c CHECKPATCH: ./board/esd/hh405/logo_1024_768_8bpp.c CHECKPATCH: ./board/esd/hh405/logo_320_240_4bpp.c CHECKPATCH: ./board/esd/hh405/logo_640_480_24bpp.c CHECKPATCH: ./board/esd/apc405/logo_640_480_24bpp.c CHECKPATCH: ./board/esd/voh405/logo_320_240_4bpp.c CHECKPATCH: ./board/esd/voh405/logo_640_480_24bpp.c CHECKPATCH: ./board/esd/hh405/fpgadata.c CHECKPATCH: ./board/esd/pci405/fpgadata.c CHECKPATCH: ./board/esd/tasreg/fpgadata.c CHECKPATCH: ./board/esd/apc405/fpgadata.c CHECKPATCH: ./board/esd/voh405/fpgadata.c CHECKPATCH: ./board/esd/ash405/fpgadata.c CHECKPATCH: ./board/esd/dasa_sim/fpgadata.c CHECKPATCH: ./board/esd/ar405/fpgadata_xl30.c CHECKPATCH: ./board/esd/ar405/fpgadata.c CHECKPATCH: ./board/esd/plu405/fpgadata.c CHECKPATCH: ./board/esd/wuh405/fpgadata.c CHECKPATCH: ./board/esd/cpci405/fpgadata_cpci405.c CHECKPATCH: ./board/esd/cpci405/fpgadata_cpci405ab.c CHECKPATCH: ./board/esd/cpci405/fpgadata_cpci4052.c CHECKPATCH: ./board/esd/canbt/fpgadata.c CHECKPATCH: ./board/esd/du405/fpgadata.c CHECKPATCH: ./board/esd/cpciiser4/fpgadata.c CHECKPATCH: ./board/dave/PPChameleonEVB/fpgadata.c avr32:mmu.c: fix printf() length modifier fat.c: fix printf() length modifier cmd_sf.c: fix printf() length modifier Make printf and vprintf safe from buffer overruns vsprintf: Move function documentation into header file Add safe vsnprintf and snprintf library functions Move vsprintf functions into their own header Conflicts: tools/mkenvimage.c Signed-off-by: Wolfgang Denk <wd@denx.de>
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.
Showing 59 changed files Side-by-side Diff
- README
- arch/avr32/cpu/at32ap700x/mmu.c
- arch/x86/cpu/coreboot/Makefile
- arch/x86/cpu/coreboot/asm-offsets.c
- arch/x86/cpu/coreboot/coreboot_car.S
- arch/x86/cpu/coreboot/ipchecksum.c
- arch/x86/cpu/coreboot/sdram.c
- arch/x86/cpu/coreboot/sysinfo.c
- arch/x86/cpu/coreboot/tables.c
- arch/x86/include/asm/arch-coreboot/ipchecksum.h
- arch/x86/include/asm/arch-coreboot/sysinfo.h
- arch/x86/include/asm/arch-coreboot/tables.h
- arch/x86/include/asm/zimage.h
- arch/x86/lib/bootm.c
- arch/x86/lib/zimage.c
- board/chromebook-x86/coreboot/Makefile
- board/chromebook-x86/coreboot/coreboot.c
- board/chromebook-x86/coreboot/coreboot_pci.c
- board/chromebook-x86/coreboot/coreboot_start.S
- board/chromebook-x86/coreboot/coreboot_start16.S
- board/dave/PPChameleonEVB/fpgadata.c
- board/esd/apc405/fpgadata.c
- board/esd/apc405/logo_640_480_24bpp.c
- board/esd/ar405/fpgadata.c
- board/esd/ar405/fpgadata_xl30.c
- board/esd/ash405/fpgadata.c
- board/esd/canbt/fpgadata.c
- board/esd/cpci405/fpgadata_cpci405.c
- board/esd/cpci405/fpgadata_cpci4052.c
- board/esd/cpci405/fpgadata_cpci405ab.c
- board/esd/cpciiser4/fpgadata.c
- board/esd/dasa_sim/fpgadata.c
- board/esd/du405/fpgadata.c
- board/esd/hh405/fpgadata.c
- board/esd/hh405/logo_1024_768_8bpp.c
- board/esd/hh405/logo_320_240_4bpp.c
- board/esd/hh405/logo_320_240_8bpp.c
- board/esd/hh405/logo_640_480_24bpp.c
- board/esd/pci405/fpgadata.c
- board/esd/plu405/fpgadata.c
- board/esd/tasreg/fpgadata.c
- board/esd/voh405/fpgadata.c
- board/esd/voh405/logo_320_240_4bpp.c
- board/esd/voh405/logo_640_480_24bpp.c
- board/esd/wuh405/fpgadata.c
- boards.cfg
- common/cmd_sf.c
- common/console.c
- drivers/net/mvgbe.c
- drivers/net/phy/micrel.c
- fs/fat/fat.c
- include/common.h
- include/configs/coreboot.h
- include/net.h
- include/serial.h
- include/vsprintf.h
- lib/vsprintf.c
- net/eth.c
- tools/mkenvimage.c