Submitted by: 3ABXO3 (evrinoma@gmail.com)
Date: 2012-04-20
Initial Package Version:
Upstream Status:
Origin:
Description:
Signed-off-by: 3ABXO3 <evrinoma@gmail.com>
diff -Naur coreboot-clear/coreboot/payloads/external/FILO/filo/fs/fsys_cbfs.c coreboot/payloads/external/FILO/filo/fs/fsys_cbfs.c
--- coreboot-clear/coreboot/payloads/external/FILO/filo/fs/fsys_cbfs.c	2012-04-20 11:16:24.983077892 +0400
+++ coreboot/payloads/external/FILO/filo/fs/fsys_cbfs.c	2012-04-20 11:34:02.000000000 +0400
@@ -16,6 +16,9 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#ifndef __CBFS_FILO_H__
+#define __CBFS_FILO_H__
+#endif
 
 #include "filesys.h"
 #include <cbfs.h>
diff -Naur coreboot-clear/coreboot/payloads/external/FILO/Makefile.inc coreboot/payloads/external/FILO/Makefile.inc
--- coreboot-clear/coreboot/payloads/external/FILO/Makefile.inc	2012-04-20 10:54:52.000000000 +0400
+++ coreboot/payloads/external/FILO/Makefile.inc	2012-04-20 10:45:07.000000000 +0400
@@ -8,15 +8,17 @@
 all: filo
 
 checkout:
-	echo "    GIT        FILO $(NAME-y)"
-	test -d filo || \
-		git clone http://review.coreboot.org/p/filo.git
-	cd filo && \
-		git checkout master && \
-		git pull; \
-		test -n $(TAG-y) && \
-			git branch -f $(NAME-y) $(TAG-y) && \
-			git checkout $(NAME-y)
+	@if [ ! -d filo ]; then \
+		echo "    GIT        FILO $(NAME-y)"; \
+		test -d filo || \
+			git clone http://review.coreboot.org/p/filo.git; \
+		cd filo && \
+			git checkout master && \
+			git pull; \
+			test -n $(TAG-y) && \
+				git branch -f $(NAME-y) $(TAG-y) && \
+				git checkout $(NAME-y); \
+	fi;
 
 config: libpayload
 	echo "    CONFIG     FILO $(NAME-y)"
diff -Naur coreboot-clear/coreboot/payloads/libpayload/include/cbfs_core.h coreboot/payloads/libpayload/include/cbfs_core.h
--- coreboot-clear/coreboot/payloads/libpayload/include/cbfs_core.h	2012-04-20 10:54:53.000000000 +0400
+++ coreboot/payloads/libpayload/include/cbfs_core.h	2012-04-20 11:45:19.000000000 +0400
@@ -172,7 +172,11 @@
 void *cbfs_get_file(const char *name);
 
 /* returns pointer to file data inside CBFS after if type is correct */
+#ifdef __CBFS_FILO_H__
+struct cbfs_stage *cbfs_find_file(const char *name, int type);
+#else
 void *cbfs_find_file(const char *name, int type);
+#endif
 
 /* returns 0 on success, -1 on failure */
 int cbfs_decompress(int algo, void *src, void *dst, int len);
diff -Naur coreboot-clear/coreboot/payloads/libpayload/libcbfs/cbfs.c coreboot/payloads/libpayload/libcbfs/cbfs.c
--- coreboot-clear/coreboot/payloads/libpayload/libcbfs/cbfs.c	2012-04-20 10:54:53.000000000 +0400
+++ coreboot/payloads/libpayload/libcbfs/cbfs.c	2012-04-20 11:43:02.000000000 +0400
@@ -26,6 +26,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+#ifdef __CBFS_FILO_H__
+#undef __CBFS_FILO_H__
+#endif
 
 #include <arch/endian.h>
 #include <stdio.h>
diff -Naur coreboot-clear/coreboot/src/arch/x86/boot/coreboot_table.c coreboot/src/arch/x86/boot/coreboot_table.c
--- coreboot-clear/coreboot/src/arch/x86/boot/coreboot_table.c	2012-04-20 10:54:53.000000000 +0400
+++ coreboot/src/arch/x86/boot/coreboot_table.c	2012-04-20 12:04:17.000000000 +0400
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
  * MA 02110-1301 USA
  */
+#ifdef __CBFS_FILO_H__
+#undef __CBFS_FILO_H__
+#endif
 
 #include <console/console.h>
 #include <ip_checksum.h>
diff -Naur coreboot-clear/coreboot/src/arch/x86/include/bootblock_common.h coreboot/src/arch/x86/include/bootblock_common.h
--- coreboot-clear/coreboot/src/arch/x86/include/bootblock_common.h	2012-04-20 10:54:53.000000000 +0400
+++ coreboot/src/arch/x86/include/bootblock_common.h	2012-04-20 12:04:33.000000000 +0400
@@ -1,3 +1,7 @@
+#ifdef __CBFS_FILO_H__
+#undef __CBFS_FILO_H__
+#endif
+
 #include <cpu/x86/lapic/boot_cpu.c>
 
 #ifdef CONFIG_BOOTBLOCK_CPU_INIT
diff -Naur coreboot-clear/coreboot/src/arch/x86/lib/cbfs_and_run.c coreboot/src/arch/x86/lib/cbfs_and_run.c
--- coreboot-clear/coreboot/src/arch/x86/lib/cbfs_and_run.c	2012-04-20 10:54:53.000000000 +0400
+++ coreboot/src/arch/x86/lib/cbfs_and_run.c	2012-04-20 12:04:04.000000000 +0400
@@ -16,6 +16,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#ifdef __CBFS_FILO_H__
+#undef __CBFS_FILO_H__
+#endif
 
 #include <console/console.h>
 #include <cbfs.h>
diff -Naur coreboot-clear/coreboot/src/boot/hardwaremain.c coreboot/src/boot/hardwaremain.c
--- coreboot-clear/coreboot/src/boot/hardwaremain.c	2012-04-20 10:54:53.000000000 +0400
+++ coreboot/src/boot/hardwaremain.c	2012-04-20 11:37:52.000000000 +0400
@@ -24,6 +24,9 @@
 /*
  * C Bootstrap code for the coreboot
  */
+#ifdef __CBFS_FILO_H__
+#undef __CBFS_FILO_H__
+#endif
 
 #include <console/console.h>
 #include <version.h>
diff -Naur coreboot-clear/coreboot/src/boot/selfboot.c coreboot/src/boot/selfboot.c
--- coreboot-clear/coreboot/src/boot/selfboot.c	2012-04-20 10:54:53.000000000 +0400
+++ coreboot/src/boot/selfboot.c	2012-04-20 11:38:19.000000000 +0400
@@ -17,6 +17,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
  */
+#ifdef __CBFS_FILO_H__
+#undef __CBFS_FILO_H__
+#endif
 
 #include <arch/byteorder.h>
 #include <console/console.h>
diff -Naur coreboot-clear/coreboot/src/devices/oprom/x86.c coreboot/src/devices/oprom/x86.c
--- coreboot-clear/coreboot/src/devices/oprom/x86.c	2012-04-20 10:54:53.000000000 +0400
+++ coreboot/src/devices/oprom/x86.c	2012-04-20 11:42:37.000000000 +0400
@@ -17,6 +17,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
+#ifdef __CBFS_FILO_H__
+#undef __CBFS_FILO_H__
+#endif
 
 #include <device/pci.h>
 #include <string.h>
diff -Naur coreboot-clear/coreboot/src/devices/oprom/yabel/vbe.c coreboot/src/devices/oprom/yabel/vbe.c
--- coreboot-clear/coreboot/src/devices/oprom/yabel/vbe.c	2012-04-20 10:54:53.000000000 +0400
+++ coreboot/src/devices/oprom/yabel/vbe.c	2012-04-20 12:05:27.000000000 +0400
@@ -10,6 +10,9 @@
  * Contributors:
  *     IBM Corporation - initial implementation
  *****************************************************************************/
+#ifdef __CBFS_FILO_H__
+#undef __CBFS_FILO_H__
+#endif
 
 #include <string.h>
 #include <types.h>
diff -Naur coreboot-clear/coreboot/src/devices/pci_rom.c coreboot/src/devices/pci_rom.c
--- coreboot-clear/coreboot/src/devices/pci_rom.c	2012-04-20 10:54:53.000000000 +0400
+++ coreboot/src/devices/pci_rom.c	2012-04-20 11:38:44.000000000 +0400
@@ -20,6 +20,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
+#ifdef __CBFS_FILO_H__
+#undef __CBFS_FILO_H__
+#endif
 
 #include <console/console.h>
 #include <device/device.h>
diff -Naur coreboot-clear/coreboot/src/lib/cbfs.c coreboot/src/lib/cbfs.c
--- coreboot-clear/coreboot/src/lib/cbfs.c	2012-04-20 10:54:53.000000000 +0400
+++ coreboot/src/lib/cbfs.c	2012-04-20 11:37:09.000000000 +0400
@@ -16,6 +16,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
  */
+#ifdef __CBFS_FILO_H__
+#undef __CBFS_FILO_H__
+#endif
 
 #include <types.h>
 #include <string.h>
diff -Naur coreboot-clear/coreboot/src/mainboard/siemens/sitemp_g1p1/romstage.c coreboot/src/mainboard/siemens/sitemp_g1p1/romstage.c
--- coreboot-clear/coreboot/src/mainboard/siemens/sitemp_g1p1/romstage.c	2012-04-20 10:54:53.000000000 +0400
+++ coreboot/src/mainboard/siemens/sitemp_g1p1/romstage.c	2012-04-20 12:03:43.000000000 +0400
@@ -18,6 +18,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
+#ifdef __CBFS_FILO_H__
+#undef __CBFS_FILO_H__
+#endif
 
 #define RC0 (6<<8)
 #define RC1 (7<<8)
diff -Naur coreboot-clear/coreboot/src/northbridge/intel/i82830/vga.c coreboot/src/northbridge/intel/i82830/vga.c
--- coreboot-clear/coreboot/src/northbridge/intel/i82830/vga.c	2012-04-20 10:54:53.000000000 +0400
+++ coreboot/src/northbridge/intel/i82830/vga.c	2012-04-20 12:02:51.000000000 +0400
@@ -17,6 +17,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
+#ifdef __CBFS_FILO_H__
+#undef __CBFS_FILO_H__
+#endif
 
 #include <console/console.h>
 #include <arch/io.h>
diff -Naur coreboot-clear/coreboot/src/pc80/mc146818rtc.c coreboot/src/pc80/mc146818rtc.c
--- coreboot-clear/coreboot/src/pc80/mc146818rtc.c	2012-04-20 10:54:53.000000000 +0400
+++ coreboot/src/pc80/mc146818rtc.c	2012-04-20 11:35:39.000000000 +0400
@@ -1,3 +1,7 @@
+#ifdef __CBFS_FILO_H__
+#undef __CBFS_FILO_H__
+#endif
+
 #include <stdint.h>
 #include <console/console.h>
 #include <pc80/mc146818rtc.h>
diff -Naur coreboot-clear/coreboot/util/cbfstool/cbfs-mkpayload.c coreboot/util/cbfstool/cbfs-mkpayload.c
--- coreboot-clear/coreboot/util/cbfstool/cbfs-mkpayload.c	2012-04-20 10:54:54.000000000 +0400
+++ coreboot/util/cbfstool/cbfs-mkpayload.c	2012-04-20 11:41:58.000000000 +0400
@@ -18,6 +18,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
  */
+#ifdef __CBFS_FILO_H__
+#undef __CBFS_FILO_H__
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff -Naur coreboot-clear/coreboot/util/cbfstool/cbfs-mkstage.c coreboot/util/cbfstool/cbfs-mkstage.c
--- coreboot-clear/coreboot/util/cbfstool/cbfs-mkstage.c	2012-04-20 10:54:54.000000000 +0400
+++ coreboot/util/cbfstool/cbfs-mkstage.c	2012-04-20 11:41:48.000000000 +0400
@@ -18,6 +18,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
  */
+#ifdef __CBFS_FILO_H__
+#undef __CBFS_FILO_H__
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff -Naur coreboot-clear/coreboot/util/cbfstool/cbfstool.c coreboot/util/cbfstool/cbfstool.c
--- coreboot-clear/coreboot/util/cbfstool/cbfstool.c	2012-04-20 10:54:54.000000000 +0400
+++ coreboot/util/cbfstool/cbfstool.c	2012-04-20 11:42:03.000000000 +0400
@@ -17,6 +17,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
  */
+#ifdef __CBFS_FILO_H__
+#undef __CBFS_FILO_H__
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff -Naur coreboot-clear/coreboot/util/cbfstool/common.c coreboot/util/cbfstool/common.c
--- coreboot-clear/coreboot/util/cbfstool/common.c	2012-04-20 10:54:54.000000000 +0400
+++ coreboot/util/cbfstool/common.c	2012-04-20 11:42:08.000000000 +0400
@@ -17,6 +17,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
  */
+#ifdef __CBFS_FILO_H__
+#undef __CBFS_FILO_H__
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff -Naur coreboot-clear/coreboot/util/nvramtool/accessors/layout-bin.c coreboot/util/nvramtool/accessors/layout-bin.c
--- coreboot-clear/coreboot/util/nvramtool/accessors/layout-bin.c	2012-04-20 10:54:54.000000000 +0400
+++ coreboot/util/nvramtool/accessors/layout-bin.c	2012-04-20 12:02:24.000000000 +0400
@@ -28,6 +28,9 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 \*****************************************************************************/
+#ifdef __CBFS_FILO_H__
+#undef __CBFS_FILO_H__
+#endif
 
 #include <arpa/inet.h>
 #include <string.h>
diff -Naur coreboot-clear/coreboot/util/nvramtool/cbfs.c coreboot/util/nvramtool/cbfs.c
--- coreboot-clear/coreboot/util/nvramtool/cbfs.c	2012-04-20 10:54:54.000000000 +0400
+++ coreboot/util/nvramtool/cbfs.c	2012-04-20 11:40:11.000000000 +0400
@@ -18,6 +18,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
  */
+#ifdef __CBFS_FILO_H__
+#undef __CBFS_FILO_H__
+#endif
 
 #include <arpa/inet.h>
 #include <sys/types.h>
diff -Naur coreboot-clear/coreboot/util/nvramtool/cli/nvramtool.c coreboot/util/nvramtool/cli/nvramtool.c
--- coreboot-clear/coreboot/util/nvramtool/cli/nvramtool.c	2012-04-20 10:54:54.000000000 +0400
+++ coreboot/util/nvramtool/cli/nvramtool.c	2012-04-20 12:02:15.000000000 +0400
@@ -27,6 +27,9 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 \*****************************************************************************/
+#ifdef __CBFS_FILO_H__
+#undef __CBFS_FILO_H__
+#endif
 
 #include <fcntl.h>
 #include <stdio.h>
diff -Naur coreboot-clear/coreboot/util/nvramtool/lbtable.c coreboot/util/nvramtool/lbtable.c
--- coreboot-clear/coreboot/util/nvramtool/lbtable.c	2012-04-20 10:54:54.000000000 +0400
+++ coreboot/util/nvramtool/lbtable.c	2012-04-20 11:40:41.000000000 +0400
@@ -28,6 +28,9 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 \*****************************************************************************/
+#ifdef __CBFS_FILO_H__
+#undef __CBFS_FILO_H__
+#endif
 
 #include <arpa/inet.h>
 #include <string.h>