summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-07-28 08:27:01 +0000
committerRichard Purdie <richard@openedhand.com>2006-07-28 08:27:01 +0000
commitf14be9a582466a2de0ad47dfc0054cf752a1508d (patch)
tree3d48f4ffcdaecc56292e17495e5881081c7e4ca9
parent8ea8ee86875b5c0bee1c84c6b100b3959070e495 (diff)
downloadpoky-f14be9a582466a2de0ad47dfc0054cf752a1508d.tar.gz
nokia770.conf, ipaq-pxa270.conf: Update after task-machine changes
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@570 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/conf/machine/include/zaurus-clamshell.conf2
-rw-r--r--meta/conf/machine/ipaq-pxa270.conf3
-rw-r--r--meta/conf/machine/nokia770.conf21
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 7ec56bc6a2..00d687963f 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 \
21GUI_MACHINE_CLASS = "bigscreen" 21GUI_MACHINE_CLASS = "bigscreen"
22GPE_EXTRA_INSTALL += "gaim sylpheed" 22GPE_EXTRA_INSTALL += "gaim sylpheed"
23 23
24include conf/machine/include/handheld-common.conf
25
26# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. 24# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
27include conf/machine/include/tune-xscale.conf 25include conf/machine/include/tune-xscale.conf
28 26
diff --git a/meta/conf/machine/ipaq-pxa270.conf b/meta/conf/machine/ipaq-pxa270.conf
index 1aeb8f3f2b..e621d7b9b8 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 \
30 30
31SERIAL_CONSOLE = "115200 ttyS0" 31SERIAL_CONSOLE = "115200 ttyS0"
32 32
33include conf/machine/include/handheld-common.conf
34
35GUI_MACHINE_CLASS = "bigscreen" 33GUI_MACHINE_CLASS = "bigscreen"
36 34
37# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. 35# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
@@ -45,6 +43,7 @@ BOOTSTRAP_EXTRA_RRECOMMENDS += ""
45HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \ 43HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \
46 hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power" 44 hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power"
47 45
46MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget usbhost"
48 47
49module_autoload_evdev = "evdev" 48module_autoload_evdev = "evdev"
50module_autoload_hx4700_power = "hx4700_power" 49module_autoload_hx4700_power = "hx4700_power"
diff --git a/meta/conf/machine/nokia770.conf b/meta/conf/machine/nokia770.conf
index 9bde19dcf6..fac474edae 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"
17# Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. 17# Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
18include conf/machine/include/tune-arm926ejs.conf 18include conf/machine/include/tune-arm926ejs.conf
19 19
20
21#size of the root partition (yes, it is 123 MB) 20#size of the root partition (yes, it is 123 MB)
22ROOT_FLASH_SIZE = "123" 21ROOT_FLASH_SIZE = "123"
23EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000" 22EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000"
@@ -32,25 +31,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-nokia770"
32BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils nokia770-init \ 31BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils nokia770-init \
33${PCMCIA_MANAGER} apm ppp wireless-tools console-tools" 32${PCMCIA_MANAGER} apm ppp wireless-tools console-tools"
34 33
35# NFS Modules
36#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
37# Crypto Modules
38#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
39# SMB and CRAMFS
40#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
41# Serial Modules
42#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 "
43# Bluetooth Modules
44#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
45# kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco"
46# PPP Modules
47#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ppp-generic kernel-module-ppp-async"
48
49#USB Gadget Modules
50#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage kernel-module-g-serial \
51# kernel-module-g-ether"
52 34
53ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " 35ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
54 36
55include conf/machine/include/handheld-common.conf 37MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost"
56