| Message ID | 1401100934-13535-1-git-send-email-yamada.m@jp.panasonic.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Mon, May 26, 2014 at 07:42:14PM +0900, Masahiro Yamada wrote: > "make ep8248_config" fails with an error like this: > > $ make ep8248_config > make: *** [ep8248_config] Error 1 > > Its cause is that there are two entries for "ep8248". > > The first is around line 661 of boards.cfg. (as Active) > The second appears around line 1242. (as Orphan) > > This bug was originally introduced by commit e7e90901 > and I fixed it by commit 8ad5d45e. > (Refer to git-log of commit 8ad5d45e) > > But this bug was re-introduced by commit 05d134b0 because > the custodian made a mistake when he resolved a merge conflict. > > Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> > Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> > Cc: Heiko Schocher <hs@denx.de> > Cc: Kim Phillips <kim.phillips@linaro.org> Applied to u-boot/master, thanks!
diff --git a/boards.cfg b/boards.cfg index 221b7f8..0a0871b 100644 --- a/boards.cfg +++ b/boards.cfg @@ -658,7 +658,6 @@ Active powerpc mpc8260 - - cpu86 Active powerpc mpc8260 - - cpu86 CPU86_ROMBOOT CPU86:BOOT_ROM Wolfgang Denk <wd@denx.de> Active powerpc mpc8260 - - cpu87 CPU87 - - Active powerpc mpc8260 - - cpu87 CPU87_ROMBOOT CPU87:BOOT_ROM - -Active powerpc mpc8260 - - ep8248 ep8248 - Yuli Barcohen <yuli@arabellasw.com> Active powerpc mpc8260 - - iphase4539 IPHASE4539 - Wolfgang Grandegger <wg@denx.de> Active powerpc mpc8260 - - muas3001 muas3001 - Heiko Schocher <hs@denx.de> Active powerpc mpc8260 - - muas3001 muas3001_dev muas3001:MUAS_DEV_BOARD Heiko Schocher <hs@denx.de>
"make ep8248_config" fails with an error like this: $ make ep8248_config make: *** [ep8248_config] Error 1 Its cause is that there are two entries for "ep8248". The first is around line 661 of boards.cfg. (as Active) The second appears around line 1242. (as Orphan) This bug was originally introduced by commit e7e90901 and I fixed it by commit 8ad5d45e. (Refer to git-log of commit 8ad5d45e) But this bug was re-introduced by commit 05d134b0 because the custodian made a mistake when he resolved a merge conflict. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Heiko Schocher <hs@denx.de> Cc: Kim Phillips <kim.phillips@linaro.org> --- boards.cfg | 1 - 1 file changed, 1 deletion(-)