[U-Boot] [PATCH V2 3/4] ARM: Warn when the machine ID isn't set.

Christopher Harvey
2011-07-07T14:34:24Z

Linux cannot boot without it.

Signed-off-by: Christopher Harvey <charvey@matrox.com>
---

V2:
Used a #define instead of a constant.
Used a printf instead of a debug.

arch/arm/include/asm/u-boot.h | 2 ++
arch/arm/lib/board.c | 1 +
arch/arm/lib/bootm.c | 6 ++++++
3 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/arch/arm/include/asm/u-boot.h b/arch/arm/include/asm/u-boot.h
index ed33327..81735de 100644
--- a/arch/arm/include/asm/u-boot.h
+++ b/arch/arm/include/asm/u-boot.h
@@ -48,4 +48,6 @@ typedef struct bd_info {
} bi_dram[CONFIG_NR_DRAM_BANKS];
} bd_t;

+#define BI_ARCH_NUMBER_INVALID 0xffffffff
+
#endif /* _U_BOOT_H_ */
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index fc52a26..4923397 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -404,6 +404,7 @@ void board_init_f (ulong bootflag)
post_bootmode_init();
post_run (NULL, POST_ROM | post_bootmode_get(0));
#endif
+ gd->bd->bi_arch_number = BI_ARCH_NUMBER_INVALID;

gd->bd->bi_baudrate = gd->baudrate;
/* Ram ist board specific, so move it to board code ... */
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 802e833..ea9bf17 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -113,6 +113,12 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
printf ("Using machid 0x%x from environment\n", machid);
}

+#ifdef DEBUG
+ if (machid == BI_ARCH_NUMBER_INVALID) {
+ printf("Warning: machid not set.\n");
+ }
+#endif
+
show_boot_progress (15);

#ifdef CONFIG_OF_LIBFDT
--
1.7.3.4