Merge branch 'oc_recovery' to master

diff --cc u-boot/Makefile
Simple merge

diff --cc u-boot/board/ar7240/ap121/ap121.c
Simple merge

diff --cc u-boot/board/ar7240/common/ar7240_flash.c
Simple merge

diff --cc u-boot/board/ar7240/common/ar7240_s26_phy.c
Simple merge

diff --cc u-boot/cpu/mips/ar7240/ag7240.c
Simple merge

diff --cc u-boot/cpu/mips/ar7240/ag934x.c
index e68c9e9aa76e492325746522358105763e043982,64e47281e2d2ae47cda001125b9b4accbd782fd0..12a0b476f4cbc58a5cf759bb612e5d3cce810780
--- 1/u-boot/cpu/mips/ar7240/ag934x.c
--- 2/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;\r
                mac[4] = 0x0b;\r
                mac[5] = 0xad;\r
 -              printf("## Error: MAC address in FLASH is invalid, using fixed!\n");\r
+ \r
++              printf("## Error: MAC address in FLASH is invalid, using fixed!\n");
        }\r
  #else\r
        // 00-03-7F (Atheros Communications, Inc.)\r

diff --cc u-boot/include/configs/ap121.h
Simple merge

diff --cc u-boot/lib_mips/board.c
index a5423dba8f55e144d70fa13e73441f71060a3dc4,eebff3c4a69f51e534ac326005764c0be8671a72..85808ab56919057eccf75525c13c071854d2636f
--- 1/u-boot/lib_mips/board.c
--- 2/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 */

diff --cc u-boot/net/bootp.c
Simple merge