diff options
author | Vadim Bendebury <vbendeb@chromium.org> | 2011-06-16 13:25:02 -0700 |
---|---|---|
committer | Simon Glass <sjg@chromium.org> | 2011-08-29 10:39:29 -0700 |
commit | 889f8e96da85483ffb140caa5120e1c556e7b5ac (patch) | |
tree | 940a38ce787810074c4fcae6650a7c0bb6c3b5f7 /include/configs/tegra2-common.h | |
parent | 8feb0062040a30f479706d11afc06752397e01c0 (diff) |
Derive board name and machine ID from the device tree.
The board device ID needs to be passed to the kernel for proper
initialization of the machine (until FDT is deployed for that).
The device ID is picked based on the board name in the u-boot
device tree.
BUG=chromium-os:834
TEST=manual
Tested combined with the rest of the patches in this set.
Change-Id: Ifb9395196d13e96d6616ec61ae1e6fc6bd300ab6
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: http://gerrit.chromium.org/gerrit/2773
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include/configs/tegra2-common.h')
-rw-r--r-- | include/configs/tegra2-common.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/configs/tegra2-common.h b/include/configs/tegra2-common.h index da74f31579..717c35764d 100644 --- a/include/configs/tegra2-common.h +++ b/include/configs/tegra2-common.h @@ -84,7 +84,9 @@ #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_REG_SIZE (-4) -#ifndef CONFIG_OF_CONTROL +#ifdef CONFIG_OF_CONTROL +#define CONFIG_COMPAT_STRING "nvidia,tegra250" +#else #define V_NS16550_CLK 216000000 /* 216MHz (pllp_out0) */ #define CONFIG_SYS_NS16550_SERIAL @@ -94,7 +96,7 @@ * select serial console configuration */ #define CONFIG_CONS_INDEX 1 -#endif /* CONFIG_OF_CONTROL */ +#endif /* CONFIG_OF_CONTROL ^^^^^ not defined */ #define CONFIG_ENV_SIZE SZ_4K |