From: Igor Grinberg Date: Tue, 16 Aug 2011 23:48:23 +0000 (+0000) Subject: arm: fix bd pointer dereference prior initialization X-Git-Tag: v2011.09-rc1~68^2~121 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=15c2e2c0ea64a0ab10b6765e2b0ab46d99d9ac34;p=oweals%2Fu-boot.git arm: fix bd pointer dereference prior initialization gd->bd pointer has been used prior been initialized. Move the relevant code after the initialization. Signed-off-by: Igor Grinberg --- diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index 646cf450f7..c899839852 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -275,10 +275,6 @@ void board_init_f(ulong bootflag) gd->mon_len = _bss_end_ofs; -#ifdef CONFIG_MACH_TYPE - gd->bd->bi_arch_number = CONFIG_MACH_TYPE; /* board id for Linux */ -#endif - for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) { if ((*init_fnc_ptr)() != 0) { hang (); @@ -376,6 +372,11 @@ void board_init_f(ulong bootflag) gd->bd = bd; debug("Reserving %zu Bytes for Board Info at: %08lx\n", sizeof (bd_t), addr_sp); + +#ifdef CONFIG_MACH_TYPE + gd->bd->bi_arch_number = CONFIG_MACH_TYPE; /* board id for Linux */ +#endif + addr_sp -= sizeof (gd_t); id = (gd_t *) addr_sp; debug("Reserving %zu Bytes for Global Data at: %08lx\n",