diff options
42 files changed, 280 insertions, 3 deletions
diff --git a/misc/buildroot/ChangeLog b/misc/buildroot/ChangeLog index aa87dd9a5..e5c9dcc34 100644 --- a/misc/buildroot/ChangeLog +++ b/misc/buildroot/ChangeLog @@ -149,4 +149,5 @@ buildroot-1.14 2011-xx-xx <gnutt@nuttx.org> * Added a Cortex-M3 GCC 4.8.2 EABI configuration (2014-2-27). * toolchain/nxflat/ldnxflat.c and mknxflat.c: Fix error with binutils-2.4: bfd.h wants us to include config.h first (2014-2.27). + * Added support for the kconfig-frontends-3.12.0.0 tools. diff --git a/misc/buildroot/Makefile b/misc/buildroot/Makefile index 166b13c04..94b70aaad 100644 --- a/misc/buildroot/Makefile +++ b/misc/buildroot/Makefile @@ -51,7 +51,7 @@ cc-option = $(shell if $(TARGET_CC) $(TARGET_CFLAGS) $(1) -S -o /dev/null -xc /d # along with the packages to build for the target. # ############################################################## -TARGETS:=binutils + include toolchain/Makefile.in include package/Makefile.in diff --git a/misc/buildroot/configs/arm-defconfig b/misc/buildroot/configs/arm-defconfig index 81a8508fe..41ef5b98e 100644 --- a/misc/buildroot/configs/arm-defconfig +++ b/misc/buildroot/configs/arm-defconfig @@ -68,6 +68,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-elf" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y BR2_BINUTILS_VERSION_2_17=y # BR2_BINUTILS_VERSION_2_19 is not set # BR2_BINUTILS_VERSION_2_19_1 is not set diff --git a/misc/buildroot/configs/arm-kconfig-frontends-3.12.0.0 b/misc/buildroot/configs/arm-kconfig-frontends-3.12.0.0 new file mode 100644 index 000000000..4d3537d51 --- /dev/null +++ b/misc/buildroot/configs/arm-kconfig-frontends-3.12.0.0 @@ -0,0 +1,112 @@ +# +# Automatically generated make config: don't edit +# +BR2_HAVE_DOT_CONFIG=y +# BR2_alpha is not set +BR2_arm=y +# BR2_armeb is not set +# BR2_avr is not set +# BR2_avr32 is not set +# BR2_bfin is not set +# BR2_cris is not set +# BR2_i386 is not set +# BR2_m32c is not set +# BR2_m68k is not set +# BR2_m68hc11 is not set +# BR2_m68hc12 is not set +# BR2_m9s12x is not set +# BR2_mips is not set +# BR2_mipsel is not set +# BR2_nios2 is not set +# BR2_powerpc is not set +# BR2_sh is not set +# BR2_sh64 is not set +# BR2_h8300 is not set +# BR2_sparc is not set +# BR2_x86_64 is not set +BR2_generic_arm=y +# BR2_arm610 is not set +# BR2_arm7tdmi is not set +# BR2_arm710 is not set +# BR2_arm720t is not set +# BR2_arm740t is not set +# BR2_arm920t is not set +# BR2_arm922t is not set +# BR2_arm926t is not set +# BR2_arm1136jf_s is not set +# BR2_cortex_a5 is not set +# BR2_cortex_a8 is not set +# BR2_cortex_m3 is not set +# BR2_cortex_m4f is not set +# BR2_cortex_m0 is not set +# BR2_sa110 is not set +# BR2_sa1100 is not set +# BR2_xscale is not set +# BR2_iwmmxt is not set +# BR2_GCC_CORTEX is not set +# BR2_GCC_CORTEX_M4F is not set +# BR2_ARM_OABI is not set +BR2_ARM_EABI=y +BR2_ARCH="arm" +BR2_GCC_TARGET_ABI="aapcs-linux" +BR2_ENDIAN="LITTLE" + +# +# Build options +# +BR2_WGET="wget --passive-ftp" +BR2_SVN="svn co" +BR2_ZCAT="zcat" +BR2_BZCAT="bzcat" +BR2_TAR_OPTIONS="" +BR2_DL_DIR="$(BASE_DIR)/../archives" +BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx" +BR2_TOPDIR_PREFIX="" +BR2_TOPDIR_SUFFIX="" +BR2_GNU_BUILD_SUFFIX="pc-elf" +BR2_GNU_TARGET_SUFFIX="nuttx-elf" +# BR2_PREFER_IMA is not set + +# +# Toolchain Options +# + +# +# Binutils Options +# +# BR2_PACKAGE_BINUTILS is not set + +# +# GCC Options +# +# BR2_PACKAGE_GCC is not set +# BR2_GCC_SUPPORTS_SYSROOT is not set + +# +# Gdb Options +# +# BR2_PACKAGE_GDB is not set +# BR2_PACKAGE_GDB_SERVER is not set +# BR2_PACKAGE_GDB_HOST is not set + +# +# NuttX Binary Support +# +# BR2_PACKAGE_NXFLAT is not set +# BR2_PACKAGE_GENROMFS is not set +BR2_PACKAGE_KCONFIG_FRONTENDS=y +# BR2_NCONF_FRONTEND is not set +# BR2_GCONF_FRONTEND is not set +# BR2_QCONF_FRONTEND is not set +BR2_KCONFIG_FRONTENDS_VERSION="3.12.0.0" + +# +# Common Toolchain Options +# +# BR2_PACKAGE_SSTRIP_TARGET is not set +# BR2_PACKAGE_SSTRIP_HOST is not set +# BR2_ENABLE_MULTILIB is not set +BR2_LARGEFILE=y +BR2_SOFT_FLOAT=y +BR2_TARGET_OPTIMIZATION="-Os -pipe" diff --git a/misc/buildroot/configs/arm7tdmi-defconfig-4.2.4 b/misc/buildroot/configs/arm7tdmi-defconfig-4.2.4 index 093cc1667..217e311f0 100644 --- a/misc/buildroot/configs/arm7tdmi-defconfig-4.2.4 +++ b/misc/buildroot/configs/arm7tdmi-defconfig-4.2.4 @@ -70,6 +70,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-elf" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y # BR2_BINUTILS_VERSION_2_17 is not set BR2_BINUTILS_VERSION_2_19=y # BR2_BINUTILS_VERSION_2_19_1 is not set diff --git a/misc/buildroot/configs/arm7tdmi-defconfig-4.3.3 b/misc/buildroot/configs/arm7tdmi-defconfig-4.3.3 index c027c8a8c..68156270d 100644 --- a/misc/buildroot/configs/arm7tdmi-defconfig-4.3.3 +++ b/misc/buildroot/configs/arm7tdmi-defconfig-4.3.3 @@ -71,6 +71,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-elf" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y # BR2_BINUTILS_VERSION_2_17 is not set # BR2_BINUTILS_VERSION_2_18 is not set # BR2_BINUTILS_VERSION_2_19 is not set diff --git a/misc/buildroot/configs/arm920t-defconfig-4.2.4 b/misc/buildroot/configs/arm920t-defconfig-4.2.4 index ae933fcec..19c1be0d8 100644 --- a/misc/buildroot/configs/arm920t-defconfig-4.2.4 +++ b/misc/buildroot/configs/arm920t-defconfig-4.2.4 @@ -70,6 +70,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-elf" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y # BR2_BINUTILS_VERSION_2_17 is not set BR2_BINUTILS_VERSION_2_19=y # BR2_BINUTILS_VERSION_2_19_1 is not set diff --git a/misc/buildroot/configs/arm920t-defconfig-4.3.3 b/misc/buildroot/configs/arm920t-defconfig-4.3.3 index 7f9f6b03f..e1dd6f8e5 100644 --- a/misc/buildroot/configs/arm920t-defconfig-4.3.3 +++ b/misc/buildroot/configs/arm920t-defconfig-4.3.3 @@ -71,6 +71,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-elf" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y # BR2_BINUTILS_VERSION_2_17 is not set # BR2_BINUTILS_VERSION_2_18 is not set # BR2_BINUTILS_VERSION_2_19 is not set diff --git a/misc/buildroot/configs/arm920t-eabi-defconfig-4.5.2 b/misc/buildroot/configs/arm920t-eabi-defconfig-4.5.2 index 6e55dc363..50fb905a7 100644 --- a/misc/buildroot/configs/arm920t-eabi-defconfig-4.5.2 +++ b/misc/buildroot/configs/arm920t-eabi-defconfig-4.5.2 @@ -71,6 +71,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-eabi" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y # BR2_BINUTILS_VERSION_2_17 is not set # BR2_BINUTILS_VERSION_2_18 is not set # BR2_BINUTILS_VERSION_2_19 is not set diff --git a/misc/buildroot/configs/arm926t-defconfig-4.2.4 b/misc/buildroot/configs/arm926t-defconfig-4.2.4 index 26b266f0e..de697e0a4 100644 --- a/misc/buildroot/configs/arm926t-defconfig-4.2.4 +++ b/misc/buildroot/configs/arm926t-defconfig-4.2.4 @@ -70,6 +70,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-elf" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y # BR2_BINUTILS_VERSION_2_17 is not set BR2_BINUTILS_VERSION_2_19=y # BR2_BINUTILS_VERSION_2_19_1 is not set diff --git a/misc/buildroot/configs/arm926t-defconfig-4.3.3 b/misc/buildroot/configs/arm926t-defconfig-4.3.3 index 1d6301779..2e5b8f82e 100644 --- a/misc/buildroot/configs/arm926t-defconfig-4.3.3 +++ b/misc/buildroot/configs/arm926t-defconfig-4.3.3 @@ -71,6 +71,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-elf" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y # BR2_BINUTILS_VERSION_2_17 is not set # BR2_BINUTILS_VERSION_2_19 is not set BR2_BINUTILS_VERSION_2_19_1=y diff --git a/misc/buildroot/configs/arm926t-defconfig-nxflat b/misc/buildroot/configs/arm926t-defconfig-nxflat index 4f6a669c2..cd58d80f4 100644 --- a/misc/buildroot/configs/arm926t-defconfig-nxflat +++ b/misc/buildroot/configs/arm926t-defconfig-nxflat @@ -71,6 +71,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-elf" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y # BR2_BINUTILS_VERSION_2_17 is not set # BR2_BINUTILS_VERSION_2_19 is not set BR2_BINUTILS_VERSION_2_19_1=y diff --git a/misc/buildroot/configs/avr-defconfig-4.3.3 b/misc/buildroot/configs/avr-defconfig-4.3.3 index a2ea9feb1..7a7ddf2e0 100644 --- a/misc/buildroot/configs/avr-defconfig-4.3.3 +++ b/misc/buildroot/configs/avr-defconfig-4.3.3 @@ -51,6 +51,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-elf" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y # BR2_BINUTILS_VERSION_2_17 is not set # BR2_BINUTILS_VERSION_2_18 is not set # BR2_BINUTILS_VERSION_2_19 is not set diff --git a/misc/buildroot/configs/avr-defconfig-4.5.2 b/misc/buildroot/configs/avr-defconfig-4.5.2 index 465376fd0..baea4e7d0 100644 --- a/misc/buildroot/configs/avr-defconfig-4.5.2 +++ b/misc/buildroot/configs/avr-defconfig-4.5.2 @@ -51,6 +51,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-elf" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y # BR2_BINUTILS_VERSION_2_17 is not set # BR2_BINUTILS_VERSION_2_18 is not set # BR2_BINUTILS_VERSION_2_19 is not set diff --git a/misc/buildroot/configs/bfin-defconfig-4.2.4 b/misc/buildroot/configs/bfin-defconfig-4.2.4 index 9cae0a8d9..8f1b4db5c 100644 --- a/misc/buildroot/configs/bfin-defconfig-4.2.4 +++ b/misc/buildroot/configs/bfin-defconfig-4.2.4 @@ -50,6 +50,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-elf" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y # BR2_BINUTILS_VERSION_2_17 is not set BR2_BINUTILS_VERSION_2_19=y # BR2_BINUTILS_VERSION_2_19_1 is not set diff --git a/misc/buildroot/configs/cortexa8-eabi-defconfig-4.6.3 b/misc/buildroot/configs/cortexa8-eabi-defconfig-4.6.3 index ae38a77ea..1666c5308 100644 --- a/misc/buildroot/configs/cortexa8-eabi-defconfig-4.6.3 +++ b/misc/buildroot/configs/cortexa8-eabi-defconfig-4.6.3 @@ -74,6 +74,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-eabi" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y # BR2_BINUTILS_VERSION_2_17 is not set # BR2_BINUTILS_VERSION_2_18 is not set # BR2_BINUTILS_VERSION_2_19 is not set diff --git a/misc/buildroot/configs/cortexa8-eabi-defconfig-4.8.2 b/misc/buildroot/configs/cortexa8-eabi-defconfig-4.8.2 index 64ed71dc2..3e8c571ac 100644 --- a/misc/buildroot/configs/cortexa8-eabi-defconfig-4.8.2 +++ b/misc/buildroot/configs/cortexa8-eabi-defconfig-4.8.2 @@ -74,6 +74,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-eabi" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y # BR2_BINUTILS_VERSION_2_17 is not set # BR2_BINUTILS_VERSION_2_18 is not set # BR2_BINUTILS_VERSION_2_19 is not set diff --git a/misc/buildroot/configs/cortexm0-eabi-defconfig-4.6.3 b/misc/buildroot/configs/cortexm0-eabi-defconfig-4.6.3 index 663d548db..9059b87a2 100644 --- a/misc/buildroot/configs/cortexm0-eabi-defconfig-4.6.3 +++ b/misc/buildroot/configs/cortexm0-eabi-defconfig-4.6.3 @@ -72,6 +72,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-eabi" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y # BR2_BINUTILS_VERSION_2_17 is not set # BR2_BINUTILS_VERSION_2_18 is not set # BR2_BINUTILS_VERSION_2_19 is not set diff --git a/misc/buildroot/configs/cortexm3-defconfig-4.3.3 b/misc/buildroot/configs/cortexm3-defconfig-4.3.3 index a3371531b..d8790d9df 100644 --- a/misc/buildroot/configs/cortexm3-defconfig-4.3.3 +++ b/misc/buildroot/configs/cortexm3-defconfig-4.3.3 @@ -71,6 +71,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-elf" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y # BR2_BINUTILS_VERSION_2_17 is not set # BR2_BINUTILS_VERSION_2_18 is not set # BR2_BINUTILS_VERSION_2_19 is not set diff --git a/misc/buildroot/configs/cortexm3-defconfig-nxflat b/misc/buildroot/configs/cortexm3-defconfig-nxflat index 263126d1f..3ee6123cb 100644 --- a/misc/buildroot/configs/cortexm3-defconfig-nxflat +++ b/misc/buildroot/configs/cortexm3-defconfig-nxflat @@ -70,6 +70,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-elf" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y # BR2_BINUTILS_VERSION_2_17 is not set # BR2_BINUTILS_VERSION_2_19 is not set BR2_BINUTILS_VERSION_2_19_1=y diff --git a/misc/buildroot/configs/cortexm3-eabi-defconfig-4.6.3 b/misc/buildroot/configs/cortexm3-eabi-defconfig-4.6.3 index 27d743919..f940c70dc 100644 --- a/misc/buildroot/configs/cortexm3-eabi-defconfig-4.6.3 +++ b/misc/buildroot/configs/cortexm3-eabi-defconfig-4.6.3 @@ -77,6 +77,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-eabi" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y # BR2_BINUTILS_VERSION_2_17 is not set # BR2_BINUTILS_VERSION_2_18 is not set # BR2_BINUTILS_VERSION_2_19 is not set diff --git a/misc/buildroot/configs/cortexm3-eabi-defconfig-4.8.2 b/misc/buildroot/configs/cortexm3-eabi-defconfig-4.8.2 index e1d91ab80..b2418c7f9 100644 --- a/misc/buildroot/configs/cortexm3-eabi-defconfig-4.8.2 +++ b/misc/buildroot/configs/cortexm3-eabi-defconfig-4.8.2 @@ -77,6 +77,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-eabi" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y # BR2_BINUTILS_VERSION_2_17 is not set # BR2_BINUTILS_VERSION_2_18 is not set # BR2_BINUTILS_VERSION_2_19 is not set diff --git a/misc/buildroot/configs/cortexm4f-eabi-defconfig-4.7.3 b/misc/buildroot/configs/cortexm4f-eabi-defconfig-4.7.3 index 161a690ac..2363d6b22 100644 --- a/misc/buildroot/configs/cortexm4f-eabi-defconfig-4.7.3 +++ b/misc/buildroot/configs/cortexm4f-eabi-defconfig-4.7.3 @@ -77,6 +77,7 @@ BR2_PREFER_IMA=y # # Binutils Options # +BR2_PACKAGE_BINUTILS=y # BR2_BINUTILS_VERSION_2_17 is not set # BR2_BINUTILS_VERSION_2_18 is not set # BR2_BINUTILS_VERSION_2_19 is not set diff --git a/misc/buildroot/configs/h8300_defconfig b/misc/buildroot/configs/h8300_defconfig index df7e91b10..b9559dfe5 100644 --- a/misc/buildroot/configs/h8300_defconfig +++ b/misc/buildroot/configs/h8300_defconfig @@ -50,6 +50,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-elf" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y BR2_BINUTILS_VERSION_2_17=y # BR2_BINUTILS_VERSION_2_19 is not set # BR2_BINUTILS_VERSION_2_19_1 is not set diff --git a/misc/buildroot/configs/i486-defconfig-4.3.3 b/misc/buildroot/configs/i486-defconfig-4.3.3 index ca79c8518..7f9fbef01 100644 --- a/misc/buildroot/configs/i486-defconfig-4.3.3 +++ b/misc/buildroot/configs/i486-defconfig-4.3.3 @@ -57,6 +57,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-elf" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y # BR2_BINUTILS_VERSION_2_17 is not set # BR2_BINUTILS_VERSION_2_18 is not set # BR2_BINUTILS_VERSION_2_19 is not set diff --git a/misc/buildroot/configs/m32c-defconfig-4.2.4 b/misc/buildroot/configs/m32c-defconfig-4.2.4 index 2942cf830..2bb7dc5e3 100644 --- a/misc/buildroot/configs/m32c-defconfig-4.2.4 +++ b/misc/buildroot/configs/m32c-defconfig-4.2.4 @@ -50,6 +50,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-elf" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y # BR2_BINUTILS_VERSION_2_17 is not set BR2_BINUTILS_VERSION_2_19=y # BR2_BINUTILS_VERSION_2_19_1 is not set diff --git a/misc/buildroot/configs/m32c-defconfig-4.3.3 b/misc/buildroot/configs/m32c-defconfig-4.3.3 index 35f307b75..3657809c2 100644 --- a/misc/buildroot/configs/m32c-defconfig-4.3.3 +++ b/misc/buildroot/configs/m32c-defconfig-4.3.3 @@ -50,6 +50,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-elf" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y # BR2_BINUTILS_VERSION_2_17 is not set # BR2_BINUTILS_VERSION_2_19 is not set BR2_BINUTILS_VERSION_2_19_1=y diff --git a/misc/buildroot/configs/m68hc11-config b/misc/buildroot/configs/m68hc11-config index 5d546f146..dd5585b36 100644 --- a/misc/buildroot/configs/m68hc11-config +++ b/misc/buildroot/configs/m68hc11-config @@ -50,6 +50,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-elf" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y BR2_BINUTILS_VERSION_2_17=y # BR2_BINUTILS_VERSION_2_19 is not set # BR2_BINUTILS_VERSION_2_19_1 is not set diff --git a/misc/buildroot/configs/m68hc12-config-3.4.6 b/misc/buildroot/configs/m68hc12-config-3.4.6 index eb2dca5f0..5772e2e18 100644 --- a/misc/buildroot/configs/m68hc12-config-3.4.6 +++ b/misc/buildroot/configs/m68hc12-config-3.4.6 @@ -50,6 +50,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-elf" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y BR2_BINUTILS_VERSION_2_17=y # BR2_BINUTILS_VERSION_2_19 is not set # BR2_BINUTILS_VERSION_2_19_1 is not set diff --git a/misc/buildroot/configs/m68hc12-config-4.3.3 b/misc/buildroot/configs/m68hc12-config-4.3.3 index 300194f36..615f6d26e 100644 --- a/misc/buildroot/configs/m68hc12-config-4.3.3 +++ b/misc/buildroot/configs/m68hc12-config-4.3.3 @@ -50,6 +50,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-elf" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y # BR2_BINUTILS_VERSION_2_17 is not set # BR2_BINUTILS_VERSION_2_19 is not set BR2_BINUTILS_VERSION_2_19_1=y diff --git a/misc/buildroot/configs/m68k-defconfig b/misc/buildroot/configs/m68k-defconfig index 33b978633..3cd7ce430 100644 --- a/misc/buildroot/configs/m68k-defconfig +++ b/misc/buildroot/configs/m68k-defconfig @@ -50,6 +50,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-elf" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y BR2_BINUTILS_VERSION_2_17=y # BR2_BINUTILS_VERSION_2_19 is not set # BR2_BINUTILS_VERSION_2_19_1 is not set diff --git a/misc/buildroot/configs/m9s12x-config-3.3.6 b/misc/buildroot/configs/m9s12x-config-3.3.6 index d317ee7d8..864b04f48 100644 --- a/misc/buildroot/configs/m9s12x-config-3.3.6 +++ b/misc/buildroot/configs/m9s12x-config-3.3.6 @@ -51,6 +51,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-elf" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y # BR2_BINUTILS_VERSION_2_17 is not set BR2_BINUTILS_VERSION_2_18=y # BR2_BINUTILS_VERSION_2_19 is not set diff --git a/misc/buildroot/configs/sh-defconfig b/misc/buildroot/configs/sh-defconfig index 1700faf24..859411449 100644 --- a/misc/buildroot/configs/sh-defconfig +++ b/misc/buildroot/configs/sh-defconfig @@ -57,6 +57,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-elf" # # Binutils Options # +BR2_PACKAGE_BINUTILS=y BR2_BINUTILS_VERSION_2_17=y # BR2_BINUTILS_VERSION_2_19 is not set # BR2_BINUTILS_VERSION_2_19_1 is not set diff --git a/misc/buildroot/package/Makefile.in b/misc/buildroot/package/Makefile.in index d79783343..ea03e36b7 100644 --- a/misc/buildroot/package/Makefile.in +++ b/misc/buildroot/package/Makefile.in @@ -108,4 +108,3 @@ endif ifeq ($(BR2_INSTALL_LIBSTDCPP),) TARGET_CONFIGURE_OPTS+=CXX="" endif - diff --git a/misc/buildroot/toolchain/Config.in b/misc/buildroot/toolchain/Config.in index 7824dba35..32b442eab 100644 --- a/misc/buildroot/toolchain/Config.in +++ b/misc/buildroot/toolchain/Config.in @@ -7,6 +7,7 @@ source "toolchain/gcc/Config.in" source "toolchain/gdb/Config.in" source "toolchain/nxflat/Config.in" source "toolchain/genromfs/Config.in" +source "toolchain/kconfig-frontends/Config.in" comment "Common Toolchain Options" diff --git a/misc/buildroot/toolchain/Makefile.in b/misc/buildroot/toolchain/Makefile.in index 84e2ae42f..365e5cc6a 100644 --- a/misc/buildroot/toolchain/Makefile.in +++ b/misc/buildroot/toolchain/Makefile.in @@ -10,7 +10,6 @@ else MULTILIB:=--disable-multilib endif - # FIXME -- this is temporary OPTIMIZE_FOR_CPU=$(ARCH) diff --git a/misc/buildroot/toolchain/binutils/Config.in b/misc/buildroot/toolchain/binutils/Config.in index c3dfa133c..2f7ce321e 100644 --- a/misc/buildroot/toolchain/binutils/Config.in +++ b/misc/buildroot/toolchain/binutils/Config.in @@ -2,12 +2,19 @@ comment "Binutils Options" +config BR2_PACKAGE_BINUTILS + bool "Build binutils" + default n + help + Build the binutils for the target architecture. + choice prompt "Binutils Version" default BR2_BINUTILS_VERSION_2_19_1 if BR2_GCC_CORTEX default BR2_BINUTILS_VERSION_2_19 if !BR2_avr32 && !BR2_GCC_CORTEX && !BR2_m9s12x default BR2_BINUTILS_VERSION_2_18 if BR2_m9s12x default BR2_BINUTILS_VERSION_2_17 if !BR2_GCC_CORTEX && !BR2_m9s12x + depends on BR2_PACKAGE_BINUTILS help Select the version of binutils you wish to use. @@ -43,6 +50,7 @@ endchoice config BR2_BINUTILS_VERSION string + depends on BR2_PACKAGE_BINUTILS default "2.17" if BR2_BINUTILS_VERSION_2_17 default "2.18" if BR2_BINUTILS_VERSION_2_18 default "2.19" if BR2_BINUTILS_VERSION_2_19 @@ -54,5 +62,6 @@ config BR2_BINUTILS_VERSION config BR2_EXTRA_BINUTILS_CONFIG_OPTIONS string "Additional binutils options" default "" + depends on BR2_PACKAGE_BINUTILS help Any additional binutils options you may want to include ... diff --git a/misc/buildroot/toolchain/binutils/binutils.mk b/misc/buildroot/toolchain/binutils/binutils.mk index e4f00c899..ecdb0f722 100644 --- a/misc/buildroot/toolchain/binutils/binutils.mk +++ b/misc/buildroot/toolchain/binutils/binutils.mk @@ -123,3 +123,7 @@ binutils_target-clean: binutils_target-dirclean: rm -rf $(BINUTILS_DIR2) + +ifeq ($(strip $(BR2_PACKAGE_BINUTILS)),y) +TARGETS+=binutils +endif diff --git a/misc/buildroot/toolchain/gcc/Config.in b/misc/buildroot/toolchain/gcc/Config.in index 2e39074cf..5044d92e1 100644 --- a/misc/buildroot/toolchain/gcc/Config.in +++ b/misc/buildroot/toolchain/gcc/Config.in @@ -5,6 +5,7 @@ comment "GCC Options" config BR2_PACKAGE_GCC bool "Build GCC cross-compiler" default n + select BR2_PACKAGE_BINUTILS help Build the GCC cross-compiler for the target architecture. diff --git a/misc/buildroot/toolchain/kconfig-frontends/Config.in b/misc/buildroot/toolchain/kconfig-frontends/Config.in new file mode 100644 index 000000000..034051cdb --- /dev/null +++ b/misc/buildroot/toolchain/kconfig-frontends/Config.in @@ -0,0 +1,34 @@ +config BR2_PACKAGE_KCONFIG_FRONTENDS + bool "Build kconfig-frontends" + default y + help + The kconfig-frontends are required to configure NuttX. See + http://ymorin.is-a-geek.org/projects/kconfig-frontends + + NOTE: You must have the ncurses library installed on your computer + +if BR2_PACKAGE_KCONFIG_FRONTENDS + +config BR2_NCONF_FRONTEND + bool "Build nconfig frontend" + default n + help + NOTE: You must have the ncurses library installed on your computer + +config BR2_GCONF_FRONTEND + bool "Build GTK gconf frontend" + default n + help + NOTE: You must have the QTK developer library installed on your computer + +config BR2_QCONF_FRONTEND + bool "Build Qt qconfig frontend" + default n + help + NOTE: You must have the QTK developer library installed on your computer + +config BR2_KCONFIG_FRONTENDS_VERSION + string + default "3.12.0.0" + +endif # BR2_PACKAGE_KCONFIG_FRONTENDS diff --git a/misc/buildroot/toolchain/kconfig-frontends/kconfig-frontends.mk b/misc/buildroot/toolchain/kconfig-frontends/kconfig-frontends.mk new file mode 100644 index 000000000..2aedc1627 --- /dev/null +++ b/misc/buildroot/toolchain/kconfig-frontends/kconfig-frontends.mk @@ -0,0 +1,86 @@ +###################################################################### +# +# kconfig-frontends +# +###################################################################### + +KCONFIGS_VERSION:=$(strip $(subst ",, $(BR2_KCONFIG_FRONTENDS_VERSION))) +KCONFIGS_SOURCE:=kconfig-frontends-$(KCONFIGS_VERSION).tar.bz2 +KCONFIGS_BUILD:=$(TOOL_BUILD_DIR)/kconfig-frontends-$(KCONFIGS_VERSION) +KCONFIGS_SITE:=http://ymorin.is-a-geek.org/download/kconfig-frontends +KCONFIGS_CAT:=$(BZCAT) + +ifeq ($(strip $(BR2_NCONF_FRONTEND)),y) +KCONFIGS_ENABLE_NCONF:=--enable-nconf +else +KCONFIGS_ENABLE_NCONF:=--disable-nconf +endif + +ifeq ($(strip $(BR2_GCONF_FRONTEND)),y) +KCONFIGS_ENABLE_GCONF:=--enable-gconf +else +KCONFIGS_ENABLE_GCONF:=--disable-gconf +endif + +ifeq ($(strip $(BR2_QCONF_FRONTEND)),y) +KCONFIGS_ENABLE_QCONF:=--enable-qconf +else +KCONFIGS_ENABLE_QCONF:=--disable-qconf +endif + +$(DL_DIR)/$(KCONFIGS_SOURCE): + mkdir -p $(DL_DIR) + $(WGET) -P $(DL_DIR) $(KCONFIGS_SITE)/$(KCONFIGS_SOURCE) + +$(KCONFIGS_BUILD)/.unpacked : $(DL_DIR)/$(KCONFIGS_SOURCE) + $(BZCAT) $(DL_DIR)/$(KCONFIGS_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - + @#toolchain/patch-kernel.sh $(KCONFIGS_BUILD) toolchain/kconfig-frontends \*.patch + touch $@ + +$(KCONFIGS_BUILD)/.configured : $(KCONFIGS_BUILD)/.unpacked + (cd $(KCONFIGS_BUILD); \ + CC="$(HOSTCC)" \ + ./configure \ + --enable-mconf \ + --disable-shared \ + --enable-static \ + --disable-utils \ + $(KCONFIGS_ENABLE_NCONF) \ + $(KCONFIGS_ENABLE_GCONF) \ + $(KCONFIGS_ENABLE_QCONF) \ + --prefix=$(STAGING_DIR) \ + --build=$(GNU_HOST_NAME) \ + --host=$(GNU_HOST_NAME) \ + --disable-werror); + touch $@ + +$(KCONFIGS_BUILD)/.compiled : $(KCONFIGS_BUILD)/.configured + $(MAKE) -C $(KCONFIGS_BUILD) + touch $@ + +$(KCONFIGS_BUILD)/.installed: $(KCONFIGS_BUILD)/.compiled + $(MAKE) -C $(KCONFIGS_BUILD) install + touch $@ + +kconfig-frontends: $(KCONFIGS_BUILD)/.installed + +kconfig-frontends-source: + +kconfig-frontends-clean: + rm -f $(STAGING_DIR)/bin/kconfig-conf + rm -f $(STAGING_DIR)/bin/kconfig-mconf + rm -f $(STAGING_DIR)/bin/kconfig-nconf + rm -f $(STAGING_DIR)/bin/kconfig-gconf + rm -f $(STAGING_DIR)/bin/kconfig-qconf + (if [ -d $(KCONFIGS_BUILD) ]; then $(MAKE) -C $(KCONFIGS_BUILD) clean; fi) + rm -f $(KCONFIGS_BUILD)/.installed + rm -f $(KCONFIGS_BUILD)/.compiled + rm -f $(KCONFIGS_BUILD)/.configured + rm -f $(KCONFIGS_BUILD)/.unpacked + +kconfig-frontends-dirclean: + rm -rf $(KCONFIGS_BUILD) + +ifeq ($(strip $(BR2_PACKAGE_KCONFIG_FRONTENDS)),y) +TARGETS+=kconfig-frontends +endif diff --git a/misc/buildroot/toolchain/nxflat/Config.in b/misc/buildroot/toolchain/nxflat/Config.in index a977bede1..60299df55 100644 --- a/misc/buildroot/toolchain/nxflat/Config.in +++ b/misc/buildroot/toolchain/nxflat/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_NXFLAT bool "Build NXFLAT tools" default n depends on BR2_arm + select BR2_PACKAGE_BINUTILS help Build tools need to build NuttX NXFLAT load-able binary |