aboutsummaryrefslogtreecommitdiff
path: root/projects
diff options
context:
space:
mode:
authorSwift Geek <swiftgeek@gmail.com>2017-09-04 08:11:18 +0000
committerGogs <gogitservice@gmail.com>2017-09-04 08:11:18 +0000
commit93ea8f2fadd050fafae7532638f973c09879748b (patch)
treebf3cc7040ca6c74e96a95501202f5cd99654779c /projects
parent27de7f5f3f0efbd9450e75bb40b8fb212ddc1269 (diff)
parent838c19e4e31021fba2a07a129191eb6a70029283 (diff)
downloadlibrebootfr-93ea8f2fadd050fafae7532638f973c09879748b.tar.gz
librebootfr-93ea8f2fadd050fafae7532638f973c09879748b.zip
Merge branch 'grub-integration' of kragle/libreboot into master
Diffstat (limited to 'projects')
-rw-r--r--projects/grub/install/corebootfb/background/COPYING (renamed from projects/grub/configs/background/COPYING)0
-rw-r--r--projects/grub/install/corebootfb/background/background1024x768.png (renamed from projects/grub/configs/background/background1024x768.png)bin3158 -> 3158 bytes
-rw-r--r--projects/grub/install/corebootfb/background/background1280x800.png (renamed from projects/grub/configs/background/background1280x800.png)bin3387 -> 3387 bytes
-rw-r--r--projects/grub/install/corebootfb/background/logo.svg (renamed from projects/grub/configs/background/logo.svg)0
-rw-r--r--projects/grub/install/install6
-rw-r--r--projects/grub/install/textmode/AUTHORS (renamed from projects/grub/install/txtmode/AUTHORS)0
-rw-r--r--projects/grub/install/textmode/COPYING (renamed from projects/grub/install/txtmode/COPYING)0
-rw-r--r--projects/grub/install/textmode/grub.cfg (renamed from projects/grub/install/txtmode/grub.cfg)0
-rw-r--r--projects/grub/install/textmode/grubtest.cfg (renamed from projects/grub/install/txtmode/grubtest.cfg)0
9 files changed, 4 insertions, 2 deletions
diff --git a/projects/grub/configs/background/COPYING b/projects/grub/install/corebootfb/background/COPYING
index 9467677a..9467677a 100644
--- a/projects/grub/configs/background/COPYING
+++ b/projects/grub/install/corebootfb/background/COPYING
diff --git a/projects/grub/configs/background/background1024x768.png b/projects/grub/install/corebootfb/background/background1024x768.png
index 2689d5d8..2689d5d8 100644
--- a/projects/grub/configs/background/background1024x768.png
+++ b/projects/grub/install/corebootfb/background/background1024x768.png
Binary files differ
diff --git a/projects/grub/configs/background/background1280x800.png b/projects/grub/install/corebootfb/background/background1280x800.png
index 0570c879..0570c879 100644
--- a/projects/grub/configs/background/background1280x800.png
+++ b/projects/grub/install/corebootfb/background/background1280x800.png
Binary files differ
diff --git a/projects/grub/configs/background/logo.svg b/projects/grub/install/corebootfb/background/logo.svg
index 62147c1d..62147c1d 100644
--- a/projects/grub/configs/background/logo.svg
+++ b/projects/grub/install/corebootfb/background/logo.svg
diff --git a/projects/grub/install/install b/projects/grub/install/install
index 3ebca5a2..31fd22fa 100644
--- a/projects/grub/install/install
+++ b/projects/grub/install/install
@@ -1,5 +1,7 @@
grubenv:grubenv
-txtmode/grub.cfg:txtmode/grub.cfg
-txtmode/grubtest.cfg:txtmode/grubtest.cfg
+textmode/grub.cfg:textmode/grub.cfg
+textmode/grubtest.cfg:textmode/grubtest.cfg
corebootfb/grub.cfg:corebootfb/grub.cfg
corebootfb/grubtest.cfg:corebootfb/grubtest.cfg
+corebootfb/background/background1024x768.png:corebootfb/background/background1024x768.png
+corebootfb/background/background1280x800.png:corebootfb/background/background1280x800.png
diff --git a/projects/grub/install/txtmode/AUTHORS b/projects/grub/install/textmode/AUTHORS
index 0157cfed..0157cfed 100644
--- a/projects/grub/install/txtmode/AUTHORS
+++ b/projects/grub/install/textmode/AUTHORS
diff --git a/projects/grub/install/txtmode/COPYING b/projects/grub/install/textmode/COPYING
index a41d4868..a41d4868 100644
--- a/projects/grub/install/txtmode/COPYING
+++ b/projects/grub/install/textmode/COPYING
diff --git a/projects/grub/install/txtmode/grub.cfg b/projects/grub/install/textmode/grub.cfg
index 90946c01..90946c01 100644
--- a/projects/grub/install/txtmode/grub.cfg
+++ b/projects/grub/install/textmode/grub.cfg
diff --git a/projects/grub/install/txtmode/grubtest.cfg b/projects/grub/install/textmode/grubtest.cfg
index d9ab637d..d9ab637d 100644
--- a/projects/grub/install/txtmode/grubtest.cfg
+++ b/projects/grub/install/textmode/grubtest.cfg