Merge.
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Sep 13 12:12:05 2009 +0200 (2009-09-13)
changeset 1533c26952040832
parent 1532 4bbffda18b21
parent 1527 24dac8b8a9b4
child 1534 d4ddf19a1968
child 1537 a53a5e1d61db
Merge.
     1.1 --- a/config/kernel/linux.in	Sun Sep 13 11:49:10 2009 +0200
     1.2 +++ b/config/kernel/linux.in	Sun Sep 13 12:12:05 2009 +0200
     1.3 @@ -77,9 +77,9 @@
     1.4      prompt "2.6.26.8 (OBSOLETE)"
     1.5      depends on OBSOLETE
     1.6  
     1.7 -config KERNEL_V_2_6_27_31
     1.8 +config KERNEL_V_2_6_27_33
     1.9      bool
    1.10 -    prompt "2.6.27.31 (long-term stable)"
    1.11 +    prompt "2.6.27.33 (long-term stable)"
    1.12  
    1.13  config KERNEL_V_2_6_28_10
    1.14      bool
    1.15 @@ -137,6 +137,14 @@
    1.16      bool
    1.17      prompt "2.6.30.5"
    1.18  
    1.19 +config KERNEL_V_2_6_30_6
    1.20 +    bool
    1.21 +    prompt "2.6.30.6"
    1.22 +
    1.23 +config KERNEL_V_2_6_31
    1.24 +    bool
    1.25 +    prompt "2.6.31"
    1.26 +
    1.27  # CT_INSERT_VERSION_ABOVE
    1.28  # Don't remove above line!
    1.29  
    1.30 @@ -159,7 +167,7 @@
    1.31      default "2.6.24.7" if KERNEL_V_2_6_24_7
    1.32      default "2.6.25.20" if KERNEL_V_2_6_25_20
    1.33      default "2.6.26.8" if KERNEL_V_2_6_26_8
    1.34 -    default "2.6.27.31" if KERNEL_V_2_6_27_31
    1.35 +    default "2.6.27.33" if KERNEL_V_2_6_27_33
    1.36      default "2.6.28.10" if KERNEL_V_2_6_28_10
    1.37      default "2.6.29" if KERNEL_V_2_6_29
    1.38      default "2.6.29.1" if KERNEL_V_2_6_29_1
    1.39 @@ -174,6 +182,8 @@
    1.40      default "2.6.30.3" if KERNEL_V_2_6_30_3
    1.41      default "2.6.30.4" if KERNEL_V_2_6_30_4
    1.42      default "2.6.30.5" if KERNEL_V_2_6_30_5
    1.43 +    default "2.6.30.6" if KERNEL_V_2_6_30_6
    1.44 +    default "2.6.31" if KERNEL_V_2_6_31
    1.45  # CT_INSERT_VERSION_STRING_ABOVE
    1.46  # Don't remove above line!
    1.47      help
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/patches/gcc/4.3.0/380-unbreak-armv4t.patch	Sun Sep 13 12:12:05 2009 +0200
     2.3 @@ -0,0 +1,11 @@
     2.4 +--- gcc-4.3.2.orig/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:44.000000000 +0200
     2.5 ++++ gcc-4.3.2/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:51.000000000 +0200
     2.6 +@@ -44,7 +44,7 @@
     2.7 +    The ARM10TDMI core is the default for armv5t, so set
     2.8 +    SUBTARGET_CPU_DEFAULT to achieve this.  */
     2.9 + #undef  SUBTARGET_CPU_DEFAULT
    2.10 +-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
    2.11 ++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
    2.12 + 
    2.13 + /* TARGET_BIG_ENDIAN_DEFAULT is set in
    2.14 +    config.gcc for big endian configurations.  */
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/patches/gcc/4.3.1/360-unbreak-armv4t.patch	Sun Sep 13 12:12:05 2009 +0200
     3.3 @@ -0,0 +1,11 @@
     3.4 +--- gcc-4.3.2.orig/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:44.000000000 +0200
     3.5 ++++ gcc-4.3.2/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:51.000000000 +0200
     3.6 +@@ -44,7 +44,7 @@
     3.7 +    The ARM10TDMI core is the default for armv5t, so set
     3.8 +    SUBTARGET_CPU_DEFAULT to achieve this.  */
     3.9 + #undef  SUBTARGET_CPU_DEFAULT
    3.10 +-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
    3.11 ++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
    3.12 + 
    3.13 + /* TARGET_BIG_ENDIAN_DEFAULT is set in
    3.14 +    config.gcc for big endian configurations.  */
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/patches/gcc/4.3.2/390-unbreak-armv4t.patch	Sun Sep 13 12:12:05 2009 +0200
     4.3 @@ -0,0 +1,11 @@
     4.4 +--- gcc-4.3.2.orig/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:44.000000000 +0200
     4.5 ++++ gcc-4.3.2/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:51.000000000 +0200
     4.6 +@@ -44,7 +44,7 @@
     4.7 +    The ARM10TDMI core is the default for armv5t, so set
     4.8 +    SUBTARGET_CPU_DEFAULT to achieve this.  */
     4.9 + #undef  SUBTARGET_CPU_DEFAULT
    4.10 +-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
    4.11 ++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
    4.12 + 
    4.13 + /* TARGET_BIG_ENDIAN_DEFAULT is set in
    4.14 +    config.gcc for big endian configurations.  */
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/patches/gcc/4.3.3/390-unbreak-armv4t.patch	Sun Sep 13 12:12:05 2009 +0200
     5.3 @@ -0,0 +1,11 @@
     5.4 +--- gcc-4.3.2.orig/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:44.000000000 +0200
     5.5 ++++ gcc-4.3.2/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:51.000000000 +0200
     5.6 +@@ -44,7 +44,7 @@
     5.7 +    The ARM10TDMI core is the default for armv5t, so set
     5.8 +    SUBTARGET_CPU_DEFAULT to achieve this.  */
     5.9 + #undef  SUBTARGET_CPU_DEFAULT
    5.10 +-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
    5.11 ++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
    5.12 + 
    5.13 + /* TARGET_BIG_ENDIAN_DEFAULT is set in
    5.14 +    config.gcc for big endian configurations.  */
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/patches/gcc/4.3.4/390-unbreak-armv4t.patch	Sun Sep 13 12:12:05 2009 +0200
     6.3 @@ -0,0 +1,11 @@
     6.4 +--- gcc-4.3.2.orig/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:44.000000000 +0200
     6.5 ++++ gcc-4.3.2/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:51.000000000 +0200
     6.6 +@@ -44,7 +44,7 @@
     6.7 +    The ARM10TDMI core is the default for armv5t, so set
     6.8 +    SUBTARGET_CPU_DEFAULT to achieve this.  */
     6.9 + #undef  SUBTARGET_CPU_DEFAULT
    6.10 +-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
    6.11 ++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
    6.12 + 
    6.13 + /* TARGET_BIG_ENDIAN_DEFAULT is set in
    6.14 +    config.gcc for big endian configurations.  */