From 05dec8ff13b6fffbaeccd26c9cb6823e2c09420e Mon Sep 17 00:00:00 2001
From: nat <nat@NetBSD.org>
Date: Fri, 1 May 2015 02:00:41 +0000
Subject: [PATCH] Include splash with genfb. splash.o is only included with
 options SPLASHSCREEN. splash_image.o target moved to Makefile.kern.inc.

This commit was approved by matt@
---
 sys/arch/amd64/conf/Makefile.amd64 | 6 +-----
 sys/arch/arm/conf/Makefile.arm     | 6 +-----
 sys/conf/Makefile.kern.inc         | 8 +++++++-
 sys/dev/splash/files.splash        | 4 ++--
 sys/dev/splash/splash.mk           | 2 +-
 sys/dev/wsfb/files.wsfb            | 4 ++--
 6 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64
index bd4be4cf81aa..c8ce0ecad336 100644
--- a/sys/arch/amd64/conf/Makefile.amd64
+++ b/sys/arch/amd64/conf/Makefile.amd64
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.amd64,v 1.48 2015/04/30 15:22:32 nat Exp $
+#	$NetBSD: Makefile.amd64,v 1.49 2015/05/01 02:00:41 nat Exp $
 
 # Makefile for NetBSD
 #
@@ -73,10 +73,6 @@ copy.o: ${AMD64}/amd64/copy.S assym.h
 spl.o: ${AMD64}/amd64/spl.S assym.h
 	${NORMAL_S}
 
-.if defined(SPLASHSCREEN_IMAGE)
-.include "$S/dev/splash/splash.mk"
-.endif
-
 ##
 ## (5) link settings
 ##
diff --git a/sys/arch/arm/conf/Makefile.arm b/sys/arch/arm/conf/Makefile.arm
index d81610264d45..d910ce584270 100644
--- a/sys/arch/arm/conf/Makefile.arm
+++ b/sys/arch/arm/conf/Makefile.arm
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.arm,v 1.47 2015/04/30 15:22:32 nat Exp $
+#	$NetBSD: Makefile.arm,v 1.48 2015/05/01 02:00:41 nat Exp $
 
 # Makefile for NetBSD
 #
@@ -74,10 +74,6 @@ ${SYSTEM_FIRST_OBJ}: ${SYSTEM_FIRST_SFILE} assym.h
 locore.o: ${ARM}/arm32/locore.S assym.h
 	${NORMAL_S}
 
-.if defined(SPLASHSCREEN_IMAGE)
-.include "$S/dev/splash/splash.mk"
-.endif
-
 ##
 ## (5) link settings
 ##
diff --git a/sys/conf/Makefile.kern.inc b/sys/conf/Makefile.kern.inc
index 886454336c5b..a2ad57125bc3 100644
--- a/sys/conf/Makefile.kern.inc
+++ b/sys/conf/Makefile.kern.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.kern.inc,v 1.183 2014/11/15 12:56:28 uebayasi Exp $
+#	$NetBSD: Makefile.kern.inc,v 1.184 2015/05/01 02:00:41 nat Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -317,6 +317,12 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} $S/conf/newvers.sh \
 	${COMPILE_CTFCONVERT}
 .endif
 
+# Option for embedding a splashscreen image.
+.if defined(SPLASHSCREEN_IMAGE) 
+.include "${S}/dev/splash/splash.mk"
+init_main.o: splash_image.o
+.endif
+
 .if defined(MEMORY_DISK_IMAGE)
 md_root_image.h: ${MEMORY_DISK_IMAGE}
 	${_MKTARGET_CREATE}
diff --git a/sys/dev/splash/files.splash b/sys/dev/splash/files.splash
index 1006c5cdff92..39d3fb24810c 100644
--- a/sys/dev/splash/files.splash
+++ b/sys/dev/splash/files.splash
@@ -1,6 +1,6 @@
-# $NetBSD: files.splash,v 1.3 2011/02/06 23:25:18 jmcneill Exp $
+# $NetBSD: files.splash,v 1.4 2015/05/01 02:00:41 nat Exp $
 
 define splash: stbi
-file dev/splash/splash.c	splash
+file dev/splash/splash.c	splash & splashscreen
 
 defflag opt_splash.h	SPLASHSCREEN
diff --git a/sys/dev/splash/splash.mk b/sys/dev/splash/splash.mk
index 72c0ed43882c..b52ebfa6dc5e 100644
--- a/sys/dev/splash/splash.mk
+++ b/sys/dev/splash/splash.mk
@@ -1,7 +1,7 @@
 # Makefile for embedding splash image into kernel.
 .include <bsd.endian.mk>
 
-MD_OBJS+=	splash_image.o
+MI_OBJS+=	splash_image.o
 CFLAGS+=	-DSPLASHSCREEN_IMAGE
 
 .if (${OBJECT_FMTS:Melf64})
diff --git a/sys/dev/wsfb/files.wsfb b/sys/dev/wsfb/files.wsfb
index c97df1379a68..9c98fc0f108e 100644
--- a/sys/dev/wsfb/files.wsfb
+++ b/sys/dev/wsfb/files.wsfb
@@ -1,4 +1,4 @@
-# $NetBSD: files.wsfb,v 1.8 2014/03/18 18:20:42 riastradh Exp $
+# $NetBSD: files.wsfb,v 1.9 2015/05/01 02:00:41 nat Exp $
 
 #
 # wsdisplay framebuffer drivers
@@ -10,6 +10,6 @@ defflag opt_wsfb.h WSFB_ALLOW_OTHERS	# allow to mmap() foreign ranges
 
 # a generic framebuffer console
 define genfb: rasops1, rasops2, rasops8, rasops15, rasops16, rasops24, rasops32, vcons
-device genfb: genfb, wsemuldisplaydev, drm
+device genfb: genfb, wsemuldisplaydev, drm, splash
 file	dev/wsfb/genfb.c	genfb	needs-flag
 defflag opt_genfb.h GENFB_DEBUG GENFB_SHADOWFB