[U-Boot] [PATCH] 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 yamada.m@jp.panasonic.com Cc: Heiko Schocher hs@denx.de Cc: Kim Phillips kim.phillips@linaro.org ---
Heiko's patch is correct.
Compare http://patchwork.ozlabs.org/patch/314128/
and
"git show -M e7e909010"
You will easily understand what happened when Kim Phillips applied this patch.
boards.cfg | 1 - 1 file changed, 1 deletion(-)
diff --git a/boards.cfg b/boards.cfg index 983c657..c1d4b2d 100644 --- a/boards.cfg +++ b/boards.cfg @@ -649,7 +649,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 - ids ids8247 IDS8247 - Heiko Schocher hs@denx.de Active powerpc mpc8260 - - iphase4539 IPHASE4539 - Wolfgang Grandegger wg@denx.de Active powerpc mpc8260 - - muas3001 muas3001 - Heiko Schocher hs@denx.de

Hello Masahiro,
Am 30.04.2014 05:55, schrieb Masahiro Yamada:
"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 Yamadayamada.m@jp.panasonic.com Cc: Heiko Schocherhs@denx.de Cc: Kim Phillipskim.phillips@linaro.org
Thanks for detecting this!
Acked-by: Heiko Schocher hs@denx.de
bye, Heiko

On Wed, 30 Apr 2014 07:14:53 +0200 Heiko Schocher hs@denx.de wrote:
Hello Masahiro,
Am 30.04.2014 05:55, schrieb Masahiro Yamada:
"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 Yamadayamada.m@jp.panasonic.com Cc: Heiko Schocherhs@denx.de Cc: Kim Phillipskim.phillips@linaro.org
Thanks for detecting this!
Acked-by: Heiko Schocher hs@denx.de
apologies for the damage:
Acked-by: Kim Phillips kim.phillips@freescale.com
Wolfgang and/or Tom, please feel free to apply directly.
Kim

On 04/29/2014 10:55 PM, 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 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 yamada.m@jp.panasonic.com Cc: Heiko Schocher hs@denx.de Cc: Kim Phillips kim.phillips@linaro.org
Applied to u-boot-mpc85xx/master.
Thanks,
York
participants (4)
-
Heiko Schocher
-
Kim Phillips
-
Masahiro Yamada
-
York Sun