make sisfb default mode setting derived from config file.

16 years ago · 5fcd5577e5
2 changed files with 4 additions and 2 deletions
--- a/Targets/Bonito2fdev/conf/Bonito.2fdev.via.sisfb
+++ b/Targets/Bonito2fdev/conf/Bonito.2fdev.via.sisfb
@ -185,3 +185,4 @@ option VIA686B_POWERFIXUP
 option DEVBD2F_VIA
 option CONFIG_VIDEO_BMP_LOGO
 option CONFIG_VIDEO_SW_CURSOR
+option PCI_BIGMEM_ADDRESS 0
--- a/fb/sis/sis_main.c
+++ b/fb/sis/sis_main.c
@ -7246,8 +7246,9 @@ return 0;
 /*                      MODULE                       */
 /*****************************************************/

-
-static char		*mode = "1280x1024-16@75";
+#define _MTOS(x) #x
+#define MTOS(x) _MTOS(x)
+static char		*mode = MTOS(FB_XSIZE) "x"  MTOS(FB_YSIZE) "-" MTOS(FB_COLOR_BITS) "@75";
 static int		vesa = -1;
 static unsigned int	rate = 0;
 static unsigned int	crt1off = 1;