From 45fbd9a23fd2e436efcb9e19a384c845dd349af9 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Wed, 24 Apr 2013 14:44:15 +0200 Subject: [PATCH] Add missing video ids to coreboot and ieee1275 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 c2d56f10b..d863bb32a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-04-24 Vladimir Serbinenko + + Add missing video ids to coreboot and ieee1275 video. + 2013-04-24 Vladimir Serbinenko * 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 5cd074b26..db81ca1cc 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 000efdb85..984b5943e 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 93feeb52a..5830b68f8 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 40a77111d..bd5852e4f 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