2013-06-07 18:03:56 +00:00
|
|
|
From 88929d27c333342a5d4099ab4178a1be19e98d43 Mon Sep 17 00:00:00 2001
|
2013-05-02 20:54:52 +00:00
|
|
|
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
|
|
Date: Wed, 24 Apr 2013 14:44:15 +0200
|
2013-06-12 19:24:37 +00:00
|
|
|
Subject: [PATCH 338/482] Add missing video ids to coreboot and ieee1275
|
2013-05-02 20:54:52 +00:00
|
|
|
video.
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
ChangeLog | 4 ++++
|
|
|
|
|
grub-core/loader/i386/linux.c | 2 ++
|
|
|
|
|
grub-core/video/i386/coreboot/cbfb.c | 1 +
|
|
|
|
|
grub-core/video/ieee1275.c | 1 +
|
|
|
|
|
include/grub/video.h | 2 ++
|
|
|
|
|
5 files changed, 10 insertions(+)
|
|
|
|
|
|
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
|
|
|
index c2d56f1..d863bb3 100644
|
|
|
|
|
--- a/ChangeLog
|
|
|
|
|
+++ b/ChangeLog
|
|
|
|
|
@@ -1,5 +1,9 @@
|
|
|
|
|
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.
|
|
|
|
|
|
|
|
|
|
2013-04-24 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
|
|
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
|
|
|
|
|
index 5cd074b..db81ca1 100644
|
|
|
|
|
--- 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 000efdb..984b594 100644
|
|
|
|
|
--- 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 93feeb5..5830b68 100644
|
|
|
|
|
--- 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 40a7711..bd5852e 100644
|
|
|
|
|
--- 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
|
|
|
|
|
--
|
2013-06-07 18:03:56 +00:00
|
|
|
1.8.2.1
|
2013-05-02 20:54:52 +00:00
|
|
|
|
