diff options
-rw-r--r-- | conf/machine/corgi.conf | 2 | ||||
-rw-r--r-- | conf/machine/husky.conf | 2 | ||||
-rw-r--r-- | conf/machine/shepherd.conf | 2 | ||||
-rw-r--r-- | conf/machine/zaurus-clamshell.conf | 0 | ||||
-rw-r--r-- | conf/machine/zaurus-pxa.conf | 28 |
5 files changed, 3 insertions, 31 deletions
diff --git a/conf/machine/corgi.conf b/conf/machine/corgi.conf index 080ad1af7b..c5181e08f1 100644 --- a/conf/machine/corgi.conf +++ b/conf/machine/corgi.conf @@ -2,4 +2,4 @@ #@NAME: Sharp Zaurus SL-C700 #@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-C700 device -include conf/machine/zaurus-pxa.conf +include conf/machine/zaurus-clamshell.conf diff --git a/conf/machine/husky.conf b/conf/machine/husky.conf index 24a7f61dff..c15be2549b 100644 --- a/conf/machine/husky.conf +++ b/conf/machine/husky.conf @@ -2,4 +2,4 @@ #@NAME: Sharp Zaurus SL-C750,Sharp Zaurus SL-C760 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C760 and Sharp Zaurus SL-C860 devices -include conf/machine/zaurus-pxa.conf +include conf/machine/zaurus-clamshell.conf diff --git a/conf/machine/shepherd.conf b/conf/machine/shepherd.conf index 91987fc4f7..54e367aa20 100644 --- a/conf/machine/shepherd.conf +++ b/conf/machine/shepherd.conf @@ -2,4 +2,4 @@ #@NAME: Sharp Zaurus SL-C750 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C750 device -include conf/machine/zaurus-pxa.conf +include conf/machine/zaurus-clamshell.conf diff --git a/conf/machine/zaurus-clamshell.conf b/conf/machine/zaurus-clamshell.conf new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/conf/machine/zaurus-clamshell.conf diff --git a/conf/machine/zaurus-pxa.conf b/conf/machine/zaurus-pxa.conf deleted file mode 100644 index a7b5efddee..0000000000 --- a/conf/machine/zaurus-pxa.conf +++ /dev/null @@ -1,28 +0,0 @@ -TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm ${MACHINE}" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support chkhinge" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules sharp-sdmmc-support \ -kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \ -kernel-module-usbdcore kernel-module-usbdmonitor chkhinge" - -EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n" -EXTRA_IMAGEDEPENDS = "sharp-flash-header-c700" - -IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ - --output=${T}/${IMAGE_NAME}.rootfs.jffs2 \ - ${EXTRA_IMAGECMD}; \ - cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ - ${T}/${IMAGE_NAME}.rootfs.jffs2 > \ - ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img" - -GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_DEPENDS += "gaim sylpheed" -GPE_EXTRA_INSTALL += "gaim sylpheed" - -include conf/machine/handheld-common.conf -# not using tune-xscale.conf so as to retain backwards compatibility -include conf/machine/tune-strongarm.conf - -SERIAL_CONSOLE = "115200 ttyS0" |