Module Name: src
Committed By: nat
Date: Fri May 1 02:00:41 UTC 2015
Modified Files:
src/sys/arch/amd64/conf: Makefile.amd64
src/sys/arch/arm/conf: Makefile.arm
src/sys/conf: Makefile.kern.inc
src/sys/dev/splash: files.splash splash.mk
src/sys/dev/wsfb: files.wsfb
Log Message:
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@
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/amd64/conf/Makefile.amd64
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/arm/conf/Makefile.arm
cvs rdiff -u -r1.183 -r1.184 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/splash/files.splash
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/splash/splash.mk
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/wsfb/files.wsfb
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.48 src/sys/arch/amd64/conf/Makefile.amd64:1.49
--- src/sys/arch/amd64/conf/Makefile.amd64:1.48 Thu Apr 30 15:22:32 2015
+++ src/sys/arch/amd64/conf/Makefile.amd64 Fri May 1 02:00:41 2015
@@ -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
##
Index: src/sys/arch/arm/conf/Makefile.arm
diff -u src/sys/arch/arm/conf/Makefile.arm:1.47 src/sys/arch/arm/conf/Makefile.arm:1.48
--- src/sys/arch/arm/conf/Makefile.arm:1.47 Thu Apr 30 15:22:32 2015
+++ src/sys/arch/arm/conf/Makefile.arm Fri May 1 02:00:41 2015
@@ -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_SFIL
locore.o: ${ARM}/arm32/locore.S assym.h
${NORMAL_S}
-.if defined(SPLASHSCREEN_IMAGE)
-.include "$S/dev/splash/splash.mk"
-.endif
-
##
## (5) link settings
##
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.183 src/sys/conf/Makefile.kern.inc:1.184
--- src/sys/conf/Makefile.kern.inc:1.183 Sat Nov 15 12:56:28 2014
+++ src/sys/conf/Makefile.kern.inc Fri May 1 02:00:41 2015
@@ -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}
${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}
Index: src/sys/dev/splash/files.splash
diff -u src/sys/dev/splash/files.splash:1.3 src/sys/dev/splash/files.splash:1.4
--- src/sys/dev/splash/files.splash:1.3 Sun Feb 6 23:25:18 2011
+++ src/sys/dev/splash/files.splash Fri May 1 02:00:41 2015
@@ -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
Index: src/sys/dev/splash/splash.mk
diff -u src/sys/dev/splash/splash.mk:1.1 src/sys/dev/splash/splash.mk:1.2
--- src/sys/dev/splash/splash.mk:1.1 Thu Apr 30 13:46:47 2015
+++ src/sys/dev/splash/splash.mk Fri May 1 02:00:41 2015
@@ -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})
Index: src/sys/dev/wsfb/files.wsfb
diff -u src/sys/dev/wsfb/files.wsfb:1.8 src/sys/dev/wsfb/files.wsfb:1.9
--- src/sys/dev/wsfb/files.wsfb:1.8 Tue Mar 18 18:20:42 2014
+++ src/sys/dev/wsfb/files.wsfb Fri May 1 02:00:41 2015
@@ -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 # a
# 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
