diff options
| -rw-r--r-- | meta/conf/machine/include/zaurus-clamshell.conf | 2 | ||||
| -rw-r--r-- | meta/conf/machine/ipaq-pxa270.conf | 3 | ||||
| -rw-r--r-- | meta/conf/machine/nokia770.conf | 21 |
3 files changed, 2 insertions, 24 deletions
diff --git a/meta/conf/machine/include/zaurus-clamshell.conf b/meta/conf/machine/include/zaurus-clamshell.conf index 7ec56bc6a..00d687963 100644 --- a/meta/conf/machine/include/zaurus-clamshell.conf +++ b/meta/conf/machine/include/zaurus-clamshell.conf @@ -21,8 +21,6 @@ IMAGE_CMD_jffs2 += "; cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_INSTALL += "gaim sylpheed" -include conf/machine/include/handheld-common.conf - # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. include conf/machine/include/tune-xscale.conf diff --git a/meta/conf/machine/ipaq-pxa270.conf b/meta/conf/machine/ipaq-pxa270.conf index 1aeb8f3f2..e621d7b9b 100644 --- a/meta/conf/machine/ipaq-pxa270.conf +++ b/meta/conf/machine/ipaq-pxa270.conf @@ -30,8 +30,6 @@ PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \ SERIAL_CONSOLE = "115200 ttyS0" -include conf/machine/include/handheld-common.conf - GUI_MACHINE_CLASS = "bigscreen" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. @@ -45,6 +43,7 @@ BOOTSTRAP_EXTRA_RRECOMMENDS += "" HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \ hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power" +MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget usbhost" module_autoload_evdev = "evdev" module_autoload_hx4700_power = "hx4700_power" diff --git a/meta/conf/machine/nokia770.conf b/meta/conf/machine/nokia770.conf index 9bde19dcf..fac474eda 100644 --- a/meta/conf/machine/nokia770.conf +++ b/meta/conf/machine/nokia770.conf @@ -17,7 +17,6 @@ GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser tscalib" # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. include conf/machine/include/tune-arm926ejs.conf - #size of the root partition (yes, it is 123 MB) ROOT_FLASH_SIZE = "123" EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000" @@ -32,25 +31,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-nokia770" BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils nokia770-init \ ${PCMCIA_MANAGER} apm ppp wireless-tools console-tools" -# 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 " -# 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" -# PPP Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ppp-generic kernel-module-ppp-async" - -#USB Gadget Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage kernel-module-g-serial \ -# kernel-module-g-ether" ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " -include conf/machine/include/handheld-common.conf - +MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost" |