# HG changeset patch # User "Yann E. MORIN" # Date 1252836725 -7200 # Node ID c269520408324f0b840679f404bee156a86055b2 # Parent 4bbffda18b21bc5f131a6d39d116c1891dfd0261# Parent 24dac8b8a9b4125c14ee53c23166adde106767a1 Merge. diff -r 4bbffda18b21 -r c26952040832 config/kernel/linux.in --- a/config/kernel/linux.in Sun Sep 13 11:49:10 2009 +0200 +++ b/config/kernel/linux.in Sun Sep 13 12:12:05 2009 +0200 @@ -77,9 +77,9 @@ prompt "2.6.26.8 (OBSOLETE)" depends on OBSOLETE -config KERNEL_V_2_6_27_31 +config KERNEL_V_2_6_27_33 bool - prompt "2.6.27.31 (long-term stable)" + prompt "2.6.27.33 (long-term stable)" config KERNEL_V_2_6_28_10 bool @@ -137,6 +137,14 @@ bool prompt "2.6.30.5" +config KERNEL_V_2_6_30_6 + bool + prompt "2.6.30.6" + +config KERNEL_V_2_6_31 + bool + prompt "2.6.31" + # CT_INSERT_VERSION_ABOVE # Don't remove above line! @@ -159,7 +167,7 @@ default "2.6.24.7" if KERNEL_V_2_6_24_7 default "2.6.25.20" if KERNEL_V_2_6_25_20 default "2.6.26.8" if KERNEL_V_2_6_26_8 - default "2.6.27.31" if KERNEL_V_2_6_27_31 + default "2.6.27.33" if KERNEL_V_2_6_27_33 default "2.6.28.10" if KERNEL_V_2_6_28_10 default "2.6.29" if KERNEL_V_2_6_29 default "2.6.29.1" if KERNEL_V_2_6_29_1 @@ -174,6 +182,8 @@ default "2.6.30.3" if KERNEL_V_2_6_30_3 default "2.6.30.4" if KERNEL_V_2_6_30_4 default "2.6.30.5" if KERNEL_V_2_6_30_5 + default "2.6.30.6" if KERNEL_V_2_6_30_6 + default "2.6.31" if KERNEL_V_2_6_31 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! help diff -r 4bbffda18b21 -r c26952040832 patches/gcc/4.3.0/380-unbreak-armv4t.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/gcc/4.3.0/380-unbreak-armv4t.patch Sun Sep 13 12:12:05 2009 +0200 @@ -0,0 +1,11 @@ +--- gcc-4.3.2.orig/gcc/config/arm/linux-eabi.h 2009-09-08 23:46:44.000000000 +0200 ++++ gcc-4.3.2/gcc/config/arm/linux-eabi.h 2009-09-08 23:46:51.000000000 +0200 +@@ -44,7 +44,7 @@ + The ARM10TDMI core is the default for armv5t, so set + SUBTARGET_CPU_DEFAULT to achieve this. */ + #undef SUBTARGET_CPU_DEFAULT +-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi ++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi + + /* TARGET_BIG_ENDIAN_DEFAULT is set in + config.gcc for big endian configurations. */ diff -r 4bbffda18b21 -r c26952040832 patches/gcc/4.3.1/360-unbreak-armv4t.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/gcc/4.3.1/360-unbreak-armv4t.patch Sun Sep 13 12:12:05 2009 +0200 @@ -0,0 +1,11 @@ +--- gcc-4.3.2.orig/gcc/config/arm/linux-eabi.h 2009-09-08 23:46:44.000000000 +0200 ++++ gcc-4.3.2/gcc/config/arm/linux-eabi.h 2009-09-08 23:46:51.000000000 +0200 +@@ -44,7 +44,7 @@ + The ARM10TDMI core is the default for armv5t, so set + SUBTARGET_CPU_DEFAULT to achieve this. */ + #undef SUBTARGET_CPU_DEFAULT +-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi ++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi + + /* TARGET_BIG_ENDIAN_DEFAULT is set in + config.gcc for big endian configurations. */ diff -r 4bbffda18b21 -r c26952040832 patches/gcc/4.3.2/390-unbreak-armv4t.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/gcc/4.3.2/390-unbreak-armv4t.patch Sun Sep 13 12:12:05 2009 +0200 @@ -0,0 +1,11 @@ +--- gcc-4.3.2.orig/gcc/config/arm/linux-eabi.h 2009-09-08 23:46:44.000000000 +0200 ++++ gcc-4.3.2/gcc/config/arm/linux-eabi.h 2009-09-08 23:46:51.000000000 +0200 +@@ -44,7 +44,7 @@ + The ARM10TDMI core is the default for armv5t, so set + SUBTARGET_CPU_DEFAULT to achieve this. */ + #undef SUBTARGET_CPU_DEFAULT +-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi ++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi + + /* TARGET_BIG_ENDIAN_DEFAULT is set in + config.gcc for big endian configurations. */ diff -r 4bbffda18b21 -r c26952040832 patches/gcc/4.3.3/390-unbreak-armv4t.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/gcc/4.3.3/390-unbreak-armv4t.patch Sun Sep 13 12:12:05 2009 +0200 @@ -0,0 +1,11 @@ +--- gcc-4.3.2.orig/gcc/config/arm/linux-eabi.h 2009-09-08 23:46:44.000000000 +0200 ++++ gcc-4.3.2/gcc/config/arm/linux-eabi.h 2009-09-08 23:46:51.000000000 +0200 +@@ -44,7 +44,7 @@ + The ARM10TDMI core is the default for armv5t, so set + SUBTARGET_CPU_DEFAULT to achieve this. */ + #undef SUBTARGET_CPU_DEFAULT +-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi ++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi + + /* TARGET_BIG_ENDIAN_DEFAULT is set in + config.gcc for big endian configurations. */ diff -r 4bbffda18b21 -r c26952040832 patches/gcc/4.3.4/390-unbreak-armv4t.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/gcc/4.3.4/390-unbreak-armv4t.patch Sun Sep 13 12:12:05 2009 +0200 @@ -0,0 +1,11 @@ +--- gcc-4.3.2.orig/gcc/config/arm/linux-eabi.h 2009-09-08 23:46:44.000000000 +0200 ++++ gcc-4.3.2/gcc/config/arm/linux-eabi.h 2009-09-08 23:46:51.000000000 +0200 +@@ -44,7 +44,7 @@ + The ARM10TDMI core is the default for armv5t, so set + SUBTARGET_CPU_DEFAULT to achieve this. */ + #undef SUBTARGET_CPU_DEFAULT +-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi ++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi + + /* TARGET_BIG_ENDIAN_DEFAULT is set in + config.gcc for big endian configurations. */