r3229 - jhalfs/trunk

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Tue Nov 14 12:52:38 PST 2006


Author: manuel
Date: 2006-11-14 13:52:36 -0700 (Tue, 14 Nov 2006)
New Revision: 3229

Modified:
   jhalfs/trunk/Config.in
Log:
Added CLFS3 mips confog options.

Modified: jhalfs/trunk/Config.in
===================================================================
--- jhalfs/trunk/Config.in	2006-11-14 19:58:26 UTC (rev 3228)
+++ jhalfs/trunk/Config.in	2006-11-14 20:52:36 UTC (rev 3229)
@@ -91,7 +91,7 @@
 			bool	"x86"
 
 		config	ARCH_MIPS
-			bool	"mips"	if !BOOK_CLFS2 && !BOOK_CLFS3
+			bool	"mips"	if !BOOK_CLFS2
 
 		config	ARCH_PPC
 			bool	"ppc"	if !BOOK_CLFS2 && !BOOK_CLFS3
@@ -116,10 +116,10 @@
 			bool	"32-bit"	if !ARCH_ALPHA
 
 		config	DATA_64
-			bool	"64-bit"	if !ARCH_PPC && !ARCH_ARM && !((BOOK_CLFS2 || BOOK_CLFS3) && ARCH_X86)
+			bool	"64-bit"	if !ARCH_PPC && !ARCH_ARM && !((BOOK_CLFS2 || BOOK_CLFS3) && ARCH_X86) || (BOOK_CLFS3 && ARCH_MIPS)
 
 		config	DATA_MULTI
-			bool	"multilib"	if !ARCH_ALPHA && !ARCH_ARM && !((BOOK_CLFS2 || BOOK_CLFS3) && ARCH_X86)
+			bool	"multilib"	if !ARCH_ALPHA && !ARCH_ARM && !((BOOK_CLFS2 || BOOK_CLFS3) && ARCH_X86) && !(BOOK_CLFS3 && ARCH_MIPS)
 	endchoice
 
 	choice
@@ -136,7 +136,7 @@
 			bool	"i686"			if ARCH_X86 && DATA_32
 
 		config	PROC_mipsel
-			bool	"mips -little endian"	if ARCH_MIPS
+			bool	"mips little endian"	if ARCH_MIPS
 
 		config	PROC_mips
 			bool	"mips"			if ARCH_MIPS
@@ -148,8 +148,16 @@
 		default "i486-pc-linux-uclibc"		if ARCH_X86 && PROC_i486
 		default "i586-pc-linux-uclibc"		if ARCH_X86 && PROC_i586
 		default "i686-pc-linux-uclibc"		if ARCH_X86 && PROC_i686
+		default "mipsel-unknown-linux-uclibc"	if ARCH_MIPS && PROC_mipsel
+		default "mips-unknown-linux-uclibc"	if ARCH_MIPS && PROC_mips
 
+	config TARGET
+		string
+		depends	DATA_64 && BOOK_CLFS3
+		default "mips64el-unknown-linux-uclibc"	if ARCH_MIPS && PROC_mipsel
+		default "mips64-unknown-linux-uclibc"	if ARCH_MIPS && PROC_mips
 
+
 	config TARGET
 		string
 		depends	DATA_32 && !BOOK_CLFS3
@@ -164,7 +172,7 @@
 
 	config TARGET
 		string
-		depends	DATA_64
+		depends	DATA_64 && !BOOK_CLFS3
 		default	"x86_64-unknown-linux-gnu"	if ARCH_X86
 		default	"mips64el-unknown-linux-gnu"	if ARCH_MIPS && PROC_mipsel
 		default	"mips64-unknown-linux-gnu"	if ARCH_MIPS && PROC_mips
@@ -201,7 +209,12 @@
 
 	config	ARCH
 		string
-		depends	DATA_64
+		depends	DATA_64 && BOOK_CLFS3
+		default	"mips"	if ARCH_MIPS
+
+	config	ARCH
+		string
+		depends	DATA_64 && !BOOK_CLFS3
 		default	"x86_64-64"	if ARCH_X86
 		default	"mips64-64"	if ARCH_MIPS
 		default	"sparc64-64"	if ARCH_SPARC
@@ -215,6 +228,12 @@
 		default	"sparc64"	if ARCH_SPARC
 		default	"ppc64"		if ARCH_PPC
 
+	config  MIPS_LEVEL
+		string
+		depends BOOK_CLFS3 && ARCH_MIPS
+		default	"1"		if DATA_32
+		default "3"		if DATA_64
+
 	choice
 		prompt	"Build method"
 		depends	BOOK_CLFS




More information about the alfs-log mailing list