diff options
31 files changed, 217 insertions, 316 deletions
diff --git a/Makefile.in b/Makefile.in index 5e6307d33..f02b6bd55 100644 --- a/Makefile.in +++ b/Makefile.in @@ -62,7 +62,7 @@ ifeq ($(HAVE_DOT_CONFIG),y) # on spot to save us from alot of hazzle. $(top_builddir)include/bits/uClibc_config.h: $(top_builddir)extra/config/conf $(KCONFIG_CONFIG) $(top_srcdir)extra/scripts/conf-header.sh | $(top_builddir)include/bits $(top_builddir)include/config @$(disp_gen) - $(Q)@$< -s $(top_srcdir)extra/Configs/Config.$(ARCH) + $(Q)@$< -s $(top_srcdir)extra/Configs/Config.in $(Q)$(top_srcdir)extra/scripts/conf-header.sh $(KCONFIG_CONFIG) > $@ $(Q)$(MAKE) headers-y @@ -395,35 +395,35 @@ $(top_builddir)extra/config/conf $(top_builddir)extra/config/mconf: | $(top_buil $(Q)$(MAKE) -C extra/config $(@F) menuconfig: $(top_builddir)extra/config/mconf - $(Q)$(top_builddir)extra/config/mconf extra/Configs/Config.$(ARCH) + $(Q)$(top_builddir)extra/config/mconf extra/Configs/Config.in config: $(top_builddir)extra/config/conf - $(Q)$(top_builddir)extra/config/conf extra/Configs/Config.$(ARCH) + $(Q)$(top_builddir)extra/config/conf extra/Configs/Config.in oldconfig: $(top_builddir)extra/config/conf - $(Q)$(top_builddir)extra/config/conf -o extra/Configs/Config.$(ARCH) + $(Q)$(top_builddir)extra/config/conf -o extra/Configs/Config.in silentoldconfig: $(top_builddir)extra/config/conf - $(Q)$(top_builddir)extra/config/conf -s extra/Configs/Config.$(ARCH) + $(Q)$(top_builddir)extra/config/conf -s extra/Configs/Config.in randconfig: $(top_builddir)extra/config/conf - $(Q)$(top_builddir)extra/config/conf -r extra/Configs/Config.$(ARCH) + $(Q)$(top_builddir)extra/config/conf -r extra/Configs/Config.in allyesconfig: $(top_builddir)extra/config/conf - $(Q)$(top_builddir)extra/config/conf -y extra/Configs/Config.$(ARCH) + $(Q)$(top_builddir)extra/config/conf -y extra/Configs/Config.in $(SED) -i -e "s/^DODEBUG=.*/# DODEBUG is not set/" \ -e "s/^DOASSERTS=.*/# DOASSERTS is not set/" \ -e "s/^SUPPORT_LD_DEBUG_EARLY=.*/# SUPPORT_LD_DEBUG_EARLY is not set/" \ -e "s/^SUPPORT_LD_DEBUG=.*/# SUPPORT_LD_DEBUG is not set/" \ -e "s/^UCLIBC_MJN3_ONLY=.*/# UCLIBC_MJN3_ONLY is not set/" \ $(KCONFIG_CONFIG) - $(Q)$(top_builddir)extra/config/conf -o extra/Configs/Config.$(ARCH) + $(Q)$(top_builddir)extra/config/conf -o extra/Configs/Config.in allnoconfig: $(top_builddir)extra/config/conf - $(Q)$(top_builddir)extra/config/conf -n extra/Configs/Config.$(ARCH) + $(Q)$(top_builddir)extra/config/conf -n extra/Configs/Config.in defconfig: $(top_builddir)extra/config/conf - $(Q)$(top_builddir)extra/config/conf -d extra/Configs/Config.$(ARCH) \ + $(Q)$(top_builddir)extra/config/conf -d extra/Configs/Config.in \ -D extra/Configs/defconfigs/$(ARCH) include_clean: @@ -63,15 +63,14 @@ STRIP_FLAGS ?= -x -R .note -R .comment # Select the compiler needed to build binaries for your development system HOSTCC = gcc BUILD_CFLAGS = -Os -Wall -SUBARCH := $(shell uname -m | $(SED) -e s/i.86/i386/ \ +export ARCH := $(shell uname -m | $(SED) -e s/i.86/i386/ \ -e s/sun.*/sparc/ -e s/sparc.*/sparc/ \ -e s/arm.*/arm/ -e s/sa110/arm/ \ -e s/sh.*/sh/ \ -e s/s390x/s390/ -e s/parisc.*/hppa/ \ -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ -e s/xtensa.*/xtensa/ ) -ARCH ?= $(SUBARCH) -export ARCH + #--------------------------------------------------------- # Nothing beyond this point should ever be touched by mere diff --git a/extra/Configs/Config.alpha b/extra/Configs/Config.alpha index 3f1fe659e..fd2d7a8e5 100644 --- a/extra/Configs/Config.alpha +++ b/extra/Configs/Config.alpha @@ -7,10 +7,6 @@ config TARGET_ARCH string default "alpha" -source "extra/Configs/Config.in.arches" -menu "Target Architecture Features and Options" -source "extra/Configs/Config.in.arch" - config FORCE_OPTIONS_FOR_ARCH bool default y @@ -21,6 +17,3 @@ config FORCE_OPTIONS_FOR_ARCH config ARCH_CFLAGS string - -endmenu -source "extra/Configs/Config.in.common" diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm index 8f2c07166..2b91a34d3 100644 --- a/extra/Configs/Config.arm +++ b/extra/Configs/Config.arm @@ -7,10 +7,6 @@ config TARGET_ARCH string default "arm" -source "extra/Configs/Config.in.arches" -menu "Target Architecture Features and Options" -source "extra/Configs/Config.in.arch" - config FORCE_OPTIONS_FOR_ARCH bool default y @@ -138,6 +134,3 @@ config CONFIG_ARM_IWMMXT select ARCH_HAS_MMU endchoice - -endmenu -source "extra/Configs/Config.in.common" diff --git a/extra/Configs/Config.avr32 b/extra/Configs/Config.avr32 index 036616f14..8d70e6e99 100644 --- a/extra/Configs/Config.avr32 +++ b/extra/Configs/Config.avr32 @@ -7,10 +7,6 @@ config TARGET_ARCH string default "avr32" -source "extra/Configs/Config.in.arches" -menu "Target Architecture Features and Options" -source "extra/Configs/Config.in.arch" - config FORCE_OPTIONS_FOR_ARCH bool default y @@ -33,6 +29,3 @@ endchoice config LINKRELAX bool "Enable linker optimizations" default y - -endmenu -source "extra/Configs/Config.in.common" diff --git a/extra/Configs/Config.bfin b/extra/Configs/Config.bfin index 34f663633..60c397af0 100644 --- a/extra/Configs/Config.bfin +++ b/extra/Configs/Config.bfin @@ -7,10 +7,6 @@ config TARGET_ARCH string default "bfin" -source "extra/Configs/Config.in.arches" -menu "Target Architecture Features and Options" -source "extra/Configs/Config.in.arch" - config FORCE_OPTIONS_FOR_ARCH bool default y @@ -19,6 +15,3 @@ config FORCE_OPTIONS_FOR_ARCH config ARCH_CFLAGS string - -endmenu -source "extra/Configs/Config.in.common" diff --git a/extra/Configs/Config.cris b/extra/Configs/Config.cris index 57b72e96c..b3811d1e9 100644 --- a/extra/Configs/Config.cris +++ b/extra/Configs/Config.cris @@ -7,10 +7,6 @@ config TARGET_ARCH string default "cris" -source "extra/Configs/Config.in.arches" -menu "Target Architecture Features and Options" -source "extra/Configs/Config.in.arch" - config FORCE_OPTIONS_FOR_ARCH bool default y @@ -39,6 +35,3 @@ config CONFIG_CRISV32 bool "CRISv32" endchoice - -endmenu -source "extra/Configs/Config.in.common" diff --git a/extra/Configs/Config.e1 b/extra/Configs/Config.e1 index 969a433f7..144d9d34d 100644 --- a/extra/Configs/Config.e1 +++ b/extra/Configs/Config.e1 @@ -7,10 +7,6 @@ config TARGET_ARCH string default "e1" -source "extra/Configs/Config.in.arches" -menu "Target Architecture Features and Options" -source "extra/Configs/Config.in.arch" - config FORCE_OPTIONS_FOR_ARCH bool default y @@ -25,6 +21,3 @@ config ARCH_E1 config ARCH_CFLAGS string default "-mgnu-param" - -endmenu -source "extra/Configs/Config.in.common" diff --git a/extra/Configs/Config.frv b/extra/Configs/Config.frv index 15ff76c24..63bbfed72 100644 --- a/extra/Configs/Config.frv +++ b/extra/Configs/Config.frv @@ -7,10 +7,6 @@ config TARGET_ARCH string default "frv" -source "extra/Configs/Config.in.arches" -menu "Target Architecture Features and Options" -source "extra/Configs/Config.in.arch" - config FORCE_OPTIONS_FOR_ARCH bool default y @@ -20,6 +16,3 @@ config FORCE_OPTIONS_FOR_ARCH config ARCH_CFLAGS string - -endmenu -source "extra/Configs/Config.in.common" diff --git a/extra/Configs/Config.h8300 b/extra/Configs/Config.h8300 index dcc17665c..262a0d245 100644 --- a/extra/Configs/Config.h8300 +++ b/extra/Configs/Config.h8300 @@ -7,10 +7,6 @@ config TARGET_ARCH string default "h8300" -source "extra/Configs/Config.in.arches" -menu "Target Architecture Features and Options" -source "extra/Configs/Config.in.arch" - config FORCE_OPTIONS_FOR_ARCH bool default y @@ -33,6 +29,3 @@ endchoice config ARCH_CFLAGS string - -endmenu -source "extra/Configs/Config.in.common" diff --git a/extra/Configs/Config.hppa b/extra/Configs/Config.hppa index 0c7089c44..1c264a800 100644 --- a/extra/Configs/Config.hppa +++ b/extra/Configs/Config.hppa @@ -7,10 +7,6 @@ config TARGET_ARCH string default "hppa" -source "extra/Configs/Config.in.arches" -menu "Target Architecture Features and Options" -source "extra/Configs/Config.in.arch" - config FORCE_OPTIONS_FOR_ARCH bool default y @@ -22,6 +18,3 @@ config FORCE_OPTIONS_FOR_ARCH config ARCH_CFLAGS string - -endmenu -source "extra/Configs/Config.in.common" diff --git a/extra/Configs/Config.i386 b/extra/Configs/Config.i386 index c65eefd43..850ab8ea8 100644 --- a/extra/Configs/Config.i386 +++ b/extra/Configs/Config.i386 @@ -3,16 +3,10 @@ # see extra/config/Kconfig-language.txt # - - config TARGET_ARCH string default "i386" -source "extra/Configs/Config.in.arches" -menu "Target Architecture Features and Options" -source "extra/Configs/Config.in.arch" - config FORCE_OPTIONS_FOR_ARCH bool default y @@ -106,6 +100,3 @@ config CONFIG_NEHEMIAH bool "VIA C3-2 (Nehemiah)" endchoice - -endmenu -source "extra/Configs/Config.in.common" diff --git a/extra/Configs/Config.i960 b/extra/Configs/Config.i960 index 22459ddd6..cb325c7ea 100644 --- a/extra/Configs/Config.i960 +++ b/extra/Configs/Config.i960 @@ -7,10 +7,6 @@ config TARGET_ARCH string default "i960" -source "extra/Configs/Config.in.arches" -menu "Target Architecture Features and Options" -source "extra/Configs/Config.in.arch" - config FORCE_OPTIONS_FOR_ARCH bool default y @@ -21,6 +17,3 @@ config FORCE_OPTIONS_FOR_ARCH config ARCH_CFLAGS string default "-mh -mint32 -fsigned-char" - -endmenu -source "extra/Configs/Config.in.common" diff --git a/extra/Configs/Config.ia64 b/extra/Configs/Config.ia64 index e92e22ee9..dc13319b3 100644 --- a/extra/Configs/Config.ia64 +++ b/extra/Configs/Config.ia64 @@ -7,10 +7,6 @@ config TARGET_ARCH string default "ia64" -source "extra/Configs/Config.in.arches" -menu "Target Architecture Features and Options" -source "extra/Configs/Config.in.arch" - config FORCE_OPTIONS_FOR_ARCH bool default y @@ -20,6 +16,3 @@ config FORCE_OPTIONS_FOR_ARCH config ARCH_CFLAGS string - -endmenu -source "extra/Configs/Config.in.common" diff --git a/extra/Configs/Config.in.common b/extra/Configs/Config.in index e9550af6d..a3f191059 100644 --- a/extra/Configs/Config.in.common +++ b/extra/Configs/Config.in @@ -3,6 +3,204 @@ # see extra/config/Kconfig-language.txt # +mainmenu "uClibc C Library Configuration" + +choice + prompt "Target Architecture" + help + The architecture of your target. + +config TARGET_alpha + bool "alpha" + +config TARGET_arm + bool "arm" + +config TARGET_avr32 + bool "avr32" + +config TARGET_bfin + bool "bfin" + +config TARGET_cris + bool "cris" + +config TARGET_e1 + bool "e1 (BROKEN)" + +config TARGET_frv + bool "frv (BROKEN)" + +config TARGET_h8300 + bool "h8300 (BROKEN)" + +config TARGET_hppa + bool "hppa" + +config TARGET_i386 + bool "i386" + +config TARGET_i960 + bool "i960 (BROKEN)" + +config TARGET_ia64 + bool "ia64" + +config TARGET_m68k + bool "m68k" + +config TARGET_microblaze + bool "microblaze (BROKEN)" + +config TARGET_mips + bool "mips" + +config TARGET_nios + bool "nios" + +config TARGET_nios2 + bool "nios2" + +config TARGET_powerpc + bool "powerpc" + +config TARGET_sh + bool "superh" + +config TARGET_sh64 + bool "sh64" + +config TARGET_sparc + bool "sparc" + +config TARGET_v850 + bool "v850 (BROKEN)" + +config TARGET_vax + bool "vax" + +config TARGET_x86_64 + bool "x86_64" + +config TARGET_xtensa + bool "xtensa" + +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_avr32 +source "extra/Configs/Config.avr32" +endif + +if TARGET_bfin +source "extra/Configs/Config.bfin" +endif + +if TARGET_cris +source "extra/Configs/Config.cris" +endif + +if TARGET_e1 +source "extra/Configs/Config.e1" +endif + +if TARGET_frv +source "extra/Configs/Config.frv" +endif + +if TARGET_h8300 +source "extra/Configs/Config.h8300" +endif + +if TARGET_hppa +source "extra/Configs/Config.hppa" +endif + +if TARGET_i386 +source "extra/Configs/Config.i386" +endif + +if TARGET_i960 +source "extra/Configs/Config.i960" +endif + +if TARGET_ia64 +source "extra/Configs/Config.ia64" +endif + +if TARGET_m68k +source "extra/Configs/Config.m68k" +endif + +if TARGET_nios +source "extra/Configs/Config.nios" +endif + +if TARGET_nios2 +source "extra/Configs/Config.nios2" +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_sh64 +source "extra/Configs/Config.sh64" +endif + +if TARGET_sparc +source "extra/Configs/Config.sparc" +endif + +if TARGET_v850 +source "extra/Configs/Config.v850" +endif + +if TARGET_vax +source "extra/Configs/Config.vax" +endif + +if TARGET_x86_64 +source "extra/Configs/Config.x86_64" +endif + +if TARGET_xtensa +source "extra/Configs/Config.xtensa" +endif + +config TARGET_SUBARCH + string + default "e500" if CONFIG_E500 + default "classic" if CONFIG_CLASSIC + default "sh4" if CONFIG_SH4 + default "" + +source "extra/Configs/Config.in.arch" + +endmenu + menu "General Library Settings" config HAVE_NO_PIC @@ -1981,6 +2179,3 @@ config UCLIBC_MJN3_ONLY Most people will answer N. endmenu - -config HAVE_DOT_CONFIG - def_bool y diff --git a/extra/Configs/Config.in.arch b/extra/Configs/Config.in.arch index e215c8f37..76ab0022f 100644 --- a/extra/Configs/Config.in.arch +++ b/extra/Configs/Config.in.arch @@ -3,12 +3,6 @@ # see extra/config/Kconfig-language.txt # -config TARGET_SUBARCH - string - default "e500" if CONFIG_E500 - default "classic" if CONFIG_CLASSIC - default "sh4" if CONFIG_SH4 - default "" # # Binary format @@ -206,3 +200,6 @@ config UCLIBC_UCLINUX_BROKEN_MUNMAP depends on !ARCH_USE_MMU default y +config HAVE_DOT_CONFIG + bool + default y diff --git a/extra/Configs/Config.in.arches b/extra/Configs/Config.in.arches deleted file mode 100644 index e83c78a3d..000000000 --- a/extra/Configs/Config.in.arches +++ /dev/null @@ -1,114 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see extra/config/Kconfig-language.txt -# - -mainmenu "uClibc C Library Configuration" - -choice - prompt "Target Architecture" - default TARGET_alpha if TARGET_ARCH = "alpha" - default TARGET_arm if TARGET_ARCH = "arm" - default TARGET_avr32 if TARGET_ARCH = "avr32" - default TARGET_bfin if TARGET_ARCH = "bfin" - default TARGET_cris if TARGET_ARCH = "cris" - default TARGET_e1 if TARGET_ARCH = "e1" - default TARGET_frv if TARGET_ARCH = "frv" - default TARGET_h8300 if TARGET_ARCH = "h8300" - default TARGET_hppa if TARGET_ARCH = "hppa" - default TARGET_i386 if TARGET_ARCH = "i386" - default TARGET_i960 if TARGET_ARCH = "i960" - default TARGET_ia64 if TARGET_ARCH = "ia64" - default TARGET_m68k if TARGET_ARCH = "m68k" - default TARGET_microblaze if TARGET_ARCH = "microblaze" - default TARGET_mips if TARGET_ARCH = "mips" - default TARGET_nios if TARGET_ARCH = "nios" - default TARGET_nios2 if TARGET_ARCH = "nios2" - default TARGET_powerpc if TARGET_ARCH = "powerpc" - default TARGET_sh if TARGET_ARCH = "sh" - default TARGET_sh64 if TARGET_ARCH = "sh64" - default TARGET_sparc if TARGET_ARCH = "sparc" - default TARGET_v850 if TARGET_ARCH = "v850" - default TARGET_vax if TARGET_ARCH = "vax" - default TARGET_x86_64 if TARGET_ARCH = "x86_64" - default TARGET_xtensa if TARGET_ARCH = "xtensa" - help - The architecture of your target. - -config TARGET_alpha - bool "alpha" - -config TARGET_arm - bool "arm" - -config TARGET_avr32 - bool "avr32" - -config TARGET_bfin - bool "bfin" - -config TARGET_cris - bool "cris" - -config TARGET_e1 - bool "e1 (BROKEN)" - -config TARGET_frv - bool "frv (BROKEN)" - -config TARGET_h8300 - bool "h8300 (BROKEN)" - -config TARGET_hppa - bool "hppa" - -config TARGET_i386 - bool "i386" - -config TARGET_i960 - bool "i960 (BROKEN)" - -config TARGET_ia64 - bool "ia64" - -config TARGET_m68k - bool "m68k" - -config TARGET_microblaze - bool "microblaze (BROKEN)" - -config TARGET_mips - bool "mips" - -config TARGET_nios - bool "nios" - -config TARGET_nios2 - bool "nios2" - -config TARGET_powerpc - bool "powerpc" - -config TARGET_sh - bool "superh" - -config TARGET_sh64 - bool "sh64" - -config TARGET_sparc - bool "sparc" - -config TARGET_v850 - bool "v850 (BROKEN)" - -config TARGET_vax - bool "vax" - -config TARGET_x86_64 - bool "x86_64" - -config TARGET_xtensa - bool "xtensa" - -endchoice - diff --git a/extra/Configs/Config.m68k b/extra/Configs/Config.m68k index d82b15f6a..95807c485 100644 --- a/extra/Configs/Config.m68k +++ b/extra/Configs/Config.m68k @@ -7,14 +7,7 @@ config TARGET_ARCH string default "m68k" -source "extra/Configs/Config.in.arches" -menu "Target Architecture Features and Options" -source "extra/Configs/Config.in.arch" - config FORCE_OPTIONS_FOR_ARCH bool default y select ARCH_BIG_ENDIAN - -endmenu -source "extra/Configs/Config.in.common" diff --git a/extra/Configs/Config.microblaze b/extra/Configs/Config.microblaze index 0d4cf971a..a89914ef1 100644 --- a/extra/Configs/Config.microblaze +++ b/extra/Configs/Config.microblaze @@ -7,10 +7,6 @@ config TARGET_ARCH string default "microblaze" -source "extra/Configs/Config.in.arches" -menu "Target Architecture Features and Options" -source "extra/Configs/Config.in.arch" - config FORCE_OPTIONS_FOR_ARCH bool default y @@ -23,6 +19,3 @@ config ARCH_CFLAGS config CROSS string default "mb-" - -endmenu -source "extra/Configs/Config.in.common" diff --git a/extra/Configs/Config.mips b/extra/Configs/Config.mips index b40d05ce9..8350ea427 100644 --- a/extra/Configs/Config.mips +++ b/extra/Configs/Config.mips @@ -7,10 +7,6 @@ config TARGET_ARCH string default "mips" -source "extra/Configs/Config.in.arches" -menu "Target Architecture Features and Options" -source "extra/Configs/Config.in.arch" - config FORCE_OPTIONS_FOR_ARCH bool default y @@ -79,6 +75,3 @@ config CONFIG_MIPS_ISA_MIPS64 bool "MIPS64" endchoice - -endmenu -source "extra/Configs/Config.in.common" diff --git a/extra/Configs/Config.nios b/extra/Configs/Config.nios index 6cf911bdb..f1dbd6c42 100644 --- a/extra/Configs/Config.nios +++ b/extra/Configs/Config.nios @@ -7,10 +7,6 @@ config TARGET_ARCH string default "nios" -source "extra/Configs/Config.in.arches" -menu "Target Architecture Features and Options" -source "extra/Configs/Config.in.arch" - config FORCE_OPTIONS_FOR_ARCH bool default y @@ -25,6 +21,3 @@ config ARCH_CFLAGS config CROSS string - -endmenu -source "extra/Configs/Config.in.common" diff --git a/extra/Configs/Config.nios2 b/extra/Configs/Config.nios2 index 5d1a52014..1f945556b 100644 --- a/extra/Configs/Config.nios2 +++ b/extra/Configs/Config.nios2 @@ -7,10 +7,6 @@ config TARGET_ARCH string default "nios2" -source "extra/Configs/Config.in.arches" -menu "Target Architecture Features and Options" -source "extra/Configs/Config.in.arch" - config FORCE_OPTIONS_FOR_ARCH bool default y @@ -24,6 +20,3 @@ config ARCH_CFLAGS config CROSS string - -endmenu -source "extra/Configs/Config.in.common" diff --git a/extra/Configs/Config.powerpc b/extra/Configs/Config.powerpc index c34124aef..8ba267cf1 100644 --- a/extra/Configs/Config.powerpc +++ b/extra/Configs/Config.powerpc @@ -7,10 +7,6 @@ config TARGET_ARCH string default "powerpc" -source "extra/Configs/Config.in.arches" -menu "Target Architecture Features and Options" -source "extra/Configs/Config.in.arch" - config FORCE_OPTIONS_FOR_ARCH bool default y @@ -40,6 +36,3 @@ config CONFIG_E500 e500 v1 and v2 core. endchoice - -endmenu -source "extra/Configs/Config.in.common" diff --git a/extra/Configs/Config.sh b/extra/Configs/Config.sh index a1e8f9666..8538bcc65 100644 --- a/extra/Configs/Config.sh +++ b/extra/Configs/Config.sh @@ -7,10 +7,6 @@ config TARGET_ARCH string default "sh" -source "extra/Configs/Config.in.arches" -menu "Target Architecture Features and Options" -source "extra/Configs/Config.in.arch" - config FORCE_OPTIONS_FOR_ARCH bool default y @@ -54,9 +50,6 @@ config CONFIG_SH4 endchoice config ARCH_HAS_BWD_MEMCPY - bool - default y - depends on CONFIG_SH4 - -endmenu -source "extra/Configs/Config.in.common" + bool + default y + depends on CONFIG_SH4 diff --git a/extra/Configs/Config.sh64 b/extra/Configs/Config.sh64 index 4077bd297..54d738e36 100644 --- a/extra/Configs/Config.sh64 +++ b/extra/Configs/Config.sh64 @@ -7,10 +7,6 @@ config TARGET_ARCH string default "sh64" -source "extra/Configs/Config.in.arches" -menu "Target Architecture Features and Options" -source "extra/Configs/Config.in.arch" - config FORCE_OPTIONS_FOR_ARCH bool default y @@ -37,6 +33,3 @@ config CONFIG_SH5 bool "SH5" endchoice - -endmenu -source "extra/Configs/Config.in.common" diff --git a/extra/Configs/Config.sparc b/extra/Configs/Config.sparc index 8b41001d3..3b19f9d14 100644 --- a/extra/Configs/Config.sparc +++ b/extra/Configs/Config.sparc @@ -7,10 +7,6 @@ config TARGET_ARCH string default "sparc" -source "extra/Configs/Config.in.arches" -menu "Target Architecture Features and Options" -source "extra/Configs/Config.in.arch" - config FORCE_OPTIONS_FOR_ARCH bool default y @@ -43,6 +39,3 @@ config CONFIG_SPARC_V9B bool "SPARC v9b" endchoice - -endmenu -source "extra/Configs/Config.in.common" diff --git a/extra/Configs/Config.v850 b/extra/Configs/Config.v850 index 3bc245e51..a668bba7c 100644 --- a/extra/Configs/Config.v850 +++ b/extra/Configs/Config.v850 @@ -7,10 +7,6 @@ config TARGET_ARCH string default "v850" -source "extra/Configs/Config.in.arches" -menu "Target Architecture Features and Options" -source "extra/Configs/Config.in.arch" - config FORCE_OPTIONS_FOR_ARCH bool default y @@ -24,6 +20,3 @@ config ARCH_CFLAGS config CROSS string default "v850e-elf-" - -endmenu -source "extra/Configs/Config.in.common" diff --git a/extra/Configs/Config.vax b/extra/Configs/Config.vax index e04f63846..4192e28c2 100644 --- a/extra/Configs/Config.vax +++ b/extra/Configs/Config.vax @@ -7,10 +7,6 @@ config TARGET_ARCH string default "vax" -source "extra/Configs/Config.in.arches" -menu "Target Architecture Features and Options" -source "extra/Configs/Config.in.arch" - config FORCE_OPTIONS_FOR_ARCH bool default y @@ -26,6 +22,3 @@ config ARCH_LDFLAGS config CROSS string default "vax-linux-uclibc-" - -endmenu -source "extra/Configs/Config.in.common" diff --git a/extra/Configs/Config.x86_64 b/extra/Configs/Config.x86_64 index 60d13250a..7ae357f61 100644 --- a/extra/Configs/Config.x86_64 +++ b/extra/Configs/Config.x86_64 @@ -7,10 +7,6 @@ config TARGET_ARCH string default "x86_64" -source "extra/Configs/Config.in.arches" -menu "Target Architecture Features and Options" -source "extra/Configs/Config.in.arch" - config FORCE_OPTIONS_FOR_ARCH bool default y @@ -19,6 +15,3 @@ config FORCE_OPTIONS_FOR_ARCH config ARCH_CFLAGS string - -endmenu -source "extra/Configs/Config.in.common" diff --git a/extra/Configs/Config.xtensa b/extra/Configs/Config.xtensa index 5d6e4377c..75132471a 100644 --- a/extra/Configs/Config.xtensa +++ b/extra/Configs/Config.xtensa @@ -7,12 +7,6 @@ config TARGET_ARCH string default "xtensa" -source "extra/Configs/Config.in.arches" -menu "Target Architecture Features and Options" -source "extra/Configs/Config.in.arch" - config ARCH_CFLAGS string -endmenu -source "extra/Configs/Config.in.common" diff --git a/extra/scripts/MAKEALL b/extra/scripts/MAKEALL index c5f388e20..6bacc9a7c 100755 --- a/extra/scripts/MAKEALL +++ b/extra/scripts/MAKEALL @@ -71,7 +71,7 @@ mark_arch() if [ -z "$*" ] ; then set -- $(awk \ '$0 ~ /^config TARGET_/ { sub("TARGET_",""); print $NF }' \ - extra/Configs/Config.in.arches | grep -v SUBARCH) + extra/Configs/Config.in | grep -v SUBARCH) fi pass="" fail="" |