From 8984d9a75483f644ad614de35bde78ee73a79f37 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Fri, 13 Feb 2015 19:31:19 -0500
Subject: Delete GRUB Invaders from libreboot

---
(limited to 'resources')

diff --git a/resources/grub/config/menuentries/txtmode.cfg b/resources/grub/config/menuentries/txtmode.cfg
index ded51bd..63166e0 100644
--- a/resources/grub/config/menuentries/txtmode.cfg
+++ b/resources/grub/config/menuentries/txtmode.cfg
@@ -1,7 +1,3 @@
-menuentry 'Load GRUB Invaders' {
-	set root='memdisk'
-	chainloader /invaders.exec
-}
 menuentry 'Load MemTest86+' {
 	set root='memdisk'
 	chainloader /memtest
diff --git a/resources/grubinvaders/patch/compile.sh.patch b/resources/grubinvaders/patch/compile.sh.patch
deleted file mode 100644
index 0e7c3b8..0000000
--- a/resources/grubinvaders/patch/compile.sh.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-6c6
-< CFLAGS="-fno-builtin -nostdinc -O2 -I. -Wall -Werror"
----
-> CFLAGS="-fno-builtin -nostdinc -O2 -I. -Wall -Werror -fno-stack-protector"
diff --git a/resources/grubinvaders/patch/diff.patch b/resources/grubinvaders/patch/diff.patch
deleted file mode 100644
index 2867dea..0000000
--- a/resources/grubinvaders/patch/diff.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ur invaders/clean.sh invaders-fixed/clean.sh
---- invaders/clean.sh	2001-05-21 22:43:13.000000000 +0200
-+++ invaders-fixed/clean.sh	2009-04-13 17:03:14.000000000 +0200
-@@ -2,4 +2,4 @@
- 
- set -e
- set -v
--rm -f *.o *~ invaders.exec
-+rm -f *.o *~ invaders.exec invaders
-diff -ur invaders/compile.sh invaders-fixed/compile.sh
---- invaders/compile.sh	2001-05-21 22:26:46.000000000 +0200
-+++ invaders-fixed/compile.sh	2009-04-13 16:59:44.000000000 +0200
-@@ -4,7 +4,7 @@
- set -v
- 
- CFLAGS="-fno-builtin -nostdinc -O2 -I. -Wall -Werror"
--LDFLAGS="-nostdlib -Wl,-N -Wl,-Ttext -Wl,100000"
-+LDFLAGS="-nostdlib -Wl,-N -Wl,-Ttext -Wl,100000 -Wl,--build-id=none"
- gcc $CFLAGS -c keyboard.c
- gcc $CFLAGS -c delay.c
- gcc $CFLAGS -c common.c
-diff -ur invaders/video.c invaders-fixed/video.c
---- invaders/video.c	2001-05-13 15:56:33.000000000 +0200
-+++ invaders-fixed/video.c	2009-04-13 17:01:22.000000000 +0200
-@@ -36,7 +36,7 @@
-   video_putchar(x+1,y,hextab[hex&15]);
- };
- 
--void video_putstring(int32 x, int32 y, uint8 *str)
-+void video_putstring(int32 x, int32 y, char *str)
- {
-   while (*str) video_putchar(x++,y,*(str++));
- };
-diff -ur invaders/video.h invaders-fixed/video.h
---- invaders/video.h	2001-05-13 15:56:33.000000000 +0200
-+++ invaders-fixed/video.h	2009-04-13 17:01:05.000000000 +0200
-@@ -8,7 +8,7 @@
- void video_putchar(int32 x, int32 y, uint8 code);
- void video_fill(int32 x, int32 y, int32 width, int32 height, uint8 code);
- void video_puthex8(int32 x, int32 y, uint8 hex);
--void video_putstring(int32 x, int32 y, uint8 *str);
-+void video_putstring(int32 x, int32 y, char *str);
- 
- // immediate effect
- void video_update();
diff --git a/resources/utilities/grub-assemble/gen.sh b/resources/utilities/grub-assemble/gen.sh
index 6090e1e..b908a6a 100755
--- a/resources/utilities/grub-assemble/gen.sh
+++ b/resources/utilities/grub-assemble/gen.sh
@@ -49,7 +49,6 @@ then
 	  --install-modules="$grub_install_modules" \
 	  /boot/grub/grub.cfg="../../../resources/grub/config/grub_memdisk.cfg" \
 	  /memtest="../../../memtest86+-5.01/memtest" \
-	  /invaders.exec="../../../grubinvaders/invaders.exec" \
 	  $(./grub_memdisk_keymap)
 else
 	echo "grub-assemble gen.sh: invalid mode '$1'"
--
cgit v0.9.1