Add missing video ids to coreboot and ieee1275 video.

diff --git a/ChangeLog b/ChangeLog
index c2d56f10bef67c69e43c5302c95eaca340615f1d..d863bb32a09139d91008eaafdff92a3129d1666f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-24  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Add missing video ids to coreboot and ieee1275 video.
+
 2013-04-24  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/grub-mkrescue.in: Add mips-arc support.

diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
index 5cd074b266bc6a6bb40792cc574bcebd1763cf90..db81ca1cc62df9cf0b0a99bcb2acdb4ef02b800f 100644 (file)
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -338,6 +338,8 @@ grub_linux_setup_video (struct linux_kernel_params *params)
        case GRUB_VIDEO_DRIVER_CIRRUS:
        case GRUB_VIDEO_DRIVER_BOCHS:
        case GRUB_VIDEO_DRIVER_RADEON_FULOONG2E:
+       case GRUB_VIDEO_DRIVER_IEEE1275:
+       case GRUB_VIDEO_DRIVER_COREBOOT:
          /* Make gcc happy. */
        case GRUB_VIDEO_DRIVER_SDL:
        case GRUB_VIDEO_DRIVER_NONE:

diff --git a/grub-core/video/i386/coreboot/cbfb.c b/grub-core/video/i386/coreboot/cbfb.c
index 000efdb8587f4e494e41fe7f29bfa7d494f0f656..984b5943e9dbd0a01ef3844cc80b9e608da812c9 100644 (file)
--- a/grub-core/video/i386/coreboot/cbfb.c
+++ b/grub-core/video/i386/coreboot/cbfb.c
@@ -128,6 +128,7 @@ static struct grub_video_adapter grub_video_cbfb_adapter =
     .name = "Coreboot video driver",
 
     .prio = GRUB_VIDEO_ADAPTER_PRIO_FIRMWARE_DIRTY,
+    .id = GRUB_VIDEO_DRIVER_COREBOOT,
 
     .init = grub_video_cbfb_init,
     .fini = grub_video_fb_fini,

diff --git a/grub-core/video/ieee1275.c b/grub-core/video/ieee1275.c
index 93feeb52ab54dbbfd92935923b7b70f7d8991fec..5830b68f8ccbef8a1aa5d009e4bd519b1c416b3a 100644 (file)
--- a/grub-core/video/ieee1275.c
+++ b/grub-core/video/ieee1275.c
@@ -241,6 +241,7 @@ static struct grub_video_adapter grub_video_ieee1275_adapter =
     .name = "IEEE1275 video driver",
 
     .prio = GRUB_VIDEO_ADAPTER_PRIO_FIRMWARE,
+    .id = GRUB_VIDEO_DRIVER_IEEE1275,
 
     .init = grub_video_ieee1275_init,
     .fini = grub_video_ieee1275_fini,

diff --git a/include/grub/video.h b/include/grub/video.h
index 40a77111d0e4f1b89bb1672dfb5f348a12a7e52b..bd5852e4fed7062a8944fd617872e794b37c12b9 100644 (file)
--- a/include/grub/video.h
+++ b/include/grub/video.h
@@ -283,6 +283,8 @@ typedef enum grub_video_driver_id
     GRUB_VIDEO_DRIVER_SDL,
     GRUB_VIDEO_DRIVER_SIS315PRO,
     GRUB_VIDEO_DRIVER_RADEON_FULOONG2E,
+    GRUB_VIDEO_DRIVER_COREBOOT,
+    GRUB_VIDEO_DRIVER_IEEE1275
   } grub_video_driver_id_t;
 
 typedef enum grub_video_adapter_prio