From mboxrd@z Thu Jan 1 00:00:00 1970 From: Masahiro Yamada Date: Mon, 21 Apr 2014 17:37:55 +0900 Subject: [U-Boot] [GIT PULL] u-boot-mips/master In-Reply-To: References: Message-ID: <20140421173753.0A7C.AA925319@jp.panasonic.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Tom, On Sun, 20 Apr 2014 13:28:53 +0200 Daniel Schwierzeck wrote: > The following changes since commit b149c4c399b111cec1ff7505ca9fabbeeb4fe394: > > ARM:tegra20: Remove aes debug prints (2014-04-18 16:14:17 -0400) > > are available in the git repository at: > > git://git.denx.de/u-boot-mips.git master > > for you to fetch changes up to ed638b6af2e9089bc998500db7e9c655c02c2493: > > MAKEALL: remove hard-coded MIPS boards (2014-04-20 13:16:43 +0200) > > ---------------------------------------------------------------- > Daniel Schwierzeck (3): > MIPS: always keep all sections in u-boot ELF binary. > MIPS: drop incaip board > Active mips mips64 - - qemu-mips qemu_mips64el qemu-mips64:SYS_LITTLE_ENDIAN - > Active nds32 n1213 ag101 AndesTech adp-ag101 adp-ag101 - Andes > diff --git a/doc/README.scrapyard b/doc/README.scrapyard > index 7d67033..32c85ad 100644 > --- a/doc/README.scrapyard > +++ b/doc/README.scrapyard > @@ -114,3 +114,4 @@ PCIPPC2 powerpc MPC740/MPC750 7c9e89b 2013-02-07 Wolfgang Den > PCIPPC6 powerpc MPC740/MPC750 - - Wolfgang Denk > omap2420h4 arm omap24xx - 2013-06-04 Richard Woodruff > eNET x86 x86 7e8c53d 2013-02-14 Graeme Russ > +incaip mips mips32 - 2014-04-17 Wolfgang Denk Commit bef67f1f32 sorted the list in reverse chronological order but the patch "MIPS: drop incaip board" broke the rule so soon. :-( Tom, a conflict will happen anyway when pulling u-boot-mips/master. When you fix the merge conflict, could you move "incaip" to the top of the list of README.scrapyard? Best Regard Masahiro Yamada