summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2009-11-06 11:36:17 +0000
committerGraeme Gregory <dp@xora.org.uk>2009-11-06 11:36:17 +0000
commitaab18585dd7249dce9bff26f8e2d48fb1de3e1d7 (patch)
treea421659e4457b9d2b7ef5d9c86d08d027f182155 /conf
parent654b4ac743061b15e0ed9ee8652d4462221b644d (diff)
parentbc6d9ef31bd6590071c1dfb5e18bbceb22e4ad09 (diff)
Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
-rw-r--r--conf/checksums.ini4
-rw-r--r--conf/machine/geodegx.conf10
-rw-r--r--conf/machine/geodelx.conf4
3 files changed, 12 insertions, 6 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index ae4896cdf2..131215d21a 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -16954,6 +16954,10 @@ sha256=d7b9f19b92fd5c693c16cd62f441d051b699f28ec6a175d1b464e58bacd8c78f
md5=84c077a37684e4cbfa67b18154390d8a
sha256=0acd83f7b85db7ee18c2b0b7505e1ba6fd722c36f49a8870a831c851660e3512
+[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.31.4.tar.bz2]
+md5=ae7fde9fd0ae0d8ac12a1e1536d6d3ce
+sha256=e63041db1ef666ca43293762c8aaec27bd4b54b6d86aee68ebb090c1b66584f4
+
[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2]
md5=e921200f074ca97184e150ef5a4af825
sha256=f5dba6366e87e91234d1b0069cfea655b0a4cb37ea97f899226f16998e6ab9f1
diff --git a/conf/machine/geodegx.conf b/conf/machine/geodegx.conf
index 0ec6782076..a9cf5773ee 100644
--- a/conf/machine/geodegx.conf
+++ b/conf/machine/geodegx.conf
@@ -2,16 +2,18 @@
# Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved
# Released under the MIT license (see packages/COPYING)
-TARGET_ARCH = "i486"
+TARGET_ARCH = "i586"
require conf/machine/include/tune-geode.inc
-PREFERRED_PROVIDER_virtual/kernel = "linux-geodegx"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+MACHINE_EXTRA_RDEPENDS = "kernel grub"
+MACHINE_FEATURES = "kernel26 pci ext2 x86"
+MACHINE_KERNEL_VERSION = "2.6"
udevdir = "/dev"
KERNEL_IMAGETYPE = "bzImage"
GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=geode"
+GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=i586"
diff --git a/conf/machine/geodelx.conf b/conf/machine/geodelx.conf
index f8874fd966..7316f2d747 100644
--- a/conf/machine/geodelx.conf
+++ b/conf/machine/geodelx.conf
@@ -2,7 +2,7 @@
# Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved
# Released under the MIT license (see packages/COPYING)
-TARGET_ARCH = "i486"
+TARGET_ARCH = "i586"
require conf/machine/include/tune-geode.inc
@@ -11,5 +11,5 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-geodelx"
KERNEL_IMAGETYPE = "bzImage"
GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=geode"
+GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=i586"
SELECTED_OPTIMIZATION_pn-glibc := "${@'${SELECTED_OPTIMIZATION}'.replace('-fomit-frame-pointer', '')}"