[src/trunk]: src/sys Include splash with genfb.

[nat <nat%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c6d5921b09cd
branches:  trunk
changeset: 337846:c6d5921b09cd
user:      nat <nat%NetBSD.org@localhost>
date:      Fri May 01 02:00:41 2015 +0000

description:
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@

diffstat:

 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(-)

diffs (103 lines):

diff -r 23297279f4bc -r c6d5921b09cd sys/arch/amd64/conf/Makefile.amd64
--- a/sys/arch/amd64/conf/Makefile.amd64        Thu Apr 30 16:09:06 2015 +0000
+++ b/sys/arch/amd64/conf/Makefile.amd64        Fri May 01 02:00:41 2015 +0000
@@ -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 @@
 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 -r 23297279f4bc -r c6d5921b09cd sys/arch/arm/conf/Makefile.arm
--- a/sys/arch/arm/conf/Makefile.arm    Thu Apr 30 16:09:06 2015 +0000
+++ b/sys/arch/arm/conf/Makefile.arm    Fri May 01 02:00:41 2015 +0000
@@ -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 @@
 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 -r 23297279f4bc -r c6d5921b09cd sys/conf/Makefile.kern.inc
--- a/sys/conf/Makefile.kern.inc        Thu Apr 30 16:09:06 2015 +0000
+++ b/sys/conf/Makefile.kern.inc        Fri May 01 02:00:41 2015 +0000
@@ -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 @@
        ${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 -r 23297279f4bc -r c6d5921b09cd sys/dev/splash/files.splash
--- a/sys/dev/splash/files.splash       Thu Apr 30 16:09:06 2015 +0000
+++ b/sys/dev/splash/files.splash       Fri May 01 02:00:41 2015 +0000
@@ -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 -r 23297279f4bc -r c6d5921b09cd sys/dev/splash/splash.mk
--- a/sys/dev/splash/splash.mk  Thu Apr 30 16:09:06 2015 +0000
+++ b/sys/dev/splash/splash.mk  Fri May 01 02:00:41 2015 +0000
@@ -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 -r 23297279f4bc -r c6d5921b09cd sys/dev/wsfb/files.wsfb
--- a/sys/dev/wsfb/files.wsfb   Thu Apr 30 16:09:06 2015 +0000
+++ b/sys/dev/wsfb/files.wsfb   Fri May 01 02:00:41 2015 +0000
@@ -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 @@
 
 # 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