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

diff --git a/payloads/coreinfo/Kconfig b/payloads/coreinfo/Kconfig
index 461cd24999113a7c05eb532709be7f63c9004546..4a8508e987a71cf7334f13a890e876770d2c1a2a 100644 (file)
--- 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 59af713962f4cc961435971c7cba91558c93afc8..6b0e7c4435c72e83c1bee02a44e8f2c5280d49ec 100644 (file)
--- 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