From: Wolfgang Denk <wd@denx.de>
Date: Fri, 23 Dec 2011 19:53:58 +0000 (+0100)
Subject: Merge branch 'next' of ../next
X-Git-Tag: v2012.04-rc1~341
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bfcc40bb09b05c90cc3b1496abb270eb8aa72134;p=u-boot

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>
---

bfcc40bb09b05c90cc3b1496abb270eb8aa72134
diff --cc tools/mkenvimage.c
index 3bb471d310,753d9e6ddf..c5ed373b99
--- a/tools/mkenvimage.c
+++ b/tools/mkenvimage.c
@@@ -82,12 -81,12 +84,15 @@@ int main(int argc, char **argv
  	struct stat txt_file_stat;
  
  	int fp, ep;
 +	const char *prg;
 +
 +	prg = basename(argv[0]);
  
+ 	/* Turn off getopt()'s internal error message */
+ 	opterr = 0;
+ 
  	/* Parse the cmdline */
- 	while ((option = getopt(argc, argv, "s:o:rbp:h")) != -1) {
+ 	while ((option = getopt(argc, argv, ":s:o:rbp:hV")) != -1) {
  		switch (option) {
  		case 's':
  			datasize = strtol(optarg, NULL, 0);
@@@ -110,11 -109,19 +115,19 @@@
  			padbyte = strtol(optarg, NULL, 0);
  			break;
  		case 'h':
 -			usage(argv[0]);
 +			usage(prg);
  			return EXIT_SUCCESS;
+ 		case 'V':
+ 			printf("%s version %s\n", prg, PLAIN_VERSION);
+ 			return EXIT_SUCCESS;
+ 		case ':':
+ 			fprintf(stderr, "Missing argument for option -%c\n",
 -				optopt);
++				option);
+ 			usage(argv[0]);
+ 			return EXIT_FAILURE;
  		default:
 -			fprintf(stderr, "Wrong option -%c\n", optopt);
 -			usage(argv[0]);
 +			fprintf(stderr, "Wrong option -%c\n", option);
 +			usage(prg);
  			return EXIT_FAILURE;
  		}
  	}
@@@ -122,9 -129,9 +135,9 @@@
  	/* Check datasize and allocate the data */
  	if (datasize == 0) {
  		fprintf(stderr,
- 			"Please specify the size of the envrionnment "
+ 			"Please specify the size of the environment "
  			"partition.\n");
 -		usage(argv[0]);
 +		usage(prg);
  		return EXIT_FAILURE;
  	}