From 0a5d6e6d97f345848ee3cd44e6d49ecfb65f543f Mon Sep 17 00:00:00 2001
From: Cliff Brake <cbrake@bec-systems.com>
Date: Sat, 6 Jan 2007 20:35:13 +0000
Subject: devkitidp-pxa255 2.6.11: drop this version

---
 conf/machine/devkitidp-pxa255.conf               | 12 ++++---
 packages/linux/devkitidp-pxa255-kernel_2.6.11.bb | 41 ------------------------
 2 files changed, 7 insertions(+), 46 deletions(-)
 delete mode 100644 packages/linux/devkitidp-pxa255-kernel_2.6.11.bb

diff --git a/conf/machine/devkitidp-pxa255.conf b/conf/machine/devkitidp-pxa255.conf
index 029246a8c2..468c2ebd7d 100644
--- a/conf/machine/devkitidp-pxa255.conf
+++ b/conf/machine/devkitidp-pxa255.conf
@@ -5,12 +5,12 @@
 TARGET_ARCH = "arm"
 
 GUI_MACHINE_CLASS = "bigscreen"
-PACKAGE_EXTRA_ARCHS = "armv5te"
+PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 
-PREFERRED_PROVIDER_virtual/bootloader = "uboot-${MACHINE}"
-PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "uboot-${MACHINE} ${MACHINE}-kernel"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
+PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
+PREFERRED_VERSION_u-boot = "1.1.6"
+UBOOT_MACHINE = "pxa255_idp_config"
 
 require conf/machine/include/tune-xscale.conf
 
@@ -20,4 +20,6 @@ SERIAL_CONSOLE = "115200 ttyS0"
 # used by opie-collections.inc
 ROOT_FLASH_SIZE = "32"
 
+MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa"
+MACHINE_TASK_PROVIDER = "task-base"
 
diff --git a/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb b/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb
deleted file mode 100644
index 0629e22bc9..0000000000
--- a/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-SECTION = "kernel"
-DESCRIPTION = "Linux kernel for the BSQUARE PXA255 DevKitIDP"
-LICENSE = "GPL"
-PR = "r2"
-DEPENDS = "u-boot"
-
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2 \
-	   ftp://ftp.accelent.com/pxa255_idp/linux/kernel-2.6.11-rc4_idp.patch;patch=1 \
-	   ftp://ftp.accelent.com/pxa255_idp/linux/kernel-2.6.11_idp_leds.patch;patch=1 \
-	   ftp://ftp.accelent.com/pxa255_idp/linux/devkitidp-pxa255_defconfig"
-
-S = "${WORKDIR}/linux-2.6.11"
-
-COMPATIBLE_HOST = 'arm.*-linux'
-COMPATIBLE_MACHINE = "devkitidp-pxa255"
-
-inherit kernel
-inherit package
-
-ARCH = "arm"
-KERNEL_IMAGETYPE = "uImage"
-#CMDLINE_CONSOLE ?= "ttyS0,115200n8"
-#CMDLINE_ROOT = "root=/dev/slug rootfstype=ext2,jffs2 initrd=0x01000000,10M mem=32M@0x00000000"
-#CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000"
-#CMDLINE_ROOT = "root=/dev/ram0 rw rootfstype=ext2,jffs2 initrd=0x01000000,10M init=/linuxrc mem=32M@0x00000000"
-#CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}"
-CMDLINE = "root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS0,115200 mtdparts=phys_mapped_flash:256k(boot)ro,0x1C0000(kernel),-(root)"
-
-do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/${MACHINE}_defconfig ${S}/.config
-#	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
-}
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-- 
cgit v1.2.3