353076fee8
Fix the following warnings in promcon: WARNING: o-sparc64/drivers/video/console/built-in.o(.text+0x480): Section mismatch: reference to .init.data:promfont_unitable (between 'promcon_init_unimap' and 'promcon_init') WARNING: o-sparc64/drivers/video/console/built-in.o(.text+0x488): Section mismatch: reference to .init.data:promfont_unitable (between 'promcon_init_unimap' and 'promcon_init') WARNING: o-sparc64/drivers/video/console/built-in.o(.text+0x48c): Section mismatch: reference to .init.data:promfont_unicount (between 'promcon_init_unimap' and 'promcon_init') WARNING: o-sparc64/drivers/video/console/built-in.o(.text+0x490): Section mismatch: reference to .init.data:promfont_unicount (between 'promcon_init_unimap' and 'promcon_init') The warnings happens because the function: promcon_init_unimap() references promfont_unitable and promfont_unicount which are marked __initdata by the conmakehash command in the drivers/video/console/Makefile Fix the warning by removing the __initdata marker on the two variables. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
53 lines
1.9 KiB
Makefile
53 lines
1.9 KiB
Makefile
# Makefile for the Linux graphics to console drivers.
|
|
# 5 Aug 1999, James Simmons, <mailto:jsimmons@users.sf.net>
|
|
# Rewritten to use lists instead of if-statements.
|
|
|
|
# Font handling
|
|
font-objs := fonts.o
|
|
|
|
font-objs-$(CONFIG_FONT_SUN8x16) += font_sun8x16.o
|
|
font-objs-$(CONFIG_FONT_SUN12x22) += font_sun12x22.o
|
|
font-objs-$(CONFIG_FONT_8x8) += font_8x8.o
|
|
font-objs-$(CONFIG_FONT_8x16) += font_8x16.o
|
|
font-objs-$(CONFIG_FONT_6x11) += font_6x11.o
|
|
font-objs-$(CONFIG_FONT_7x14) += font_7x14.o
|
|
font-objs-$(CONFIG_FONT_10x18) += font_10x18.o
|
|
font-objs-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o
|
|
font-objs-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o
|
|
font-objs-$(CONFIG_FONT_MINI_4x6) += font_mini_4x6.o
|
|
|
|
font-objs += $(font-objs-y)
|
|
|
|
# Each configuration option enables a list of files.
|
|
|
|
obj-$(CONFIG_DUMMY_CONSOLE) += dummycon.o
|
|
obj-$(CONFIG_SGI_NEWPORT_CONSOLE) += newport_con.o font.o
|
|
obj-$(CONFIG_PROM_CONSOLE) += promcon.o promcon_tbl.o
|
|
obj-$(CONFIG_STI_CONSOLE) += sticon.o sticore.o font.o
|
|
obj-$(CONFIG_VGA_CONSOLE) += vgacon.o
|
|
obj-$(CONFIG_MDA_CONSOLE) += mdacon.o
|
|
obj-$(CONFIG_FRAMEBUFFER_CONSOLE) += fbcon.o bitblit.o font.o softcursor.o
|
|
ifeq ($(CONFIG_FB_TILEBLITTING),y)
|
|
obj-$(CONFIG_FRAMEBUFFER_CONSOLE) += tileblit.o
|
|
endif
|
|
ifeq ($(CONFIG_FRAMEBUFFER_CONSOLE_ROTATION),y)
|
|
obj-$(CONFIG_FRAMEBUFFER_CONSOLE) += fbcon_rotate.o fbcon_cw.o fbcon_ud.o \
|
|
fbcon_ccw.o
|
|
endif
|
|
|
|
obj-$(CONFIG_FB_STI) += sticore.o font.o
|
|
|
|
ifeq ($(CONFIG_USB_SISUSBVGA_CON),y)
|
|
obj-$(CONFIG_USB_SISUSBVGA) += font.o
|
|
endif
|
|
|
|
# Targets that kbuild needs to know about
|
|
targets := promcon_tbl.c
|
|
|
|
quiet_cmd_conmakehash = CNMKHSH $@
|
|
cmd_conmakehash = scripts/conmakehash $< | \
|
|
sed -e '/\#include <[^>]*>/p' -e 's/types/init/' \
|
|
-e 's/dfont\(_uni.*\]\)/promfont\1 /' > $@
|
|
|
|
$(obj)/promcon_tbl.c: $(src)/prom.uni
|
|
$(call cmd,conmakehash)
|