summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorBrian Harring <ferringb@chromium.org>2012-02-08 23:34:13 -0800
committerBrian Harring <ferringb@chromium.org>2012-02-08 23:35:08 -0800
commitdebacb801479e992807f7e0d81f52932b0d7e9a2 (patch)
treeeb6d7b7521f88e75f13bb0ef8429a18708228c9b /board
parent3848b4ed5e95e44be300f3c5132706dbd8271b77 (diff)
Revert "arm: tegra2: split LP0 code to help future chips"
This reverts commit 4c7502242627f64d91432cb4958be5f93f65fbff Don't think this is the cause of http://code.google.com/p/chromium-os/issues/detail?id=26116, but it was in the same batch so I'm reverting in the process. Change-Id: Icc013ced6c22e29d569ee4ca8ef73522154ec1a8 Reviewed-on: https://gerrit.chromium.org/gerrit/15561 Reviewed-by: Brian Harring <ferringb@chromium.org> Tested-by: Brian Harring <ferringb@chromium.org>
Diffstat (limited to 'board')
-rw-r--r--board/nvidia/common/Makefile4
-rw-r--r--board/nvidia/common/board.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/board/nvidia/common/Makefile b/board/nvidia/common/Makefile
index 48d04b494d..cd821ebb07 100644
--- a/board/nvidia/common/Makefile
+++ b/board/nvidia/common/Makefile
@@ -31,8 +31,8 @@ COBJS-$(CONFIG_SPI_UART_SWITCH) += uart-spi-fix.o
COBJS-$(CONFIG_TEGRA_CLOCK_SCALING) += emc.o
COBJS-$(CONFIG_TEGRA_PMU) += pmu.o
COBJS-$(CONFIG_TEGRA_KEYBOARD) += generic_kbc.o
-COBJS-$(CONFIG_TEGRA_LP0) += crypto/aes_ref.o
-COBJS-$(CONFIG_TEGRA_LP0) += crypto/crypto.o
+COBJS-$(CONFIG_TEGRA2_LP0) += crypto/aes_ref.o
+COBJS-$(CONFIG_TEGRA2_LP0) += crypto/crypto.o
COBJS-$(CONFIG_TEGRA2_NAND) += tegra2_nand.o
COBJS := $(COBJS-y)
diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c
index 5cb219b4f9..4e517deda8 100644
--- a/board/nvidia/common/board.c
+++ b/board/nvidia/common/board.c
@@ -346,7 +346,7 @@ int board_init(void)
board_emc_init();
#endif
-#ifdef CONFIG_TEGRA_LP0
+#ifdef CONFIG_TEGRA2_LP0
/* prepare the WB code to LP0 location */
warmboot_prepare_code(TEGRA_LP0_ADDR, TEGRA_LP0_SIZE);
#endif