From: Heiko Z. <smi...@us...> - 2004-03-23 00:34:36
|
Update of /cvsroot/devil-linux/build/scripts/configuration In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6469/scripts/configuration Modified Files: prepare.config Log Message: variable hz patch can now be de-selected Index: prepare.config =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/configuration/prepare.config,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- prepare.config 22 Mar 2004 01:34:06 -0000 1.11 +++ prepare.config 23 Mar 2004 00:24:13 -0000 1.12 @@ -7,7 +7,7 @@ test -z "$CONFIG_KERNEL_CPU" && CONFIG_KERNEL_CPU=486 test -z "$CONFIG_CPU" && CONFIG_CPU=486 -test -z "$CONFIG_HZ" && CONFIG_HZ=100 +test -z "$CONFIG_VHZ" && CONFIG_VHZ=OFF test -z "$CONFIG_PSCHED_CLOCK_SOURCE" && CONFIG_PSCHED_CLOCK_SOURCE=PSCHED_JIFFIES test "$CONFIG_KERNEL_CPU" != "686" -a "$CONFIG_KERNEL_CPU" != "VIAC3_2" -a "$CONFIG_PSCHED_CLOCK_SOURCE" = "PSCHED_CPU" && CONFIG_PSCHED_CLOCK_SOURCE=PSCHED_JIFFIES @@ -25,14 +25,17 @@ test -z "$CONFIG_INITRD_FS" && CONFIG_INITRD_FS=CRAMFS menu_add "Build Configuration" list "InitRD Filesystem" CONFIG_INITRD_FS CRAMFS EXT2 -test "$CONFIG_LINUX_VERSION" = "2.4" && menu_add "Build Configuration|Processor and Memory" list "Variable HZ" CONFIG_HZ 100 200 250 400 500 750 800 1000 -if [ "$CONFIG_KERNEL_CPU" = "686" -o "$CONFIG_KERNEL_CPU" = "VIAC3_2" ]; then - menu_add "Build Configuration|Processor and Memory" list "PSCHED_CLOCK_SOURCE" CONFIG_PSCHED_CLOCK_SOURCE PSCHED_GETTIMEOFDAY PSCHED_JIFFIES PSCHED_CPU -else - menu_add "Build Configuration|Processor and Memory" list "PSCHED_CLOCK_SOURCE" CONFIG_PSCHED_CLOCK_SOURCE PSCHED_GETTIMEOFDAY PSCHED_JIFFIES +if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then + menu_add "Build Configuration|Processor and Memory" list "Variable HZ" CONFIG_VHZ OFF 100 200 250 400 500 750 800 1000 + if [ ! "$CONFIG_VHZ" = "OFF" ]; then + if [ "$CONFIG_KERNEL_CPU" = "686" -o "$CONFIG_KERNEL_CPU" = "VIAC3_2" ]; then + menu_add "Build Configuration|Processor and Memory" list "PSCHED_CLOCK_SOURCE" CONFIG_PSCHED_CLOCK_SOURCE PSCHED_GETTIMEOFDAY PSCHED_JIFFIES PSCHED_CPU + else + menu_add "Build Configuration|Processor and Memory" list "PSCHED_CLOCK_SOURCE" CONFIG_PSCHED_CLOCK_SOURCE PSCHED_GETTIMEOFDAY PSCHED_JIFFIES + fi + fi fi - #For new epia models (nehemiah), CONFIG_KERNEL_CPU has to be VIAC3_2 and CONFIG_CPU = 686 #gcc -march=i686 #see (http://www.ussg.iu.edu/hypermail/linux/kernel/0304.0/1685.html) |