From: Albert ARIBAUD Date: Tue, 10 Dec 2013 13:31:56 +0000 (+0100) Subject: Merge branch 'u-boot/master' into 'u-boot-arm/master' X-Git-Tag: v2014.01-rc2~42^2 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f15ea6e1d67782a1626d4a4922b6c20e380085e5;p=u-boot 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 --- f15ea6e1d67782a1626d4a4922b6c20e380085e5 diff --cc arch/arm/cpu/armv7/omap-common/Makefile index 679c1a18a4,4d3a165f59..59f5352b26 --- a/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 +ifneq ($(CONFIG_OMAP54XX),) - COBJS += pipe3-phy.o ++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/rmobile/Makefile index 7b9d47eb87,5e296c4208..22219990dd --- a/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/compulab/cm_t335/u-boot.lds index 3bd96e9c1b,0000000000..1b609a249a mode 100644,000000..100644 --- a/board/compulab/cm_t335/u-boot.lds +++ b/board/compulab/cm_t335/u-boot.lds @@@ -1,101 -1,0 +1,101 @@@ +/* + * Copyright (c) 2004-2008 Texas Instruments + * + * (C) Copyright 2002 + * Gary Jennejohn, DENX Software Engineering, + * + * 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/libcm_t335.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 doc/README.scrapyard index a48ce7c866,f045f433f6..604de0c8a7 --- a/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 ================================================================================================= +omap730p2 arm arm926ejs - 2013-11-11 + pn62 powerpc mpc824x - 2013-11-11 Wolfgang Grandegger -pdnb3 arm ixp - 2013-09-24 Stefan Roese -scpu arm ixp - 2013-09-24 Stefan Roese +pdnb3 arm ixp 304db0b 2013-09-24 Stefan Roese +scpu arm ixp 304db0b 2013-09-24 Stefan Roese omap1510inn arm arm925t 0610a16 2013-09-23 Kshitij Gupta CANBT powerpc 405CR fb8f4fd 2013-08-07 Matthias Fuchs Alaska8220 powerpc mpc8220 d6ed322 2013-05-11 diff --cc include/configs/am3517_evm.h index 5e259f5c4e,a3473b51bd..1fa477aac8 --- a/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. */