kernel/linux: reorder stuff
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon May 09 19:26:54 2011 +0200 (2011-05-09)
changeset 2446d902cd77419f
parent 2445 7000b634ba04
child 2447 bb73e7632b54
kernel/linux: reorder stuff

Yet another reordering...

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
config/kernel/linux.in
config/kernel/linux.in.2
     1.1 --- a/config/kernel/linux.in	Sun May 08 22:57:57 2011 +0200
     1.2 +++ b/config/kernel/linux.in	Mon May 09 19:26:54 2011 +0200
     1.3 @@ -3,3 +3,200 @@
     1.4  ## select KERNEL_SUPPORTS_SHARED_LIBS
     1.5  ##
     1.6  ## help Build a toolchain targeting systems running Linux as a kernel.
     1.7 +
     1.8 +choice
     1.9 +    bool
    1.10 +    prompt "Get kernel headers from:"
    1.11 +
    1.12 +config KERNEL_LINUX_INSTALL
    1.13 +    bool
    1.14 +    prompt "kernel's 'headers_install'"
    1.15 +    help
    1.16 +      This will make use of the new headers_install rule in recent kernels.
    1.17 +      This is most probably what you want to use.
    1.18 +
    1.19 +config KERNEL_LINUX_USE_CUSTOM_HEADERS
    1.20 +    bool
    1.21 +    prompt "pre-installed headers tree"
    1.22 +    help
    1.23 +      If you have some pre-installed kernel headers lying around, you can
    1.24 +      enter the path to these headers, below, they will be copied from
    1.25 +      there, and into the toolchain's sysroot.
    1.26 +      
    1.27 +      Note:
    1.28 +      This will *not* let you use a complete kernel tree!
    1.29 +      If you want to use your own full kernel tree, then you want to
    1.30 +      say 'Y' to KERNEL_LINUX_INSTALL, above, and select KERNEL_LINUX_CUSTOM.
    1.31 +
    1.32 +endchoice
    1.33 +
    1.34 +if KERNEL_LINUX_INSTALL
    1.35 +
    1.36 +choice
    1.37 +    bool
    1.38 +    prompt "Linux kernel version"
    1.39 +# Don't remove next line
    1.40 +# CT_INSERT_VERSION_BELOW
    1.41 +
    1.42 +config KERNEL_V_2_6_38_4
    1.43 +    bool
    1.44 +    prompt "2.6.38.4"
    1.45 +
    1.46 +config KERNEL_V_2_6_38_3
    1.47 +    bool
    1.48 +    prompt "2.6.38.3"
    1.49 +
    1.50 +config KERNEL_V_2_6_38_2
    1.51 +    bool
    1.52 +    prompt "2.6.38.2"
    1.53 +
    1.54 +config KERNEL_V_2_6_38_1
    1.55 +    bool
    1.56 +    prompt "2.6.38.1"
    1.57 +
    1.58 +config KERNEL_V_2_6_38
    1.59 +    bool
    1.60 +    prompt "2.6.38"
    1.61 +
    1.62 +config KERNEL_V_2_6_37_6
    1.63 +    bool
    1.64 +    prompt "2.6.37.6"
    1.65 +
    1.66 +config KERNEL_V_2_6_36_4
    1.67 +    bool
    1.68 +    prompt "2.6.36.4"
    1.69 +
    1.70 +config KERNEL_V_2_6_35_13
    1.71 +    bool
    1.72 +    prompt "2.6.35.13 (longterm)"
    1.73 +    help
    1.74 +      The Linux 2.6.35 tree is a "longterm" maintenance branch.
    1.75 +      
    1.76 +      It is intended to fill the niche for users who are not using distribution
    1.77 +      kernels but want to use a regression-free kernel for a longer time.
    1.78 +      
    1.79 +      Critical bug fixes to later 2.6 releases are often ported to this branch
    1.80 +      which makes 2.6.35 a very useful base for many embedded developers seeking
    1.81 +      stable APIs or those who do not need the latest bleeding edge features.
    1.82 +      
    1.83 +      ... and no, this kernel has not undergone any specific QA testing.
    1.84 +      
    1.85 +      See the original announcement by Andi Kleen in the following mailing
    1.86 +      list entry:
    1.87 +        http://marc.info/?l=linux-kernel&m=129136895415202&w=4
    1.88 +
    1.89 +config KERNEL_V_2_6_34_9
    1.90 +    bool
    1.91 +    prompt "2.6.34.9"
    1.92 +
    1.93 +config KERNEL_V_2_6_33_12
    1.94 +    bool
    1.95 +    prompt "2.6.33.12"
    1.96 +
    1.97 +config KERNEL_V_2_6_32_39
    1.98 +    bool
    1.99 +    prompt "2.6.32.39 (longterm)"
   1.100 +    help
   1.101 +      The Linux 2.6.32 tree is a "longterm" maintenance branch.
   1.102 +      
   1.103 +      It is intended to fill the niche for users who are not using distribution
   1.104 +      kernels but want to use a regression-free kernel for a longer time.
   1.105 +      
   1.106 +      Critical bug fixes to later 2.6 releases are often ported to this branch
   1.107 +      which makes 2.6.32 a very useful base for many embedded developers seeking
   1.108 +      stable APIs or those who do not need the latest bleeding edge features.
   1.109 +      
   1.110 +      ... and no, this kernel has not undergone any specific QA testing.
   1.111 +      
   1.112 +      See the original announcement by Greg Kroah-Hartman in the following
   1.113 +      mailing list entry:
   1.114 +        http://marc.info/?l=linux-kernel&m=126384198403392&w=4
   1.115 +
   1.116 +config KERNEL_V_2_6_31_14
   1.117 +    bool
   1.118 +    prompt "2.6.31.14"
   1.119 +
   1.120 +config KERNEL_V_2_6_27_58
   1.121 +    bool
   1.122 +    prompt "2.6.27.58 (longterm)"
   1.123 +    help
   1.124 +      The Linux 2.6.27 tree is a "longterm" maintenance branch.
   1.125 +      
   1.126 +      It is intended to fill the niche for users who are not using distribution
   1.127 +      kernels but want to use a regression-free kernel for a longer time.
   1.128 +      
   1.129 +      Critical bug fixes to later 2.6 releases are often ported to this branch
   1.130 +      which makes 2.6.27 a very useful base for many embedded developers seeking
   1.131 +      stable APIs or those who do not need the latest bleeding edge features.
   1.132 +      
   1.133 +      ... and no, this kernel has not undergone any specific QA testing.
   1.134 +      
   1.135 +      See the original announcement by Adrian Bunk in the following mailing list
   1.136 +      entry:
   1.137 +        http://marc.info/?l=linux-kernel&m=122375909403298&w=4
   1.138 +      
   1.139 +      It is now maintained by Greg Kroah-Hartman, see this mailing list entry:
   1.140 +        http://marc.info/?l=linux-kernel&m=129133701916793&w=4
   1.141 +
   1.142 +config KERNEL_LINUX_CUSTOM
   1.143 +    bool
   1.144 +    prompt "custom tarball"
   1.145 +    help
   1.146 +      Use a local tarball of a complete kernel source tree.
   1.147 +
   1.148 +config KERNEL_LINUX_CUSTOM_TARBALL
   1.149 +    string
   1.150 +    prompt "Path to custom tarball"
   1.151 +    depends on KERNEL_LINUX_CUSTOM
   1.152 +    help
   1.153 +      Enter here the path to the tarball of your full kernel tree.
   1.154 +
   1.155 +endchoice
   1.156 +
   1.157 +config KERNEL_VERSION
   1.158 +    string
   1.159 +# Don't remove next line
   1.160 +# CT_INSERT_VERSION_STRING_BELOW
   1.161 +    default "2.6.38.4" if KERNEL_V_2_6_38_4
   1.162 +    default "2.6.38.3" if KERNEL_V_2_6_38_3
   1.163 +    default "2.6.38.2" if KERNEL_V_2_6_38_2
   1.164 +    default "2.6.38.1" if KERNEL_V_2_6_38_1
   1.165 +    default "2.6.38" if KERNEL_V_2_6_38
   1.166 +    default "2.6.37.6" if KERNEL_V_2_6_37_6
   1.167 +    default "2.6.36.4" if KERNEL_V_2_6_36_4
   1.168 +    default "2.6.35.13" if KERNEL_V_2_6_35_13
   1.169 +    default "2.6.34.9" if KERNEL_V_2_6_34_9
   1.170 +    default "2.6.33.12" if KERNEL_V_2_6_33_12
   1.171 +    default "2.6.32.39" if KERNEL_V_2_6_32_39
   1.172 +    default "2.6.31.14" if KERNEL_V_2_6_31_14
   1.173 +    default "2.6.27.58" if KERNEL_V_2_6_27_58
   1.174 +
   1.175 +endif # KERNEL_LINUX_INSTALL
   1.176 +
   1.177 +if KERNEL_LINUX_USE_CUSTOM_HEADERS
   1.178 +
   1.179 +config KERNEL_LINUX_CUSTOM_PATH
   1.180 +    string
   1.181 +    prompt "Path to custom headers directory/tarball"
   1.182 +    help
   1.183 +      See KERNEL_LINUX_CUSTOM_IS_TARBALL, below.
   1.184 +
   1.185 +config KERNEL_LINUX_CUSTOM_IS_TARBALL
   1.186 +    bool
   1.187 +    prompt "This is a tarball"
   1.188 +    default n
   1.189 +    help
   1.190 +      If you say 'n' here, the path above is expected to point to a directory
   1.191 +      containing readily prepared headers
   1.192 +      
   1.193 +      If you say 'y' here, then the path above is expected to point to a
   1.194 +      tarball of such a directory.
   1.195 +      
   1.196 +      Eg., if your headers are available in: /foo/bar/buz/my_hdrs/include,
   1.197 +      say 'n' here, and enter: /foo/bar/buz/my_hdrs below.
   1.198 +      
   1.199 +      Now, passing a tarball around is easier than passing a directory, so
   1.200 +      if you want to, you can make a tarball of /foo/bar/buz/my_hdrs/include,
   1.201 +      say 'y' here, and enter the path to this tarball below.
   1.202 +
   1.203 +endif # KERNEL_LINUX_USE_CUSTOM_HEADERS
     2.1 --- a/config/kernel/linux.in.2	Sun May 08 22:57:57 2011 +0200
     2.2 +++ b/config/kernel/linux.in.2	Mon May 09 19:26:54 2011 +0200
     2.3 @@ -1,174 +1,9 @@
     2.4  # Linux kernel options
     2.5  
     2.6 -choice
     2.7 -    bool
     2.8 -    prompt "Get kernel headers from:"
     2.9 -
    2.10 -config KERNEL_LINUX_INSTALL
    2.11 -    bool
    2.12 -    prompt "kernel's 'headers_install'"
    2.13 -    help
    2.14 -      This will make use of the new headers_install rule in recent kernels.
    2.15 -      This is most probably what you want to use.
    2.16 -
    2.17 -config KERNEL_LINUX_USE_CUSTOM_HEADERS
    2.18 -    bool
    2.19 -    prompt "pre-installed headers tree"
    2.20 -    help
    2.21 -      If you have some pre-installed kernel headers lying around, you can
    2.22 -      enter the path to these headers, below, they will be copied from
    2.23 -      there, and into the toolchain's sysroot.
    2.24 -      
    2.25 -      Note:
    2.26 -      This will *not* let you use a complete kernel tree!
    2.27 -      If you want to use your own full kernel tree, then you want to
    2.28 -      say 'Y' to KERNEL_LINUX_INSTALL, above, and select KERNEL_LINUX_CUSTOM.
    2.29 -
    2.30 -endchoice
    2.31 -
    2.32  if KERNEL_LINUX_INSTALL
    2.33  
    2.34  choice
    2.35      bool
    2.36 -    prompt "Linux kernel version"
    2.37 -# Don't remove next line
    2.38 -# CT_INSERT_VERSION_BELOW
    2.39 -
    2.40 -config KERNEL_V_2_6_38_4
    2.41 -    bool
    2.42 -    prompt "2.6.38.4"
    2.43 -
    2.44 -config KERNEL_V_2_6_38_3
    2.45 -    bool
    2.46 -    prompt "2.6.38.3"
    2.47 -
    2.48 -config KERNEL_V_2_6_38_2
    2.49 -    bool
    2.50 -    prompt "2.6.38.2"
    2.51 -
    2.52 -config KERNEL_V_2_6_38_1
    2.53 -    bool
    2.54 -    prompt "2.6.38.1"
    2.55 -
    2.56 -config KERNEL_V_2_6_38
    2.57 -    bool
    2.58 -    prompt "2.6.38"
    2.59 -
    2.60 -config KERNEL_V_2_6_37_6
    2.61 -    bool
    2.62 -    prompt "2.6.37.6"
    2.63 -
    2.64 -config KERNEL_V_2_6_36_4
    2.65 -    bool
    2.66 -    prompt "2.6.36.4"
    2.67 -
    2.68 -config KERNEL_V_2_6_35_13
    2.69 -    bool
    2.70 -    prompt "2.6.35.13 (longterm)"
    2.71 -    help
    2.72 -      The Linux 2.6.35 tree is a "longterm" maintenance branch.
    2.73 -      
    2.74 -      It is intended to fill the niche for users who are not using distribution
    2.75 -      kernels but want to use a regression-free kernel for a longer time.
    2.76 -      
    2.77 -      Critical bug fixes to later 2.6 releases are often ported to this branch
    2.78 -      which makes 2.6.35 a very useful base for many embedded developers seeking
    2.79 -      stable APIs or those who do not need the latest bleeding edge features.
    2.80 -      
    2.81 -      ... and no, this kernel has not undergone any specific QA testing.
    2.82 -      
    2.83 -      See the original announcement by Andi Kleen in the following mailing
    2.84 -      list entry:
    2.85 -        http://marc.info/?l=linux-kernel&m=129136895415202&w=4
    2.86 -
    2.87 -config KERNEL_V_2_6_34_9
    2.88 -    bool
    2.89 -    prompt "2.6.34.9"
    2.90 -
    2.91 -config KERNEL_V_2_6_33_12
    2.92 -    bool
    2.93 -    prompt "2.6.33.12"
    2.94 -
    2.95 -config KERNEL_V_2_6_32_39
    2.96 -    bool
    2.97 -    prompt "2.6.32.39 (longterm)"
    2.98 -    help
    2.99 -      The Linux 2.6.32 tree is a "longterm" maintenance branch.
   2.100 -      
   2.101 -      It is intended to fill the niche for users who are not using distribution
   2.102 -      kernels but want to use a regression-free kernel for a longer time.
   2.103 -      
   2.104 -      Critical bug fixes to later 2.6 releases are often ported to this branch
   2.105 -      which makes 2.6.32 a very useful base for many embedded developers seeking
   2.106 -      stable APIs or those who do not need the latest bleeding edge features.
   2.107 -      
   2.108 -      ... and no, this kernel has not undergone any specific QA testing.
   2.109 -      
   2.110 -      See the original announcement by Greg Kroah-Hartman in the following
   2.111 -      mailing list entry:
   2.112 -        http://marc.info/?l=linux-kernel&m=126384198403392&w=4
   2.113 -
   2.114 -config KERNEL_V_2_6_31_14
   2.115 -    bool
   2.116 -    prompt "2.6.31.14"
   2.117 -
   2.118 -config KERNEL_V_2_6_27_58
   2.119 -    bool
   2.120 -    prompt "2.6.27.58 (longterm)"
   2.121 -    help
   2.122 -      The Linux 2.6.27 tree is a "longterm" maintenance branch.
   2.123 -      
   2.124 -      It is intended to fill the niche for users who are not using distribution
   2.125 -      kernels but want to use a regression-free kernel for a longer time.
   2.126 -      
   2.127 -      Critical bug fixes to later 2.6 releases are often ported to this branch
   2.128 -      which makes 2.6.27 a very useful base for many embedded developers seeking
   2.129 -      stable APIs or those who do not need the latest bleeding edge features.
   2.130 -      
   2.131 -      ... and no, this kernel has not undergone any specific QA testing.
   2.132 -      
   2.133 -      See the original announcement by Adrian Bunk in the following mailing list
   2.134 -      entry:
   2.135 -        http://marc.info/?l=linux-kernel&m=122375909403298&w=4
   2.136 -      
   2.137 -      It is now maintained by Greg Kroah-Hartman, see this mailing list entry:
   2.138 -        http://marc.info/?l=linux-kernel&m=129133701916793&w=4
   2.139 -
   2.140 -config KERNEL_LINUX_CUSTOM
   2.141 -    bool
   2.142 -    prompt "custom tarball"
   2.143 -    help
   2.144 -      Use a local tarball of a complete kernel source tree.
   2.145 -
   2.146 -config KERNEL_LINUX_CUSTOM_TARBALL
   2.147 -    string
   2.148 -    prompt "Path to custom tarball"
   2.149 -    depends on KERNEL_LINUX_CUSTOM
   2.150 -    help
   2.151 -      Enter here the path to the tarball of your full kernel tree.
   2.152 -
   2.153 -endchoice
   2.154 -
   2.155 -config KERNEL_VERSION
   2.156 -    string
   2.157 -# Don't remove next line
   2.158 -# CT_INSERT_VERSION_STRING_BELOW
   2.159 -    default "2.6.38.4" if KERNEL_V_2_6_38_4
   2.160 -    default "2.6.38.3" if KERNEL_V_2_6_38_3
   2.161 -    default "2.6.38.2" if KERNEL_V_2_6_38_2
   2.162 -    default "2.6.38.1" if KERNEL_V_2_6_38_1
   2.163 -    default "2.6.38" if KERNEL_V_2_6_38
   2.164 -    default "2.6.37.6" if KERNEL_V_2_6_37_6
   2.165 -    default "2.6.36.4" if KERNEL_V_2_6_36_4
   2.166 -    default "2.6.35.13" if KERNEL_V_2_6_35_13
   2.167 -    default "2.6.34.9" if KERNEL_V_2_6_34_9
   2.168 -    default "2.6.33.12" if KERNEL_V_2_6_33_12
   2.169 -    default "2.6.32.39" if KERNEL_V_2_6_32_39
   2.170 -    default "2.6.31.14" if KERNEL_V_2_6_31_14
   2.171 -    default "2.6.27.58" if KERNEL_V_2_6_27_58
   2.172 -
   2.173 -choice
   2.174 -    bool
   2.175      prompt "Kernel verbosity:"
   2.176      default KERNEL_LINUX_VERBOSITY_0
   2.177  
   2.178 @@ -207,31 +42,3 @@
   2.179        here to have an extra check passed onto the headers.
   2.180  
   2.181  endif # KERNEL_LINUX_INSTALL
   2.182 -
   2.183 -if KERNEL_LINUX_USE_CUSTOM_HEADERS
   2.184 -
   2.185 -config KERNEL_LINUX_CUSTOM_IS_TARBALL
   2.186 -    bool
   2.187 -    prompt "This is a tarball"
   2.188 -    default n
   2.189 -    help
   2.190 -      If you say 'n' here, the path below is expected to point to a directory
   2.191 -      containing readily prepared headers
   2.192 -      
   2.193 -      If you say 'y' here, then the path below is expected to point to a
   2.194 -      tarball of such a directory.
   2.195 -      
   2.196 -      Eg., if your headers are available in: /foo/bar/buz/my_hdrs/include,
   2.197 -      say 'n' here, and enter: /foo/bar/buz/my_hdrs below.
   2.198 -      
   2.199 -      Now, passing a tarball around is easier than passing a directory, so
   2.200 -      if you want to, you can make a tarball of /foo/bar/buz/my_hdrs/include,
   2.201 -      say 'y' here, and enter the path to this tarball below.
   2.202 -
   2.203 -config KERNEL_LINUX_CUSTOM_PATH
   2.204 -    string
   2.205 -    prompt "Path to custom headers directory/tarball"
   2.206 -    help
   2.207 -      See KERNEL_LINUX_CUSTOM_IS_TARBALL, above.
   2.208 -
   2.209 -endif # KERNEL_LINUX_USE_CUSTOM_HEADERS