conf/machine: Merge task-base updates
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@856 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
parent
5962332b14
commit
274eccaf5a
|
@ -12,7 +12,6 @@ XSERVER = "xserver-kdrive-omap"
|
|||
|
||||
# 800x480 is big enough for me
|
||||
GUI_MACHINE_CLASS = "bigscreen"
|
||||
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
|
||||
|
@ -28,11 +27,10 @@ SERIAL_CONSOLE = "115200 ttyS0"
|
|||
|
||||
PREFERRED_PROVIDER_virtual/kernel = "linux-nokia770"
|
||||
|
||||
#BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils nokia770-init \
|
||||
#${PCMCIA_MANAGER} apm ppp wireless-tools console-tools"
|
||||
|
||||
|
||||
#use this if you are using the nokia initfs
|
||||
ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
|
||||
|
||||
MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost"
|
||||
MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init"
|
||||
|
||||
MACHINE_TASK_PROVIDER = "task-base"
|
|
@ -11,3 +11,5 @@ require conf/machine/include/tune-arm926ejs.conf
|
|||
SERIAL_CONSOLE = "115200 ttyAMA0"
|
||||
|
||||
PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
|
||||
|
||||
MACHINE_TASK_PROVIDER = "task-base"
|
|
@ -15,3 +15,5 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
|
|||
|
||||
GLIBC_ADDONS = "nptl"
|
||||
GLIBC_EXTRA_OECONF = "--with-tls"
|
||||
|
||||
MACHINE_TASK_PROVIDER = "task-base"
|
Loading…
Reference in New Issue