]> git.dujemihanovic.xyz Git - u-boot.git/commit
boards.cfg: fix a configuration error of ep8248 board again
authorMasahiro Yamada <yamada.m@jp.panasonic.com>
Mon, 26 May 2014 10:42:14 +0000 (19:42 +0900)
committerTom Rini <trini@ti.com>
Thu, 5 Jun 2014 18:38:38 +0000 (14:38 -0400)
commit7a33c773fe112a129200b1ea640b7abc445f2409
tree9ba573de74657a1921e3164b64d9ffc12795de99
parentf77d7096634368e655f23cc4ce9fd2f01e238a9b
boards.cfg: fix a configuration error of ep8248 board again

"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