build: enable MIPS16 again, but make it depend on !gcc-4.6

[openwrt/staging/chunkeey.git] / Config.in

diff --git a/Config.in b/Config.in
index 0ef2f1413d79b365df141646bd6742a7d550421a..2074245758c6b8c578df3c9fc381c932a955dd3f 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -140,18 +140,20 @@ menu "Target Images"
                  Allows you to change the percentage of reserved blocks in the root filesystem
 
        config TARGET_ROOTFS_INCLUDE_KERNEL
-               bool "include kernel in rootfs"
+               bool "Include kernel in root filesystem"
                depends on TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS
                default n if USES_UBIFS
                help
-                 Include the kernel image in the rootfs
+                 Include the kernel image in the rootfs. Typically the image is placed
+                 below /boot.
 
        config TARGET_ROOTFS_INCLUDE_DTB
-               bool "include dtb in rootfs"
+               bool "Include DTB in root filesystem"
                depends on TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS
                default n if USES_UBIFS
                help
-                 Include the device tree blob file in the rootfs
+                 Include the device tree blob file(s) in the rootfs. Typically the DTBs
+                 are placed below /boot.
 
 endmenu
 
@@ -877,6 +879,8 @@ menuconfig TARGET_OPTIONS
        config USE_MIPS16
                bool "Build packages with MIPS16 instructions" if TARGET_OPTIONS
                depends on HAS_MIPS16
+               depends on !GCC_VERSION_4_6
+               default y
                help
                  If your target CPU does support the MIPS16 instruction set
                  and you want to use it for packages, enable this option.