[commit] r1280 - trunk

[repository service]

Author: oxygene
Date: Tue Mar  8 08:17:44 2011
New Revision: 1280
URL: http://flashrom.org/trac/flashrom/changeset/1280

Log:
Fix and improve libpayload platform support

- Fix various minor compile issues (eg. include necessary standard headers)
- Fix compilation of libpayload code paths
- Provide libpayload support in Makefile
- Add make target "libflashrom.a" which links non-CLI code to static
  library

Signed-off-by: Patrick Georgi 
Tested-with-DOS-crosscompiler-by: Idwer Vollering 
Acked-by: Carl-Daniel Hailfinger

Modified:
   trunk/Makefile
   trunk/physmap.c
   trunk/spi.c
   trunk/udelay.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Tue Mar  8 01:23:49 2011	(r1279)
+++ trunk/Makefile	Tue Mar  8 08:17:44 2011	(r1280)
@@ -28,6 +28,8 @@
 MANDIR  ?= $(PREFIX)/share/man
 CFLAGS  ?= -Os -Wall -Wshadow
 EXPORTDIR ?= .
+AR      ?= ar
+RANLIB  ?= ranlib

WARNERROR ?= yes

@@ -82,6 +84,39 @@
 endif
 endif

+ifeq ($(OS_ARCH), libpayload)
+CC:=CC=i386-elf-gcc lpgcc
+AR:=i386-elf-ar
+RANLIB:=i386-elf-ranlib
+CPPFLAGS += -DSTANDALONE
+ifeq ($(CONFIG_DUMMY), yes)
+UNSUPPORTED_FEATURES += CONFIG_DUMMY=yes
+else
+override CONFIG_DUMMY = no
+endif
+ifeq ($(CONFIG_BUSPIRATE_SPI), yes)
+UNSUPPORTED_FEATURES += CONFIG_BUSPIRATE_SPI=yes
+else
+override CONFIG_BUSPIRATE_SPI = no
+endif
+ifeq ($(CONFIG_SERPROG), yes)
+UNSUPPORTED_FEATURES += CONFIG_SERPROG=yes
+else
+override CONFIG_SERPROG = no
+endif
+# Dediprog and FT2232 are not supported with libpayload (missing libusb support)
+ifeq ($(CONFIG_DEDIPROG), yes)
+UNSUPPORTED_FEATURES += CONFIG_DEDIPROG=yes
+else
+override CONFIG_DEDIPROG = no
+endif
+ifeq ($(CONFIG_FT2232_SPI), yes)
+UNSUPPORTED_FEATURES += CONFIG_FT2232_SPI=yes
+else
+override CONFIG_FT2232_SPI = no
+endif
+endif
+
 CHIP_OBJS = jedec.o stm50flw0x0x.o w39.o w29ee011.o \
    sst28sf040.o m29f400bt.o 82802ab.o pm49fl00x.o \
    sst49lfxxxc.o sst_fwhub.o flashchips.o spi.o spi25.o sharplhf00l04.o
@@ -335,11 +370,16 @@
 # We could use PULLED_IN_LIBS, but that would be ugly.
 FEATURE_LIBS += $(shell LC_ALL=C grep -q "NEEDLIBZ := yes" .libdeps && printf "%s" "-lz")

-OBJS = $(CHIP_OBJS) $(CLI_OBJS) $(PROGRAMMER_OBJS) $(LIB_OBJS)
+LIBFLASHROM_OBJS = $(CHIP_OBJS) $(PROGRAMMER_OBJS) $(LIB_OBJS)
+OBJS = $(CLI_OBJS) $(LIBFLASHROM_OBJS)

$(PROGRAM)$(EXEC_SUFFIX): $(OBJS)
    $(CC) $(LDFLAGS) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(FEATURE_LIBS) $(LIBS)

+libflashrom.a: $(LIBFLASHROM_OBJS)
+	$(AR) rcs $@ $^
+	$(RANLIB) $@
+
 # TAROPTIONS reduces information leakage from the packager's system.
 # If other tar programs support command line arguments for setting uid/gid of
 # stored files, they can be handled here as well.
@@ -352,7 +392,7 @@
 # This includes all frontends and libflashrom.
 # We don't use EXEC_SUFFIX here because we want to clean everything.
 clean:
-	rm -f $(PROGRAM) $(PROGRAM).exe *.o *.d
+	rm -f $(PROGRAM) $(PROGRAM).exe libflashrom.a *.o *.d

distclean: clean
    rm -f .features .libdeps

Modified: trunk/physmap.c
==============================================================================
--- trunk/physmap.c	Tue Mar  8 01:23:49 2011	(r1279)
+++ trunk/physmap.c	Tue Mar  8 08:17:44 2011	(r1280)
@@ -492,6 +492,7 @@
 int libpayload_wrmsr(int addr, msr_t msr)
 {
    _wrmsr(addr, msr.lo | ((unsigned long long)msr.hi << 32));
+	return 0;
 }
 #else
 msr_t rdmsr(int addr)

Modified: trunk/spi.c
==============================================================================
--- trunk/spi.c	Tue Mar  8 01:23:49 2011	(r1279)
+++ trunk/spi.c	Tue Mar  8 08:17:44 2011	(r1280)
@@ -22,6 +22,7 @@
  * Contains the generic SPI framework
  */

+#include <strings.h>
 #include <string.h>
 #include "flash.h"
 #include "flashchips.h"

Modified: trunk/udelay.c
==============================================================================
--- trunk/udelay.c	Tue Mar  8 01:23:49 2011	(r1279)
+++ trunk/udelay.c	Tue Mar  8 08:17:44 2011	(r1280)
@@ -182,6 +182,7 @@
 }

#else 
+#include <libpayload.h>

void myusec_calibrate_delay(void)
 {