[commit] r5685 - trunk/payloads/coreinfo

[repository service]

Author: myles
Date: Thu Aug  5 16:41:29 2010
New Revision: 5685
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5685

Log:
Change default path and configuration for Coreinfo.

Signed-off-by: Myles Watson 
Acked-by: Cai Bai Yin 
Acked-by: Peter Stuge

Modified:
   trunk/payloads/coreinfo/Kconfig
   trunk/payloads/coreinfo/Makefile

Modified: trunk/payloads/coreinfo/Kconfig
==============================================================================
--- trunk/payloads/coreinfo/Kconfig	Thu Aug  5 08:12:16 2010	(r5684)
+++ trunk/payloads/coreinfo/Kconfig	Thu Aug  5 16:41:29 2010	(r5685)
@@ -103,8 +103,10 @@
    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"

Modified: trunk/payloads/coreinfo/Makefile
==============================================================================
--- trunk/payloads/coreinfo/Makefile	Thu Aug  5 08:12:16 2010	(r5684)
+++ trunk/payloads/coreinfo/Makefile	Thu Aug  5 16:41:29 2010	(r5685)
@@ -44,7 +44,7 @@
 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