From: Masahiro Yamada Date: Wed, 30 Apr 2014 03:55:22 +0000 (+0900) Subject: boards.cfg: fix a configuration error of ep8248 board X-Git-Tag: v2014.07-rc2~18^2 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8ad5d45e;p=u-boot boards.cfg: fix a configuration error of ep8248 board "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 652 of boards.cfg. (as Active) The second appears around line 1230. (as Orphan) This bug was accidentally introduced by commit e7e90901. But it is not the author's fault. He just intended to change IDS8247 board. The commiter added ep8248 entry by mistake when he resolved a conflict. Signed-off-by: Masahiro Yamada Cc: Heiko Schocher Cc: Kim Phillips Acked-by: Heiko Schocher Acked-by: Kim Phillips --- diff --git a/boards.cfg b/boards.cfg index 9fa01a2c35..3a59686c29 100644 --- a/boards.cfg +++ b/boards.cfg @@ -652,7 +652,6 @@ Active powerpc mpc8260 - - cpu86 Active powerpc mpc8260 - - cpu86 CPU86_ROMBOOT CPU86:BOOT_ROM Wolfgang Denk Active powerpc mpc8260 - - cpu87 CPU87 - - Active powerpc mpc8260 - - cpu87 CPU87_ROMBOOT CPU87:BOOT_ROM - -Active powerpc mpc8260 - - ep8248 ep8248 - Yuli Barcohen Active powerpc mpc8260 - - iphase4539 IPHASE4539 - Wolfgang Grandegger Active powerpc mpc8260 - - muas3001 muas3001 - Heiko Schocher Active powerpc mpc8260 - - muas3001 muas3001_dev muas3001:MUAS_DEV_BOARD Heiko Schocher