[uClibc-cvs] uClibc/extra/Configs Config.alpha, 1.10, 1.11 Config.arm, 1.38, 1.39 Config.cris, 1.7, 1.8 Config.e1, 1.1, 1.2 Config.h8300, 1.14, 1.15 Config.i386, 1.35, 1.36 Config.i960, 1.10, 1.11 Config.in, 1.35, 1.36 Config.in.arch, 1.9, 1.10 Config.m68k, 1.30, 1.31 Config.microblaze, 1.1, 1.2 Config.mips, 1.36, 1.37 Config.powerpc, 1.31, 1.32 Config.sh, 1.36, 1.37 Config.sparc, 1.13, 1.14 Config.v850, 1.2, 1.3 Config.arm.default, 1.2, NONE Config.cris.default, 1.5, NONE Config.e1.default, 1.1, NONE Config.h8300.default, 1.1, NONE Config.i386.default, 1.7, NONE Config.m68k.default, 1.1, NONE Config.microblaze.default, 1.1, NONE Config.mips.default, 1.3, NONE Config.mipsel, 1.35, NONE Config.mipsel.default, 1.3, NONE Config.powerpc.default, 1.1, NONE Config.sh.default, 1.2, NONE Config.sh64, 1.1, NONE Config.sh64.default, 1.1, NONE Config.v850.default, 1.1, NONE

Erik Andersen andersen at uclibc.org
Tue Nov 4 13:08:13 UTC 2003


Update of /var/cvs/uClibc/extra/Configs
In directory winder:/tmp/cvs-serv7696/extra/Configs

Modified Files:
	Config.alpha Config.arm Config.cris Config.e1 Config.h8300 
	Config.i386 Config.i960 Config.in Config.in.arch Config.m68k 
	Config.microblaze Config.mips Config.powerpc Config.sh 
	Config.sparc Config.v850 
Removed Files:
	Config.arm.default Config.cris.default Config.e1.default 
	Config.h8300.default Config.i386.default Config.m68k.default 
	Config.microblaze.default Config.mips.default Config.mipsel 
	Config.mipsel.default Config.powerpc.default Config.sh.default 
	Config.sh64 Config.sh64.default Config.v850.default 
Log Message:
Rework the config system.  Better utilize the Kconfig language
which should simplify enabling arbitrary architectures.
 -Erik


--- Config.v850.default DELETED ---

--- Config.i386.default DELETED ---

--- Config.sh.default DELETED ---

--- Config.mipsel.default DELETED ---

Index: Config.cris
===================================================================
RCS file: /var/cvs/uClibc/extra/Configs/Config.cris,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Config.cris	27 Aug 2003 13:04:27 -0000	1.7
+++ Config.cris	4 Nov 2003 13:07:49 -0000	1.8
@@ -3,14 +3,13 @@
 # see extra/config/Kconfig-language.txt
 #
 
-mainmenu "uClibc C Library Configuration"
-
-menu "Target Architecture Features and Options"
-
 config HAVE_ELF
 	bool
 	default y
 
+config TARGET_ARCH
+	default "cris"
+
 config ARCH_CFLAGS
 	string
 
@@ -32,14 +31,9 @@
 		- CRIS  Generic support for Axis' CRIS architecture.
 
 config CONFIG_CRIS
+	select UCLIBC_HAS_MMU
+	select ARCH_HAS_NO_FPU
 	bool "CRIS"
 
 endchoice
 
-source "extra/Configs/Config.in.arch"
-
-endmenu
-
-source "extra/Configs/Config.in"
-
-

--- Config.powerpc.default DELETED ---

Index: Config.powerpc
===================================================================
RCS file: /var/cvs/uClibc/extra/Configs/Config.powerpc,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- Config.powerpc	8 Nov 2002 00:17:44 -0000	1.31
+++ Config.powerpc	4 Nov 2003 13:07:50 -0000	1.32
@@ -3,12 +3,12 @@
 # see extra/config/Kconfig-language.txt
 #
 
-mainmenu "uClibc C Library Configuration"
-
-menu "Target Architecture Features and Options"
+config TARGET_ARCH
+	default "powerpc"
 
 config HAVE_ELF
 	bool
+	select UCLIBC_HAS_MMU
 	default y
 
 config ARCH_CFLAGS
@@ -20,10 +20,3 @@
 config LIBGCC_CFLAGS
 	string
 
-source "extra/Configs/Config.in.arch"
-
-endmenu
-
-source "extra/Configs/Config.in"
-
-

Index: Config.h8300
===================================================================
RCS file: /var/cvs/uClibc/extra/Configs/Config.h8300,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Config.h8300	29 Apr 2003 14:46:29 -0000	1.14
+++ Config.h8300	4 Nov 2003 13:07:49 -0000	1.15
@@ -3,9 +3,15 @@
 # see extra/config/Kconfig-language.txt
 #
 
-mainmenu "uClibc C Library Configuration"
+config HAVE_ELF
+	bool
+	select ARCH_HAS_NO_MMU
+	select ARCH_HAS_NO_FPU
+	select ARCH_HAS_C_SYMBOL_PREFIX
+	default y
 
-menu "Target Architecture Features and Options"
+config TARGET_ARCH
+	default "h8300"
 
 choice
 	prompt "Target Processor"
@@ -21,10 +27,6 @@
 
 endchoice
 
-config HAVE_ELF
-	bool
-	default y
-
 config ARCH_CFLAGS
 	string
 
@@ -34,18 +36,3 @@
 config LIBGCC_CFLAGS
 	string
 
-config ARCH_HAS_NO_MMU
-	bool
-	default y
-
-config ARCH_HAS_C_SYMBOL_PREFIX
-	bool
-	default y
-
-source "extra/Configs/Config.in.arch"
-
-endmenu
-
-source "extra/Configs/Config.in"
-
-

Index: Config.v850
===================================================================
RCS file: /var/cvs/uClibc/extra/Configs/Config.v850,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Config.v850	8 Nov 2002 00:17:44 -0000	1.2
+++ Config.v850	4 Nov 2003 13:07:50 -0000	1.3
@@ -3,9 +3,16 @@
 # see extra/config/Kconfig-language.txt
 #
 
-mainmenu "uClibc C Library Configuration"
+config TARGET_ARCH
+	default "v850"
 
-menu "Target Architecture Features and Options"
+config HAVE_ELF
+	bool
+	select ARCH_HAS_NO_FPU
+	select ARCH_HAS_NO_MMU
+	select ARCH_HAS_C_SYMBOL_PREFIX
+	select HAVE_NO_PIC
+	default y
 
 config ARCH_CFLAGS
 	string
@@ -16,34 +23,7 @@
 config LIBGCC_CFLAGS
 	string
 
-config HAVE_ELF
-	bool
-	default y
-
-config ARCH_HAS_NO_MMU
-	bool
-	default y
-
-config ARCH_HAS_NO_FPU
-	bool
-	default y
-
-config ARCH_HAS_C_SYMBOL_PREFIX
-	bool
-	default y
-
-config HAVE_NO_PIC
-	bool
-	default y
-
 config CROSS
         string
 	default "v850e-elf-"
 
-source "extra/Configs/Config.in.arch"
-
-endmenu
-
-source "extra/Configs/Config.in"
-
-

--- Config.m68k.default DELETED ---

Index: Config.alpha
===================================================================
RCS file: /var/cvs/uClibc/extra/Configs/Config.alpha,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Config.alpha	8 Nov 2002 00:17:43 -0000	1.10
+++ Config.alpha	4 Nov 2003 13:07:49 -0000	1.11
@@ -3,14 +3,15 @@
 # see extra/config/Kconfig-language.txt
 #
 
-mainmenu "uClibc C Library Configuration"
-
-menu "Target Architecture Features and Options"
-
 config HAVE_ELF
 	bool
+	select UCLIBC_HAS_MMU
+	select ARCH_HAS_NO_FPU
 	default y
 
+config TARGET_ARCH
+	default "alpha"
+
 config ARCH_CFLAGS
 	string
 
@@ -20,10 +21,3 @@
 config LIBGCC_CFLAGS
 	string
 
-source "extra/Configs/Config.in.arch"
-
-endmenu
-
-source "extra/Configs/Config.in"
-
-

Index: Config.mips
===================================================================
RCS file: /var/cvs/uClibc/extra/Configs/Config.mips,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- Config.mips	12 Jun 2003 22:10:40 -0000	1.36
+++ Config.mips	4 Nov 2003 13:07:49 -0000	1.37
@@ -3,9 +3,9 @@
 # see extra/config/Kconfig-language.txt
 #
 
-mainmenu "uClibc C Library Configuration"
-
-menu "Target Architecture Features and Options"
+config TARGET_ARCH
+	default "mips" if ARCH_BIG_ENDIAN
+	default "mipsel" if ARCH_LITTLE_ENDIAN
 
 config HAVE_ELF
 	bool
@@ -21,10 +21,3 @@
 config LIBGCC_CFLAGS
 	string
 
-source "extra/Configs/Config.in.arch"
-
-endmenu
-
-source "extra/Configs/Config.in"
-
-

Index: Config.e1
===================================================================
RCS file: /var/cvs/uClibc/extra/Configs/Config.e1,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Config.e1	8 Oct 2003 18:15:41 -0000	1.1
+++ Config.e1	4 Nov 2003 13:07:49 -0000	1.2
@@ -4,46 +4,27 @@
 # see extra/config/Kconfig-language.txt
 #
 
-mainmenu "uClibc C Library Configuration"
+config HAVE_ELF
+	select ARCH_HAS_NO_MMU
+	select ARCH_HAS_NO_FPU
+	select ARCH_HAS_C_SYMBOL_PREFIX
+	bool
+	default n
 
-menu "Target Architecture Features and Options"
+config TARGET_ARCH
+	default "e1"
 
 config ARCH_E1 
 	bool
 	default y
 
-config HAVE_ELF
-	bool
-	default n
-
 config ARCH_CFLAGS
 	string
 	default "-I$(KERNEL_SOURCE)/include -mgnu-param" 
 
-#	--bitwise-or
-
 config ARCH_LDFLAGS
 	string
 
 config LIBGCC_CFLAGS
 	string
 
-config HAVE_ELF
-	bool
-	default n
-
-config ARCH_HAS_NO_MMU
-	bool
-	default y
-
-config ARCH_HAS_C_SYMBOL_PREFIX
-        bool
-        default y
-
-source "extra/Configs/Config.in.arch"
-
-endmenu
-
-source "extra/Configs/Config.in"
-
-

--- Config.arm.default DELETED ---

Index: Config.sparc
===================================================================
RCS file: /var/cvs/uClibc/extra/Configs/Config.sparc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Config.sparc	27 Nov 2002 20:17:24 -0000	1.13
+++ Config.sparc	4 Nov 2003 13:07:50 -0000	1.14
@@ -3,9 +3,8 @@
 # see extra/config/Kconfig-language.txt
 #
 
-mainmenu "uClibc C Library Configuration"
-
-menu "Target Architecture Features and Options"
+config TARGET_ARCH
+	default "sparc"
 
 config HAVE_ELF
 	bool
@@ -20,10 +19,3 @@
 config LIBGCC_CFLAGS
 	string
 
-source "extra/Configs/Config.in.arch"
-
-endmenu
-
-source "extra/Configs/Config.in"
-
-

Index: Config.m68k
===================================================================
RCS file: /var/cvs/uClibc/extra/Configs/Config.m68k,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- Config.m68k	8 Nov 2002 00:17:44 -0000	1.30
+++ Config.m68k	4 Nov 2003 13:07:49 -0000	1.31
@@ -3,12 +3,13 @@
 # see extra/config/Kconfig-language.txt
 #
 
-mainmenu "uClibc C Library Configuration"
-
-menu "Target Architecture Features and Options"
+config TARGET_ARCH
+	default "m68k"
 
 config HAVE_ELF
 	bool
+	select ARCH_HAS_NO_MMU
+	select ARCH_HAS_NO_FPU
 	default y
 
 config ARCH_CFLAGS
@@ -25,14 +26,3 @@
 	bool
 	default y
 
-config ARCH_HAS_NO_MMU
-	bool
-	default y
-
-source "extra/Configs/Config.in.arch"
-
-endmenu
-
-source "extra/Configs/Config.in"
-
-

Index: Config.i960
===================================================================
RCS file: /var/cvs/uClibc/extra/Configs/Config.i960,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Config.i960	8 Nov 2002 00:17:43 -0000	1.10
+++ Config.i960	4 Nov 2003 13:07:49 -0000	1.11
@@ -3,12 +3,13 @@
 # see extra/config/Kconfig-language.txt
 #
 
-mainmenu "uClibc C Library Configuration"
-
-menu "Target Architecture Features and Options"
+config TARGET_ARCH
+	default "i960"
 
 config HAVE_ELF
 	bool
+	select ARCH_HAS_NO_MMU
+	select ARCH_HAS_NO_FPU
 	default n
 
 config ARCH_CFLAGS
@@ -21,18 +22,7 @@
 config LIBGCC_CFLAGS
 	string
 	
-config ARCH_HAS_NO_MMU
-	bool
-	default y
-
 config ARCH_HAS_C_SYMBOL_PREFIX
 	bool
 	default y
 
-source "extra/Configs/Config.in.arch"
-
-endmenu
-
-source "extra/Configs/Config.in"
-
-

--- Config.mips.default DELETED ---

Index: Config.in.arch
===================================================================
RCS file: /var/cvs/uClibc/extra/Configs/Config.in.arch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Config.in.arch	9 Nov 2002 21:09:17 -0000	1.9
+++ Config.in.arch	4 Nov 2003 13:07:49 -0000	1.10
@@ -3,6 +3,25 @@
 # see extra/config/Kconfig-language.txt
 #
 
+choice
+	prompt "Target Processor Endianness"
+	default ARCH_LITTLE_ENDIAN
+	help
+	  This is the endianness you wish to build use.  Choose either Big
+	  Endian, or Little Endian.
+
+config ARCH_LITTLE_ENDIAN
+	bool "Little Endian"
+
+config ARCH_BIG_ENDIAN
+	bool "Big Endian"
+
+endchoice
+
+config ARCH_HAS_NO_MMU
+	bool
+	default n
+
 config UCLIBC_HAS_MMU
 	bool "Target CPU has a memory management unit (MMU)"
 	default y
@@ -27,6 +46,10 @@
 	  Answering N to this option can reduce the size of uClibc.  Most people
 	  will answer Y.
 
+config ARCH_HAS_NO_FPU
+	bool
+	default n
+
 config HAS_FPU
 	bool "Target CPU has a floating point unit (FPU)"
 	depends on UCLIBC_HAS_FLOATS && !ARCH_HAS_NO_FPU
@@ -93,3 +116,7 @@
 	default "_" if ARCH_HAS_C_SYMBOL_PREFIX
 	default "" if !ARCH_HAS_C_SYMBOL_PREFIX
 
+config HAVE_DOT_CONFIG
+	bool
+	default y
+

--- Config.mipsel DELETED ---

Index: Config.sh
===================================================================
RCS file: /var/cvs/uClibc/extra/Configs/Config.sh,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- Config.sh	13 Aug 2003 20:08:24 -0000	1.36
+++ Config.sh	4 Nov 2003 13:07:50 -0000	1.37
@@ -3,9 +3,11 @@
 # see extra/config/Kconfig-language.txt
 #
 
-mainmenu "uClibc C Library Configuration"
-
-menu "Target Architecture Features and Options"
+config TARGET_ARCH
+	default "sh2" if CONFIG_SH2
+	default "sh3" if CONFIG_SH3
+	default "sh4" if CONFIG_SH4
+	default "sh64" if CONFIG_SH5
 
 config HAVE_ELF
 	bool
@@ -41,46 +43,28 @@
 	  - "SH2" Hitachi SH2
 	  - "SH3" Hitachi SH3
 	  - "SH4" Hitachi SH4
+	  - "SH5" SH-5 101, 103
 
 config CONFIG_SH2
+	select ARCH_HAS_NO_FPU
+	select ARCH_HAS_NO_MMU
 	bool "SH2"
 
 config CONFIG_SH3
+	select HAS_FPU
+	select UCLIBC_HAS_MMU
 	bool "SH3"
 
 config CONFIG_SH4
+	select HAS_FPU
+	select UCLIBC_HAS_MMU
 	bool "SH4"
 
-endchoice
-
-choice
-	prompt "Target Processor Endianness"
-	default ARCH_LITTLE_ENDIAN
-	help
-	  This is the endianness you wish to build use.  Choose either Big
-	  Endian, or Little Endian.
-
-config ARCH_LITTLE_ENDIAN
-	bool "Little Endian"
-
-config ARCH_BIG_ENDIAN
-	bool "Big Endian"
+config CONFIG_SH5
+	select HAS_FPU
+	select UCLIBC_HAS_MMU
+	bool "SH5"
 
 endchoice
 
 
-config ARCH_HAS_NO_MMU
-	bool
-	default y if CONFIG_SH2
-
-config ARCH_HAS_NO_FPU
-       bool
-       default y if CONFIG_SH2 || CONFIG_SH3
-
-source "extra/Configs/Config.in.arch"
-
-endmenu
-
-source "extra/Configs/Config.in"
-
-

--- Config.sh64.default DELETED ---

--- Config.cris.default DELETED ---

Index: Config.microblaze
===================================================================
RCS file: /var/cvs/uClibc/extra/Configs/Config.microblaze,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Config.microblaze	14 Oct 2003 11:52:27 -0000	1.1
+++ Config.microblaze	4 Nov 2003 13:07:49 -0000	1.2
@@ -3,9 +3,16 @@
 # see extra/config/Kconfig-language.txt
 #
 
-mainmenu "uClibc C Library Configuration"
+config TARGET_ARCH
+	default "microblaze"
 
-menu "Target Architecture Features and Options"
+config HAVE_ELF
+	bool
+	select ARCH_HAS_NO_MMU
+	select ARCH_HAS_NO_FPU
+	select ARCH_HAS_C_SYMBOL_PREFIX
+	select HAVE_NO_PIC
+	default y
 
 config ARCH_CFLAGS
 	string
@@ -16,34 +23,7 @@
 config LIBGCC_CFLAGS
 	string
 
-config HAVE_ELF
-	bool
-	default y
-
-config ARCH_HAS_NO_MMU
-	bool
-	default y
-
-config ARCH_HAS_NO_FPU
-	bool
-	default y
-
-config ARCH_HAS_C_SYMBOL_PREFIX
-	bool
-	default y
-
-config HAVE_NO_PIC
-	bool
-	default y
-
 config CROSS
         string
 	default "mb-"
 
-source "extra/Configs/Config.in.arch"
-
-endmenu
-
-source "extra/Configs/Config.in"
-
-

--- Config.sh64 DELETED ---

Index: Config.arm
===================================================================
RCS file: /var/cvs/uClibc/extra/Configs/Config.arm,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- Config.arm	31 Oct 2003 23:25:59 -0000	1.38
+++ Config.arm	4 Nov 2003 13:07:49 -0000	1.39
@@ -3,14 +3,13 @@
 # see extra/config/Kconfig-language.txt
 #
 
-mainmenu "uClibc C Library Configuration"
-
-menu "Target Architecture Features and Options"
-
 config HAVE_ELF
 	bool
 	default y
 
+config TARGET_ARCH
+	default "arm"
+
 config ARCH_CFLAGS
 	string
 
@@ -41,60 +40,54 @@
 	  If you don't know what to do, choose "Generic Arm".
 
 config CONFIG_GENERIC_ARM
+	select UCLIBC_HAS_MMU
+	select ARCH_HAS_NO_FPU
 	bool "Generic Arm"
 
 config CONFIG_ARM610
+	select ARCH_HAS_NO_MMU
+	select ARCH_HAS_NO_FPU
 	bool "Arm 610"
 
 config CONFIG_ARM710
+	select ARCH_HAS_NO_MMU
+	select ARCH_HAS_NO_FPU
 	bool "Arm 710"
 
 config CONFIG_ARM720T
+	select UCLIBC_HAS_MMU
+	select ARCH_HAS_NO_FPU
 	bool "Arm 720T"
 
 config CONFIG_ARM920T
+	select UCLIBC_HAS_MMU
+	select ARCH_HAS_NO_FPU
 	bool "Arm 920T"
 
 config CONFIG_ARM922T
+	select UCLIBC_HAS_MMU
+	select ARCH_HAS_NO_FPU
 	bool "Arm 922T"
 
 config CONFIG_ARM926T
+	select UCLIBC_HAS_MMU
+	select ARCH_HAS_NO_FPU
 	bool "Arm 926T"
 
 config CONFIG_ARM_SA110
+	select UCLIBC_HAS_MMU
+	select ARCH_HAS_NO_FPU
 	bool "Intel StrongArm SA-110"
 
 config CONFIG_ARM_SA1100
+	select UCLIBC_HAS_MMU
+	select ARCH_HAS_NO_FPU
 	bool "Intel StrongArm SA-1100"
 
 config CONFIG_ARM_XSCALE
+	select UCLIBC_HAS_MMU
+	select ARCH_HAS_NO_FPU
 	bool "Intel Xscale"
 
 endchoice
 
-choice
-	prompt "Target Processor Endianness"
-	default ARCH_LITTLE_ENDIAN
-	help
-	  This is the endianness you wish to build use.  Choose either Big
-	  Endian, or Little Endian.
-
-config ARCH_LITTLE_ENDIAN
-	bool "Little Endian"
-
-config ARCH_BIG_ENDIAN
-	bool "Big Endian"
-
-endchoice
-
-config ARCH_HAS_NO_MMU
-	bool
-	default y if CONFIG_ARM7TDMI
-
-source "extra/Configs/Config.in.arch"
-
-endmenu
-
-source "extra/Configs/Config.in"
-
-

--- Config.h8300.default DELETED ---

--- Config.microblaze.default DELETED ---

--- Config.e1.default DELETED ---

Index: Config.in
===================================================================
RCS file: /var/cvs/uClibc/extra/Configs/Config.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Config.in	31 Oct 2003 23:25:59 -0000	1.35
+++ Config.in	4 Nov 2003 13:07:49 -0000	1.36
@@ -2,13 +2,130 @@
 # For a description of the syntax of this configuration file,
 # see extra/config/Kconfig-language.txt
 #
-config HAVE_DOT_CONFIG
-	bool
-	default y
+mainmenu "uClibc C Library Configuration"
+
+
+choice
+	prompt "Target Architecture"
+	default TARGET_I386
+	help
+	  Stuff
+
+config TARGET_ALPHA
+	bool "alpha"
+
+config TARGET_ARM
+	bool "arm"
+
+config TARGET_CRIS
+	bool "cris"
+
+config TARGET_E1
+	bool "e1"
+
+config TARGET_H8300
+	bool "h8300"
+
+config TARGET_I386
+	bool "i386"
+
+config TARGET_I960
+	bool "i960"
+
+config TARGET_M68K
+	bool "m68k"
+
+config TARGET_MICROBLAZE
+	bool "microblaze"
+
+config TARGET_MIPS
+	bool "mips"
+
+config TARGET_POWERPC
+	bool "powerpc"
+
+config TARGET_SH
+	bool "SuperH"
+
+config TARGET_SPARC
+	bool "sparc"
+
+config TARGET_V850
+	bool "v850"
+
+endchoice
+
+
+menu "Target Architecture Features and Options"
+
+if TARGET_ALPHA
+source "extra/Configs/Config.alpha"
+endif
+
+if TARGET_ARM
+source "extra/Configs/Config.arm"
+endif
 
+if TARGET_CRIS
+source "extra/Configs/Config.cris"
+endif
+
+if TARGET_E1
+source "extra/Configs/Config.e1"
+endif
+
+if TARGET_H8300
+source "extra/Configs/Config.h8300"
+endif
+
+if TARGET_I386
+source "extra/Configs/Config.i386"
+endif
+
+if TARGET_I960
+source "extra/Configs/Config.i960"
+endif
+
+if TARGET_M68K
+source "extra/Configs/Config.m68k"
+endif
+
+if TARGET_MICROBLAZE
+source "extra/Configs/Config.microblaze"
+endif
+
+if TARGET_MIPS
+source "extra/Configs/Config.mips"
+endif
+
+if TARGET_POWERPC
+source "extra/Configs/Config.powerpc"
+endif
+
+if TARGET_SH
+source "extra/Configs/Config.sh"
+endif
+
+if TARGET_SPARC
+source "extra/Configs/Config.sparc"
+endif
+
+if TARGET_V850
+source "extra/Configs/Config.v850"
+endif
+
+
+
+source "extra/Configs/Config.in.arch"
+
+endmenu
 
 menu "General Library Settings"
 
+config HAVE_NO_PIC
+	bool
+	default n
+
 config DOPIC
 	bool "Generate Position Independent Code (PIC)"
 	default y
@@ -818,7 +935,7 @@
 
 menu "Library Installation Options"
 
-config SHARED_LIB_LOADER_PATH
+config SHARED_LIB_LOADER_PREFIX
 	string "Shared library loader path"
 	depends on BUILD_UCLIBC_LDSO
 	default "$(DEVEL_PREFIX)/lib"
@@ -827,6 +944,9 @@
 	  shared library will be invoked.  This value will be compiled into
 	  every binary compiled with uClibc.
 
+	  For a typical target system this should be set to "/lib", such that
+	  'make install' will install /lib/ld-uClibc.so.0.
+
 	  BIG FAT WARNING:
 	  If you do not have a shared library loader with the correct name
 	  sitting in the directory this points to, your binaries will not 
@@ -848,20 +968,25 @@
 
 config RUNTIME_PREFIX
 	string "uClibc runtime library directory"
-	default "/usr/$(TARGET_ARCH)-linux-uclibc"
+	default "/usr/$(TARGET_ARCH)-linux-uclibc/"
 	help
 	  RUNTIME_PREFIX is the directory into which the uClibc runtime
 	  libraries will be installed.   The result will look something
 	  like the following:
 	      $(RUNTIME_PREFIX)/
 	          lib/            <contains all runtime libraries>
+	          bin/ldd         <the ldd utility program>
+	          sbin/ldconfig   <the ldconfig utility program>
 	  This value is used by the 'make install' Makefile target.  Since this
-	  directory is compiled into the uclibc cross compiler wrapper, you
-	  have to recompile uClibc if you change this value...
+	  directory is compiled into the shared library loader, you will need to
+	  recompile uClibc if you change this value...
+
+	  For a typical target system this should be set to "/", such that
+	  'make install' will install /lib/libuClibc-<VERSION>.so
 
 config DEVEL_PREFIX
 	string "uClibc development environment directory"
-	default "/usr/$(TARGET_ARCH)-linux-uclibc"
+	default "/usr/$(TARGET_ARCH)-linux-uclibc/usr/"
 	help
 	  DEVEL_PREFIX is the directory into which the uClibc development
 	  environment will be installed.   The result will look something
@@ -869,29 +994,11 @@
 	      $(DEVEL_PREFIX)/
 	          lib/            <contains static libs>
 		  include/        <Where all the header files go>
-	  This value is used by the 'make install' Makefile target.  Since this
-	  directory is compiled into the uclibc cross compiler wrapper, you
-	  have to recompile uClibc if you change this value...
-
-config SYSTEM_DEVEL_PREFIX
-	string "uClibc development environment system directory"
-	default "$(DEVEL_PREFIX)"
-	help
-	  SYSTEM_DEVEL_PREFIX is the directory prefix used when installing
-	  bin/arch-uclibc-gcc, bin/arch-uclibc-ld, etc.   This is only used by
-	  the 'make install' target, and is not compiled into anything.  This
-	  defaults to $(DEVEL_PREFIX), but makers of .rpms and .debs may want
-	  to set this to "/usr" instead.
+	  This value is used by the 'make install' Makefile target when
+	  installing a uClibc development environment.
 
-config DEVEL_TOOL_PREFIX
-	string "uClibc development environment tool directory"
-	default "$(DEVEL_PREFIX)/usr"
-	help
-	  DEVEL_TOOL_PREFIX is the directory prefix used when installing
-	  bin/gcc, bin/ld, etc.   This is only used by the 'make install'
-	  target, and is not compiled into anything.  This defaults to
-	  $(DEVEL_PREFIX)/usr, but makers of .rpms and .debs may want to
-	  set this to something else.
+	  For a typical target system this should be set to "/usr", such that
+	  'make install' will install /usr/include/<header files>.
 
 endmenu
 

Index: Config.i386
===================================================================
RCS file: /var/cvs/uClibc/extra/Configs/Config.i386,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Config.i386	16 Jan 2003 07:15:18 -0000	1.35
+++ Config.i386	4 Nov 2003 13:07:49 -0000	1.36
@@ -3,14 +3,17 @@
 # see extra/config/Kconfig-language.txt
 #
 
-mainmenu "uClibc C Library Configuration"
-
-menu "Target Architecture Features and Options"
-
 config HAVE_ELF
 	bool
+	select HAS_FPU
+	select ARCH_LITTLE_ENDIAN
+	select UCLIBC_HAS_MMU
 	default y
 
+config TARGET_ARCH
+	string
+	default "i386"
+
 config ARCH_CFLAGS
 	string
 
@@ -21,7 +24,7 @@
 	string
 
 choice
-	prompt "Target Processor Type"
+	prompt "Target x86 Processor Family"
 	default CONFIG_GENERIC_386
 	help
 	  This is the processor type of your CPU. This information is used for
@@ -58,6 +61,7 @@
 	bool "Generic 386"
 
 config CONFIG_386
+	select ARCH_HAS_NO_FPU
 	bool "386"
 
 config CONFIG_486
@@ -98,9 +102,3 @@
 
 endchoice
 
-source "extra/Configs/Config.in.arch"
-
-endmenu
-
-source "extra/Configs/Config.in"
-




More information about the uClibc-cvs mailing list