diff options
| author | Doug Anderson <dianders@chromium.org> | 2011-08-03 14:25:05 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-08-29 10:59:22 -0700 |
| commit | 5d7b2e97b22c31567d0c06f188602aefec6d9a58 (patch) | |
| tree | 78b037a8d610629235fcbb103f87626dfbeb47d7 /board/nvidia | |
| parent | c38c513e71d93ad677996384f25364bafcfeede4 (diff) | |
CHROMIUM: ARM: tegra: Don't call board_emc_init() before bi_arch_number set.
The board_emc_init() was a complete no-op, since the bi_arch_number was
always -1. This makes it work properly.
BUG=chromium-os:18648
TEST=Added print statements and saw proper board ID.
TEST=Booted on Kaen and saw boot speed improvement (with additional CL
fixing the emc table).
Change-Id: Ic92b014216a866e389dd760d6becdb72e5bf7243
Reviewed-on: http://gerrit.chromium.org/gerrit/5238
Reviewed-by: Doug Anderson <dianders@chromium.org>
Tested-by: Doug Anderson <dianders@chromium.org>
Diffstat (limited to 'board/nvidia')
| -rw-r--r-- | board/nvidia/common/board.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c index 20fdff22f0..7f10cd9c37 100644 --- a/board/nvidia/common/board.c +++ b/board/nvidia/common/board.c @@ -230,7 +230,18 @@ int board_init(void) i2c_init_board(); pmu_set_nominal(); +#endif + + /* board id for Linux */ +#ifdef CONFIG_OF_CONTROL + gd->bd->bi_arch_number = fdt_decode_get_machine_arch_id(gd->blob); + if (gd->bd->bi_arch_number == -1U) + printf("Warning: No /config/machine-arch-id defined in fdt\n"); +#else + gd->bd->bi_arch_number = CONFIG_MACH_TYPE; +#endif +#ifdef CONFIG_TEGRA2_I2C board_emc_init(); #endif @@ -242,14 +253,6 @@ int board_init(void) /* boot param addr */ gd->bd->bi_boot_params = (NV_PA_SDRAM_BASE + 0x100); - /* board id for Linux */ -#ifdef CONFIG_OF_CONTROL - gd->bd->bi_arch_number = fdt_decode_get_machine_arch_id(gd->blob); - if (gd->bd->bi_arch_number == -1U) - printf("Warning: No /config/machine-arch-id defined in fdt\n"); -#else - gd->bd->bi_arch_number = CONFIG_MACH_TYPE; -#endif return 0; } |