1 files changed, 39 insertions, 8 deletions

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 6bdd53c..dce64f9 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -106,7 +106,6 @@ kernel = {
 
   noemu_nodist = symlist.c;
 
-  i386_pc = kern/generic/rtc_get_time_ms.c;
   mips = kern/generic/rtc_get_time_ms.c;
 
   ieee1275 = disk/ieee1275/ofdisk.c;
@@ -127,8 +126,6 @@ kernel = {
   i386_coreboot_multiboot_qemu = kern/i386/coreboot/init.c;
   i386_coreboot_multiboot_qemu = term/i386/pc/vga_text.c;
 
-  x86 = kern/i386/pit.c;
-
   efi = disk/efi/efidisk.c;
   efi = kern/efi/efi.c;
   efi = kern/efi/init.c;
@@ -461,6 +458,12 @@ module = {
 };
 
 module = {
+  name = usbserial_usbdebug;
+  common = bus/usb/serial/usbdebug_late.c;
+  enable = usb;
+};
+
+module = {
   name = uhci;
   common = bus/usb/uhci.c;
   enable = x86;
@@ -517,12 +520,36 @@ module = {
 };
 
 module = {
+  name = cmosdump;
+  common = commands/i386/cmosdump.c;
+  enable = cmos;
+};
+
+module = {
   name = iorw;
   common = commands/iorw.c;
   enable = x86;
 };
 
 module = {
+  name = cbtime;
+  common = commands/i386/coreboot/cb_timestamps.c;
+  enable = i386_coreboot;
+};
+
+module = {
+  name = cbls;
+  common = commands/i386/coreboot/cbls.c;
+  enable = i386_coreboot;
+};
+
+module = {
+  name = cbmemc;
+  common = term/i386/coreboot/cbmemc.c;
+  enable = i386_coreboot;
+};
+
+module = {
   name = regexp;
   common = commands/regexp.c;
   common = commands/wildcard.c;
@@ -608,8 +635,6 @@ module = {
 module = {
   name = cat;
   common = commands/cat.c;
-  arm_uboot = lib/arg.c;
-  arm_uboot = commands/extcmd.c;
 };
 
 module = {
@@ -1397,9 +1422,9 @@ module = {
 
 module = {
   name = linux16;
-  i386_pc = loader/i386/pc/linux.c;
-  i386_pc = lib/cmdline.c;
-  enable = i386_pc;
+  common = loader/i386/pc/linux.c;
+  common = lib/cmdline.c;
+  enable = x86;
 };
 
 module = {
@@ -1883,6 +1908,12 @@ module = {
 };
 
 module = {
+  name = boottime;
+  common = commands/boottime.c;
+  condition = COND_ENABLE_BOOT_TIME_STATS;
+};
+
+module = {
   name = adler32;
   common = lib/adler32.c;
 };