diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-11-09 12:51:47 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-11-09 22:59:47 +0100 |
| commit | 85b8c5c4bf80025de4632ae6c9a8a606e51508a4 (patch) | |
| tree | 7a89b428296ab5baca8f07c4019e3485e452cf42 /doc/README.scrapyard | |
| parent | 15c5cdf5aa6b292145e5e3e220ec1f42b11eff6f (diff) | |
| parent | 3285d4ca197928a048d3dda86751b5d26e6e0e86 (diff) | |
| download | talos-obmc-uboot-85b8c5c4bf80025de4632ae6c9a8a606e51508a4.tar.gz talos-obmc-uboot-85b8c5c4bf80025de4632ae6c9a8a606e51508a4.zip | |
Merge branch 'iu-boot/master' into 'u-boot-arm/master'
Conflicts:
arch/arm/cpu/arm926ejs/mxs/Makefile
board/compulab/cm_t35/Makefile
board/corscience/tricorder/Makefile
board/ppcag/bg0900/Makefile
drivers/bootcount/Makefile
include/configs/omap4_common.h
include/configs/pdnb3.h
Makefile conflicts are due to additions/removals of
object files on the ARM branch vs KBuild introduction
on the main branch. Resolution consists in adjusting
the list of object files in the main branch version.
This also applies to two files which are not listed
as conflicting but had to be modified:
board/compulab/common/Makefile
board/udoo/Makefile
include/configs/omap4_common.h conflicts are due to
the OMAP4 conversion to ti_armv7_common.h on the ARM
side, and CONFIG_SYS_HZ removal on the main side.
Resolution is to convert as this icludes removal of
CONFIG_SYS_HZ.
include/configs/pdnb3.h is due to a removal on ARM side.
Trivial resolution is to remove the file.
Note: 'git show' will also list two files just because
they are new:
include/configs/am335x_igep0033.h
include/configs/omap3_igep00x0.h
Diffstat (limited to 'doc/README.scrapyard')
| -rw-r--r-- | doc/README.scrapyard | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/README.scrapyard b/doc/README.scrapyard index 7cfb3a3772..8ed09c7103 100644 --- a/doc/README.scrapyard +++ b/doc/README.scrapyard @@ -11,7 +11,9 @@ easily if here is something they might want to dig for... Board Arch CPU Commit Removed Last known maintainer/contact ================================================================================================= -omap1510inn arm arm925t - - Kshitij Gupta <kshitij@ti.com> +pdnb3 arm ixp - 2013-09-24 Stefan Roese <sr@denx.de> +scpu arm ixp - 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 Yukon8220 powerpc mpc8220 d6ed322 2013-05-11 |
