[U-Boot-Users] [PATCH 04/13] [new uImage] Cleanup OF/FDT #if/#elif/#endif use in do_bootm_linux()

Jerry Van Baren
2008-01-11T17:32:56Z

Kim Phillips wrote:
> On Fri, 11 Jan 2008 11:26:03 -0500
> Jerry Van Baren <gerald.vanbaren@ge.com> wrote:
>
>> Marian Balakowicz wrote:
>>> Make CONFIG_OF_LIBFDT and CONFIG_OF_FLAT_TREE use more
>>> readable in PPC variant of do_bootm_linux() routine.
>>>
>>> Signed-off-by: Marian Balakowicz <m8@semihalf.com>
>> What is the wisdom of the crowd, is it possible to port over the
>> remaining 5 boards and removing the "CONFIG_OF_FLAT_TREE" code in this
>> merge window, or is it too risky? My gut says too risky, do it in the
>> next window.
>>
>> $ find . -name "*.[h]" | xargs grep CONFIG_OF_FLAT_TREE | grep 1
>> ./include/configs/mpc7448hpc2.h:#define CONFIG_OF_FLAT_TREE 1
>> ./include/configs/sbc8349.h:#define CONFIG_OF_FLAT_TREE 1
>
> apparently you're not up to date; the sbc8349 has already been
> converted over.
>
> Kim

Ahh, you're right (blushes).

$ find . -name "*.[h]" | xargs grep CONFIG_OF_FLAT_TREE | grep 1
./include/configs/mpc7448hpc2.h:#define CONFIG_OF_FLAT_TREE 1
./include/configs/MPC8610HPCD.h:#define CONFIG_OF_FLAT_TREE 1
./include/configs/stxxtc.h:#define CONFIG_OF_FLAT_TREE 1
./include/configs/sbc8641d.h:#define CONFIG_OF_FLAT_TREE 1

$ find . -name "*.[h]" | xargs grep CONFIG_OF_LIBFDT | grep 1 | wc -l
29

Even better! Add in Jon's pending update and we are down to 3 boards,
one of which will be "really easy".

mpc7448hpc2 No maintainer listed, "Created 08/11/2006 Roy Zang"
stxxtc Dan Malek
sbc8641d Joe Hamman

Thanks, everybody,
gvb