Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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@
This commit is contained in:
nat 2015-05-01 02:00:41 +00:00
parent 36903b682e
commit 05dec8ff13
6 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/amd64/conf/Makefile.amd64
View File

@ -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
##

6
sys/arch/arm/conf/Makefile.arm
View File

@ -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
##

8
sys/conf/Makefile.kern.inc
View File

@ -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}

4
sys/dev/splash/files.splash
View File

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

2
sys/dev/splash/splash.mk
View File

@ -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})

4
sys/dev/wsfb/files.wsfb
View File

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