summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMyles Watson <mylesgw@gmail.com>2010-08-05 14:41:29 +0000
committerMyles Watson <mylesgw@gmail.com>2010-08-05 14:41:29 +0000
commit29ee87338cb2fb01f73105c831b132fbe87e43cc (patch)
treecd8acee886798bcd154b7e5ed5e15d6f00fb0d84
parent23ffe8b6904187ecc4860f71794e995bd123704a (diff)
Change default path and configuration for Coreinfo.
Signed-off-by: Myles Watson <mylesgw@gmail.com> Acked-by: Cai Bai Yin <caibaiyin.pku@gmail.com> Acked-by: Peter Stuge <peter@stuge.se> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5685 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--payloads/coreinfo/Kconfig6
-rw-r--r--payloads/coreinfo/Makefile2
2 files changed, 5 insertions, 3 deletions
diff --git a/payloads/coreinfo/Kconfig b/payloads/coreinfo/Kconfig
index 461cd24999..4a8508e987 100644
--- a/payloads/coreinfo/Kconfig
+++ b/payloads/coreinfo/Kconfig
@@ -103,8 +103,10 @@ config MODULE_RAMDUMP
default y
config MODULE_LAR
- bool "Enable the coreboot LAR module"
- default y
+ bool "Enable the coreboot v3 LAR module"
+ help
+ LAR support must also be enabled in libpayload.
+ default n
config MODULE_CBFS
bool "Enable the coreboot CBFS module"
diff --git a/payloads/coreinfo/Makefile b/payloads/coreinfo/Makefile
index 59af713962..6b0e7c4435 100644
--- a/payloads/coreinfo/Makefile
+++ b/payloads/coreinfo/Makefile
@@ -44,7 +44,7 @@ HOSTCXX = g++
HOSTCFLAGS := -I$(srck) -I$(objk)
HOSTCXXFLAGS := -I$(srck) -I$(objk)
-LIBPAYLOAD_DIR := ../libpayload
+LIBPAYLOAD_DIR := ../libpayload/install/libpayload
XCC := CC=$(CC) $(LIBPAYLOAD_DIR)/bin/lpgcc
AS = $(LIBPAYLOAD_DIR)/bin/lpas
STRIP ?= strip