From: Piotr Dymacz <pepe2k@gmail.com>
Date: Wed, 4 Dec 2013 22:22:09 +0000 (+0100)
Subject: Merge branch 'oc_recovery' to master
X-Git-Tag: 2014-11-19~52
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f07d176785a9d05f0a0772d231203d9be4e1d75b;p=oweals%2Fu-boot_mod.git

Merge branch 'oc_recovery' to master
---

f07d176785a9d05f0a0772d231203d9be4e1d75b
diff --cc u-boot/cpu/mips/ar7240/ag934x.c
index e68c9e9,64e4728..12a0b47
--- a/u-boot/cpu/mips/ar7240/ag934x.c
+++ b/u-boot/cpu/mips/ar7240/ag934x.c
@@@ -546,6 -541,8 +546,8 @@@ static void ag7240_get_ethaddr(struct e
  		mac[3] = 0x09;
  		mac[4] = 0x0b;
  		mac[5] = 0xad;
+ 
 -		printf("## Error: MAC address in FLASH is invalid, using fixed!\n");
++		printf("## Error: MAC address in FLASH is invalid, using fixed!\n");
  	}
  #else
  	// 00-03-7F (Atheros Communications, Inc.)
diff --cc u-boot/lib_mips/board.c
index a5423db,eebff3c..85808ab
--- a/u-boot/lib_mips/board.c
+++ b/u-boot/lib_mips/board.c
@@@ -296,8 -301,10 +303,9 @@@ void board_init_r(gd_t *id, ulong dest_
  	extern char * env_name_spec;
  #endif
  	bd_t *bd;
 -	int i;
  	char *s;
  	unsigned char buffer[6];
+ 	unsigned int ahb_freq, ddr_freq, cpu_freq, spi_freq;
  
  	gd = id;
  	gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */