From 89fa2a85730b687217cea4a5f594bd9df35de313 Mon Sep 17 00:00:00 2001
From: Philippe Houdoin <philippe.houdoin@gmail.com>
Date: Mon, 11 Oct 2010 12:54:21 +0000
Subject: [PATCH] Move the boot images conditional selection in one place, to
 remove possible mismatch images info between loader and kernel.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38947 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 headers/private/kernel/boot/images.h          | 21 +++++++++++++++++++
 .../boot/platform/generic/video_splash.cpp    | 10 +--------
 src/system/kernel/boot_splash.cpp             | 11 +---------
 3 files changed, 23 insertions(+), 19 deletions(-)
 create mode 100644 headers/private/kernel/boot/images.h

diff --git a/headers/private/kernel/boot/images.h b/headers/private/kernel/boot/images.h
new file mode 100644
index 0000000000..794395c5a0
--- /dev/null
+++ b/headers/private/kernel/boot/images.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2010, Philippe Houdoin <phoudoin at haiku-os dot org>.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef KERNEL_BOOT_IMAGES_H
+#define KERNEL_BOOT_IMAGES_H
+
+#ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL
+#	ifdef HAIKU_OFFICIAL_RELEASE
+#		include <boot/images-tm.h>
+#	else
+#		include <boot/images-tm-development.h>
+#	endif
+#else
+#	include <boot/images-sans-tm.h>
+#endif
+
+
+#endif	/* KERNEL_BOOT_ARCH_H */
+
+
diff --git a/src/system/boot/platform/generic/video_splash.cpp b/src/system/boot/platform/generic/video_splash.cpp
index d07284532d..7d0827ded7 100644
--- a/src/system/boot/platform/generic/video_splash.cpp
+++ b/src/system/boot/platform/generic/video_splash.cpp
@@ -12,15 +12,7 @@
 #include <boot/menu.h>
 #include <boot/kernel_args.h>
 #include <boot/platform/generic/video.h>
-#ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL
-#	ifdef HAIKU_OFFICIAL_RELEASE
-#		include <boot/images-tm.h>
-#	else
-#		include <boot/images-tm-development.h>
-#	endif
-#else
-#	include <boot/images-sans-tm.h>
-#endif
+#include <boot/images.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/system/kernel/boot_splash.cpp b/src/system/kernel/boot_splash.cpp
index a7c39aa774..2ced62b1c0 100644
--- a/src/system/kernel/boot_splash.cpp
+++ b/src/system/kernel/boot_splash.cpp
@@ -15,16 +15,7 @@
 #include <KernelExport.h>
 
 #define __BOOTSPLASH_KERNEL__
-#ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL
-#	ifdef HAIKU_OFFICIAL_RELEASE
-#		include <boot/images-tm.h>
-#	else
-#		include <boot/images-tm-development.h>
-#	endif
-#else
-#	include <boot/images-sans-tm.h>
-#endif
-
+#include <boot/images.h>
 
 #include <boot_item.h>
 #include <debug.h>