From: Ben Gras Date: Wed, 5 Apr 2006 11:56:05 +0000 (+0000) Subject: Kludge for 1586 processor id. X-Git-Tag: v3.1.2a~42 X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=9ee6aa8b7bf558a371eca45481067aa3ae08a576;p=minix.git Kludge for 1586 processor id. --- diff --git a/boot/boot.c b/boot/boot.c index 284e32cd8..4d9db242b 100755 --- a/boot/boot.c +++ b/boot/boot.c @@ -843,7 +843,7 @@ void get_parameters(void) { char params[SECTOR_SIZE + 1]; token **acmds; - int r, bus; + int r, bus, processor; memory *mp; static char bus_type[][4] = { "xt", "at", "mca" @@ -860,7 +860,9 @@ void get_parameters(void) b_setvar(E_SPECIAL|E_VAR|E_DEV, "ramimagedev", "bootdev"); b_setvar(E_SPECIAL|E_VAR, "ramsize", "0"); #if BIOS - b_setvar(E_SPECIAL|E_VAR, "processor", ul2a10(getprocessor())); + processor = getprocessor(); + if(processor == 1586) processor = 686; + b_setvar(E_SPECIAL|E_VAR, "processor", ul2a10(processor)); b_setvar(E_SPECIAL|E_VAR, "bus", bus_type[get_bus()]); b_setvar(E_SPECIAL|E_VAR, "video", vid_type[get_video()]); b_setvar(E_SPECIAL|E_VAR, "chrome", vid_chrome[get_video() & 1]); diff --git a/commands/Makefile b/commands/Makefile index 2c1b5c319..10a36ab5c 100755 --- a/commands/Makefile +++ b/commands/Makefile @@ -3,7 +3,7 @@ MAKE = exec make -$(MAKEFLAGS) BZIP2=bzip2-1.0.3 -SMALLPROGRAMS=`arch` aal advent ash autil awk bc byacc cawf cron de dhcpd dis88 elle ftp ftpd ftpd200 httpd ibm indent m4 make mdb mined patch pax ps reboot rlogind scripts sh simple syslogd talk talkd telnet telnetd urlget yap zmodem +SMALLPROGRAMS=`arch` aal advent ash autil awk bc byacc cawf cron de dhcpd dis88 elle elvis ftp ftpd ftpd200 httpd ibm indent m4 make mdb mined patch pax ps reboot rlogind scripts sh simple syslogd talk talkd telnet telnetd urlget yap zmodem usage: @echo "Usage: make all # Compile all commands" >&2