Index: src/arch/ppc/Config.lb
===================================================================
--- src/arch/ppc/Config.lb	(revision 4557)
+++ src/arch/ppc/Config.lb	(working copy)
@@ -1,3 +1,4 @@
+uses CONFIG_CBFS
 ldscript init/ldscript.lb
 
 makerule coreboot.strip 
@@ -10,6 +11,11 @@
 	action "cp $< $@"
 end
 
+if CONFIG_CBFS
+	initobject /src/lib/cbfs.o
+	initobject /src/lib/lzma.o
+end
+
 dir init
 dir lib
 dir boot
Index: src/arch/ppc/init/ppc_main.c
===================================================================
--- src/arch/ppc/init/ppc_main.c	(revision 4557)
+++ src/arch/ppc/init/ppc_main.c	(working copy)
@@ -5,13 +5,8 @@
 
 #include <board.h>
 #include <sdram.h>
+#include <cbfs.h>
 
-extern unsigned _iseg[];
-extern unsigned _liseg[];
-extern unsigned _eliseg[];
-
-void (*payload)(void) = (void (*)(void))_iseg;
-
 /*
  * At this point we're running out of flash with our
  * stack in cache ram. We need to do the following:
@@ -25,8 +20,7 @@
 
 void ppc_main(void)
 {
-	unsigned *from;
-	unsigned *to;
+	void (*payload)(void);
 
 	/*
  	 * very early board initialization
@@ -49,15 +43,9 @@
 	flush_dcache();
 
 	/*
-	 * Relocate payload (text & data) if necessary
+	 * Relocate payload (text & data)
 	 */
-	if (_liseg != _iseg) {	
-		from = _liseg;
-		to = _iseg;
-		while (from < _eliseg)
-			*to++ = *from++;
-	}
-
+	payload = cbfs_load_stage("fallback/coreboot_ram");
 	payload();
 
 	/* NOT REACHED */
Index: util/cbfstool/tools/cbfs-mkstage.c
===================================================================
--- util/cbfstool/tools/cbfs-mkstage.c	(revision 4557)
+++ util/cbfstool/tools/cbfs-mkstage.c	(working copy)
@@ -29,6 +29,18 @@
 #include "common.h"
 #include "../cbfs.h"
 
+unsigned int idemp(unsigned int x)
+{
+	return x;
+}
+
+unsigned int swap32(unsigned int x)
+{
+	return ((x>>24) | ((x>>8) & 0xff00) | ((x<<8) & 0xff0000) | (x<<24));
+}
+
+unsigned int (*elf32_to_native)(unsigned int)=idemp;
+
 int parse_elf(unsigned char *input, unsigned char **output,
 	      int mode, void (*compress) (char *, int, char *, int *))
 {
@@ -42,10 +54,22 @@
 	struct cbfs_stage *stage;
 	unsigned int data_start, data_end, mem_end;
 
+	int elf_bigendian = 0;
+	int host_bigendian = 0;
+	if (ehdr->e_ident[EI_DATA]==ELFDATA2MSB) {
+		elf_bigendian = 1;
+	}
+	if ((unsigned int)"1234"==0x31323334) {
+		host_bigendian = 1;
+	}
+	if (elf_bigendian != host_bigendian) {
+		elf32_to_native = swap32;
+	}
+
 	headers = ehdr->e_phnum;
 	header = (char *)ehdr;
 
-	phdr = (Elf32_Phdr *) & (header[ehdr->e_phoff]);
+	phdr = (Elf32_Phdr *) & header[elf32_to_native(ehdr->e_phoff)];
 
 	/* Now, regular headers - we only care about PT_LOAD headers,
 	 * because thats what we're actually going to load
@@ -58,19 +82,19 @@
 	for (i = 0; i < headers; i++) {
 		unsigned int start, mend, rend;
 
-		if (phdr[i].p_type != PT_LOAD)
+		if (elf32_to_native(phdr[i].p_type) != PT_LOAD)
 			continue;
 
 		/* Empty segments are never interesting */
-		if (phdr[i].p_memsz == 0)
+		if (elf32_to_native(phdr[i].p_memsz) == 0)
 			continue;
 
 		/* BSS */
 
-		start = phdr[i].p_paddr;
+		start = elf32_to_native(phdr[i].p_paddr);
 
-		mend = start + phdr[i].p_memsz;
-		rend = start + phdr[i].p_filesz;
+		mend = start + elf32_to_native(phdr[i].p_memsz);
+		rend = start + elf32_to_native(phdr[i].p_filesz);
 
 		if (start < data_start)
 			data_start = start;
@@ -94,14 +118,14 @@
 
 	for (i = 0; i < headers; i++) {
 
-		if (phdr[i].p_type != PT_LOAD)
+		if (elf32_to_native(phdr[i].p_type) != PT_LOAD)
 			continue;
 
-		if (phdr[i].p_memsz == 0)
+		if (elf32_to_native(phdr[i].p_memsz) == 0)
 			continue;
 
-		memcpy(buffer + (phdr[i].p_paddr - data_start),
-		       &header[phdr[i].p_offset], phdr[i].p_filesz);
+		memcpy(buffer + (elf32_to_native(phdr[i].p_paddr) - data_start),
+		       &header[elf32_to_native(phdr[i].p_offset)], elf32_to_native(phdr[i].p_filesz));
 	}
 
 	/* Now make the output buffer */
