[Devil-linux-commit] build/scripts prepare,1.51,1.52

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15834/scripts

Modified Files:
	prepare 
Log Message:
have a separate config file for each CPU type
and do some more cleanup of the kernel config


Index: prepare
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/prepare,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- prepare	30 Dec 2004 19:36:48 -0000	1.51
+++ prepare	30 Dec 2004 23:57:26 -0000	1.52
@@ -95,14 +95,6 @@
 	fi
 
 	cp $KERNEL_CONFIG_DIR/config_linux $KERNELDIR/.config || exit 1
-	echo "CONFIG_M$CONFIG_KERNEL_CPU=y" >> $KERNELDIR/.config
-	echo "CONFIG_NR_CPUS=$CONFIG_LINUX_NR_CPUS" >> $KERNELDIR/.config
-
-	if [ "$CONFIG_LINUX_SMP" == "y" ]; then
-		cat $KERNEL_CONFIG_DIR/config_linux.smp  >> $KERNELDIR/.config || exit 1
-	else
-		cat $KERNEL_CONFIG_DIR/config_linux.up  >> $KERNELDIR/.config || exit 1
-	fi
 
 	if [ "$CONFIG_HIGHMEM" == "y" ]; then
 		cat $KERNEL_CONFIG_DIR/config_highmem.yes >> $KERNELDIR/.config || exit 1
@@ -110,12 +102,12 @@
 		cat $KERNEL_CONFIG_DIR/config_highmem.no >> $KERNELDIR/.config || exit 1
 	fi
 
-	if [ "$CONFIG_KERNEL_CPU" == "VIAC3_2" ]; then
-		cat $KERNEL_CONFIG_DIR/config_linux.epia >> $KERNELDIR/.config || exit 1
-	elif [ "$CONFIG_KERNEL_CPU" == "486" ]; then
-		cat $KERNEL_CONFIG_DIR/config_linux.486 >> $KERNELDIR/.config || exit 1
+	cat $KERNEL_CONFIG_DIR/config_linux.$CONFIG_KERNEL_CPU >> $KERNELDIR/.config || exit 1
+
+	if [ "$CONFIG_LINUX_SMP" == "y" ]; then
+		cat $KERNEL_CONFIG_DIR/config_linux.smp  >> $KERNELDIR/.config || exit 1
 	else
-		cat $KERNEL_CONFIG_DIR/config_linux.486 >> $KERNELDIR/.config || exit 1
+		cat $KERNEL_CONFIG_DIR/config_linux.up  >> $KERNELDIR/.config || exit 1
 	fi
 
 	if [ "$CONFIG_ALSA" == "y" ]; then