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.
---
V3: Moved gd->bd->bi_arch_number = BI_ARCH_NUMBER_INVALID; before the init_sequence loop, so it doesn't overwrite existing values. Removed unneeded braces.
Reminder, in V2 of this series there are 3 uncommited patches that have no comments.
arch/arm/include/asm/u-boot.h | 2 ++ arch/arm/lib/board.c | 2 ++ arch/arm/lib/bootm.c | 5 +++++ 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..1635aa1 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -281,6 +281,8 @@ void board_init_f (ulong bootflag)
gd->mon_len = _bss_end_ofs;
+ gd->bd->bi_arch_number = BI_ARCH_NUMBER_INVALID; + for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) { if ((*init_fnc_ptr)() != 0) { hang (); diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 802e833..8e75b5a 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -113,6 +113,11 @@ 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