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

Marian Balakowicz
2008-01-11T14:28:59Z

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

common/cmd_bootm.c | 3 +--
lib_ppc/ppc_linux.c | 20 +++++++++++---------
2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index a4952fd..310173a 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -40,8 +40,7 @@
#include <fdt.h>
#include <libfdt.h>
#include <fdt_support.h>
-#endif
-#if defined(CONFIG_OF_FLAT_TREE)
+#elif defined(CONFIG_OF_FLAT_TREE)
#include <ft_build.h>
#endif

diff --git a/lib_ppc/ppc_linux.c b/lib_ppc/ppc_linux.c
index 823758c..3a4b74f 100644
--- a/lib_ppc/ppc_linux.c
+++ b/lib_ppc/ppc_linux.c
@@ -37,8 +37,7 @@
#include <fdt.h>
#include <libfdt.h>
#include <fdt_support.h>
-#endif
-#if defined(CONFIG_OF_FLAT_TREE)
+#elif defined(CONFIG_OF_FLAT_TREE)
#include <ft_build.h>
#endif

@@ -268,7 +267,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
hdr = (image_header_t *)of_flat_tree;
#if defined(CONFIG_OF_FLAT_TREE)
if (*((ulong *)(of_flat_tree + image_get_header_size())) != OF_DT_HEADER) {
-#else
+#elif defined(CONFIG_OF_LIBFDT)
if (fdt_check_header(of_flat_tree + image_get_header_size()) != 0) {
#endif
#ifndef CFG_NO_FLASH
@@ -312,7 +311,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
}
#if defined(CONFIG_OF_FLAT_TREE)
if (*((ulong *)(of_flat_tree + image_get_header_size())) != OF_DT_HEADER) {
-#else
+#elif defined(CONFIG_OF_LIBFDT)
if (fdt_check_header(of_flat_tree + image_get_header_size()) != 0) {
#endif
puts ("ERROR: uImage data is not a fdt - "
@@ -363,7 +362,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,

#if defined(CONFIG_OF_FLAT_TREE)
if (*((ulong *)(of_flat_tree)) != OF_DT_HEADER) {
-#else
+#elif defined(CONFIG_OF_LIBFDT)
if (fdt_check_header (of_flat_tree) != 0) {
#endif
puts ("ERROR: image is not a fdt - "
@@ -374,7 +373,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
#if defined(CONFIG_OF_FLAT_TREE)
if (((struct boot_param_header *)of_flat_tree)->totalsize !=
image_to_cpu (len_ptr[2])) {
-#else
+#elif defined(CONFIG_OF_LIBFDT)
if (be32_to_cpu (fdt_totalsize (of_flat_tree)) !=
image_to_cpu(len_ptr[2])) {
#endif
@@ -517,8 +516,9 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
ft_board_setup(of_flat_tree, gd->bd);
#endif
}
-#endif /* CONFIG_OF_LIBFDT */
-#if defined(CONFIG_OF_FLAT_TREE)
+
+#elif defined(CONFIG_OF_FLAT_TREE)
+
#ifdef CFG_BOOTMAPSZ
/*
* The blob must be within CFG_BOOTMAPSZ,
@@ -551,7 +551,9 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
*/
ft_setup(of_flat_tree, kbd, initrd_start, initrd_end);
/* ft_dump_blob(of_flat_tree); */
-#endif
+
+#endif /* #if defined(CONFIG_OF_LIBFDT) #elif defined(CONFIG_OF_FLAT_TREE) */
+
debug ("## Transferring control to Linux (at address %08lx) ...\n",
(ulong)kernel);