Module Name: src
Committed By: uebayasi
Date: Mon Sep 14 01:40:03 UTC 2015
Modified Files:
src/sys/conf: splash.mk
src/sys/dev/splash: files.splash splash.mk
src/sys/kern: init_main.c
Log Message:
Handle splash image generation better.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/conf/splash.mk
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/splash/files.splash
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/splash/splash.mk
cvs rdiff -u -r1.469 -r1.470 src/sys/kern/init_main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/splash.mk
diff -u src/sys/conf/splash.mk:1.2 src/sys/conf/splash.mk:1.3
--- src/sys/conf/splash.mk:1.2 Fri Sep 11 15:56:56 2015
+++ src/sys/conf/splash.mk Mon Sep 14 01:40:03 2015
@@ -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
Index: src/sys/dev/splash/files.splash
diff -u src/sys/dev/splash/files.splash:1.4 src/sys/dev/splash/files.splash:1.5
--- src/sys/dev/splash/files.splash:1.4 Fri May 1 02:00:41 2015
+++ src/sys/dev/splash/files.splash Mon Sep 14 01:40:03 2015
@@ -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
Index: src/sys/dev/splash/splash.mk
diff -u src/sys/dev/splash/splash.mk:1.3 src/sys/dev/splash/splash.mk:1.4
--- src/sys/dev/splash/splash.mk:1.3 Fri May 1 02:35:16 2015
+++ src/sys/dev/splash/splash.mk Mon Sep 14 01:40:03 2015
@@ -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
Index: src/sys/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.469 src/sys/kern/init_main.c:1.470
--- src/sys/kern/init_main.c:1.469 Mon Aug 31 16:46:14 2015
+++ src/sys/kern/init_main.c Mon Sep 14 01:40:03 2015
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: init_main.c,
#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
