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

@@ -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 */
+
+

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
+#include <boot/images.h>
-#	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 <stdio.h>
 #include <stdlib.h>

src/system/kernel/boot_splash.cpp

@@ -15,16 +15,7 @@
 #include <KernelExport.h>
 
 #define __BOOTSPLASH_KERNEL__
-#ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL
+#include <boot/images.h>
-#	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_item.h>
 #include <debug.h>