[Buildroot] [PATCH 0/6] misc config-cleanup

[Buildroot] [PATCH 0/6] misc config-cleanup

[Bernhard Reutner-Fischer]

The attached small series ??) starts to cleanup some aspects of Peter's tree
and starts to sync up with miscellaneous changes from my tree.

Peter, please pull.

??) git://git.buildroot.org/~aldot/git/buildroot

Bernhard Reutner-Fischer (6):
  atmel mirrors are only needed for atmel targets
  always append FPU_SUFFIX
  default to EABI on arm
  improve arch selection and gcc setup
  mark odd strip invocations
  remove superfluous OPTIMIZE and DEBUG config knobs

 Config.in                       |  108 +------
 package/Makefile.in             |   40 +--
 package/ntfs-3g/ntfs-3g.mk      |    2 +
 target/Config.in.arch           |  683 +++++++++++++++++++++++++++++++++++----
 target/device/Config.in.mirrors |    4 +-
 toolchain/Config.in.2           |   12 +
 toolchain/gcc/Makefile.in       |   25 ++-
 toolchain/gcc/gcc-uclibc-4.x.mk |    9 +-
 8 files changed, 665 insertions(+), 218 deletions(-)

[Buildroot] [PATCH 1/6] atmel mirrors are only needed for atmel targets

[Bernhard Reutner-Fischer]

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 target/device/Config.in.mirrors |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/device/Config.in.mirrors b/target/device/Config.in.mirrors
index c647801..e0b1d07 100644
--- a/target/device/Config.in.mirrors
+++ b/target/device/Config.in.mirrors
@@ -64,7 +64,7 @@ config BR2_DEBIAN_MIRROR
 
 	  Usually, just add your country code like XX here:
 	  http://ftp.XX.debian.org
-
+if BR2_TARGET_ATMEL
 source	"target/device/Atmel/Config.in.mirrors"
-
+endif
 endmenu
-- 
1.6.3.3

[Buildroot] [PATCH 2/6] always append FPU_SUFFIX

[Bernhard Reutner-Fischer]

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 Config.in           |    7 -------
 package/Makefile.in |   10 ++--------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/Config.in b/Config.in
index cc83a6a..86e50ac 100644
--- a/Config.in
+++ b/Config.in
@@ -99,13 +99,6 @@ config BR2_STAGING_DIR
 	  Most people will leave this set to the default value of
 	  "$(BASE_DIR)/staging".
 
-config BR2_FPU_SUFFIX
-	bool "Add '_nofpu' suffix for softfloat toolchains"
-	help
-	  If the toolchain is configured to use softfloat, then
-	  the "_nofpu" suffix will be added to the toolchain build
-	  directory name and to any rootfs image name
-
 config BR2_GNU_BUILD_SUFFIX
 	string "GNU build hostname suffix"
 	default "pc-linux-gnu"
diff --git a/package/Makefile.in b/package/Makefile.in
index fa7c740..fc7b312 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -105,18 +105,12 @@ XXXX=xxxx
 ROOTFS_SUFFIX:=-$(BR2_ROOTFS_SUFFIX)
 endif
 
-ifeq ($(call qstrip,$(BR2_FPU_SUFFIX)),y)
-COND_ARCH_FPU_SUFFIX:=$(ARCH_FPU_SUFFIX)
-else
-COND_ARCH_FPU_SUFFIX:=
-endif
-
 ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
 TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
 
 # Quotes are needed for spaces et al in path components.
 TARGET_PATH="$(TOOLCHAIN_DIR)/bin:$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)"
-IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX)
+IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX)
 GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
 REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX)
 TARGET_CROSS=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-
@@ -127,7 +121,7 @@ TOOLCHAIN_EXTERNAL_PATH:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
 TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
 TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(TOOLCHAIN_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)"
 #IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(TOOLCHAIN_EXTERNAL_PREFIX)$(ROOTFS_SUFFIX)
-IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX)
+IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX)
 
 REAL_GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
 GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
-- 
1.6.3.3

[Buildroot] [PATCH 3/6] default to EABI on arm

[Bernhard Reutner-Fischer]

Use of OABI is strongly discouraged since years now.

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 target/Config.in.arch |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/target/Config.in.arch b/target/Config.in.arch
index e63fc02..e82c8f4 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -116,14 +116,17 @@ config BR2_ARM_TYPE
 choice
 	prompt "Target ABI"
 	depends on BR2_arm || BR2_armeb
-	default BR2_ARM_OABI
+	default BR2_ARM_EABI
 	help
 	  Application Binary Interface to use
 
-config BR2_ARM_OABI
-	bool "OABI"
+	  Note:
+	    Using OABI is discouraged.
+
 config BR2_ARM_EABI
 	bool "EABI"
+config BR2_ARM_OABI
+	bool "OABI"
 endchoice
 
 choice
-- 
1.6.3.3

[Buildroot] [PATCH 4/6] improve arch selection and gcc setup

[Bernhard Reutner-Fischer]

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 package/Makefile.in             |    4 +-
 target/Config.in.arch           |  674 +++++++++++++++++++++++++++++++++++----
 toolchain/Config.in.2           |   12 +
 toolchain/gcc/Makefile.in       |   25 ++-
 toolchain/gcc/gcc-uclibc-4.x.mk |    9 +-
 5 files changed, 652 insertions(+), 72 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index fc7b312..0ffd22c 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -110,7 +110,7 @@ TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
 
 # Quotes are needed for spaces et al in path components.
 TARGET_PATH="$(TOOLCHAIN_DIR)/bin:$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)"
-IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX)
+IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(ARCH_FPU_SUFFIX)$(ARCH_MMU_SUFFIX)$(ROOTFS_SUFFIX)
 GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
 REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX)
 TARGET_CROSS=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-
@@ -121,7 +121,7 @@ TOOLCHAIN_EXTERNAL_PATH:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
 TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
 TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(TOOLCHAIN_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)"
 #IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(TOOLCHAIN_EXTERNAL_PREFIX)$(ROOTFS_SUFFIX)
-IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX)
+IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(ARCH_FPU_SUFFIX)$(ARCH_MMU_SUFFIX)$(ROOTFS_SUFFIX)
 
 REAL_GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
 GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
diff --git a/target/Config.in.arch b/target/Config.in.arch
index e82c8f4..3b3a809 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -14,6 +14,8 @@ config BR2_armeb
 config BR2_avr32
 	bool "avr32"
 	select BR2_SOFT_FLOAT
+config BR2_bfin
+	bool "bfin"
 config BR2_cris
 	bool "cris"
 config BR2_ia64
@@ -23,7 +25,6 @@ config BR2_i386
 	bool "i386"
 config BR2_m68k
 	bool "m68k"
-	depends on BROKEN # ice in uclibc / inet_ntoa_r
 config BR2_mips
 	bool "mips"
 config BR2_mipsel
@@ -33,6 +34,8 @@ config BR2_nios2
 	depends on BROKEN # no kernel headers
 config BR2_powerpc
 	bool "powerpc"
+config BR2_s390
+	bool "s390"
 config BR2_sh
 	bool "superh"
 config BR2_sh64
@@ -136,7 +139,7 @@ choice
 	default BR2_mips_1 if BR2_mipsel
 	help
 	  Specific CPU variant to use
-	
+
 	  64bit cabable: 3, 4, 64, 64r2
 	  non-64bit capable: 1, 2, 32, 32r2
 
@@ -232,49 +235,70 @@ config BR2_x86_i686
 	bool "i686"
 config BR2_x86_pentiumpro
 	bool "pentium pro"
+	depends on BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 config BR2_x86_pentium_mmx
 	bool "pentium MMX"
+	depends on BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 config BR2_x86_pentium_m
 	bool "pentium mobile"
+	depends on BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 config BR2_x86_pentium2
 	bool "pentium2"
+	depends on BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 config BR2_x86_pentium3
 	bool "pentium3"
+	depends on BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 config BR2_x86_pentium4
 	bool "pentium4"
+	depends on BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 config BR2_x86_prescott
 	bool "prescott"
+	depends on BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 config BR2_x86_nocona
 	bool "nocona"
+	depends on BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 config BR2_x86_core2
 	bool "core2"
+	depends on BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 config BR2_x86_k6
 	bool "k6"
+	depends on BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 config BR2_x86_k6_2
 	bool "k6-2"
+	depends on BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 config BR2_x86_athlon
 	bool "athlon"
+	depends on BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 config BR2_x86_athlon_4
 	bool "athlon-4"
+	depends on BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 config BR2_x86_opteron
 	bool "opteron"
+	depends on BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 config BR2_x86_opteron_sse3
 	bool "opteron w/ SSE3"
+	depends on BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 config BR2_x86_barcelona
 	bool "barcelona"
+	depends on BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 config BR2_x86_geode
 	bool "geode"
+	depends on BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 config BR2_x86_c3
 	bool "cyrix 3 (MMX + 3dNOW!)"
+	depends on BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 config BR2_x86_winchip_c6
 	bool "IDT winchip C6 (i486 + slow MMX)"
+	depends on BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 config BR2_x86_winchip2
 	bool "IDT winchip2 (i486 +MMX +SSE)"
+	depends on BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 endchoice
 
 choice
 	prompt "Target Architecture Variant"
 	depends on BR2_x86_64
+	depends on BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 	default BR2_x86_64_generic
 	help
 	  Specific CPU variant to use
@@ -316,6 +340,25 @@ endchoice
 
 choice
 	prompt "Target Architecture Variant"
+	depends on BR2_s390
+	default BR2_s390_g5
+	help
+	  Specific CPU variant to use
+
+config BR2_s390_g5
+	bool "g5"
+config BR2_s390_g6
+	bool "g6"
+config BR2_s390_z900
+	bool "z900"
+config BR2_s390_z990
+	bool "z990"
+config BR2_s390_z9_109
+	bool "z9_109"
+endchoice
+
+choice
+	prompt "Target Architecture Variant"
 	depends on BR2_sparc
 	default BR2_sparc_v7
 	help
@@ -401,38 +444,6 @@ endchoice
 
 choice
 	prompt "Target Architecture Variant"
-	depends on BR2_xtensa
-	default BR2_xtensa_dc232b
-	help
-	  Specific CPU variant to use
-
-config BR2_xtensa_custom
-	bool "Custom Xtensa processor configuration"
-config BR2_xtensa_dc232a
-	bool "dc232a - Diamond 232L Standard Core Rev.A (LE)"
-config BR2_xtensa_dc232b
-	bool "dc232b - Diamond 232L Standard Core Rev.B (LE)"
-#config BR2_xtensa_s5000
-#	bool "s5000 - Stretch S5000"
-endchoice
-
-config BR2_xtensa_custom_name
-	string "Custom Xtensa processor configuration name"
-	depends on BR2_xtensa_custom
-	default ""
-	help
-	  Name given to a custom Xtensa processor configuration.
-	  This is used to select the correct overlay.
-
-config BR2_xtensa_core_name
-	string
-	default BR2_xtensa_custom_name	if BR2_xtensa_custom
-	default "dc232a"		if BR2_xtensa_dc232a
-	default "dc232b"		if BR2_xtensa_dc232b
-#	default "s5000"			if BR2_xtensa_s5000
-
-choice
-	prompt "Target Architecture Variant"
 	depends on BR2_powerpc
 	default BR2_generic_powerpc
 	help
@@ -441,16 +452,25 @@ config BR2_generic_powerpc
 	bool "generic"
 config BR2_powerpc_401
 	bool "401"
+	select BR2_SOFT_FLOAT_FORCE
 config BR2_powerpc_403
 	bool "403"
+	select BR2_SOFT_FLOAT_FORCE
 config BR2_powerpc_405
 	bool "405"
+	select BR2_SOFT_FLOAT_FORCE
 config BR2_powerpc_405fp
 	bool "405 with FPU"
 config BR2_powerpc_440
 	bool "440"
+	select BR2_SOFT_FLOAT_FORCE
 config BR2_powerpc_440fp
 	bool "440 with FPU"
+config BR2_powerpc_464
+	bool "464"
+	select BR2_SOFT_FLOAT_FORCE
+config BR2_powerpc_464fp
+	bool "464 with FPU"
 config BR2_powerpc_505
 	bool "505"
 config BR2_powerpc_601
@@ -479,17 +499,421 @@ config BR2_powerpc_750
 	bool "750"
 config BR2_powerpc_801
 	bool "801"
+	select BR2_SOFT_FLOAT_FORCE
 config BR2_powerpc_821
 	bool "821"
+	select BR2_SOFT_FLOAT_FORCE
 config BR2_powerpc_823
 	bool "823"
+	select BR2_SOFT_FLOAT_FORCE
+config BR2_powerpc_8540
+	bool "8540"
+config BR2_powerpc_e300c2
+	bool "e300c2"
+	select BR2_SOFT_FLOAT_FORCE
+config BR2_powerpc_e300c3
+	bool "e300c3"
+config BR2_powerpc_e500mc
+	bool "e500mc"
 config BR2_powerpc_860
 	bool "860"
+	select BR2_SOFT_FLOAT_FORCE
 config BR2_powerpc_970
 	bool "970"
-config BR2_powerpc_8540
-	bool "8540"
+config BR2_powerpc_cell
+	bool "cell"
+endchoice
+
+choice
+	prompt "Target Architecture Variant"
+	depends on BR2_bfin
+	default BR2_bf537
+	help
+	  Specific CPU variant to use
+config BR2_bf522
+	bool "bf522"
+config BR2_bf525
+	bool "bf525"
+config BR2_bf527
+	bool "bf527"
+config BR2_bf531
+	bool "bf531"
+config BR2_bf532
+	bool "bf532"
+config BR2_bf533
+	bool "bf533"
+config BR2_bf534
+	bool "bf534"
+config BR2_bf536
+	bool "bf536"
+config BR2_bf537
+	bool "bf537"
+config BR2_bf538
+	bool "bf538"
+config BR2_bf539
+	bool "bf539"
+config BR2_bf542
+	bool "bf542"
+config BR2_bf544
+	bool "bf544"
+config BR2_bf548
+	bool "bf548"
+config BR2_bf549
+	bool "bf549"
+config BR2_bf561
+	bool "bf561"
+endchoice
+
+config BR2_bfin_sirevision
+	string "sirevision"
+	depends on BR2_bfin
+	default any
+	help
+	  If sirevision is none, no workarounds are enabled.
+	  If sirevision is any, all workarounds for the targeted
+	  processor will be enabled.
+	  See man gcc for details.
+
+	  Default: any
+
+choice
+	prompt "Target Architecture Variant"
+	depends on BR2_cris
+	default BR2_cris_cris
+	help
+	  Architecture variant.
+config BR2_cris_cris
+	bool "cris"
+config BR2_cris_crisv32
+	bool "crisv32"
+endchoice
+choice
+	prompt "Target CPU Variant"
+	depends on BR2_cris
+	default BR2_cris_generic
+	help
+	  CPU variant.
+config BR2_cris_generic
+	bool "generic (v10)"
+config BR2_cris_unknown
+	bool "unknown (v0)"
+config BR2_cris_etrax_4
+	bool "etrax_4 (v3)"
+config BR2_cris_etrax_100
+	bool "etrax_100 (v8)"
+config BR2_cris_etrax_100lx
+	bool "etrax_100lx (v10)"
+endchoice
+
+choice
+	prompt "Target Type"
+	depends on BR2_m68k
+	default BR2_m68k_type_m68k
+	help
+	  Specific architecture type to use
+
+config BR2_m68k_type_m68k
+	bool "m68k / M680x0"
+	help
+	  Normal 680xx
+
+config BR2_m68k_type_coldfire
+	bool "coldfire / 520X"
+	help
+	  ColdFire
+
+	  Family | CPUs
+
+	  51qe		51qe
+	  5206		5202 5204 5206
+	  5206e		5206e
+	  5208		5207 5208
+	  5211a		5210a 5211a
+	  5213		5211 5212 5213
+	  5216		5214 5216
+	  52235		52230 52231 52232 52233 52234 52235
+	  5225		5224 5225
+	  5235		5232 5233 5234 5235 523x
+	  5249		5249
+	  5250		5250
+	  5271		5270 5271
+	  5272		5272
+	  5275		5274 5275
+	  5282		5280 5281 5282 528x
+	  5307		5307
+	  5329		5327 5328 5329 532x
+	  5373		5372 5373 537x
+	  5407		5407
+	  5475		5470 5471 5472 5473 5474 5475 547x 5480 5481 5482 5483 5484 5485
+endchoice
+
+if BR2_m68k_type_m68k
+choice
+	prompt "Target CPU Variant"
+	depends on BR2_m68k
+	default BR2_m68k_cpu_m68k_none
+	help
+	  Specific CPU variant to use
+
+config BR2_m68k_cpu_m68k_none
+	bool "none"
+	help
+	  Select this dummy if you do not want to use a specific CPU.
+
+config BR2_m68k_cpu_68000
+	bool "68000"
+	select BR2_HAVE_NOMMU
+config BR2_m68k_cpu_68010
+	bool "68010"
+	select BR2_HAVE_NOMMU
+config BR2_m68k_cpu_68020
+	bool "68020"
+config BR2_m68k_cpu_68030
+	bool "68030"
+config BR2_m68k_cpu_68040
+	bool "68040"
+config BR2_m68k_cpu_68060
+	bool "68060"
+config BR2_m68k_cpu_68302
+	bool "68302"
+config BR2_m68k_cpu_68332
+	bool "68332"
+config BR2_m68k_cpu_cpu32
+	bool "cpu32"
 endchoice
+endif
+
+if BR2_m68k_type_coldfire
+choice
+	prompt "Target CPU Variant"
+	depends on BR2_m68k
+	default BR2_m68k_cpu_coldfire_none
+	help
+	  Specific CPU variant to use
+
+config BR2_m68k_cpu_coldfire_none
+	bool "none"
+	help
+	  Select this dummy if you do not want to use a specific CPU.
+
+config BR2_m68k_cpu_coldfire_51qe
+	bool "51qe"
+	select BR2_HAVE_NOMMU
+config BR2_m68k_cpu_coldfire_5202
+	bool "5202"
+	select BR2_HAVE_NOMMU
+config BR2_m68k_cpu_coldfire_5204
+	bool "5204"
+	select BR2_HAVE_NOMMU
+config BR2_m68k_cpu_coldfire_5206
+	bool "5206"
+	select BR2_HAVE_NOMMU
+config BR2_m68k_cpu_coldfire_5206e
+	bool "5206e"
+config BR2_m68k_cpu_coldfire_5207
+	bool "5207"
+config BR2_m68k_cpu_coldfire_5208
+	bool "5208"
+config BR2_m68k_cpu_coldfire_5210a
+	bool "5210a"
+config BR2_m68k_cpu_coldfire_5211a
+	bool "5211a"
+config BR2_m68k_cpu_coldfire_5211
+	bool "5211"
+config BR2_m68k_cpu_coldfire_5212
+	bool "5212"
+config BR2_m68k_cpu_coldfire_5213
+	bool "5213"
+config BR2_m68k_cpu_coldfire_5214
+	bool "5214"
+config BR2_m68k_cpu_coldfire_5216
+	bool "5216"
+config BR2_m68k_cpu_coldfire_52230
+	bool "52230"
+config BR2_m68k_cpu_coldfire_52231
+	bool "52231"
+config BR2_m68k_cpu_coldfire_52232
+	bool "52232"
+config BR2_m68k_cpu_coldfire_52233
+	bool "52233"
+config BR2_m68k_cpu_coldfire_52234
+	bool "52234"
+config BR2_m68k_cpu_coldfire_52235
+	bool "52235"
+config BR2_m68k_cpu_coldfire_5224
+	bool "5224"
+config BR2_m68k_cpu_coldfire_5225
+	bool "5225"
+config BR2_m68k_cpu_coldfire_5232
+	bool "5232"
+config BR2_m68k_cpu_coldfire_5233
+	bool "5233"
+config BR2_m68k_cpu_coldfire_5234
+	bool "5234"
+config BR2_m68k_cpu_coldfire_5235
+	bool "5235"
+config BR2_m68k_cpu_coldfire_523x
+	bool "523x"
+config BR2_m68k_cpu_coldfire_5249
+	bool "5249"
+config BR2_m68k_cpu_coldfire_5250
+	bool "5250"
+config BR2_m68k_cpu_coldfire_5270
+	bool "5270"
+config BR2_m68k_cpu_coldfire_5271
+	bool "5271"
+config BR2_m68k_cpu_coldfire_5272
+	bool "5272"
+config BR2_m68k_cpu_coldfire_5274
+	bool "5274"
+config BR2_m68k_cpu_coldfire_5275
+	bool "5275"
+config BR2_m68k_cpu_coldfire_5280
+	bool "5280"
+config BR2_m68k_cpu_coldfire_5281
+	bool "5281"
+config BR2_m68k_cpu_coldfire_5282
+	bool "5282"
+config BR2_m68k_cpu_coldfire_528x
+	bool "528x"
+config BR2_m68k_cpu_coldfire_5307
+	bool "5307"
+config BR2_m68k_cpu_coldfire_5327
+	bool "5327"
+config BR2_m68k_cpu_coldfire_5328
+	bool "5328"
+config BR2_m68k_cpu_coldfire_5329
+	bool "5329"
+config BR2_m68k_cpu_coldfire_532x
+	bool "532x"
+config BR2_m68k_cpu_coldfire_5372
+	bool "5372"
+config BR2_m68k_cpu_coldfire_5373
+	bool "5373"
+config BR2_m68k_cpu_coldfire_537x
+	bool "537x"
+config BR2_m68k_cpu_coldfire_5407
+	bool "5407"
+config BR2_m68k_cpu_coldfire_5470
+	bool "5470"
+config BR2_m68k_cpu_coldfire_5471
+	bool "5471"
+config BR2_m68k_cpu_coldfire_5472
+	bool "5472"
+config BR2_m68k_cpu_coldfire_5473
+	bool "5473"
+config BR2_m68k_cpu_coldfire_5474
+	bool "5474"
+config BR2_m68k_cpu_coldfire_5475
+	bool "5475"
+config BR2_m68k_cpu_coldfire_547x
+	bool "547x"
+config BR2_m68k_cpu_coldfire_5480
+	bool "5480"
+config BR2_m68k_cpu_coldfire_5481
+	bool "5481"
+config BR2_m68k_cpu_coldfire_5482
+	bool "5482"
+config BR2_m68k_cpu_coldfire_5483
+	bool "5483"
+config BR2_m68k_cpu_coldfire_5484
+	bool "5484"
+config BR2_m68k_cpu_coldfire_5485
+	bool "5485"
+endchoice
+endif
+
+if 0
+choice
+	prompt "Target tune"
+	depends on BR2_m68k
+	default BR2_m68k_tune_none
+	help
+	  Specific CPU variant to generate code for per default
+config BR2_m68k_68000
+	bool "68000"
+	depends on BR2_m68k_type_m68k
+config BR2_m68k_68010
+	bool "68010"
+	depends on BR2_m68k_type_m68k
+config BR2_m68k_68020
+	bool "68020"
+	depends on BR2_m68k_type_m68k
+config BR2_m68k_68030
+	bool "68030"
+	depends on BR2_m68k_type_m68k
+config BR2_m68k_68040
+	bool "68040"
+	depends on BR2_m68k_type_m68k
+config BR2_m68k_68060
+	bool "68060"
+	depends on BR2_m68k_type_m68k
+config BR2_m68k_cpu32
+	bool "cpu32"
+	depends on BR2_m68k_type_m68k
+
+config BR2_m68k_cfv1
+	bool "cfv1"
+	depends on BR2_m68k_type_coldfire
+config BR2_m68k_cfv2
+	bool "cfv2"
+	depends on BR2_m68k_type_coldfire
+config BR2_m68k_cfv3
+	bool "cfv3"
+	depends on BR2_m68k_type_coldfire
+config BR2_m68k_cfv4
+	bool "cfv4"
+	depends on BR2_m68k_type_coldfire
+config BR2_m68k_cfv4e
+	bool "cfv4e"
+	depends on BR2_m68k_type_coldfire
+config BR2_m68k_tune_none
+	bool "none"
+config BR2_m68k_tune_tune
+	bool "specify tune manually"
+endchoice
+
+config BR2_m68k_tune
+	string "Manual target tune string"
+	depends on BR2_m68k_tune_tune
+	help
+	  You can also use e.g. "68020-40" for code that needs to run
+	  relatively well on 68020, 68030 and 68040 targets.
+	  "68020-60" would do the same but additionally include 68060.
+endif
+
+choice
+	prompt "Target Architecture Variant"
+	depends on BR2_xtensa
+	default BR2_xtensa_dc232b
+	help
+	 Specific CPU variant to use
+
+config BR2_xtensa_custom
+	bool "Custom Xtensa processor configuration"
+config BR2_xtensa_dc232a
+	bool "dc232a - Diamond 232L Standard Core Rev.A (LE)"
+config BR2_xtensa_dc232b
+	bool "dc232b - Diamond 232L Standard Core Rev.B (LE)"
+#config BR2_xtensa_s5000
+#	bool "s5000 - Stretch S5000"
+endchoice
+
+config BR2_xtensa_custom_name
+	string "Custom Xtensa processor configuration name"
+	depends on BR2_xtensa_custom
+	default ""
+	help
+	 Name given to a custom Xtensa processor configuration.
+	 This is used to select the correct overlay.
+
+config BR2_xtensa_core_name
+	string
+	depends on BR2_xtensa_custom
+	default BR2_xtensa_custom_name  if BR2_xtensa_custom
+	default "dc232a"                if BR2_xtensa_dc232a
+	default "dc232b"                if BR2_xtensa_dc232b
+#	default "s5000"                 if BR2_xtensa_s5000
 
 config BR2_ARCH
 	string
@@ -497,18 +921,20 @@ config BR2_ARCH
 	default "arm"		if BR2_arm
 	default "armeb"		if BR2_armeb
 	default "avr32"		if BR2_avr32
-	default "cris"		if BR2_cris
+	default "bfin"		if BR2_bfin
+	default "cris"		if BR2_cris_cris
+	default "crisv32"	if BR2_cris_crisv32
 	default "i386"		if BR2_x86_i386
 	default "i486"		if BR2_x86_i486
 	default "i586"		if BR2_x86_i586
 	default "i586"		if BR2_x86_pentium_mmx
 	default "i586"		if BR2_x86_geode
 	default "i686"		if BR2_x86_i686
+	default "i686"		if BR2_x86_pentiumpro
 	default "i686"		if BR2_x86_pentium2
 	default "i686"		if BR2_x86_pentium3
-	default "i686"		if BR2_x86_pentium4
 	default "i686"		if BR2_x86_pentium_m
-	default "i686"		if BR2_x86_pentiumpro
+	default "i686"		if BR2_x86_pentium4
 	default "i686"		if BR2_x86_nocona
 	default "i686"		if BR2_x86_core2
 	default "ia64"		if BR2_ia64
@@ -517,6 +943,8 @@ config BR2_ARCH
 	default "mipsel"	if BR2_mipsel
 	default "nios2"		if BR2_nios2
 	default "powerpc"	if BR2_powerpc
+	default "s390"		if BR2_s390
+	default "s390"		if BR2_s390x
 	default "sh2a_nofpueb"	if BR2_sh2a_nofpueb
 	default "sh2eb"		if BR2_sh2eb
 	default "sh3"		if BR2_sh3
@@ -533,15 +961,15 @@ config BR2_ARCH
 	default "x86_64"	if BR2_x86_64_opteron
 	default "x86_64"	if BR2_x86_64_opteron_sse3
 	default "x86_64"	if BR2_x86_64_barcelona
-	default "xtensa"	if BR2_xtensa
 
 
 config BR2_ENDIAN
 	string
 	default "LITTLE" if BR2_arm || BR2_cris || BR2_i386 || BR2_mipsel || \
 			    BR2_sh3 || BR2_sh4 || BR2_x86_64 || BR2_nios2 || \
-			    BR2_sh64
-	default "BIG"    if BR2_alpha || BR2_armeb || BR2_avr32 || BR2_m68k || BR2_mips || \
+			    BR2_sh64 || BR2_bfin
+	default "BIG"    if BR2_alpha || BR2_armeb || BR2_avr32 || BR2_m68k || \
+			    BR2_mips || \
 			    BR2_powerpc || BR2_sh2a_nofpueb || BR2_sh2eb || \
 			    BR2_sh3eb || BR2_sh4eb || BR2_sparc || BR2_sparc64
 
@@ -595,11 +1023,6 @@ config BR2_GCC_TARGET_TUNE
 	default strongarm1100	if BR2_sa1100
 	default xscale		if BR2_xscale
 	default iwmmxt		if BR2_iwmmxt
-	default v0		if BR2_cris_unknown
-	default v10		if BR2_cris_generic
-	default v3		if BR2_cris_etrax_4
-	default v8		if BR2_cris_etrax_100
-	default v10		if BR2_cris_etrax_100lx
 	default ev4		if BR2_alpha_21064
 	default ev5		if BR2_alpha_21164
 	default ev56		if BR2_alpha_21164a
@@ -608,12 +1031,6 @@ config BR2_GCC_TARGET_TUNE
 	default ev67		if BR2_alpha_21264a
 #	default itanium		if BR2_ia64_itanium1
 #	default itanium2	if BR2_ia64_itanium2
-	default 68000		if BR2_m68k_68000
-	default 68010		if BR2_m68k_68010
-	default 68020		if BR2_m68k_68020
-	default 68030		if BR2_m68k_68030
-	default 68040		if BR2_m68k_68040
-	default 68060		if BR2_m68k_68060
 	default mips1		if BR2_mips_1
 	default mips2		if BR2_mips_2
 	default mips3		if BR2_mips_3
@@ -623,12 +1040,14 @@ config BR2_GCC_TARGET_TUNE
 	default mips64		if BR2_mips_64
 	default mips64r2	if BR2_mips_64r2
 	default mips16		if BR2_mips_16
+	default common		if BR2_powerpc_generic
 	default 401		if BR2_powerpc_401
 	default 403		if BR2_powerpc_403
 	default 405		if BR2_powerpc_405
 	default 405fp		if BR2_powerpc_405fp
 	default 440		if BR2_powerpc_440
 	default 440fp		if BR2_powerpc_440fp
+	default 464		if BR2_powerpc_464
 	default 505		if BR2_powerpc_505
 	default 601		if BR2_powerpc_601
 	default 602		if BR2_powerpc_602
@@ -645,9 +1064,13 @@ config BR2_GCC_TARGET_TUNE
 	default 801		if BR2_powerpc_801
 	default 821		if BR2_powerpc_821
 	default 823		if BR2_powerpc_823
+	default 8540		if BR2_powerpc_8540
+	default e300c2		if BR2_powerpc_e300c2
+	default e300c3		if BR2_powerpc_e300c3
+	default e500mc		if BR2_powerpc_e500mc
 	default 860		if BR2_powerpc_860
 	default 970		if BR2_powerpc_970
-	default 8540		if BR2_powerpc_8540
+	default cell		if BR2_powerpc_cell
 	default v7		if BR2_sparc_v7
 	default cypress		if BR2_sparc_cypress
 	default v8		if BR2_sparc_v8
@@ -665,6 +1088,127 @@ config BR2_GCC_TARGET_TUNE
 	default ultrasparc	if BR2_sparc_ultrasparc || BR2_sparc64_ultrasparc
 	default ultrasparc3	if BR2_sparc_ultrasparc3 || BR2_sparc64_ultrasparc3
 	default niagara		if BR2_sparc_niagara || BR2_sparc64_niagara
+	default g5		if BR2_s390_g5
+	default g6		if BR2_s390_g6
+	default z900		if BR2_s390_z900
+	default z990		if BR2_s390_z990
+	default z9-109		if BR2_s390_z9_109
+config BR2_GCC_TARGET_FLAGS_TUNE
+	string
+	default 68000		if BR2_m68k_68000
+	default 68010		if BR2_m68k_68010
+	default 68020		if BR2_m68k_68020
+	default 68030		if BR2_m68k_68030
+	default 68040		if BR2_m68k_68040
+	default 68060		if BR2_m68k_68060
+	default cpu32		if BR2_m68k_cpu32
+	default cfv1		if BR2_m68k_cfv1
+	default cfv2		if BR2_m68k_cfv2
+	default cfv3		if BR2_m68k_cfv3
+	default cfv4		if BR2_m68k_cfv4
+	default cfv4e		if BR2_m68k_cfv4e
+	default $BR2_m68k_tune	if BR2_m68k_tune
+	default v0		if BR2_cris_unknown
+	default v10		if BR2_cris_generic
+	default v3		if BR2_cris_etrax_4
+	default v8		if BR2_cris_etrax_100
+	default v10		if BR2_cris_etrax_100lx
+	default $BR2_GCC_TARGET_TUNE if BR2_GCC_TARGET_TUNE
+
+config BR2_GCC_TARGET_CPU
+	string
+	default bf522		if BR2_bf522
+	default bf525		if BR2_bf525
+	default bf527		if BR2_bf527
+	default bf531		if BR2_bf531
+	default bf532		if BR2_bf532
+	default bf533		if BR2_bf533
+	default bf534		if BR2_bf534
+	default bf536		if BR2_bf536
+	default bf537		if BR2_bf537
+	default bf538		if BR2_bf538
+	default bf539		if BR2_bf539
+	default bf542		if BR2_bf542
+	default bf544		if BR2_bf544
+	default bf548		if BR2_bf548
+	default bf549		if BR2_bf549
+	default bf561		if BR2_bf561
+config BR2_GCC_TARGET_FLAGS_CPU
+	string
+	default 51qe		if BR2_m68k_cpu_coldfire_51qe
+	default 5202		if BR2_m68k_cpu_coldfire_5202
+	default 5204		if BR2_m68k_cpu_coldfire_5204
+	default 5206		if BR2_m68k_cpu_coldfire_5206
+	default 5206e		if BR2_m68k_cpu_coldfire_5206e
+	default 5207		if BR2_m68k_cpu_coldfire_5207
+	default 5208		if BR2_m68k_cpu_coldfire_5208
+	default 5210a		if BR2_m68k_cpu_coldfire_5210a
+	default 5211a		if BR2_m68k_cpu_coldfire_5211a
+	default 5211		if BR2_m68k_cpu_coldfire_5211
+	default 5212		if BR2_m68k_cpu_coldfire_5212
+	default 5213		if BR2_m68k_cpu_coldfire_5213
+	default 5214		if BR2_m68k_cpu_coldfire_5214
+	default 5216		if BR2_m68k_cpu_coldfire_5216
+	default 52230		if BR2_m68k_cpu_coldfire_52230
+	default 52231		if BR2_m68k_cpu_coldfire_52231
+	default 52232		if BR2_m68k_cpu_coldfire_52232
+	default 52233		if BR2_m68k_cpu_coldfire_52233
+	default 52234		if BR2_m68k_cpu_coldfire_52234
+	default 52235		if BR2_m68k_cpu_coldfire_52235
+	default 5224		if BR2_m68k_cpu_coldfire_5224
+	default 5225		if BR2_m68k_cpu_coldfire_5225
+	default 5232		if BR2_m68k_cpu_coldfire_5232
+	default 5233		if BR2_m68k_cpu_coldfire_5233
+	default 5234		if BR2_m68k_cpu_coldfire_5234
+	default 5235		if BR2_m68k_cpu_coldfire_5235
+	default 523x		if BR2_m68k_cpu_coldfire_523x
+	default 5249		if BR2_m68k_cpu_coldfire_5249
+	default 5250		if BR2_m68k_cpu_coldfire_5250
+	default 5270		if BR2_m68k_cpu_coldfire_5270
+	default 5271		if BR2_m68k_cpu_coldfire_5271
+	default 5272		if BR2_m68k_cpu_coldfire_5272
+	default 5274		if BR2_m68k_cpu_coldfire_5274
+	default 5275		if BR2_m68k_cpu_coldfire_5275
+	default 5280		if BR2_m68k_cpu_coldfire_5280
+	default 5281		if BR2_m68k_cpu_coldfire_5281
+	default 5282		if BR2_m68k_cpu_coldfire_5282
+	default 528x		if BR2_m68k_cpu_coldfire_528x
+	default 5307		if BR2_m68k_cpu_coldfire_5307
+	default 5327		if BR2_m68k_cpu_coldfire_5327
+	default 5328		if BR2_m68k_cpu_coldfire_5328
+	default 5329		if BR2_m68k_cpu_coldfire_5329
+	default 532x		if BR2_m68k_cpu_coldfire_532x
+	default 5372		if BR2_m68k_cpu_coldfire_5372
+	default 5373		if BR2_m68k_cpu_coldfire_5373
+	default 537x		if BR2_m68k_cpu_coldfire_537x
+	default 5407		if BR2_m68k_cpu_coldfire_5407
+	default 5470		if BR2_m68k_cpu_coldfire_5470
+	default 5471		if BR2_m68k_cpu_coldfire_5471
+	default 5472		if BR2_m68k_cpu_coldfire_5472
+	default 5473		if BR2_m68k_cpu_coldfire_5473
+	default 5474		if BR2_m68k_cpu_coldfire_5474
+	default 5475		if BR2_m68k_cpu_coldfire_5475
+	default 547x		if BR2_m68k_cpu_coldfire_547x
+	default 5480		if BR2_m68k_cpu_coldfire_5480
+	default 5481		if BR2_m68k_cpu_coldfire_5481
+	default 5482		if BR2_m68k_cpu_coldfire_5482
+	default 5483		if BR2_m68k_cpu_coldfire_5483
+	default 5484		if BR2_m68k_cpu_coldfire_5484
+	default 5485		if BR2_m68k_cpu_coldfire_5485
+	default 68000		if BR2_m68k_cpu_68000
+	default 68010		if BR2_m68k_cpu_68010
+	default 68020		if BR2_m68k_cpu_68020
+	default 68030		if BR2_m68k_cpu_68030
+	default 68040		if BR2_m68k_cpu_68040
+	default 68060		if BR2_m68k_cpu_68060
+	default 68302		if BR2_m68k_cpu_68302
+	default 68332		if BR2_m68k_cpu_68332
+	default cpu32		if BR2_m68k_cpu_cpu32
+	default $BR2_GCC_TARGET_CPU if BR2_GCC_TARGET_CPU
+
+config BR2_GCC_TARGET_FLAGS_SUBCPU
+	string
+	default $BR2_bfin_sirevision if BR2_bfin_sirevision
 
 config BR2_GCC_TARGET_ARCH
 	string
@@ -692,6 +1236,7 @@ config BR2_GCC_TARGET_ARCH
 	default winchip2	if BR2_x86_winchip2
 	default c3		if BR2_x86_c3
 	default geode		if BR2_x86_geode
+	default iwmmxt		if BR2_iwmmxt
 	default armv4t		if BR2_arm7tdmi
 	default armv3		if BR2_arm610
 	default armv3		if BR2_arm710
@@ -706,18 +1251,21 @@ config BR2_GCC_TARGET_ARCH
 	default armv4		if BR2_sa110
 	default armv4		if BR2_sa1100
 	default armv5te		if BR2_xscale
-	default iwmmxt		if BR2_iwmmxt
+	default m68k		if BR2_m68k_type_m68k
+	default cf		if BR2_m68k_type_coldfire
+	default g5		if BR2_s390_g5
+	default g6		if BR2_s390_g6
+	default z900		if BR2_s390_z900
+	default z990		if BR2_s390_z990
+	default z9-109		if BR2_s390_z9_109
+config BR2_GCC_TARGET_FLAGS_ARCH
+	string
 	default v0		if BR2_cris_unknown
 	default v10		if BR2_cris_generic
 	default v3		if BR2_cris_etrax_4
 	default v8		if BR2_cris_etrax_100
 	default v10		if BR2_cris_etrax_100lx
-	default 68000		if BR2_m68k_68000
-	default 68010		if BR2_m68k_68010
-	default 68020		if BR2_m68k_68020
-	default 68030		if BR2_m68k_68030
-	default 68040		if BR2_m68k_68040
-	default 68060		if BR2_m68k_68060
+	default $BR2_GCC_TARGET_ARCH if BR2_GCC_TARGET_ARCH && !BR2_m68k_type_m68k && !BR2_m68k_type_coldfire
 
 config BR2_GCC_TARGET_ABI
 	string
@@ -725,6 +1273,7 @@ config BR2_GCC_TARGET_ABI
 	default atpcs		if BR2_arm_dunno
 	default aapcs		if BR2_arm_dunno
 	default aapcs-linux	if BR2_ARM_EABI
+	#default iwmmxt		if BR2_iwmmxt
 	default 32		if BR2_MIPS_OABI32
 	default n32		if BR2_MIPS_ABI32
 	default eabi		if BR2_MIPS_EABI
@@ -738,4 +1287,7 @@ config BR2_GCC_TARGET_ABI
 	default no-spe		if BR2_powerpc && BR2_PPC_ABI_no-spe
 	default ibmlongdouble	if BR2_powerpc && BR2_PPC_ABI_ibmlongdouble
 	default ieeelongdouble	if BR2_powerpc && BR2_PPC_ABI_ieeelongdouble
+config BR2_GCC_TARGET_FLAGS_ABI
+	string
+	default $BR2_GCC_TARGET_ABI if BR2_GCC_TARGET_ABI
 
diff --git a/toolchain/Config.in.2 b/toolchain/Config.in.2
index 2a9ce24..d8f7ca0 100644
--- a/toolchain/Config.in.2
+++ b/toolchain/Config.in.2
@@ -85,6 +85,18 @@ config BR2_SOFT_FLOAT
 
 	  Most people will answer N.
 
+config BR2_HAVE_NOMMU
+	def_bool n
+	# assume that we have an MMU per default.
+
+config BR2_USE_MMU
+	bool "Use MMU"
+	default y
+	depends on !BR2_HAVE_NOMMU
+	help
+	  If your target has an MMU and you want to use it
+	  then say Y here.
+
 config BR2_USE_SSP
 	bool "Enable stack protection support"
 	help
diff --git a/toolchain/gcc/Makefile.in b/toolchain/gcc/Makefile.in
index e052b83..f854e88 100644
--- a/toolchain/gcc/Makefile.in
+++ b/toolchain/gcc/Makefile.in
@@ -49,16 +49,29 @@ SOFT_FLOAT_CONFIG_OPTION:=
 TARGET_SOFT_FLOAT:=
 ARCH_FPU_SUFFIX:=
 endif
+ifeq ($(BR2_USE_MMU),y)
+ARCH_MMU_SUFFIX:=
+else
+ARCH_MMU_SUFFIX:=_nommu
+endif
 
-# some additional defaults
+# Some arches (e.g. cris) do not have supported_defaults
+# These are not allowed BR2_GCC_TARGET_ARCH but only
+# BR2_GCC_TARGET_FLAGS_ARCH
+ifneq ($(call qstrip,$(BR2_GCC_TARGET_ABI)),)
+GCC_WITH_ABI:=--with-abi=$(call qstrip,$(BR2_GCC_TARGET_ABI))
+endif
 ifneq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),)
-GCC_WITH_ARCH:=--with-arch=$(BR2_GCC_TARGET_ARCH)
+GCC_WITH_ARCH:=--with-arch=$(call qstrip,$(BR2_GCC_TARGET_ARCH))
 endif
-ifneq ($(call qstrip,$(BR2_GCC_TARGET_TUNE)),)
-GCC_WITH_TUNE:=--with-tune=$(BR2_GCC_TARGET_TUNE)
+ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU)),)
+BR2_GCC_TARGET_CPU_:=$(call qstrip,$(BR2_GCC_TARGET_CPU))
+BR2_GCC_TARGET_SUBCPU_:=$(call qstrip,$(BR2_GCC_TARGET_SUBCPU))
+BR2_GCC_TARGET_SUBCPU_SEPARATOR_:=$(call qstrip,$(BR2_GCC_TARGET_SUBCPU_SEPARATOR))
+GCC_WITH_CPU:=--with-cpu=$(GCC_TARGET_CPU_)$(if $(GCC_TARGET_SUBCPU_),$(GCC_TARGET_SUBCPU_SEPARATOR)$(GCC_TARGET_SUBCPU_))
 endif
-ifneq ($(call qstrip,$(BR2_GCC_TARGET_ABI)),)
-GCC_WITH_ABI:=--with-abi=$(BR2_GCC_TARGET_ABI)
+ifneq ($(call qstrip,$(BR2_GCC_TARGET_TUNE)),)
+GCC_WITH_TUNE:=--with-tune=$(call qstrip,$(BR2_GCC_TARGET_TUNE))
 endif
 
 # AVR32 GCC configuration
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 241bfb3..a46c0c6 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -233,7 +233,8 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
 		$(MULTILIB) \
 		$(GCC_DECIMAL_FLOAT) \
 		$(SOFT_FLOAT_CONFIG_OPTION) \
-		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \
+		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) \
+		$(GCC_WITH_CPU) $(GCC_WITH_TUNE) \
 		$(EXTRA_GCC_CONFIG_OPTIONS) \
 		$(EXTRA_GCC1_CONFIG_OPTIONS) \
 		$(QUIET) \
@@ -310,7 +311,8 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ)
 		$(MULTILIB) \
 		$(GCC_DECIMAL_FLOAT) \
 		$(SOFT_FLOAT_CONFIG_OPTION) \
-		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \
+		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) \
+		$(GCC_WITH_CPU) $(GCC_WITH_TUNE) \
 		$(GCC_USE_SJLJ_EXCEPTIONS) \
 		$(DISABLE_LARGEFILE) \
 		$(EXTRA_GCC_CONFIG_OPTIONS) \
@@ -437,7 +439,8 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.prepared
 		$(MULTILIB) \
 		$(GCC_DECIMAL_FLOAT) \
 		$(SOFT_FLOAT_CONFIG_OPTION) \
-		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \
+		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) \
+		$(GCC_WITH_CPU) $(GCC_WITH_TUNE) \
 		$(GCC_USE_SJLJ_EXCEPTIONS) \
 		$(DISABLE_LARGEFILE) \
 		$(EXTRA_GCC_CONFIG_OPTIONS) \
-- 
1.6.3.3

[Buildroot] [PATCH 5/6] mark odd strip invocations

[Bernhard Reutner-Fischer]

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 package/ntfs-3g/ntfs-3g.mk |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk
index efe15fa..c6894e4 100644
--- a/package/ntfs-3g/ntfs-3g.mk
+++ b/package/ntfs-3g/ntfs-3g.mk
@@ -20,8 +20,10 @@ $(NTFS_3G_TARGET_INSTALL_TARGET): $(NTFS_3G_TARGET_INSTALL_STAGING)
 
 ifeq ($(BR2_ENABLE_DEBUG),)
 $(NTFS_3G_HOOK_POST_INSTALL): $(NTFS_3G_TARGET_INSTALL_TARGET)
+	# huh?
 	$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/bin/ntfs-3g
 	$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/bin/ntfs-3g.probe
+	# huhu? STRIP_STRIP_UNNEEDED
 	$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/lib/libntfs-3g.so*
 	touch $@
 endif
-- 
1.6.3.3

[Buildroot] [PATCH 6/6] remove superfluous OPTIMIZE and DEBUG config knobs

[Bernhard Reutner-Fischer]

There is BR2_TARGET_OPTIMIZATION that is saved in the .config

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 Config.in           |  101 +--------------------------------------------------
 package/Makefile.in |   30 +--------------
 2 files changed, 3 insertions(+), 128 deletions(-)

diff --git a/Config.in b/Config.in
index 86e50ac..ca6b298 100644
--- a/Config.in
+++ b/Config.in
@@ -169,38 +169,7 @@ config BR2_ENABLE_DEBUG
 	bool "build packages with debugging symbols"
 	select BR2_PACKAGE_GDB_SERVER
 	help
-	  Build packages with debugging symbols
-	  enabled
-
-if BR2_ENABLE_DEBUG
-choice
-	prompt "gcc debug level"
-	default BR2_DEBUG_2
-	help
-	  Set the debug level for gcc
-
-config BR2_DEBUG_1
-	bool "debug level 1"
-	help
-	  Debug level 1 produces minimal information, enough
-	  for making backtraces in parts of the program that
-	  you don't plan to debug. This includes descriptions
-	  of functions and external variables, but no information
-	  about local variables and no line numbers.
-
-config BR2_DEBUG_2
-	bool "debug level 2"
-	help
-	  The default gcc debug level is 2
-
-config BR2_DEBUG_3
-	bool "debug level 3"
-	help
-	  Level 3 includes extra information, such as all the
-	  macro definitions present in the program. Some debuggers
-	  support macro expansion when you use -g3.
-endchoice
-endif
+	 Build packages with debugging symbols enabled
 
 choice
 	prompt "strip"
@@ -231,74 +200,6 @@ config BR2_STRIP_none
 	  none    do not strip (only for debugging!)
 endchoice
 
-choice
-	prompt "gcc optimization level"
-	default BR2_OPTIMIZE_S
-	help
-	  Set the optimization level for gcc
-
-config BR2_OPTIMIZE_0
-	bool "optimization level 0"
-	depends on !BR2_PACKAGE_LINUX
-	help
-	  Do not optimize. This is the default.
-
-config BR2_OPTIMIZE_1
-	bool "optimization level 1"
-	depends on !BR2_PACKAGE_LINUX
-	help
-	  Optimize. Optimizing compilation takes somewhat more time,
-	  and a lot more memory for a large function. With -O, the
-	  compiler tries to reduce code size and execution time,
-	  without performing any optimizations that take a great deal
-	  of compilation time. -O turns on the following optimization
-	  flags: -fdefer-pop -fdelayed-branch -fguess-branch-probability
-	  -fcprop-registers -floop-optimize -fif-conversion
-	  -fif-conversion2 -ftree-ccp -ftree-dce -ftree-dominator-opts
-	  -ftree-dse -ftree-ter -ftree-lrs -ftree-sra -ftree-copyrename
-	  -ftree-fre -ftree-ch -funit-at-a-time -fmerge-constants
-	  -O also turns on -fomit-frame-pointer on machines where doing
-	  so does not interfere with debugging.
-
-config BR2_OPTIMIZE_2
-	bool "optimization level 2"
-	help
-	  Optimize even more. GCC performs nearly all supported optimizations
-	  that do not involve a space-speed tradeoff. The compiler does not
-	  perform loop unrolling or function inlining when you specify -O2.
-	  As compared to -O, this option increases both compilation time and
-	  the performance of the generated code. -O2 turns on all optimization
-	  flags specified by -O. It also turns on the following optimization
-	  flags: -fthread-jumps -fcrossjumping -foptimize-sibling-calls
-	  -fcse-follow-jumps -fcse-skip-blocks -fgcse  -fgcse-lm
-	  -fexpensive-optimizations -fstrength-reduce -frerun-cse-after-loop
-	  -frerun-loop-opt -fcaller-saves -fpeephole2 -fschedule-insns
-	  -fschedule-insns2 -fsched-interblock -fsched-spec -fregmove
-	  -fstrict-aliasing -fdelete-null-pointer-checks -freorder-blocks
-	  -freorder-functions -falign-functions -falign-jumps -falign-loops
-	  -falign-labels -ftree-vrp -ftree-pre
-	  Please note the warning under -fgcse about invoking -O2 on programs
-	  that use computed gotos.
-
-config BR2_OPTIMIZE_3
-	bool "optimization level 3"
-	help
-	  Optimize yet more. -O3 turns on all optimizations specified by -O2
-	  and also turns on the -finline-functions, -funswitch-loops and
-	  -fgcse-after-reload options.
-
-config BR2_OPTIMIZE_S
-	bool "optimize for size"
-	help
-	  Optimize for size. -Os enables all -O2 optimizations that do not
-	  typically increase code size. It also performs further optimizations
-	  designed to reduce code size. -Os disables the following optimization
-	  flags: -falign-functions -falign-jumps -falign-loops -falign-labels
-	  -freorder-blocks -freorder-blocks-and-partition -fprefetch-loop-arrays
-	  -ftree-vect-loop-version
-
-endchoice
-
 config BR2_PREFER_STATIC_LIB
 	bool "prefer static libraries"
 	help
diff --git a/package/Makefile.in b/package/Makefile.in
index 0ffd22c..7777413 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -9,35 +9,9 @@ HOSTMAKE :=$(shell which $(HOSTMAKE) || type -p $(HOSTMAKE) || echo make)
 MAKE1:=$(HOSTMAKE) -j1
 MAKE:=$(HOSTMAKE) -j$(BR2_JLEVEL)
 
-ifeq ($(BR2_OPTIMIZE_0),y)
-TARGET_OPTIMIZATION+=-O0
-endif
-ifeq ($(BR2_OPTIMIZE_1),y)
-TARGET_OPTIMIZATION+=-O1
-endif
-ifeq ($(BR2_OPTIMIZE_2),y)
-TARGET_OPTIMIZATION+=-O2
-endif
-ifeq ($(BR2_OPTIMIZE_3),y)
-TARGET_OPTIMIZATION+=-O3
-endif
-ifeq ($(BR2_OPTIMIZE_S),y)
-TARGET_OPTIMIZATION+=-Os
-endif
-ifeq ($(BR2_DEBUG_1),y)
-TARGET_DEBUGGING=-g1
-endif
-ifeq ($(BR2_DEBUG_2),y)
-TARGET_DEBUGGING=-g2
-endif
-ifeq ($(BR2_DEBUG_3),y)
-TARGET_DEBUGGING=-g3
-endif
-
-
 #########################################################################
 ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
-TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) \
+TARGET_CFLAGS=$(TARGET_OPTIMIZATION) \
 	-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
 TARGET_LDFLAGS+=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
 ifeq ($(BR2_TOOLCHAIN_SYSROOT),y)
@@ -91,7 +65,7 @@ TARGET_CXXFLAGS=$(TARGET_CFLAGS)
 # else it's an external toolchain
 #########################################################################
 else
-TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) --sysroot $(STAGING_DIR)/
+TARGET_CFLAGS=$(TARGET_OPTIMIZATION) --sysroot $(STAGING_DIR)/
 TARGET_CXXFLAGS=$(TARGET_CFLAGS)
 TARGET_LDFLAGS=--sysroot $(STAGING_DIR)/
 endif
-- 
1.6.3.3

[Buildroot] [PATCH 0/6] misc config-cleanup

[Peter Korsgaard]

>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:

 Bernhard> The attached small series ?) starts to cleanup some aspects of Peter's tree
 Bernhard> and starts to sync up with miscellaneous changes from my tree.

 Bernhard> Peter, please pull.

Thanks, much appreciated - I'll comment on the individual patches.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/6] atmel mirrors are only needed for atmel targets

[Peter Korsgaard]

>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:

 Bernhard>  	  Usually, just add your country code like XX here:
 Bernhard>  	  http://ftp.XX.debian.org
 Bernhard> -
 Bernhard> +if BR2_TARGET_ATMEL
 Bernhard>  source	"target/device/Atmel/Config.in.mirrors"
 Bernhard> -

OK.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2/6] always append FPU_SUFFIX

[Peter Korsgaard]

>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:

Why?

Please provide a bit more detailed commit messages to why we would want
to do this - Shouldn't we rather get rid of that suffix completely?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 5/6] mark odd strip invocations

[Peter Korsgaard]

>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:

 Bernhard> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
 Bernhard> ---
 Bernhard>  package/ntfs-3g/ntfs-3g.mk |    2 ++
 Bernhard>  1 files changed, 2 insertions(+), 0 deletions(-)

 Bernhard> diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk
 Bernhard> index efe15fa..c6894e4 100644
 Bernhard> --- a/package/ntfs-3g/ntfs-3g.mk
 Bernhard> +++ b/package/ntfs-3g/ntfs-3g.mk
 Bernhard> @@ -20,8 +20,10 @@ $(NTFS_3G_TARGET_INSTALL_TARGET): $(NTFS_3G_TARGET_INSTALL_STAGING)
 
 Bernhard>  ifeq ($(BR2_ENABLE_DEBUG),)
 Bernhard>  $(NTFS_3G_HOOK_POST_INSTALL): $(NTFS_3G_TARGET_INSTALL_TARGET)
 Bernhard> +	# huh?
 Bernhard>  	$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/bin/ntfs-3g
 Bernhard>  	$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/bin/ntfs-3g.probe
 Bernhard> +	# huhu? STRIP_STRIP_UNNEEDED

Please just fix stuff instead of adding questions in comments.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 3/6] default to EABI on arm

[Peter Korsgaard]

>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:

 Bernhard> Use of OABI is strongly discouraged since years now.
 Bernhard> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
 Bernhard> ---
 Bernhard>  target/Config.in.arch |    9 ++++++---
 Bernhard>  1 files changed, 6 insertions(+), 3 deletions(-)

 Bernhard> diff --git a/target/Config.in.arch b/target/Config.in.arch
 Bernhard> index e63fc02..e82c8f4 100644
 Bernhard> --- a/target/Config.in.arch
 Bernhard> +++ b/target/Config.in.arch
 Bernhard> @@ -116,14 +116,17 @@ config BR2_ARM_TYPE
 Bernhard>  choice
 Bernhard>  	prompt "Target ABI"
 Bernhard>  	depends on BR2_arm || BR2_armeb
 Bernhard> -	default BR2_ARM_OABI
 Bernhard> +	default BR2_ARM_EABI

Ok.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 4/6] improve arch selection and gcc setup

[Peter Korsgaard]

>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:

Again, please provide more detailed commit messages. This seems to be
several unrelated changes?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2/6] always append FPU_SUFFIX

[Bernhard Reutner-Fischer]

On Tue, Oct 06, 2009 at 08:34:17PM +0200, Peter Korsgaard wrote:
>>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:
>
>Why?

I can have (e.g.) m68k toolchains with and without fpu/mmu.
It's much easier to just use _nofpu_nommu suffices than to repeatedly
rebuild for a gazillion of different combinations.
>
>Please provide a bit more detailed commit messages to why we would want
>to do this - Shouldn't we rather get rid of that suffix completely?

[Buildroot] [PATCH 6/6] remove superfluous OPTIMIZE and DEBUG config knobs

[Peter Korsgaard]

>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:

 Bernhard> There is BR2_TARGET_OPTIMIZATION that is saved in the .config

I'm not sure. I think the existing config is pretty user friendly. If we
could do this, then we should probably rename it to
BR2_TARGET_EXTRA_CFLAGS or something like that so it's clear that you
should use it for all extra flags.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 5/6] mark odd strip invocations

[Bernhard Reutner-Fischer]

On Tue, Oct 06, 2009 at 08:34:55PM +0200, Peter Korsgaard wrote:
>>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:
>
> Bernhard> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
> Bernhard> ---
> Bernhard>  package/ntfs-3g/ntfs-3g.mk |    2 ++
> Bernhard>  1 files changed, 2 insertions(+), 0 deletions(-)
>
> Bernhard> diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk
> Bernhard> index efe15fa..c6894e4 100644
> Bernhard> --- a/package/ntfs-3g/ntfs-3g.mk
> Bernhard> +++ b/package/ntfs-3g/ntfs-3g.mk
> Bernhard> @@ -20,8 +20,10 @@ $(NTFS_3G_TARGET_INSTALL_TARGET): $(NTFS_3G_TARGET_INSTALL_STAGING)
> 
> Bernhard>  ifeq ($(BR2_ENABLE_DEBUG),)
> Bernhard>  $(NTFS_3G_HOOK_POST_INSTALL): $(NTFS_3G_TARGET_INSTALL_TARGET)
> Bernhard> +	# huh?
> Bernhard>  	$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/bin/ntfs-3g
> Bernhard>  	$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/bin/ntfs-3g.probe
> Bernhard> +	# huhu? STRIP_STRIP_UNNEEDED
>
>Please just fix stuff instead of adding questions in comments.

People should be made aware of stuff like that. Did the .so work at all
if you stripped all (instead of only unneeded)?

[Buildroot] [PATCH 4/6] improve arch selection and gcc setup

[Bernhard Reutner-Fischer]

On Tue, Oct 06, 2009 at 08:36:21PM +0200, Peter Korsgaard wrote:
>>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:
>
>Again, please provide more detailed commit messages. This seems to be
>several unrelated changes?

It adds some arches, fleshes out the cpu selection and provides for a
gcc that defaults to generate code for the selected cpu. Any "unrelated"
change is making sure that the changes are propagated properly. Ok?

[Buildroot] [PATCH 2/6] always append FPU_SUFFIX

[Peter Korsgaard]

>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:

 Bernhard> On Tue, Oct 06, 2009 at 08:34:17PM +0200, Peter Korsgaard wrote:
 >>>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:
 >> 
 >> Why?

 Bernhard> I can have (e.g.) m68k toolchains with and without fpu/mmu.
 Bernhard> It's much easier to just use _nofpu_nommu suffices than to repeatedly
 Bernhard> rebuild for a gazillion of different combinations.

Huh? You still have to rebuild just like before, the only minor
advantage is that the rootfs image doesn't get overwritten if you don't
delete the images dir before rebuilding.

I don't particular mind the nofpu/mmu suffixes, but where to end?
There's also abi, cpu variant, debug/optimzation level and hundreds of
other options.

I think we should just suggest people to use the O= support we already
have to put the output dirs somewhere else if they want to do something
like this.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 6/6] remove superfluous OPTIMIZE and DEBUG config knobs

[Bernhard Reutner-Fischer]

On Tue, Oct 06, 2009 at 08:41:00PM +0200, Peter Korsgaard wrote:
>>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:
>
> Bernhard> There is BR2_TARGET_OPTIMIZATION that is saved in the .config
>
>I'm not sure. I think the existing config is pretty user friendly. If we
>could do this, then we should probably rename it to
>BR2_TARGET_EXTRA_CFLAGS or something like that so it's clear that you
>should use it for all extra flags.

The help-text of BR2_TARGET_OPTIMIZATION reads:
---8<---
Optimizations to use when building for the target host.
---8<---

If you want to build with -O0 -g3 -ggdb3 , then just set it to that.
Adding knobs for each -Ox and -gx is not userfriendly but odd, given
that there always was BR2_TARGET_OPTIMIZATION and that this is (or
should be anyway) used _everywhere_.

[Buildroot] [PATCH 5/6] mark odd strip invocations

[Peter Korsgaard]

>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:

Hi,

 Bernhard> +	# huhu? STRIP_STRIP_UNNEEDED
 >> 
 >> Please just fix stuff instead of adding questions in comments.

 Bernhard> People should be made aware of stuff like that. Did the .so
 Bernhard> work at all if you stripped all (instead of only unneeded)?

Sure, but stuff should get fixed instead. I have no idea if it worked,
never used ntfs3g - Olaf?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 4/6] improve arch selection and gcc setup

[Peter Korsgaard]

>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:

 Bernhard> On Tue, Oct 06, 2009 at 08:36:21PM +0200, Peter Korsgaard wrote:
 >>>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:
 >> 
 >> Again, please provide more detailed commit messages. This seems to be
 >> several unrelated changes?

 Bernhard> It adds some arches, fleshes out the cpu selection and
 Bernhard> provides for a gcc that defaults to generate code for the
 Bernhard> selected cpu. Any "unrelated" change is making sure that the
 Bernhard> changes are propagated properly. Ok?

Could you please split it up in 3 patches then? Thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 5/6] mark odd strip invocations

[Olaf Rempel]

On Tue, 06 Oct 2009 20:51:12 +0200
Peter Korsgaard <jacmet@uclibc.org> wrote:

> >>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:
> 
> Hi,
> 
>  Bernhard> +	# huhu? STRIP_STRIP_UNNEEDED
>  >> 
>  >> Please just fix stuff instead of adding questions in comments.
> 
>  Bernhard> People should be made aware of stuff like that. Did the .so
>  Bernhard> work at all if you stripped all (instead of only unneeded)?
> 
> Sure, but stuff should get fixed instead. I have no idea if it worked,
> never used ntfs3g - Olaf?

Yep, it works 100%.
Target is a i586 automated partition-imaging tool build with gcc 4.3.3, 
binutils 2.19.1, uclibc 0.9.31.1 and using BR2_STRIP_sstrip (if that matters).

Regards
Olaf

[Buildroot] [PATCH 2/6] always append FPU_SUFFIX

[Thomas Petazzoni]

Le Tue, 06 Oct 2009 20:34:17 +0200,
Peter Korsgaard <jacmet@uclibc.org> a ?crit :

> Shouldn't we rather get rid of that suffix completely?

Agreed. If you want several toolchains for different arch, FPU or
whatever, use O=.

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 2/6] always append FPU_SUFFIX

[Thomas Petazzoni]

Le Tue, 06 Oct 2009 20:47:55 +0200,
Peter Korsgaard <jacmet@uclibc.org> a ?crit :

> I think we should just suggest people to use the O= support we already
> have to put the output dirs somewhere else if they want to do
> something like this.

Again, I fully agree.

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 0/6] misc config-cleanup

[Thomas Petazzoni]

Le Tue, 06 Oct 2009 20:32:10 +0200,
Peter Korsgaard <jacmet@uclibc.org> a ?crit :

>  Bernhard> The attached small series ?) starts to cleanup some
>  Bernhard> aspects of Peter's tree and starts to sync up with
>  Bernhard> miscellaneous changes from my tree.
> 
>  Bernhard> Peter, please pull.
> 
> Thanks, much appreciated - I'll comment on the individual patches.

Yes, thanks a lot for sending patches again to the mainline Buildroot.
This is very valuable.

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 6/6] remove superfluous OPTIMIZE and DEBUG config knobs

[Thomas Petazzoni]

Le Tue, 6 Oct 2009 20:49:39 +0200,
Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> a ?crit :

> The help-text of BR2_TARGET_OPTIMIZATION reads:
> ---8<---
> Optimizations to use when building for the target host.
> ---8<---
> 
> If you want to build with -O0 -g3 -ggdb3 , then just set it to that.
> Adding knobs for each -Ox and -gx is not userfriendly but odd, given
> that there always was BR2_TARGET_OPTIMIZATION and that this is (or
> should be anyway) used _everywhere_.

Hum, you're right. But I think I would still like to keep a "enable
debug" option that would :

 * Compile with -g and keep the unstripped binary in the staging/
   directory

 * Strip the binaries in target/

This is the normal setup needed to do remote debugging: stripped
binaries on the target, unstripped binaries with debugging symbols to
feed gdb on the host.

I don't have a very strong opinion on this, but I think having an
option for debugging/non-debugging is useful (and debugging + stripping
should probably be the default). But if we decide to get rid of the
option, some documentation would probably be enough.

Sincerly,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 1/6] atmel mirrors are only needed for atmel targets

[Peter Korsgaard]

>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:

 
 Bernhard>  	  Usually, just add your country code like XX here:
 Bernhard>  	  http://ftp.XX.debian.org
 Bernhard> -
 Bernhard> +if BR2_TARGET_ATMEL
 Bernhard>  source	"target/device/Atmel/Config.in.mirrors"
 Bernhard> -

Committed, thanks!

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 3/6] default to EABI on arm

[Peter Korsgaard]

>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:

 Bernhard> Use of OABI is strongly discouraged since years now.

Committed, thanks!

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/6] atmel mirrors are only needed for atmeltargets

[H Hartley Sweeten]

On Tuesday, October 06, 2009 2:07 PM, Peter Korsgaard wrote:
> Bernhard>  	  Usually, just add your country code like XX here:
> Bernhard>  	  http://ftp.XX.debian.org
> Bernhard> -
> Bernhard> +if BR2_TARGET_ATMEL
> Bernhard>  source	"target/device/Atmel/Config.in.mirrors"
> Bernhard> -
>
> Committed, thanks!

Hello Peter,

Shouldn't there be a whitespace line before the 'if' and after the 'endif'?
The end of Config.in.mirrors now looks like this:

config BR2_DEBIAN_MIRROR
	string "Debian Software mirror"
	default "http://ftp.debian.org"
	help
	  Debian has multiple software mirrors scattered around the world.
	  The following allows you to select your preferred mirror.

	  Usually, just add your country code like XX here:
	  http://ftp.XX.debian.org
if BR2_TARGET_ATMEL
source	"target/device/Atmel/Config.in.mirrors"
endif
endmenu

At first glance it looks like everything at the end goes with
'config BR2_DEBIAN_MIRROR'.

Regards,
Hartley

[Buildroot] [PATCH 1/6] atmel mirrors are only needed for atmeltargets

[Peter Korsgaard]

>>>>> "H" == H Hartley Sweeten <hartleys@visionengravers.com> writes:

 H> On Tuesday, October 06, 2009 2:07 PM, Peter Korsgaard wrote:
 Bernhard> Usually, just add your country code like XX here:
 Bernhard> http://ftp.XX.debian.org
 Bernhard> -
 Bernhard> +if BR2_TARGET_ATMEL
 Bernhard> source	"target/device/Atmel/Config.in.mirrors"
 Bernhard> -
 >> 
 >> Committed, thanks!

 H> Hello Peter,

 H> Shouldn't there be a whitespace line before the 'if' and after the 'endif'?
 H> The end of Config.in.mirrors now looks like this:

Kconfig doesn't seem to complain, but I agree it looks cleaner - Will
fix.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 5/6] mark odd strip invocations

[Bernhard Reutner-Fischer]

On Tue, Oct 06, 2009 at 10:01:35PM +0200, Olaf Rempel wrote:
>On Tue, 06 Oct 2009 20:51:12 +0200
>Peter Korsgaard <jacmet@uclibc.org> wrote:
>
>> >>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:
>> 
>> Hi,
>> 
>>  Bernhard> +	# huhu? STRIP_STRIP_UNNEEDED
>>  >> 
>>  >> Please just fix stuff instead of adding questions in comments.
>> 
>>  Bernhard> People should be made aware of stuff like that. Did the .so
>>  Bernhard> work at all if you stripped all (instead of only unneeded)?
>> 
>> Sure, but stuff should get fixed instead. I have no idea if it worked,
>> never used ntfs3g - Olaf?
>
>Yep, it works 100%.
>Target is a i586 automated partition-imaging tool build with gcc 4.3.3, 
>binutils 2.19.1, uclibc 0.9.31.1 and using BR2_STRIP_sstrip (if that matters).

that matters indeed; sstrip doesn't use any such flags as opposed to
strip.

[Buildroot] [PATCH 6/6] remove superfluous OPTIMIZE and DEBUG config knobs

[Bernhard Reutner-Fischer]

On Tue, Oct 06, 2009 at 10:35:58PM +0200, Thomas Petazzoni wrote:
>Le Tue, 6 Oct 2009 20:49:39 +0200,
>Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> a ?crit :
>
>> The help-text of BR2_TARGET_OPTIMIZATION reads:
>> ---8<---
>> Optimizations to use when building for the target host.
>> ---8<---
>> 
>> If you want to build with -O0 -g3 -ggdb3 , then just set it to that.
>> Adding knobs for each -Ox and -gx is not userfriendly but odd, given
>> that there always was BR2_TARGET_OPTIMIZATION and that this is (or
>> should be anyway) used _everywhere_.
>
>Hum, you're right. But I think I would still like to keep a "enable
>debug" option that would :

I didn't remove that option, it's still there :)
Note, however, that previously we handled this via the STRIP setting
(none, strip, sstrip) automagically. The auto stuff needs such an
additional knob since it wouldn't be really clean to wire it up on
STRIP_none, agree 100%.
>
> * Compile with -g and keep the unstripped binary in the staging/
>   directory

the staging area should not be stripped anyway (unless a package does it
behind our back)

[Buildroot] [PATCH 6/6] remove superfluous OPTIMIZE and DEBUG config knobs

[Peter Korsgaard]

>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:

Hi,

 >> * Compile with -g and keep the unstripped binary in the staging/
 >> directory

 Bernhard> the staging area should not be stripped anyway (unless a
 Bernhard> package does it behind our back)

Indeed. The debug stuff is for the (unlikely) situation where you want
to run gdb (not gdbserver) on the target.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 6/6] remove superfluous OPTIMIZE and DEBUG config knobs

[Bernhard Reutner-Fischer]

On Wed, Oct 07, 2009 at 09:03:42AM +0200, Peter Korsgaard wrote:
>>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:

> >> * Compile with -g and keep the unstripped binary in the staging/
> >> directory
>
> Bernhard> the staging area should not be stripped anyway (unless a
> Bernhard> package does it behind our back)
>
>Indeed. The debug stuff is for the (unlikely) situation where you want
>to run gdb (not gdbserver) on the target.

So we seem to all agree.

[Buildroot] [PATCH 5/6] mark odd strip invocations

[Peter Korsgaard]

>>>>> "Olaf" == Olaf Rempel <razzor@kopf-tisch.de> writes:

 Olaf> Yep, it works 100%.
 Olaf> Target is a i586 automated partition-imaging tool build with gcc 4.3.3, 
 Olaf> binutils 2.19.1, uclibc 0.9.31.1 and using BR2_STRIP_sstrip (if that matters).

OK, on a related note why do we need all this special install handling?
The ntfs-3g buildsystem seems to do the right thing on make install*,
E.G. with all those lines removed I have:

find -name \*ntfs\*|xargs file                         /tmp/br/target
./sbin/mount.ntfs-3g:           broken symbolic link to `/usr/bin/ntfs-3g'
./usr/lib/libntfs-3g.so:        symbolic link to `libntfs-3g.so.52.0.0'
./usr/lib/libntfs-3g.so.52:     symbolic link to `libntfs-3g.so.52.0.0'
./usr/lib/libntfs-3g.so.52.0.0: ELF 32-bit MSB shared object, PowerPC or cisco 4500, version 1 (SYSV), dynamically linked, with unknown capability 0x41000000 = 0x11676e75, with unknown capability 0x10000 = 0x90401, stripped
./usr/bin/ntfs-3g.probe:        ELF 32-bit MSB executable, PowerPC or cisco 4500, version 1 (SYSV), dynamically linked (uses shared libs), with unknown capability 0x41000000 = 0x11676e75, with unknown capability 0x10000 = 0x90401, stripped
./usr/bin/ntfs-3g:              ELF 32-bit MSB executable, PowerPC or cisco 4500, version 1 (SYSV), dynamically linked (uses shared libs), with unknown capability 0x41000000 = 0x11676e75, with unknown capability 0x10000 = 0x90401, stripped

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 4/6] improve arch selection and gcc setup

[Bernhard Reutner-Fischer]

On Tue, Oct 06, 2009 at 08:51:52PM +0200, Peter Korsgaard wrote:
>>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:
>
> Bernhard> On Tue, Oct 06, 2009 at 08:36:21PM +0200, Peter Korsgaard wrote:
> >>>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:
> >> 
> >> Again, please provide more detailed commit messages. This seems to be
> >> several unrelated changes?
>
> Bernhard> It adds some arches, fleshes out the cpu selection and
> Bernhard> provides for a gcc that defaults to generate code for the
> Bernhard> selected cpu. Any "unrelated" change is making sure that the
> Bernhard> changes are propagated properly. Ok?
>
>Could you please split it up in 3 patches then? Thanks.

done.