o Merge with Linux 2.1.116.

 o New Newport console code.
 o New G364 console code.

1 files changed, 287 insertions, 33 deletions

diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 2349e4720..412754020 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -21,13 +21,55 @@ MOD_LIST_NAME := VIDEO_MODULES
 
 # Frame Buffer Console
 
+# Nasty trick to make sure all wanted stuff is linked in
+O_TARGET = fbdev.o
+L_OBJS += fbdev.o
+
+ifeq ($(CONFIG_DUMMY_CONSOLE),y)
+  L_OBJS += dummycon.o
+endif
+
+ifeq ($(CONFIG_PROM_CONSOLE),y)
+  L_OBJS += promcon.o promcon_tbl.o
+endif
+
 ifeq ($(CONFIG_FB),y)
-  L_OBJS += fonts.o font_8x8.o font_8x16.o pearl_8x8.o font_6x11.o
-  LX_OBJS += fbcon.o fbcmap.o fbgen.o
+  L_OBJS += fonts.o
+  OX_OBJS += fbcon.o fbcmap.o
+# fbgen is not compiled by default since nobody uses it yet, except clgenfb
+  ifeq ($(CONFIG_FONT_8x8),y)
+    L_OBJS += font_8x8.o
+  endif
+  ifeq ($(CONFIG_FONT_8x16),y)
+    L_OBJS += font_8x16.o
+  endif
+  ifeq ($(CONFIG_FONT_SUN8x16),y)
+    L_OBJS += font_sun8x16.o
+  endif
+  ifeq ($(CONFIG_FONT_SUN12x22),y)
+    L_OBJS += font_sun12x22.o
+  endif
+  ifeq ($(CONFIG_FONT_6x11),y)
+    L_OBJS += font_6x11.o
+  endif
+  ifeq ($(CONFIG_FONT_ACORN_8x8),y)
+    L_OBJS += font_acorn_8x8.o
+  endif
+  ifeq ($(CONFIG_FONT_PEARL_8x8),y)
+    L_OBJS += font_pearl_8x8.o
+  endif
 endif
 
 # Frame Buffer Devices
 
+ifeq ($(CONFIG_FB_ACORN),y)
+L_OBJS += acornfb.o
+else
+  ifeq ($(CONFIG_FB_ACORN),m)
+  M_OBJS += acornfb.o
+  endif
+endif
+
 ifeq ($(CONFIG_FB_AMIGA),y)
 L_OBJS += amifb.o
 else
@@ -52,6 +94,18 @@ ifeq ($(CONFIG_FB_ATY),y)
 L_OBJS += atyfb.o
 endif
 
+ifeq ($(CONFIG_FB_CONTROL),y)
+L_OBJS += controlfb.o
+endif
+
+ifeq ($(CONFIG_FB_PLATINUM),y)
+L_OBJS += platinumfb.o
+endif
+
+ifeq ($(CONFIG_FB_CT65550),y)
+L_OBJS += chipsfb.o
+endif
+
 ifeq ($(CONFIG_FB_CYBER),y)
 L_OBJS += cyberfb.o
 else
@@ -64,8 +118,12 @@ ifeq ($(CONFIG_FB_MAC),y)
 L_OBJS += macfb.o
 endif
 
+ifeq ($(CONFIG_FB_HP300),y)
+L_OBJS += hpfb.o
+endif
+
 ifeq ($(CONFIG_FB_OF),y)
-L_OBJS += offb.o
+L_OBJS += offb.o macmodes.o
 endif
 
 ifeq ($(CONFIG_FB_RETINAZ3),y)
@@ -76,6 +134,16 @@ else
   endif
 endif
 
+ifeq ($(CONFIG_FB_CLGEN),y)
+L_OBJS += clgenfb.o
+OX_OBJS += fbgen.o
+else
+  ifeq ($(CONFIG_FB_CLGEN),m)
+  M_OBJS += clgenfb.o
+  OX_OBJS += fbgen.o
+  endif
+endif
+
 ifeq ($(CONFIG_FB_S3TRIO),y)
 L_OBJS += S3triofb.o
 else
@@ -86,6 +154,30 @@ endif
 
 ifeq ($(CONFIG_FB_TGA),y)
 L_OBJS += tgafb.o
+else
+  ifeq ($(CONFIG_FB_TGA),m)
+  M_OBJS += tgafb.o
+  endif
+endif
+
+ifeq ($(CONFIG_FB_VGA),y)
+L_OBJS += vgafb.o
+else
+  ifeq ($(CONFIG_FB_VGA),m)
+  M_OBJS += vgafb.o
+  endif
+endif
+
+ifeq ($(CONFIG_FB_VESA),y)
+L_OBJS += vesafb.o
+endif
+
+ifeq ($(CONFIG_FB_MDA),y)
+L_OBJS += mdafb.o
+else
+  ifeq ($(CONFIG_FB_MDA),m)
+  M_OBJS += mdafb.o
+  endif
 endif
 
 ifeq ($(CONFIG_FB_VIRGE),y)
@@ -96,6 +188,84 @@ else
   endif
 endif
 
+ifeq ($(CONFIG_FB_SBUS),y)
+L_OBJS += sbusfb.o
+  ifeq ($(CONFIG_FB_CREATOR),y)
+    L_OBJS += creatorfb.o
+  else
+    ifeq ($(CONFIG_FB_CREATOR),m)
+    M_OBJS += creatorfb.o
+    endif
+  endif
+  ifeq ($(CONFIG_FB_CGSIX),y)
+    L_OBJS += cgsixfb.o
+  else
+    ifeq ($(CONFIG_FB_CGSIX),m)
+    M_OBJS += cgsixfb.o
+    endif
+  endif
+  ifeq ($(CONFIG_FB_BWTWO),y)
+    L_OBJS += bwtwofb.o
+  else
+    ifeq ($(CONFIG_FB_BWTWO),m)
+    M_OBJS += bwtwofb.o
+    endif
+  endif
+  ifeq ($(CONFIG_FB_CGTHREE),y)
+    L_OBJS += cgthreefb.o
+  else
+    ifeq ($(CONFIG_FB_CGTHREE),m)
+    M_OBJS += cgthreefb.o
+    endif
+  endif
+  ifeq ($(CONFIG_FB_TCX),y)
+    L_OBJS += tcxfb.o
+  else
+    ifeq ($(CONFIG_FB_TCX),m)
+    M_OBJS += tcxfb.o
+    endif
+  endif
+else
+  ifeq ($(CONFIG_FB_SBUS),m)
+  M_OBJS += sbusfb.o
+    ifeq ($(CONFIG_FB_CREATOR),y)
+      M_OBJS += creatorfb.o
+    else
+      ifeq ($(CONFIG_FB_CREATOR),m)
+      M_OBJS += creatorfb.o
+      endif
+    endif
+    ifeq ($(CONFIG_FB_CGSIX),y)
+      M_OBJS += cgsixfb.o
+    else
+      ifeq ($(CONFIG_FB_CGSIX),m)
+      M_OBJS += cgsixfb.o
+      endif
+    endif
+    ifeq ($(CONFIG_FB_BWTWO),y)
+      M_OBJS += bwtwofb.o
+    else
+      ifeq ($(CONFIG_FB_BWTWO),m)
+      M_OBJS += bwtwofb.o
+      endif
+    endif
+    ifeq ($(CONFIG_FB_CGTHREE),y)
+      M_OBJS += cgthreefb.o
+    else
+      ifeq ($(CONFIG_FB_CGTHREE),m)
+      M_OBJS += cgthreefb.o
+      endif
+    endif
+    ifeq ($(CONFIG_FB_TCX),y)
+      M_OBJS += tcxfb.o
+    else
+      ifeq ($(CONFIG_FB_TCX),m)
+      M_OBJS += tcxfb.o
+      endif
+    endif
+  endif
+endif
+
 ifeq ($(CONFIG_FB_VIRTUAL),y)
 L_OBJS += vfb.o
 else
@@ -106,70 +276,147 @@ endif
 
 # Generic Low Level Drivers
 
-ifdef CONFIG_FBCON_AFB
-LX_OBJS += fbcon-afb.o
+ifeq ($(CONFIG_FBCON_AFB),y)
+OX_OBJS += fbcon-afb.o
+else
+  ifeq ($(CONFIG_FBCON_AFB),m)
+  MX_OBJS += fbcon-afb.o
+  endif
 endif
 
-ifdef CONFIG_FBCON_CFB2
-LX_OBJS += fbcon-cfb2.o
+ifeq ($(CONFIG_FBCON_CFB2),y)
+OX_OBJS += fbcon-cfb2.o
+else
+  ifeq ($(CONFIG_FBCON_CFB2),m)
+  MX_OBJS += fbcon-cfb2.o
+  endif
 endif
 
-ifdef CONFIG_FBCON_CFB4
-LX_OBJS += fbcon-cfb4.o
+ifeq ($(CONFIG_FBCON_CFB4),y)
+OX_OBJS += fbcon-cfb4.o
+else
+  ifeq ($(CONFIG_FBCON_CFB4),m)
+  MX_OBJS += fbcon-cfb4.o
+  endif
 endif
 
-ifdef CONFIG_FBCON_CFB8
-LX_OBJS += fbcon-cfb8.o
+ifeq ($(CONFIG_FBCON_CFB8),y)
+OX_OBJS += fbcon-cfb8.o
+else
+  ifeq ($(CONFIG_FBCON_CFB8),m)
+  MX_OBJS += fbcon-cfb8.o
+  endif
 endif
 
-ifdef CONFIG_FBCON_CFB16
-LX_OBJS += fbcon-cfb16.o
+ifeq ($(CONFIG_FBCON_CFB16),y)
+OX_OBJS += fbcon-cfb16.o
+else
+  ifeq ($(CONFIG_FBCON_CFB16),m)
+  MX_OBJS += fbcon-cfb16.o
+  endif
 endif
 
-ifdef CONFIG_FBCON_CFB24
-LX_OBJS += fbcon-cfb24.o
+ifeq ($(CONFIG_FBCON_CFB24),y)
+OX_OBJS += fbcon-cfb24.o
+else
+  ifeq ($(CONFIG_FBCON_CFB24),m)
+  MX_OBJS += fbcon-cfb24.o
+  endif
 endif
 
-ifdef CONFIG_FBCON_CFB32
-LX_OBJS += fbcon-cfb32.o
+ifeq ($(CONFIG_FBCON_CFB32),y)
+OX_OBJS += fbcon-cfb32.o
+else
+  ifeq ($(CONFIG_FBCON_CFB32),m)
+  MX_OBJS += fbcon-cfb32.o
+  endif
 endif
 
-ifdef CONFIG_FBCON_ILBM
-LX_OBJS += fbcon-ilbm.o
+ifeq ($(CONFIG_FBCON_ILBM),y)
+OX_OBJS += fbcon-ilbm.o
+else
+  ifeq ($(CONFIG_FBCON_ILBM),m)
+  MX_OBJS += fbcon-ilbm.o
+  endif
 endif
 
-ifdef CONFIG_FBCON_IPLAN2P2
-LX_OBJS += fbcon-iplan2p2.o
+ifeq ($(CONFIG_FBCON_IPLAN2P2),y)
+OX_OBJS += fbcon-iplan2p2.o
+else
+  ifeq ($(CONFIG_FBCON_IPLAN2P2),m)
+  MX_OBJS += fbcon-iplan2p2.o
+  endif
 endif
 
-ifdef CONFIG_FBCON_IPLAN2P4
-LX_OBJS += fbcon-iplan2p4.o
+ifeq ($(CONFIG_FBCON_IPLAN2P4),y)
+OX_OBJS += fbcon-iplan2p4.o
+else
+  ifeq ($(CONFIG_FBCON_IPLAN2P4),m)
+  MX_OBJS += fbcon-iplan2p4.o
+  endif
+endif
+
+ifeq ($(CONFIG_FBCON_IPLAN2P8),y)
+OX_OBJS += fbcon-iplan2p8.o
+else
+  ifeq ($(CONFIG_FBCON_IPLAN2P8),m)
+  MX_OBJS += fbcon-iplan2p8.o
+  endif
 endif
 
-ifdef CONFIG_FBCON_IPLAN2P8
-LX_OBJS += fbcon-iplan2p8.o
+ifeq ($(CONFIG_FBCON_IPLAN2P16),y)
+OX_OBJS += fbcon-iplan2p16.o
+else
+  ifeq ($(CONFIG_FBCON_IPLAN2P16),m)
+  MX_OBJS += fbcon-iplan2p16.o
+  endif
+endif
+
+ifeq ($(CONFIG_FBCON_MAC),y)
+OX_OBJS += fbcon-mac.o
+else
+  ifeq ($(CONFIG_FBCON_MAC),m)
+  MX_OBJS += fbcon-mac.o
+  endif
 endif
 
-ifdef CONFIG_FBCON_MAC
-LX_OBJS += fbcon-mac.o
+ifeq ($(CONFIG_FBCON_MFB),y)
+OX_OBJS += fbcon-mfb.o
+else
+  ifeq ($(CONFIG_FBCON_MFB),m)
+  MX_OBJS += fbcon-mfb.o
+  endif
 endif
 
-ifdef CONFIG_FBCON_MFB
-LX_OBJS += fbcon-mfb.o
+ifeq ($(CONFIG_FBCON_VGA),y)
+OX_OBJS += fbcon-vga.o
+else
+  ifeq ($(CONFIG_FBCON_VGA),m)
+  MX_OBJS += fbcon-vga.o
+  endif
 endif
 
-# GSP Console
 
 ifdef CONFIG_AMIGA_GSP
-L_OBJS := $(L_OBJS) gspcon.o gspcore.o
+L_OBJS += gspcon.o gspcore.o
 endif
 
 # VGA Text Console
 
-ifdef CONFIG_ABSTRACT_CONSOLE
 ifdef CONFIG_VGA_CONSOLE
-L_OBJS := $(L_OBJS) vgacon.o
+L_OBJS += vgacon.o
 endif
+
+# Newport Text Console
+
+ifdef CONFIG_SGI
+L_OBJS := $(L_OBJS) newport_con.o
+endif
+
+# G364 Console for Mips Magnum 4000 / Olivetti M700-10
+
+ifdef CONFIG_VIDEO_G364
+L_OBJS := $(L_OBJS) g364fb.o
 endif
 
 include $(TOPDIR)/Rules.make
@@ -177,3 +424,10 @@ include $(TOPDIR)/Rules.make
 gspcore.c: gspcore.gsp
 	$(GSPA) $< > $*.hex
 	$(GSPH2C) $*.hex > gspcore.c
+
+promcon_tbl.c: prom.uni
+	../char/conmakehash prom.uni | \
+	sed -e '/#include <[^>]*>/p' -e 's/types/init/' \
+	    -e 's/dfont\(_uni.*\]\)/promfont\1 __initdata/' > promcon_tbl.c
+
+promcon_tbl.o: promcon_tbl.c $(TOPDIR)/include/linux/types.h