Fix autogen

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 8f988b0be68857d51dc5fc2b6bb2f0d8e2ff10a6..ff5bf7a3020ec68c408f86460811cedbb2f2a461 100644 (file)
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -173,7 +173,7 @@ kernel = {
   emu = disk/host.c;
   emu = gnulib/progname.c;
   emu = gnulib/error.c;
-  emu = kern/emu/cache.S;
+  emu = kern/emu/cache_s.S;
   emu = kern/emu/console.c;
   emu = kern/emu/getroot.c;
   emu = kern/emu/hostdisk.c;
@@ -463,41 +463,6 @@ module = {
   enable = i386_multiboot;
 };
 
-module = {
-  name = lsacpi;
-
-  common = commands/lsacpi.c;
-
-  enable = efi;
-  enable = i386_pc;
-  enable = i386_coreboot;
-  enable = i386_multiboot;
-};
-
-module = {
-  name = lsefisystab;
-
-  common = commands/efi/lsefisystab.c;
-
-  enable = efi;
-};
-
-module = {
-  name = lssal;
-
-  common = commands/efi/lssal.c;
-
-  enable = efi;
-};
-
-module = {
-  name = lsefimmap;
-
-  common = commands/efi/lsefimmap.c;
-
-  enable = efi;
-};
-
 module = {
   name = lsacpi;
 

diff --git a/grub-core/kern/emu/cache.S b/grub-core/kern/emu/cache.S
deleted file mode 100644 (file)
index 8ca695c..0000000
--- a/grub-core/kern/emu/cache.S
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef GRUB_MACHINE_EMU
-#error "This source is only meant for grub-emu platform"
-#endif
-
-#if defined(__i386__) || defined(__x86_64__)
-/* Nothing is necessary.  */
-#elif defined(__sparc__)
-#include "../sparc64/cache.S"
-#elif defined(__mips__)
-/* On MIPS we must go through standard functions.  */
-#include <grub/symbol.h>
-
-FUNCTION (grub_cpu_flush_cache)
-FUNCTION (grub_arch_sync_caches)
-       .set nomacro
-       .set noreorder
-       lui $t0, %hi(_flush_cache)
-       addui $t0, $t0, %lo(_flush_cache)
-       move $a3, $zero
-       jr $t0
-        nop
-       .set reorder
-       .set macro
-#elif defined(__powerpc__)
-#include "../powerpc/cache.S"
-#elif defined(__ia64__)
-#else
-#error "No target cpu type is defined"
-#endif

diff --git a/grub-core/kern/emu/cache_s.S b/grub-core/kern/emu/cache_s.S
new file mode 100644 (file)
index 0000000..8ca695c
--- /dev/null
+++ b/grub-core/kern/emu/cache_s.S
@@ -0,0 +1,29 @@
+#ifndef GRUB_MACHINE_EMU
+#error "This source is only meant for grub-emu platform"
+#endif
+
+#if defined(__i386__) || defined(__x86_64__)
+/* Nothing is necessary.  */
+#elif defined(__sparc__)
+#include "../sparc64/cache.S"
+#elif defined(__mips__)
+/* On MIPS we must go through standard functions.  */
+#include <grub/symbol.h>
+
+FUNCTION (grub_cpu_flush_cache)
+FUNCTION (grub_arch_sync_caches)
+       .set nomacro
+       .set noreorder
+       lui $t0, %hi(_flush_cache)
+       addui $t0, $t0, %lo(_flush_cache)
+       move $a3, $zero
+       jr $t0
+        nop
+       .set reorder
+       .set macro
+#elif defined(__powerpc__)
+#include "../powerpc/cache.S"
+#elif defined(__ia64__)
+#else
+#error "No target cpu type is defined"
+#endif