Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

15 files changed, 91 insertions, 17 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 7c9dceee5f..81d4c93dc0 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -472,6 +472,8 @@ export palmqtdir = "${palmtopdir}"
 # Download locations and utilities.
 ##################################################################
 
+OE_STRICT_CHECKSUMS ?= "1"
+
 GNU_MIRROR = "ftp://ftp.gnu.org/gnu"
 DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool"
 SOURCEFORGE_MIRROR = "http://downloads.sourceforge.net"
diff --git a/conf/checksums.ini b/conf/checksums.ini
index d16a92717c..427ad5a1a6 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -502,6 +502,10 @@ sha256=59eddefa715b3810af20b2b190ae16b46d0b733144d36dc7ddd51b32adac013e
 md5=b827d300eb28458f6588eb843cba418d
 sha256=4ba65d64599ca6937b44b98d1efd04957278679ddd733081d0d8c2ecf6c0143b
 
+[http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.7/NetworkManager-0.7.0.tar.bz2]
+md5=64f780e7f95c252eaaed0201c3d9a4ca
+sha256=281234116b99b4c4b45fde038a435a0d26b7ee55beac0c351186b3f12c301659
+
 [http://downloads.sourceforge.net/numpy/Numeric-23.7.tar.gz]
 md5=8054781c58ae9cf6fe498316860b5ea8
 sha256=33225097777e84dfed251aee1265a9c0dd0976854e83f60e778a670027b12e7c
@@ -1294,6 +1298,10 @@ sha256=369fd18d406783acc92e6ced2b3536999aa0d33940398af2b4fb11dba46cbfa3
 md5=1ef201f29283179c8e5ab618529cac78
 sha256=744d8f3a8206fbc45a5558d92163d5ef7e5e0cc0700283bb6a617fb1201629f9
 
+[http://downloads.sourceforge.net/aoetools/aoetools-29.tar.gz]
+md5=6a77c8a017ef8dc0a5310db944b30035
+sha256=caba504ca4f769c5f3f8b4e97ed0da1888bd0be2efd3c33cac9bf36e7c285bc3
+
 [http://ftp.hosting-studio.de/pub/linux/apache/ant/source/apache-ant-1.7.1-src.tar.bz2]
 md5=0d68db4a1ada5c91bcbf53cefd0c2fd7
 sha256=4dc49a7260ef90a6dc6611b7e96b9f047d507589736d4a2ad6efbe3edfc6fba6
@@ -1382,6 +1390,10 @@ sha256=db22b34c0bfcab8546632475c6de2c63990214fb8ae5e2ada565410a85e22134
 md5=e77887dbafc515c63feac84686bcb3bc
 sha256=384437f3c4eb7d53ad27fdadce6cbc295ef16653b7f7739a480d91c784082ec9
 
+[http://www.apache.org/dist/apr/apr-1.3.3.tar.bz2]
+md5=2090c21dee4f0eb1512604127dcd158f
+sha256=d95f3b78366c86317043304864bb08cb836312c87ea7d142a4c02154e7e0dd37
+
 [http://www.apache.org/dist/apr/apr-util-0.9.12.tar.gz]
 md5=8e9cc71a1303b67b3278fbeab9799f2e
 sha256=5768fcc4d38fa6f811b0a89e2ef450d0f52688ff9263e548819adb096fbfc9c3
@@ -3386,6 +3398,10 @@ sha256=65451d8d6f5d4ca1dbd0700f3ef2ef257b52b542b3bab4bbeddd539f1c23f859
 md5=493aa462d01d7c5f0461d6d7f9f549b1
 sha256=1d56be1036de59926548e3defa4b9af894af9e2121d3598da13769da5c0f55b1
 
+[http://ftp.moblin.org/connman/releases/connman-0.10.tar.gz]
+md5=094743343e062ea370fcd461aa48a7fe
+sha256=bba3adf21a59f5836b1ba2615894e891627d9bcc863525f1892bc36e4e76124e
+
 [ftp://ftp.moblin.org/connman/releases/connman-0.2.tar.gz]
 md5=bf48aa07d3c1e5fe272c7f139bc01fc9
 sha256=eacc3c57cffb411b09d834d2225323cde5676165b5d2fc2a27b16cde98e3ba97
@@ -3398,6 +3414,10 @@ sha256=e3a35e2ee2cc729bd637a69c7f82d6672317738d29dacab067468bb0634eb0de
 md5=3f1995bf91846b601a25a37832c88cb6
 sha256=d40272cfb9a9990a32f6985056735df53d7368eacc28b31b8141de1fb2cb414d
 
+[ftp://ftp.moblin.org/connman/releases/connman-0.9.tar.gz]
+md5=a5ebd17ff19e8f9b4d5e783d345d135b
+sha256=9c626bda7e2cc460cdbfe9a14c13208253de6922a341ef60ba51a673c0317996
+
 [ftp://ftp.moblin.org/connman/releases/connman-gnome-0.4.tar.gz]
 md5=c9a3b384f080ed4cdf139ce9377ef2c8
 sha256=d7acac8bc0a38dfcab098137a76f5e9f4ce30ca86e82b26540502658e6b4e4a7
@@ -4078,6 +4098,10 @@ sha256=31e8e536f5efd7d7d1d5f4e4458b42aa9cd7910acf3da933cb7fa3507cf7f752
 md5=1fd89c902006271f00a774cc3183c15d
 sha256=dcc1809e8477b95317a7ff503cdd8b6d3f85b8d83a3245252ff47cf631523620
 
+[http://kernel.org/pub/linux/libs/dietlibc/dietlibc-0.31.tar.bz2]
+md5=acb98d469ee932d902fdf6de07802b7c
+sha256=99613d6a67f747f52e4184c613f7cba5cbb76af237c9acd04742e3ca24cf56cd
+
 [ftp://source.mvista.com/pub/xscale/pxa/diff-2.4.18-rmk7-pxa3.gz]
 md5=249c7a63a506d302c96be26517a70298
 sha256=ca569dfa1e5cfd2f4134f3f61f667bcfab5e15c7d43c8a6e835d384ac5b31a07
@@ -4494,6 +4518,10 @@ sha256=2382f315fda4241a0043bac1dfc669f006d8e93e87fa382b263b1672972f4077
 md5=412d8badd227807ef2f52608435240fb
 sha256=dfe24798ca067c75c84f01bf4ee3734fde3e32e4f270f7222025218d3baffbbb
 
+[http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4.1-200809111700/ecjsrc-3.4.1.zip]
+md5=4c9fe7b0c4e760e13fa887b85f8db295
+sha256=b5725fa7f8b1f7dc28776e60591e9ef0c171629fe567ef49ab9be28516ff2cd6
+
 [http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4-200806172000/ecjsrc-3.4.zip]
 md5=f7b84d912e61dfdd77b7173065845250
 sha256=a6ce5f0682462e85e5e47229e5b16555f74c60188fa0bb17536beb1138c537b4
@@ -14134,6 +14162,10 @@ sha256=0f4e55d362408e189d0c0f4e6929f4b5be7eb281e46cbf0ce3f035370c00bc7e
 md5=1ba8e147aff5e79bd2bfb983d86b53d5
 sha256=815ce53853fbf6493617f467389b799208b1ec98296b95be44a683f8bcfd7c47
 
+[http://www.opensource.apple.com/darwinsource/tarballs/other/mDNSResponder-107.6.tar.gz]
+md5=aa4e0e5c57f94489463ea6576591ce9d
+sha256=43d427d3d5c78aef57a49898def469cc4cae28190462205368be1f3a0fcc0165
+
 [ftp://ftp.gnu.org/gnu/macchanger/macchanger-1.5.0.tar.gz]
 md5=79b7cdaeca3d8ebafa764c4b0dd03ab7
 sha256=d44bfa27cb29c5a718627cb3ef3aa42eb5130426545eb2031120826cd73fa8fe
@@ -15490,6 +15522,10 @@ sha256=6eed89b661ae9f2ac0d383414ca964abea8a115f8fba0f7ab37b49b565ffb2a8
 md5=1c94a41e2399d261985a75f0cd3b895b
 sha256=9cca3e34e23f00c82bc5e7237aa81639874e90d43a689e26fbfd938279ca31c9
 
+[http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.7/network-manager-applet-0.7.0.tar.bz2]
+md5=856fc7c4cf43c8614445d9fcf78177d1
+sha256=7c9fcb0b18c72071ad42316ff5e0369a418f92d05ef419874a67826fd9d8406a
+
 [http://downloads.sourceforge.net/nfs/nfs-utils-1.0.6.tar.gz]
 md5=f17e9983457e1cf61c37f0be4493fce6
 sha256=aa99fcb016971290f9a871331eed60150ebdd84785dda1b252556a54760b97bf
@@ -15578,6 +15614,10 @@ sha256=53d2f92c3d14423b49c2ff077855cf3987d38def963c82fd26fba5de379ca540
 md5=139a1ed50a1a12e47b1f7deedf4f40c3
 sha256=4310a3a526ae5461e17f57353fc29f71d13820a215eaa62c629190cc2a026173
 
+[http://downloads.pf.itd.nrl.navy.mil/olsr/nrlolsrdv7.8.1.tgz]
+md5=46291de38362acdcd335bcf259055046
+sha256=0e6b18e3bf77dd20395881535e3e7043bcd5171c220728310215d708f44f3b1c
+
 [http://www.nlnetlabs.nl/downloads/nsd/nsd-2.0.0.tar.gz]
 md5=a09542645b91ff60564b0f4db436af01
 sha256=8f486c4ef4d3f60fba4e0f855399184ca557f03a747cae6adde4cc2dffc53ff2
@@ -19262,6 +19302,10 @@ sha256=4d710b17c5440518b43d3d1f7cbcb78a62c72f25e48a1b385a0ae3872ec8b40b
 md5=350180a6e4132a2b1262c7a15162c007
 sha256=4323581ddb6150677a36bcb87e3960100a7ea7c80906f0c7b7a27d1e43b055d9
 
+[ftp://ftp.debian.org/debian/pool/main/s/sg3-utils/sg3-utils_1.24.orig.tar.gz]
+md5=9e1b8811b013d8f97d8ea2e0942cebad
+sha256=0a06dae84a8f7f464c0c29c78a8f73f24a62894a2d3fc10b5f74a993f7b5abfe
+
 [ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/sgml-common-0.6.3.tgz]
 md5=103c9828f24820df86e55e7862e28974
 sha256=7dc418c1d361123ffc5e45d61f1b97257940a8eb35d0bfbbc493381cc5b1f959
@@ -20030,6 +20074,10 @@ sha256=c2ad63095e34b4a474e7ff4adb6ea8b7ab238bb5738d00a739102bb8bb71d805
 md5=4a0bae63e3713e89b26db7209b6a7e05
 sha256=c2ad63095e34b4a474e7ff4adb6ea8b7ab238bb5738d00a739102bb8bb71d805
 
+[http://downloads.sourceforge.net/swig/swig-1.3.38.tar.gz]
+md5=650c774917be49c526a4f8a3e733c898
+sha256=e7cbddc8c68b1eccba1c82edd5427595397d9a483c8fb1184abc9303afe08045
+
 [http://crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-1.5.10.tar.gz]
 md5=4c920f2a3ee72040df8a8e105ad840df
 sha256=5fb3f030e9395e23a48c02bde6bc81ad42b1c4056a011d9ee15c4c85110eb847
@@ -20966,6 +21014,10 @@ sha256=4467f57484124b735450e05617c2aa0f75e0e56306e92c74f9dfe59bd028fcd9
 md5=2ea9229208154229c5d6df6222f74ad7
 sha256=cc9f58ff58fbd3f5868e1f1e368e3c93e1f441afd0ac1dcbd5d01a9ce5b5b0d7
 
+[http://kernel.org/pub/linux/utils/kernel/hotplug/udev-137.tar.gz]
+md5=a3fcdcd21b2f33d598f45a68fff892bd
+sha256=ee3922bd46dbdc406be5d498be5bc062a0b39f05f1c0a1b22c3657eb0e805975
+
 [http://udhcp.busybox.net/source/udhcp-0.9.8.tar.gz]
 md5=2d7e548820d2ded5e183933cb701defb
 sha256=da0ca1e821e3fa7cfbe73ddb1480b921002ee992f5e5fbc611422c103b907443
@@ -21322,6 +21374,10 @@ sha256=5af08229d77fe55437a6c558aee9babcff23f28c8a9c8f1f0a7d152754e9947a
 md5=0539e2fa4aadb2cd4ca4bba65b1fe8b5
 sha256=95b7b4d815bd479332637c93e69ec24167cd28d4f9d9f9b718e1b091bb88aafa
 
+[http://downloads.sourceforge.net/aoetools/vblade-19.tgz]
+md5=59d45caa6454388eea60441dcf6631db
+sha256=779c8c9e80ce09e8ef1737216c8438c6e614d7001e1a6f312e4a82191e34870e
+
 [http://downloads.sourceforge.net/vde/vde-2.0.2.tar.bz2]
 md5=d97a8dbc72942c57542f50322b538a48
 sha256=05b473815f9706387a3c5eaeb4da2e492f624e0b7783432179454f9d69bb973c
@@ -21742,6 +21798,10 @@ sha256=f70b18243e049bbda66254388b6e94d404e747d913b8496d6e93a9c56bbf4af2
 md5=eb06a9a05d3916addf9451297a558aa2
 sha256=0c10e59dd079c4e5d9ec6eebe9a8ac0e1b9e472cccef49c705f87a78391e79fa
 
+[http://hostap.epitest.fi/releases/wpa_supplicant-0.6.7.tar.gz]
+md5=b61f6e94b63f92173f4286b5e6a84140
+sha256=7c698fe145785b63e584da02b21a7e9a32b0929e35fc0bc67ad99af6d5217f64
+
 [http://heanet.dl.sourceforge.net/wqy/wqy-zenhei-0.6.26-0.tar.gz]
 md5=bf2c1cb512606d995873bada27c777da
 sha256=47355b6ec84bb309614b6d657ddfda993b96ed0be569264f82e523b254f945b2
@@ -23774,6 +23834,10 @@ sha256=8d5f6ad0318a8958eaf5772657007ffb545a36c9cd8190f2511cfa03c0069d63
 md5=632c7745f884dc5e6fd707a18971aca3
 sha256=b3195456c99ab66103fd235ab410d6f3e6a56f2bdb7fb31d9d3789f2d453ec3f
 
+[http://slackware.osuosl.org/slackware-12.0/source/a/xfsprogs/xfsprogs_2.8.16-1.tar.gz]
+md5=632c7745f884dc5e6fd707a18971aca3
+sha256=b3195456c99ab66103fd235ab410d6f3e6a56f2bdb7fb31d9d3789f2d453ec3f
+
 [http://www.us.xfce.org/archive/xfce-4.2.0/src/xfwm4-4.2.0.tar.gz]
 md5=da6d773f31ef91400174c2045f0f1a80
 sha256=4ba4bad5bf750045175dc6af58ec29d046c91fa30c3b769213ce69fc739c8046
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 72787d69cf..5de7ec9bdd 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -101,7 +101,7 @@ ANGSTROM_GCC_VERSION_486sx = "4.3.2"
 # gcc 4.3.1 builds a kernel that oopses with a null-pointer in the rcu-update function
 # gcc 4.2.1 (the one from *gasp* csl) builds a working kernel, but non-working userspace
 
-KERNEL_CCSUFFIX_armv7a= "-4.2.1+csl-arm-2007q3-53"
+#KERNEL_CCSUFFIX_armv7a= "-4.2.1+csl-arm-2007q3-53"
 
 #avr32 only has support for gcc 4.2.2
 ANGSTROM_GCC_VERSION_avr32		?= "4.2.2"
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index bc5785343f..e26c5bf4c8 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -1,5 +1,5 @@
 PREFERRED_VERSION_automake-native = "1.10"
-PREFERRED_VERSION_busybox 	= "1.11.3"
+PREFERRED_VERSION_busybox 	= "1.13.2"
 PREFERRED_VERSION_cairo		= "1.8.0"
 PREFERRED_VERSION_dbus 		= "1.2.1"
 PREFERRED_VERSION_dropbear      = "0.51"
@@ -20,10 +20,11 @@ PREFERRED_VERSION_libtool-native = "2.2.4"
 PREFERRED_VERSION_libtool-cross	= "2.2.4"
 PREFERRED_VERSION_libtool-sdk	= "2.2.4"
 PREFERRED_VERSION_pango 	= "1.22.0"
-PREFERRED_VERSION_pixman	= "0.12.0"
+PREFERRED_VERSION_pixman	= "0.13.2"
 PREFERRED_VERSION_pkgconfig	= "0.23"
 PREFERRED_VERSION_pkgconfig-native = "0.23"
 PREFERRED_VERSION_pulseaudio 	= "0.9.10"
 PREFERRED_VERSION_tiff 		= "3.8.2+4.0.0beta2"
 PREFERRED_VERSION_udev 		= "124"
+PREFERRED_VERSION_wpa-supplicant = "0.6.7"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index b1635c022c..92651f60f1 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -6,7 +6,6 @@ TARGET_ARCH = "arm"
 
 MACHINE_KERNEL_VERSION ?= "2.6"
 require conf/machine/include/zaurus-${MACHINE_KERNEL_VERSION}.inc
-require conf/machine/include/kexecboot.inc
 require conf/machine/include/tune-strongarm.inc
 
 PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
diff --git a/conf/machine/davinci-dvevm.conf b/conf/machine/davinci-dvevm.conf
index 50c6561a95..f52efc2aab 100644
--- a/conf/machine/davinci-dvevm.conf
+++ b/conf/machine/davinci-dvevm.conf
@@ -6,7 +6,6 @@ TARGET_ARCH = "arm"
 
 HOTPLUG = "udev"
 
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index abc17728b5..6ccdc5070e 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -45,4 +45,5 @@ module_autoload_g_ether = "g_ether"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
+IMAGE_DEVICE_TABLES = "device_table-oldmmc.txt"
 require conf/machine/include/LAB-settings.inc
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index ab532e33ff..4906f87e76 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -73,4 +73,5 @@ module_autoload_pxa27x_udc = "pxa27x_udc"
 #FIXME: this should be controlled by a userspace utility later.
 module_autoload_g_ether = "g_ether"
 
+IMAGE_DEVICE_TABLES = "device_table-oldmmc.txt"
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/include/kexecboot.inc b/conf/machine/include/kexecboot.inc
index 7e2200853c..0a9f209fe2 100644
--- a/conf/machine/include/kexecboot.inc
+++ b/conf/machine/include/kexecboot.inc
@@ -2,7 +2,10 @@
 
 # NOTE: include this file after zaurus-2.6.inc for zaurus machines
 
-MACHINE_FEATURES_append = "kexecboot"
+MACHINE_FEATURES_append = " kexecboot "
+
+IMAGE_FSTYPES += " tar.gz "
+EXTRA_IMAGEDEPENDS += "linux-kexecboot"
 
 # Include Kernel image in kexecboot enabled images
 RDEPENDS_kernel-base = "kernel-image" 
diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc
index 296ce6a2ed..fe28a3cb4d 100644
--- a/conf/machine/include/motorola-ezx-base.inc
+++ b/conf/machine/include/motorola-ezx-base.inc
@@ -1,7 +1,7 @@
 TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ezx"
+PREFERRED_PROVIDER_virtual/kernel ?= "openezx-kernel"
 
 #cat /proc/mtd
 #dev:    size   erasesize  name
diff --git a/conf/machine/include/tune-mips32.inc b/conf/machine/include/tune-mips32.inc
new file mode 100644
index 0000000000..93da66b158
--- /dev/null
+++ b/conf/machine/include/tune-mips32.inc
@@ -0,0 +1 @@
+TARGET_CC_ARCH = "-march=mips32"
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index eee7631018..8fb36f78be 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -79,7 +79,6 @@ zaurus_make_installkit () {
     rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/     
 }
 
-# Don't include kernels in standard images for Zaurus machines
-RDEPENDS_kernel-base = ""
-
 KERNEL_IMAGETYPE ?= "zImage"
+
+require conf/machine/include/kexecboot.inc
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index c7c81c9f9a..4e8f011a1e 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices
 
 require conf/machine/include/zaurus-2.6.inc
-require conf/machine/include/kexecboot.inc
 require conf/machine/include/tune-xscale.inc
 
 IMAGE_FSTYPES ?= "jffs2"
diff --git a/conf/machine/stb225.conf b/conf/machine/stb225.conf
index 97370e1fe8..c57adb09f8 100644
--- a/conf/machine/stb225.conf
+++ b/conf/machine/stb225.conf
@@ -1,8 +1,14 @@
 # PNX8335 STB225 board
+
 TARGET_ARCH = "mipsel"
-TARGET_CC_ARCH="-march=mips32"
+
 MACHINE_FEATURES = "kernel26"
-IMAGE_FSTYPES="tar.gz"
-PREFERRED_PROVIDER_virtual/kernel="linux"
-KERNEL_IMAGETYPE="vmlinux"
-KERNEL_OUTPUT="${KERNEL_IMAGETYPE}"
+
+IMAGE_FSTYPES += "tar.gz"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+KERNEL_IMAGETYPE = "uImage"
+
+SERIAL_CONSOLE ?= "115200 ttySA0"
+
+require conf/machine/include/tune-mips32.inc
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index edea47a2d4..593ceab33d 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -4,7 +4,6 @@
 
 require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/tune-xscale.inc
-require conf/machine/include/kexecboot.inc
 
 IMAGE_FSTYPES += "jffs2 tar.gz"