diff options
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Config.in | 20 | ||||
| -rw-r--r-- | linux/linux.mk | 14 |
2 files changed, 20 insertions, 14 deletions
diff --git a/linux/Config.in b/linux/Config.in index 3909f89dd..1e015b7fc 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -19,10 +19,10 @@ if BR2_LINUX_KERNEL # choice prompt "Kernel version" - default BR2_LINUX_KERNEL_2_6_34 + default BR2_LINUX_KERNEL_2_6_35 -config BR2_LINUX_KERNEL_2_6_34 - bool "2.6.34" +config BR2_LINUX_KERNEL_2_6_35 + bool "2.6.35.6" config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "Same as toolchain kernel headers" @@ -52,7 +52,7 @@ endchoice config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE string "Kernel version" depends on BR2_LINUX_KERNEL_CUSTOM_VERSION - default "2.6.34" + default "2.6.35.6" config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION string "URL of custom kernel tarball" @@ -60,7 +60,7 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION config BR2_LINUX_KERNEL_VERSION string - default "2.6.34.1" if BR2_LINUX_KERNEL_2_6_34 + default "2.6.35.6" if BR2_LINUX_KERNEL_2_6_35 default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL @@ -111,20 +111,22 @@ config BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE choice prompt "Kernel binary format" - default BR2_LINUX_KERNEL_UIMAGE if !BR2_i386 && !BR2_x86_64 - default BR2_LINUX_KERNEL_BZIMAGE if BR2_i386 || BR2_x86_64 config BR2_LINUX_KERNEL_UIMAGE bool "uImage" + depends on BR2_arm || BR2_armeb || BR2_powerpc || BR2_avr32 || BR2_sh || BR2_sh64 config BR2_LINUX_KERNEL_BZIMAGE bool "bzImage" + depends on BR2_i386 || BR2_x86_64 config BR2_LINUX_KERNEL_ZIMAGE bool "zImage" + depends on BR2_arm || BR2_armeb || BR2_powerpc || BR2_sparc || BR2_sh || BR2_sh64 || BR2_xtensa -config BR2_LINUX_KERNEL_VMLINUX - bool "vmlinux" +config BR2_LINUX_KERNEL_VMLINUX_BIN + bool "vmlinux.bin" + depends on BR2_mips || BR2_mipsel || BR2_sh || BR2_sh64 endchoice diff --git a/linux/linux.mk b/linux/linux.mk index 3fc259c22..55dc2bfe8 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -38,11 +38,15 @@ else ifeq ($(BR2_LINUX_KERNEL_BZIMAGE),y) LINUX26_IMAGE_NAME=bzImage else ifeq ($(BR2_LINUX_KERNEL_ZIMAGE),y) LINUX26_IMAGE_NAME=zImage -else ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y) +else ifeq ($(BR2_LINUX_KERNEL_VMLINUX_BIN),y) LINUX26_IMAGE_NAME=vmlinux.bin endif +ifeq ($(KERNEL_ARCH),avr32) +LINUX26_IMAGE_PATH=$(LINUX26_DIR)/arch/$(KERNEL_ARCH)/boot/images/$(LINUX26_IMAGE_NAME) +else LINUX26_IMAGE_PATH=$(LINUX26_DIR)/arch/$(KERNEL_ARCH)/boot/$(LINUX26_IMAGE_NAME) +endif # Download $(LINUX26_DIR)/.stamp_downloaded: @@ -104,9 +108,6 @@ ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y) $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD,$(@D)/.config) $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"$(BINARIES_DIR)/rootfs.initramfs\",$(@D)/.config) $(call KCONFIG_ENABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_GZIP,$(@D)/.config) -else - $(call KCONFIG_DISABLE_OPT,CONFIG_BLK_DEV_INITRD,$(@D)/.config) - $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"\",$(@D)/.config) endif $(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) oldconfig $(Q)touch $@ @@ -162,6 +163,7 @@ TARGETS+=linux26 endif # Checks to give errors that the user can understand +ifeq ($(filter source,$(MAKECMDGOALS)),) ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y) ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG)),) $(error No kernel defconfig name specified, check your BR2_LINUX_KERNEL_DEFCONFIG setting) @@ -172,4 +174,6 @@ ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG),y) ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)),) $(error No kernel configuration file specified, check your BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE setting) endif -endif
\ No newline at end of file +endif + +endif |