[src/trunk]: src/sys Handle splash image generation better.

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

details:   https://anonhg.NetBSD.org/src/rev/fd8871e42b5f
branches:  trunk
changeset: 340570:fd8871e42b5f
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Mon Sep 14 01:40:03 2015 +0000

description:
Handle splash image generation better.

diffstat:

 sys/conf/splash.mk          |  3 +--
 sys/dev/splash/files.splash |  4 +++-
 sys/dev/splash/splash.mk    |  5 +----
 sys/kern/init_main.c        |  6 +++---
 4 files changed, 8 insertions(+), 10 deletions(-)

diffs (68 lines):

diff -r c6f3473ce5fe -r fd8871e42b5f sys/conf/splash.mk
--- a/sys/conf/splash.mk        Sun Sep 13 10:58:30 2015 +0000
+++ b/sys/conf/splash.mk        Mon Sep 14 01:40:03 2015 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: splash.mk,v 1.2 2015/09/11 15:56:56 nat Exp $
+# $NetBSD: splash.mk,v 1.3 2015/09/14 01:40:03 uebayasi Exp $
 
 # Option for embedding a splashscreen image.
 .if defined(SPLASHSCREEN_IMAGE) 
 .include "${S}/dev/splash/splash.mk"
-OBJS+= splash_image.o
 .endif
diff -r c6f3473ce5fe -r fd8871e42b5f sys/dev/splash/files.splash
--- a/sys/dev/splash/files.splash       Sun Sep 13 10:58:30 2015 +0000
+++ b/sys/dev/splash/files.splash       Mon Sep 14 01:40:03 2015 +0000
@@ -1,6 +1,8 @@
-# $NetBSD: files.splash,v 1.4 2015/05/01 02:00:41 nat Exp $
+# $NetBSD: files.splash,v 1.5 2015/09/14 01:40:03 uebayasi Exp $
 
 define splash: stbi
 file dev/splash/splash.c       splash & splashscreen
+file splash_image.o            splash & splashscreen
 
 defflag opt_splash.h   SPLASHSCREEN
+                       makeoptions_SPLASHSCREEN_IMAGE
diff -r c6f3473ce5fe -r fd8871e42b5f sys/dev/splash/splash.mk
--- a/sys/dev/splash/splash.mk  Sun Sep 13 10:58:30 2015 +0000
+++ b/sys/dev/splash/splash.mk  Mon Sep 14 01:40:03 2015 +0000
@@ -1,11 +1,8 @@
-# $NetBSD: splash.mk,v 1.3 2015/05/01 02:35:16 nat Exp $
+# $NetBSD: splash.mk,v 1.4 2015/09/14 01:40:03 uebayasi Exp $
 
 # Makefile for embedding splash image into kernel.
 .include <bsd.endian.mk>
 
-MI_OBJS+=      splash_image.o
-CFLAGS+=       -DSPLASHSCREEN_IMAGE
-
 .if (${OBJECT_FMTS:Melf64})
 BFD_ELFTARGET=elf64
 .else
diff -r c6f3473ce5fe -r fd8871e42b5f sys/kern/init_main.c
--- a/sys/kern/init_main.c      Sun Sep 13 10:58:30 2015 +0000
+++ b/sys/kern/init_main.c      Mon Sep 14 01:40:03 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: init_main.c,v 1.469 2015/08/31 16:46:14 ozaki-r Exp $  */
+/*     $NetBSD: init_main.c,v 1.470 2015/09/14 01:40:03 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.469 2015/08/31 16:46:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.470 2015/09/14 01:40:03 uebayasi Exp $");
 
 #include "opt_ddb.h"
 #include "opt_ipsec.h"
@@ -115,7 +115,7 @@
 #include "opt_rnd_printf.h"
 #include "opt_splash.h"
 
-#if defined(SPLASHSCREEN) && defined(SPLASHSCREEN_IMAGE)
+#if defined(SPLASHSCREEN) && defined(makeoptions_SPLASHSCREEN_IMAGE)
 extern void *_binary_splash_image_start;
 extern void *_binary_splash_image_end;
 #endif