summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-06-11 02:09:00 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-14 15:22:55 +0100
commit1d3cc59b8716cb1225461b3540967836a2779f00 (patch)
tree48cf75f9a5fae4552b35201f6a2e0aee1b9afc2c /meta
parent8f9d5d625931889b66dfc0d6744f3077d6775286 (diff)
downloadpoky-1d3cc59b8716cb1225461b3540967836a2779f00.tar.gz
uclibc: Cleanup the machine dependent config files
We only have arch specific machine fragments now. Introduce use of KCONFIG_ALLCONFIG and use allnoconfig (From OE-Core rev: b87df62a0bb402a1b1dbdee182c1ffd2787979bf) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/armv5te/uClibc.machine4
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/armv5teb/uClibc.machine (renamed from meta/recipes-core/uclibc/uclibc-git/nslu2be/uClibc.machine)0
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/efika/uClibc.machine45
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/mips/uClibc.machine (renamed from meta/recipes-core/uclibc/uclibc-git/qemumips/uClibc.machine)0
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/qemuarm/uClibc.machine77
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/qemux86/uClibc.machine59
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/uClibc.config0
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/uClibc.distro14
-rw-r--r--meta/recipes-core/uclibc/uclibc.inc5
-rw-r--r--meta/recipes-core/uclibc/uclibc_git.bb1
10 files changed, 17 insertions, 188 deletions
diff --git a/meta/recipes-core/uclibc/uclibc-git/armv5te/uClibc.machine b/meta/recipes-core/uclibc/uclibc-git/armv5te/uClibc.machine
index b012a38c94..2242dc94d6 100644
--- a/meta/recipes-core/uclibc/uclibc-git/armv5te/uClibc.machine
+++ b/meta/recipes-core/uclibc/uclibc-git/armv5te/uClibc.machine
@@ -38,14 +38,14 @@ FORCE_OPTIONS_FOR_ARCH=y
38CONFIG_ARM_EABI=y 38CONFIG_ARM_EABI=y
39# COMPILE_IN_THUMB_MODE is not set 39# COMPILE_IN_THUMB_MODE is not set
40USE_BX=y 40USE_BX=y
41CONFIG_GENERIC_ARM=y 41# CONFIG_GENERIC_ARM is not set
42# CONFIG_ARM610 is not set 42# CONFIG_ARM610 is not set
43# CONFIG_ARM710 is not set 43# CONFIG_ARM710 is not set
44# CONFIG_ARM7TDMI is not set 44# CONFIG_ARM7TDMI is not set
45# CONFIG_ARM720T is not set 45# CONFIG_ARM720T is not set
46# CONFIG_ARM920T is not set 46# CONFIG_ARM920T is not set
47# CONFIG_ARM922T is not set 47# CONFIG_ARM922T is not set
48# CONFIG_ARM926T is not set 48CONFIG_ARM926T=y
49# CONFIG_ARM10T is not set 49# CONFIG_ARM10T is not set
50# CONFIG_ARM1136JF_S is not set 50# CONFIG_ARM1136JF_S is not set
51# CONFIG_ARM1176JZ_S is not set 51# CONFIG_ARM1176JZ_S is not set
diff --git a/meta/recipes-core/uclibc/uclibc-git/nslu2be/uClibc.machine b/meta/recipes-core/uclibc/uclibc-git/armv5teb/uClibc.machine
index 6b07dd5162..6b07dd5162 100644
--- a/meta/recipes-core/uclibc/uclibc-git/nslu2be/uClibc.machine
+++ b/meta/recipes-core/uclibc/uclibc-git/armv5teb/uClibc.machine
diff --git a/meta/recipes-core/uclibc/uclibc-git/efika/uClibc.machine b/meta/recipes-core/uclibc/uclibc-git/efika/uClibc.machine
deleted file mode 100644
index 5ed7b517a3..0000000000
--- a/meta/recipes-core/uclibc/uclibc-git/efika/uClibc.machine
+++ /dev/null
@@ -1,45 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Wed Dec 20 11:05:48 2006
4#
5# TARGET_alpha is not set
6# TARGET_arm is not set
7# TARGET_bfin is not set
8# TARGET_cris is not set
9# TARGET_e1 is not set
10# TARGET_frv is not set
11# TARGET_h8300 is not set
12# TARGET_hppa is not set
13# TARGET_i386 is not set
14# TARGET_i960 is not set
15# TARGET_ia64 is not set
16# TARGET_m68k is not set
17# TARGET_microblaze is not set
18# TARGET_mips is not set
19# TARGET_nios is not set
20# TARGET_nios2 is not set
21TARGET_powerpc=y
22# TARGET_sh is not set
23# TARGET_sh64 is not set
24# TARGET_sparc is not set
25# TARGET_v850 is not set
26# TARGET_vax is not set
27# TARGET_x86_64 is not set
28
29#
30# Target Architecture Features and Options
31#
32TARGET_ARCH="powerpc"
33FORCE_OPTIONS_FOR_ARCH=y
34ARCH_BIG_ENDIAN=y
35
36#
37# Using Big Endian
38#
39ARCH_HAS_MMU=y
40ARCH_USE_MMU=y
41UCLIBC_HAS_FLOATS=y
42UCLIBC_HAS_FPU=y
43DO_C99_MATH=y
44KERNEL_HEADERS="<path/to/kernel/headers>"
45HAVE_DOT_CONFIG=y
diff --git a/meta/recipes-core/uclibc/uclibc-git/qemumips/uClibc.machine b/meta/recipes-core/uclibc/uclibc-git/mips/uClibc.machine
index 1cf1addca9..1cf1addca9 100644
--- a/meta/recipes-core/uclibc/uclibc-git/qemumips/uClibc.machine
+++ b/meta/recipes-core/uclibc/uclibc-git/mips/uClibc.machine
diff --git a/meta/recipes-core/uclibc/uclibc-git/qemuarm/uClibc.machine b/meta/recipes-core/uclibc/uclibc-git/qemuarm/uClibc.machine
deleted file mode 100644
index 2242dc94d6..0000000000
--- a/meta/recipes-core/uclibc/uclibc-git/qemuarm/uClibc.machine
+++ /dev/null
@@ -1,77 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Version: 0.9.32-git
4# Mon Jul 19 01:34:29 2010
5#
6# TARGET_alpha is not set
7TARGET_arm=y
8# TARGET_avr32 is not set
9# TARGET_bfin is not set
10# TARGET_cris is not set
11# TARGET_e1 is not set
12# TARGET_frv is not set
13# TARGET_h8300 is not set
14# TARGET_hppa is not set
15# TARGET_i386 is not set
16# TARGET_i960 is not set
17# TARGET_ia64 is not set
18# TARGET_m68k is not set
19# TARGET_microblaze is not set
20# TARGET_mips is not set
21# TARGET_nios is not set
22# TARGET_nios2 is not set
23# TARGET_powerpc is not set
24# TARGET_sh is not set
25# TARGET_sh64 is not set
26# TARGET_sparc is not set
27# TARGET_v850 is not set
28# TARGET_vax is not set
29# TARGET_x86_64 is not set
30# TARGET_xtensa is not set
31
32#
33# Target Architecture Features and Options
34#
35TARGET_ARCH="arm"
36FORCE_OPTIONS_FOR_ARCH=y
37# CONFIG_ARM_OABI is not set
38CONFIG_ARM_EABI=y
39# COMPILE_IN_THUMB_MODE is not set
40USE_BX=y
41# CONFIG_GENERIC_ARM is not set
42# CONFIG_ARM610 is not set
43# CONFIG_ARM710 is not set
44# CONFIG_ARM7TDMI is not set
45# CONFIG_ARM720T is not set
46# CONFIG_ARM920T is not set
47# CONFIG_ARM922T is not set
48CONFIG_ARM926T=y
49# CONFIG_ARM10T is not set
50# CONFIG_ARM1136JF_S is not set
51# CONFIG_ARM1176JZ_S is not set
52# CONFIG_ARM1176JZF_S is not set
53# CONFIG_ARM_CORTEX_M3 is not set
54# CONFIG_ARM_CORTEX_M1 is not set
55# CONFIG_ARM_SA110 is not set
56# CONFIG_ARM_SA1100 is not set
57# CONFIG_ARM_XSCALE is not set
58# CONFIG_ARM_IWMMXT is not set
59TARGET_SUBARCH=""
60
61#
62# Using ELF file format
63#
64ARCH_ANY_ENDIAN=y
65ARCH_LITTLE_ENDIAN=y
66# ARCH_WANTS_BIG_ENDIAN is not set
67ARCH_WANTS_LITTLE_ENDIAN=y
68ARCH_HAS_MMU=y
69ARCH_USE_MMU=y
70UCLIBC_HAS_FLOATS=y
71# UCLIBC_HAS_FPU is not set
72UCLIBC_HAS_SOFT_FLOAT=y
73DO_C99_MATH=y
74# DO_XSI_MATH is not set
75# UCLIBC_HAS_FENV is not set
76KERNEL_HEADERS="/usr/include"
77HAVE_DOT_CONFIG=y
diff --git a/meta/recipes-core/uclibc/uclibc-git/qemux86/uClibc.machine b/meta/recipes-core/uclibc/uclibc-git/qemux86/uClibc.machine
deleted file mode 100644
index 3909ccc9e1..0000000000
--- a/meta/recipes-core/uclibc/uclibc-git/qemux86/uClibc.machine
+++ /dev/null
@@ -1,59 +0,0 @@
1#
2# Automatically generated make config: don't edit
3#
4# TARGET_alpha is not set
5# TARGET_arm is not set
6# TARGET_bfin is not set
7# TARGET_cris is not set
8# TARGET_e1 is not set
9# TARGET_frv is not set
10# TARGET_h8300 is not set
11# TARGET_hppa is not set
12TARGET_i386=y
13# TARGET_i960 is not set
14# TARGET_m68k is not set
15# TARGET_microblaze is not set
16# TARGET_mips is not set
17# TARGET_nios is not set
18# TARGET_nios2 is not set
19# TARGET_powerpc is not set
20# TARGET_sh is not set
21# TARGET_sh64 is not set
22# TARGET_sparc is not set
23# TARGET_v850 is not set
24# TARGET_x86_64 is not set
25
26#
27# Target Architecture Features and Options
28#
29TARGET_ARCH="i386"
30# ARCH_SUPPORTS_BIG_ENDIAN is not set
31ARCH_SUPPORTS_LITTLE_ENDIAN=y
32FORCE_OPTIONS_FOR_ARCH=y
33# CONFIG_GENERIC_386 is not set
34# CONFIG_386 is not set
35# CONFIG_486 is not set
36# CONFIG_586 is not set
37# CONFIG_586MMX is not set
38# CONFIG_686 is not set
39# CONFIG_PENTIUMII is not set
40# CONFIG_PENTIUMIII is not set
41CONFIG_PENTIUM4=y
42# CONFIG_K6 is not set
43# CONFIG_K7 is not set
44# CONFIG_ELAN is not set
45# CONFIG_CRUSOE is not set
46# CONFIG_WINCHIPC6 is not set
47# CONFIG_WINCHIP2 is not set
48# CONFIG_CYRIXIII is not set
49# CONFIG_NEHEMIAH is not set
50ARCH_LITTLE_ENDIAN=y
51# ARCH_BIG_ENDIAN is not set
52# ARCH_HAS_NO_MMU is not set
53ARCH_HAS_MMU=y
54UCLIBC_HAS_FLOATS=y
55UCLIBC_HAS_FPU=y
56DO_C99_MATH=y
57# UCLIBC_HAS_FENV is not set
58KERNEL_HEADERS="<path/to/kernel/headers>"
59HAVE_DOT_CONFIG=y
diff --git a/meta/recipes-core/uclibc/uclibc-git/uClibc.config b/meta/recipes-core/uclibc/uclibc-git/uClibc.config
deleted file mode 100644
index e69de29bb2..0000000000
--- a/meta/recipes-core/uclibc/uclibc-git/uClibc.config
+++ /dev/null
diff --git a/meta/recipes-core/uclibc/uclibc-git/uClibc.distro b/meta/recipes-core/uclibc/uclibc-git/uClibc.distro
index a1b7813a0b..45b131d1f0 100644
--- a/meta/recipes-core/uclibc/uclibc-git/uClibc.distro
+++ b/meta/recipes-core/uclibc/uclibc-git/uClibc.distro
@@ -157,4 +157,16 @@ WARNINGS="-Wall"
157DO_C99_MATH=y 157DO_C99_MATH=y
158UCLIBC_HAS_LONG_DOUBLE_MATH=y 158UCLIBC_HAS_LONG_DOUBLE_MATH=y
159UCLIBC_HAS_FENV=y 159UCLIBC_HAS_FENV=y
160 160UCLIBC_LINUX_SPECIFIC=y
161UCLIBC_HAS_REALTIME=y
162UCLIBC_HAS_ADVANCED_REALTIME=y
163UCLIBC_HAS_NETWORK_SUPPORT=y
164UCLIBC_HAS_SOCKET=y
165UCLIBC_HAS_BSD_ERR=y
166UCLIBC_HAS_SYSLOG=y
167UCLIBC_HAS_CRYPT=y
168UCLIBC_HAS_CRYPT_IMPL=y
169UCLIBC_HAS_GNU_ERROR=y
170UCLIBC_HAS_PTY=y
171UCLIBC_BSD_SPECIFIC=y
172UCLIBC_HAS_EPOLL=y
diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc
index c1bc42264e..15d4e52708 100644
--- a/meta/recipes-core/uclibc/uclibc.inc
+++ b/meta/recipes-core/uclibc/uclibc.inc
@@ -202,12 +202,11 @@ do_configure() {
202 echo "### FPU" >>${S}/merged.config 202 echo "### FPU" >>${S}/merged.config
203 echo "### ABI" >>${S}/merged.config 203 echo "### ABI" >>${S}/merged.config
204 echo "### DISTRO FEATURES" >>${S}/merged.config 204 echo "### DISTRO FEATURES" >>${S}/merged.config
205 cp ${S}/merged.config ${S}/.config
206 205
207 # Mangle the resulting .config depending on OE variables 206 # Mangle the resulting .config depending on OE variables
208 sed -i -e '${configmangle}' ${S}/.config 207 sed -i -e '${configmangle}' ${S}/merged.config
209 208
210 oe_runmake oldconfig 209 oe_runmake KCONFIG_ALLCONFIG=${S}/merged.config allnoconfig
211} 210}
212 211
213do_install() { 212do_install() {
diff --git a/meta/recipes-core/uclibc/uclibc_git.bb b/meta/recipes-core/uclibc/uclibc_git.bb
index eded2fbd8f..6c88513bc6 100644
--- a/meta/recipes-core/uclibc/uclibc_git.bb
+++ b/meta/recipes-core/uclibc/uclibc_git.bb
@@ -10,7 +10,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
10FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-git' ], d)}" 10FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-git' ], d)}"
11 11
12SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \ 12SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \
13 file://uClibc.config \
14 file://uClibc.machine \ 13 file://uClibc.machine \
15 file://uClibc.distro \ 14 file://uClibc.distro \
16 file://uclibc-arm-ftruncate64.patch \ 15 file://uclibc-arm-ftruncate64.patch \