Skip to contentSkip to conversation

boards.cfg: fix a configuration error of ep8248 board

PATCH New Masahiro Yamada 4 participants 4 messages Apr 30, 2014 – May 13, 2014

lore
Share & tools
lore

Masahiro Yamada

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
Cc Heiko Schocher <[email protected]>
Cc Kim Phillips <[email protected]>

---

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(-)
boards.cfg +0 -1
index 983c657..c1d4b2d 100644
@@ -649,7 +649,6 @@ Active  powerpc     mpc8260        -           -               cpu86
 Active  powerpc     mpc8260        -           -               cpu86               CPU86_ROMBOOT                        CPU86:BOOT_ROM                                                                                                                    Wolfgang Denk <[email protected]>
 Active  powerpc     mpc8260        -           -               cpu87               CPU87                                -                                                                                                                                 -
 Active  powerpc     mpc8260        -           -               cpu87               CPU87_ROMBOOT                        CPU87:BOOT_ROM                                                                                                                    -
-Active  powerpc     mpc8260        -           -               ep8248              ep8248                               -                                                                                                                                 Yuli Barcohen <[email protected]>
 Active  powerpc     mpc8260        -           ids             ids8247             IDS8247                              -                                                                                                                                 Heiko Schocher <[email protected]>
 Active  powerpc     mpc8260        -           -               iphase4539          IPHASE4539                           -                                                                                                                                 Wolfgang Grandegger <[email protected]>
 Active  powerpc     mpc8260        -           -               muas3001            muas3001                             -                                                                                                                                 Heiko Schocher <[email protected]>
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/1 boards.cfg: fix a configuration error of ep8248 board

Hello Masahiro,

Am 30.04.2014 05:55, schrieb Masahiro Yamada:

Quoted 15 lines

"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.

Quoted 5 lines

The commiter added ep8248 entry by mistake when he resolved a conflict.

Signed-off-by Masahiro Yamada<[email protected]>
Cc Heiko Schocher<[email protected]>
Cc Kim Phillips<[email protected]>

Thanks for detecting this!

Acked-by Heiko Schocher <[email protected]>

bye,
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#2 lore raw

PATCH 1/1 boards.cfg: fix a configuration error of ep8248 board

Quoted 20 lines · On Wed, 30 Apr 2014 07:14:53 +0200 Heiko Schocher <[email protected]> wrote:

Hello Masahiro,

Am 30.04.2014 05:55, schrieb Masahiro Yamada:

Quoted 17 lines

"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.

Quoted 7 lines
Quoted 3 lines
Signed-off-by Masahiro Yamada<[email protected]>
Cc Heiko Schocher<[email protected]>
Cc Kim Phillips<[email protected]>

Thanks for detecting this!

Acked-by Heiko Schocher <[email protected]>

apologies for the damage:

Acked-by Kim Phillips <[email protected]>

Wolfgang and/or Tom, please feel free to apply directly.

Kim

#3 lore raw

PATCH 1/1 boards.cfg: fix a configuration error of ep8248 board

In reply to Masahiro Yamada
Quoted 15 lines · 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.

Quoted 6 lines

The commiter added ep8248 entry by mistake when he resolved a conflict.

Signed-off-by Masahiro Yamada <[email protected]>
Cc Heiko Schocher <[email protected]>
Cc Kim Phillips <[email protected]>

---

Applied to u-boot-mpc85xx/master.

Thanks,

York