diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | target/device/Atmel/atngw100/atngw100_defconfig | 38 | ||||
| -rw-r--r-- | target/linux/Config.in.advanced | 17 | ||||
| -rw-r--r-- | target/linux/Config.in.versions | 10 |
4 files changed, 33 insertions, 33 deletions
diff --git a/.gitignore b/.gitignore index 4a2de4e24..a50918e29 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ /project_* /toolchain_* /binaries/* +/dl /.auto.deps /.config.cmd /.config.old diff --git a/target/device/Atmel/atngw100/atngw100_defconfig b/target/device/Atmel/atngw100/atngw100_defconfig index f4c5d5b17..aed33a1ec 100644 --- a/target/device/Atmel/atngw100/atngw100_defconfig +++ b/target/device/Atmel/atngw100/atngw100_defconfig @@ -1,9 +1,9 @@ # # Automatically generated make config: don't edit -# Wed Apr 29 16:19:36 2009 +# Fri May 8 00:12:20 2009 # BR2_HAVE_DOT_CONFIG=y -BR2_VERSION="2009.05-svn" +BR2_VERSION="2009.05-rc1" # BR2_alpha is not set # BR2_arm is not set # BR2_armeb is not set @@ -69,8 +69,6 @@ BR2_TARGET_AVR32_ATNGW100=y # Secondary locations # BR2_TARGET_ATMEL_COPYTO="" -BR2_KERNEL_ARCH_PATCH_VERSION="2.6.27.6" -BR2_KERNEL_ARCH_PATCH_DIR="target/device/Atmel/arch-avr32/kernel-patches-$(BR2_KERNEL_ARCH_PATCH_VERSION)" # BR2_TARGET_VALKA is not set # @@ -178,10 +176,10 @@ BR2_EXT_UCLIBC_VERSION_0_9_30=y # BR2_KERNEL_HEADERS_2_6_25 is not set # BR2_KERNEL_HEADERS_2_6_26 is not set # BR2_KERNEL_HEADERS_2_6_27 is not set -BR2_KERNEL_HEADERS_2_6_28=y -# BR2_KERNEL_HEADERS_2_6_29 is not set +# BR2_KERNEL_HEADERS_2_6_28 is not set +BR2_KERNEL_HEADERS_2_6_29=y # BR2_KERNEL_HEADERS_SNAP is not set -BR2_DEFAULT_KERNEL_HEADERS="2.6.28.9" +BR2_DEFAULT_KERNEL_HEADERS="2.6.29.2" # # uClibc Options @@ -246,14 +244,11 @@ BR2_GCC_SHARED_LIBGCC=y # BR2_PACKAGE_GDB is not set BR2_PACKAGE_GDB_SERVER=y BR2_PACKAGE_GDB_HOST=y -# BR2_GDB_VERSION_6_2_1 is not set -# BR2_GDB_VERSION_6_3 is not set # BR2_GDB_VERSION_6_4 is not set # BR2_GDB_VERSION_6_5 is not set # BR2_GDB_VERSION_6_6 is not set BR2_GDB_VERSION_6_7_1=y # BR2_GDB_VERSION_6_8 is not set -# BR2_GDB_VERSION_SNAPSHOT is not set BR2_GDB_VERSION="6.7.1" # @@ -360,6 +355,7 @@ BR2_PACKAGE_LIBICONV=y # BR2_PACKAGE_NG_SPICE_REWORK is not set # BR2_PACKAGE_POPT is not set # BR2_PACKAGE_SCREEN is not set +# BR2_PACKAGE_SHARED_MIME_INFO is not set # BR2_PACKAGE_STARTUP_NOTIFICATION is not set BR2_PACKAGE_STRACE=y # BR2_PACKAGE_SUDO is not set @@ -534,10 +530,7 @@ BR2_PACKAGE_MTD_MTD_DEBUG=y # BR2_PACKAGE_MTD_NFTL_FORMAT is not set # BR2_PACKAGE_MTD_NFTLDUMP is not set # BR2_PACKAGE_MTD_SUMTOOL is not set - -# -# ntfs-3g requires a toolchain with LARGEFILE and WCHAR support -# +# BR2_PACKAGE_NTFS_3G is not set # BR2_PACKAGE_PCIUTILS is not set # BR2_PACKAGE_PCMCIA is not set # BR2_PACKAGE_SETSERIAL is not set @@ -652,6 +645,7 @@ BR2_PACKAGE_LIBGLIB2=y # dillo - disabled (requires jpeg,libglib12,libgtk12,zlib,libpng and Xorg(7)) # # BR2_PACKAGE_GQVIEW is not set +# BR2_PACKAGE_GOB2 is not set # BR2_PACKAGE_LEAFPAD is not set # @@ -809,7 +803,8 @@ BR2_KERNEL_LINUX_ADVANCED=y BR2_PACKAGE_LINUX=y BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-2.6.27.config" BR2_PACKAGE_LINUX_FORMAT="uImage" -BR2_KERNEL_CURRENT_VERSION="2.6.28.7" +BR2_KERNEL_CURRENT_VERSION="2.6.29.2" +BR2_KERNEL_LATEST_2_6_29="2" BR2_KERNEL_LATEST_2_6_28="7" BR2_KERNEL_LATEST_2_6_27="13" BR2_KERNEL_LATEST_2_6_26="8" @@ -819,16 +814,16 @@ BR2_KERNEL_LATEST_2_6_23="17" BR2_KERNEL_LATEST_2_6_22="19" BR2_KERNEL_LATEST_2_6_21="7" BR2_KERNEL_LATEST_2_6_20="21" -BR2_KERNEL_PATCH_LEVEL="13" -BR2_KERNEL_NEXT_VERSION="2.6.28" -BR2_KERNEL_THIS_VERSION="2.6.27" +BR2_KERNEL_PATCH_LEVEL="2" +BR2_KERNEL_THIS_VERSION="2.6.29" BR2_KERNEL_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6" BR2_MM_PATCH_SITE="http://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6" BR2_RC_MM_PATCH_DIR="$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)/2.6.$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)-mm$(BR2_KERNEL_MM_LEVEL)" BR2_KERNEL_PATCH_SITE="$(BR2_KERNEL_SITE)" # BR2_LINUX_2_6_STABLE is not set +BR2_LINUX_2_6_29=y # BR2_LINUX_2_6_28 is not set -BR2_LINUX_2_6_27=y +# BR2_LINUX_2_6_27 is not set # BR2_LINUX_2_6_26 is not set # BR2_LINUX_2_6_25 is not set # BR2_LINUX_2_6_24 is not set @@ -836,7 +831,6 @@ BR2_LINUX_2_6_27=y # BR2_LINUX_2_6_22 is not set # BR2_LINUX_2_6_21 is not set # BR2_LINUX_2_6_20 is not set -# BR2_LINUX_2_6_29 is not set # BR2_LINUX26_CUSTOM is not set # @@ -853,9 +847,9 @@ BR2_KERNEL_ADD_LATEST_MINORPATCH=y # BR2_KERNEL_ADD_LATEST_MM_PATCH is not set # BR2_KERNEL_ADD_MM_PATCH is not set BR2_KERNEL_ADD_PATCH=y -BR2_KERNEL_ARCH_PATCH_ENABLED=y +# BR2_KERNEL_ARCH_PATCH_ENABLED is not set # BR2_ARCH_AVR32_2_6_28_2 is not set -BR2_ARCH_AVR32_2_6_27_6=y +# BR2_ARCH_AVR32_2_6_27_6 is not set BR2_LINUX_BSP_PATCH="" BR2_KERNEL_PATCH="patch-$(BR2_DOWNLOAD_LINUX26_VERSION).$(BR2_KERNEL_PATCH_LEVEL).bz2" BR2_EXTRA_VERSION=".$(BR2_KERNEL_PATCH_LEVEL)" diff --git a/target/linux/Config.in.advanced b/target/linux/Config.in.advanced index c4118c05d..de54d0392 100644 --- a/target/linux/Config.in.advanced +++ b/target/linux/Config.in.advanced @@ -33,6 +33,7 @@ source "target/linux/Config.in.versions" config BR2_KERNEL_PATCH_LEVEL string + default $(BR2_KERNEL_LATEST_2_6_29) if BR2_LINUX_2_6_29 && BR2_KERNEL_ADD_LATEST_MINORPATCH default $(BR2_KERNEL_LATEST_2_6_28) if BR2_LINUX_2_6_28 && BR2_KERNEL_ADD_LATEST_MINORPATCH default $(BR2_KERNEL_LATEST_2_6_27) if BR2_LINUX_2_6_27 && BR2_KERNEL_ADD_LATEST_MINORPATCH default $(BR2_KERNEL_LATEST_2_6_26) if BR2_LINUX_2_6_26 && BR2_KERNEL_ADD_LATEST_MINORPATCH @@ -127,8 +128,12 @@ choice Select the specific Linux version you want to use config BR2_LINUX_2_6_STABLE - bool "The latest stable Linux kernel (2.6.28.2)" + bool "The latest stable Linux kernel (2.6.29.2)" +config BR2_LINUX_2_6_29 + bool "Linux 2.6.29" + select BR2_KERNEL_BASE + config BR2_LINUX_2_6_28 bool "Linux 2.6.28" select BR2_KERNEL_BASE @@ -165,10 +170,6 @@ config BR2_LINUX_2_6_20 bool "Linux 2.6.20" select BR2_KERNEL_BASE -config BR2_LINUX_2_6_29 - bool "Linux 2.6.29" - select BR2_KERNEL_BASE - config BR2_LINUX26_CUSTOM bool "Linux <custom> version" @@ -177,19 +178,19 @@ endchoice if BR2_LINUX26_CUSTOM config BR2_CUSTOM_DOWNLOAD_LINUX26_VERSION string "Linux Tarball version" - default "2.6.28" + default "2.6.30" help Specify any .tar.bz2 file config BR2_CUSTOM_LINUX26_VERSION string "Linux Version" - default "2.6.29-rc2" + default "2.6.30" help Specify what the linux version will be called config BR2_CUSTOM_LINUX26_PATCH string "patch name" - default "patch-2.6.29-rc2.bz2" + default "patch-2.6.30-rc4.bz2" help Specify a patch to be downloaded diff --git a/target/linux/Config.in.versions b/target/linux/Config.in.versions index caacfae38..467f73cdf 100644 --- a/target/linux/Config.in.versions +++ b/target/linux/Config.in.versions @@ -5,13 +5,13 @@ config LINUX26_LATEST_RC_VERSION string - default "2.6.29-rc2" if BR2_KERNEL_ADD_LATEST_RC_PATCH + default "2.6.30-rc4" if BR2_KERNEL_ADD_LATEST_RC_PATCH help Not really available as of 20090103 config LINUX26_LATEST_GIT_VERSION string - default "2.6.29-rc2-git1" if BR2_KERNEL_ADD_LATEST_SNAPSHOT + default "2.6.30-rc4-git4" if BR2_KERNEL_ADD_LATEST_SNAPSHOT config LINUX26_LATEST_MM_VERSION string @@ -19,10 +19,14 @@ config LINUX26_LATEST_MM_VERSION config BR2_KERNEL_CURRENT_VERSION string - default "2.6.28.7" + default "2.6.29.2" help This is the latest stable kernel (including minor version) +config BR2_KERNEL_LATEST_2_6_29 + string + default "2" + config BR2_KERNEL_LATEST_2_6_28 string default "7" |