diff options
| -rw-r--r-- | target/device/Config.in | 30 | ||||
| -rw-r--r-- | target/device/x86/i386/Makefile.in | 12 | ||||
| -rw-r--r-- | toolchain/gcc/Config.in | 2 | ||||
| -rw-r--r-- | toolchain/kernel-headers/Config.in | 6 |
4 files changed, 45 insertions, 5 deletions
diff --git a/target/device/Config.in b/target/device/Config.in index 15abad8f6..cbad6fd6b 100644 --- a/target/device/Config.in +++ b/target/device/Config.in @@ -11,6 +11,36 @@ config BR2_PACKAGE_LINUX kernel headers are just that (headers) and not full kernels. This is a feature. +config BR2_PACKAGE_LINUX_KCONFIG + string ".config file" + depends on BR2_PACKAGE_LINUX + default "" + help + kernel's .config to use to build a kernel for the target. + + If the above setting is empty, you can change the default + board-imposed value by passing LINUX26_KCONFIG=<path> to + make. + +config BR2_PACKAGE_LINUX_FORMAT + string "kernel binary format" + depends on BR2_PACKAGE_LINUX + default "" + help + kernel binary format. + Popular values include: + - bzImage + - zImage + and other, architecture dependant formats. + + Note that the default format is supposed to be set by your + board-description, if any. + i386 and compatible default to bzImage if nothing was given + above. + If the above setting is empty, you can change the default + board-imposed value by passing LINUX26_FORMAT=<string> to + make. + source "target/device/AMD/Config.in" source "target/device/Arm/Config.in" source "target/device/Atmel/Config.in" diff --git a/target/device/x86/i386/Makefile.in b/target/device/x86/i386/Makefile.in index 876304b7e..08ae1b1a2 100644 --- a/target/device/x86/i386/Makefile.in +++ b/target/device/x86/i386/Makefile.in @@ -1,7 +1,17 @@ BR2_BOARD_PATH:=target/device/x86/i386 +ifeq ($(strip $(BR2_PACKAGE_LINUX_KCONFIG)),) ifndef LINUX26_KCONFIG LINUX26_KCONFIG=$(BR2_BOARD_PATH)/linux26.config endif -LINUX26_FORMAT=bzImage +else +LINUX26_KCONFIG=$(strip $(BR2_PACKAGE_LINUX_KCONFIG)) +endif +ifeq ($(strip $(BR2_PACKAGE_LINUX_FORMAT)),) +ifndef LINUX26_FORMAT +LINUX26_FORMAT=bzImage +endif +else +LINUX26_FORMAT=$(strip $(BR2_PACKAGE_LINUX_FORMAT)) +endif diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index f28a365aa..f834ed314 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -4,7 +4,7 @@ comment "Gcc Options" choice prompt "GCC compiler Version" - default BR2_GCC_VERSION_3_4_6 + default BR2_GCC_VERSION_4_1_2 help Select the version of gcc you wish to use. diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in index 8af18e10c..76e0858c1 100644 --- a/toolchain/kernel-headers/Config.in +++ b/toolchain/kernel-headers/Config.in @@ -6,7 +6,7 @@ comment "Kernel Header Options" choice prompt "Kernel Headers" - default BR2_KERNEL_HEADERS_2_4_31 + default BR2_KERNEL_HEADERS_2_6_20 help Select the version of kernel header files you wish to use. You must select the correct set of header files to match @@ -25,7 +25,7 @@ choice bool "Linux 2.4.29 kernel headers" config BR2_KERNEL_HEADERS_2_4_31 - depends !BR2_nios2 + depends !BR2_nios2 && BR2_DEPRECATED bool "Linux 2.4.31 kernel headers" config BR2_KERNEL_HEADERS_2_6_9 @@ -37,7 +37,7 @@ choice bool "Linux 2.6.11 kernel headers" config BR2_KERNEL_HEADERS_2_6_12 - depends !BR2_nios2 + depends !BR2_nios2 && BR2_DEPRECATED bool "Linux 2.6.12 kernel headers" config BR2_KERNEL_HEADERS_2_6_19_2 |