diff options
| -rw-r--r-- | conf/machine/include/motorola-ezx-base.inc | 11 | ||||
| -rw-r--r-- | conf/machine/include/motorola-ezx.inc | 41 |
2 files changed, 5 insertions, 47 deletions
diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc index 95496b3266..3912d8fc9b 100644 --- a/conf/machine/include/motorola-ezx-base.inc +++ b/conf/machine/include/motorola-ezx-base.inc @@ -4,8 +4,6 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-ezx" -EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" - #cat /proc/mtd #dev: size erasesize name #mtd0: 00020000 00008000 "Bootloader" @@ -14,10 +12,6 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" #mtd3: 00020000 00020000 "Logo" MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen" - -# the EZX phones need a userspace daemon to stop the BP from shutting down the phone -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "ezxd" - MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_DISPLAY_ORIENTATION = "0" @@ -25,8 +19,13 @@ MACHINE_DISPLAY_PPI = "180" ROOT_FLASH_SIZE = "24" +EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" + EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native" +# the EZX phones need a userspace daemon to stop the BP from shutting down the phone +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "ezxd" + # Ezxd needs to be started very early so we need the mux devices in static /dev IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \ files/device_table-ezx.txt" diff --git a/conf/machine/include/motorola-ezx.inc b/conf/machine/include/motorola-ezx.inc deleted file mode 100644 index e87f6aa70f..0000000000 --- a/conf/machine/include/motorola-ezx.inc +++ /dev/null @@ -1,41 +0,0 @@ -# choose the proper kernel for this hardware -PREFERRED_PROVIDER_virtual/kernel = "ezx-kernels" -# we don't need support for kernel 2.4 -MODUTILS = "26" -# build tar.gz for SD/MMC/Transflash and jffs2 for later when we have mtd -IMAGE_FSTYPES = "tar.gz jffs2" - -BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils apm irda-utils udev-utils ppp ppp-dialin module-init-tools" - -# -# disable all modules until we have something that boots... -# - -# Ethernet modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs" -# NFS Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc" -# Crypto Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5" -# SMB and CRAMFS -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs" -# Serial Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs" -# Bluetooth Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \ -# kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \ -# kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs" -# Infrared Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \ -# kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" -# -# USB Gadget Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \ -# kernel-module-g-serial kernel-module-g-ether" -# -# Sound Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss" -#BOOTSTRAP_EXTRA_SOUND = "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc -# kernel-module-snd-timer kernel-module-snd-pcm \ -# kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s" -# |