Merge branch 'u-boot/master' into 'u-boot-arm/master'

Conflicts:
	arch/arm/cpu/armv7/rmobile/Makefile
	doc/README.scrapyard

Needed manual fix:
	arch/arm/cpu/armv7/omap-common/Makefile
	board/compulab/cm_t335/u-boot.lds

diff --cc Makefile
Simple merge

diff --cc README
Simple merge

diff --cc arch/arm/cpu/armv7/omap-common/Makefile
index 679c1a18a4545a176f9798b1897822a4ace2e09e,4d3a165f591d47bbb9afd7624c5593586b9c5451..59f5352b26d25ce62dff396ad91ab8809f9bebab
--- 1/arch/arm/cpu/armv7/omap-common/Makefile
--- 2/arch/arm/cpu/armv7/omap-common/Makefile
+++ b/arch/arm/cpu/armv7/omap-common/Makefile
@@@ -17,11 -17,6 +17,11 @@@ obj-y       += vc.
  obj-y += abb.o
  endif
  
- COBJS += pipe3-phy.o
 +ifneq ($(CONFIG_OMAP54XX),)
++obj-y += pipe3-phy.o
 +obj-$(CONFIG_SCSI_AHCI_PLAT) += sata.o
 +endif
 +
  ifeq ($(CONFIG_OMAP34XX),)
  obj-y += boot-common.o
  obj-y += lowlevel_init.o

diff --cc arch/arm/cpu/armv7/omap3/clock.c
Simple merge

diff --cc arch/arm/cpu/armv7/rmobile/Makefile
index 7b9d47eb875f680e71203b622626f2a79bb63523,5e296c4208729cd10c49c594c354d9bc5ff44ba7..22219990dd27279a6d00aded861147ec04b7322a
--- 1/arch/arm/cpu/armv7/rmobile/Makefile
--- 2/arch/arm/cpu/armv7/rmobile/Makefile
+++ b/arch/arm/cpu/armv7/rmobile/Makefile
@@@ -10,14 -11,8 +10,8 @@@ obj-y += emac.
  
  obj-$(CONFIG_DISPLAY_BOARDINFO) += board.o
  obj-$(CONFIG_GLOBAL_TIMER) += timer.o
 -obj-$(CONFIG_R8A7740) += cpu_info-r8a7740.o
 -obj-$(CONFIG_R8A7740) += pfc-r8a7740.o
 -obj-$(CONFIG_SH73A0) += cpu_info-sh73a0.o
 -obj-$(CONFIG_SH73A0) += pfc-sh73a0.o
 +obj-$(CONFIG_R8A7740) += lowlevel_init.o cpu_info-r8a7740.o pfc-r8a7740.o
 +obj-$(CONFIG_R8A7790) += lowlevel_init_ca15.o cpu_info-r8a7790.o pfc-r8a7790.o
 +obj-$(CONFIG_R8A7791) += lowlevel_init_ca15.o cpu_info-r8a7791.o pfc-r8a7791.o
 +obj-$(CONFIG_SH73A0) += lowlevel_init.o cpu_info-sh73a0.o pfc-sh73a0.o
- obj-$(CONFIG_TMU_TIMER) += sh_timer.o
- 
- SRCS += $(obj)sh_timer.c
- # from arch/sh/lib/ directory
- $(obj)sh_timer.c:
-       @rm -f $(obj)sh_timer.c
-       ln -s $(SRCTREE)/arch/sh/lib/time.c $(obj)sh_timer.c
+ obj-$(CONFIG_TMU_TIMER) += ../../../../sh/lib/time.o

diff --cc board/actux1/u-boot.lds
Simple merge

diff --cc board/actux2/u-boot.lds
Simple merge

diff --cc board/actux3/u-boot.lds
Simple merge

diff --cc board/atmel/sama5d3xek/sama5d3xek.c
Simple merge

diff --cc board/compulab/cm_t335/u-boot.lds
index 3bd96e9c1bb6ba4de923536041c69c03491ccaa5,0000000000000000000000000000000000000000..1b609a249aeff16d1a59b0b2db0af6aaac4b9ba7
mode 100644,000000..100644
--- 1/board/compulab/cm_t335/u-boot.lds
--- /dev/null
+++ b/board/compulab/cm_t335/u-boot.lds
@@@ -1,101 -1,0 +1,101 @@@
-               board/compulab/cm_t335/libcm_t335.o (.text*)
 +/*
 + * Copyright (c) 2004-2008 Texas Instruments
 + *
 + * (C) Copyright 2002
 + * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
 + *
 + * SPDX-License-Identifier:   GPL-2.0+
 + */
 +
 +OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
 +OUTPUT_ARCH(arm)
 +ENTRY(_start)
 +SECTIONS
 +{
 +      . = 0x00000000;
 +
 +      . = ALIGN(4);
 +      .text :
 +      {
 +              *(.__image_copy_start)
 +              CPUDIR/start.o (.text*)
++              board/compulab/cm_t335/built-in.o (.text*)
 +              *(.text*)
 +      }
 +
 +      . = ALIGN(4);
 +      .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
 +
 +      . = ALIGN(4);
 +      .data : {
 +              *(.data*)
 +      }
 +
 +      . = ALIGN(4);
 +
 +      . = .;
 +
 +      . = ALIGN(4);
 +      .u_boot_list : {
 +              KEEP(*(SORT(.u_boot_list*)));
 +      }
 +
 +      . = ALIGN(4);
 +
 +      .image_copy_end :
 +      {
 +              *(.__image_copy_end)
 +      }
 +
 +      .rel_dyn_start :
 +      {
 +              *(.__rel_dyn_start)
 +      }
 +
 +      .rel.dyn : {
 +              *(.rel*)
 +      }
 +
 +      .rel_dyn_end :
 +      {
 +              *(.__rel_dyn_end)
 +      }
 +
 +      _end = .;
 +
 +      /*
 +       * Deprecated: this MMU section is used by pxa at present but
 +       * should not be used by new boards/CPUs.
 +       */
 +      . = ALIGN(4096);
 +      .mmutable : {
 +              *(.mmutable)
 +      }
 +
 +/*
 + * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c
 + * __bss_base and __bss_limit are for linker only (overlay ordering)
 + */
 +
 +      .bss_start __rel_dyn_start (OVERLAY) : {
 +              KEEP(*(.__bss_start));
 +              __bss_base = .;
 +      }
 +
 +      .bss __bss_base (OVERLAY) : {
 +              *(.bss*)
 +               . = ALIGN(4);
 +               __bss_limit = .;
 +      }
 +
 +      .bss_end __bss_limit (OVERLAY) : {
 +              KEEP(*(.__bss_end));
 +      }
 +
 +      /DISCARD/ : { *(.dynsym) }
 +      /DISCARD/ : { *(.dynstr*) }
 +      /DISCARD/ : { *(.dynamic*) }
 +      /DISCARD/ : { *(.plt*) }
 +      /DISCARD/ : { *(.interp*) }
 +      /DISCARD/ : { *(.gnu*) }
 +}

diff --cc board/dvlhost/u-boot.lds
Simple merge

diff --cc board/freescale/mx31ads/u-boot.lds
Simple merge

diff --cc board/phytec/pcm051/board.c
Simple merge

diff --cc board/ti/am335x/board.c
Simple merge

diff --cc board/ti/am335x/u-boot.lds
Simple merge

diff --cc board/vpac270/u-boot-spl.lds
Simple merge

diff --cc boards.cfg
Simple merge

diff --cc doc/README.scrapyard
index a48ce7c8663af81fcc24728c7cd8f70177207960,f045f433f65f8a839c4494f75730798026d06340..604de0c8a78511f38a28b14670f7a7c5770e0693
--- 1/doc/README.scrapyard
--- 2/doc/README.scrapyard
+++ b/doc/README.scrapyard
@@@ -11,9 -11,9 +11,10 @@@ easily if here is something they might 
  
  Board            Arch        CPU            Commit      Removed     Last known maintainer/contact
  =================================================================================================
 -pdnb3            arm         ixp            -           2013-09-24  Stefan Roese <sr@denx.de>
 -scpu             arm         ixp            -           2013-09-24  Stefan Roese <sr@denx.de>
 +omap730p2        arm         arm926ejs      -           2013-11-11
+ pn62             powerpc     mpc824x        -           2013-11-11  Wolfgang Grandegger <wg@grandegger.com>
 +pdnb3            arm         ixp            304db0b     2013-09-24  Stefan Roese <sr@denx.de>
 +scpu             arm         ixp            304db0b     2013-09-24  Stefan Roese <sr@denx.de>
  omap1510inn      arm         arm925t        0610a16     2013-09-23  Kshitij Gupta <kshitij@ti.com>
  CANBT            powerpc     405CR          fb8f4fd     2013-08-07  Matthias Fuchs <matthias.fuchs@esd.eu>
  Alaska8220       powerpc     mpc8220        d6ed322     2013-05-11

diff --cc drivers/mtd/nand/atmel_nand.c
Simple merge

diff --cc include/configs/am335x_evm.h
Simple merge

diff --cc include/configs/am3517_evm.h
index 5e259f5c4e54d4b6127e2c5348fe74cdbc50022a,a3473b51bd475a2dd62ddccbe9507dc76b57fd9f..1fa477aac835d381e902f132f659cd053ca322db
--- 1/include/configs/am3517_evm.h
--- 2/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@@ -136,23 -136,13 +136,23 @@@
  #undef CONFIG_CMD_IMLS                /* List all found images        */
  
  #define CONFIG_SYS_NO_FLASH
- #define CONFIG_HARD_I2C                       1
- #define CONFIG_SYS_I2C_SPEED          100000
- #define CONFIG_SYS_I2C_SLAVE          1
- #define CONFIG_DRIVER_OMAP34XX_I2C    1
+ #define CONFIG_SYS_I2C
+ #define CONFIG_SYS_OMAP24_I2C_SPEED   100000
+ #define CONFIG_SYS_OMAP24_I2C_SLAVE   1
+ #define CONFIG_SYS_I2C_OMAP34XX
  
 -#undef CONFIG_CMD_NET
 -#undef CONFIG_CMD_NFS
 +/*
 + * Ethernet
 + */
 +#define CONFIG_DRIVER_TI_EMAC
 +#define CONFIG_DRIVER_TI_EMAC_USE_RMII
 +#define CONFIG_MII
 +#define CONFIG_BOOTP_DEFAULT
 +#define CONFIG_BOOTP_DNS
 +#define CONFIG_BOOTP_DNS2
 +#define CONFIG_BOOTP_SEND_HOSTNAME
 +#define CONFIG_NET_RETRY_COUNT                10
 +
  /*
   * Board NAND Info.
   */

diff --cc include/configs/cm_t35.h
Simple merge

diff --cc include/configs/omap3_beagle.h
Simple merge

diff --cc include/configs/siemens-am33x-common.h
Simple merge