summaryrefslogtreecommitdiffstats
path: root/meta-yocto/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta-yocto/conf')
-rw-r--r--meta-yocto/conf/bblayers.conf.sample3
-rw-r--r--meta-yocto/conf/distro/poky.conf1
-rw-r--r--meta-yocto/conf/machine/atom-pc.conf39
-rw-r--r--meta-yocto/conf/machine/beagleboard.conf40
-rw-r--r--meta-yocto/conf/machine/mpc8315e-rdb.conf31
-rw-r--r--meta-yocto/conf/machine/routerstationpro.conf26
6 files changed, 3 insertions, 137 deletions
diff --git a/meta-yocto/conf/bblayers.conf.sample b/meta-yocto/conf/bblayers.conf.sample
index edbccf02ce..98bfd70c22 100644
--- a/meta-yocto/conf/bblayers.conf.sample
+++ b/meta-yocto/conf/bblayers.conf.sample
@@ -1,6 +1,6 @@
1# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf 1# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
2# changes incompatibly 2# changes incompatibly
3LCONF_VERSION = "5" 3LCONF_VERSION = "6"
4 4
5BBPATH = "${TOPDIR}" 5BBPATH = "${TOPDIR}"
6BBFILES ?= "" 6BBFILES ?= ""
@@ -8,4 +8,5 @@ BBFILES ?= ""
8BBLAYERS ?= " \ 8BBLAYERS ?= " \
9 ##COREBASE##/meta \ 9 ##COREBASE##/meta \
10 ##COREBASE##/meta-yocto \ 10 ##COREBASE##/meta-yocto \
11 ##COREBASE##/meta-yocto-bsp \
11 " 12 "
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index 5409a7761f..6897ac481a 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -9,6 +9,7 @@ MAINTAINER = "Poky <poky@yoctoproject.org>"
9TARGET_VENDOR = "-poky" 9TARGET_VENDOR = "-poky"
10 10
11LOCALCONF_VERSION = "1" 11LOCALCONF_VERSION = "1"
12LAYER_CONF_VERSION ?= "6"
12 13
13DISTRO_FEATURES_append = " largefile opengl" 14DISTRO_FEATURES_append = " largefile opengl"
14 15
diff --git a/meta-yocto/conf/machine/atom-pc.conf b/meta-yocto/conf/machine/atom-pc.conf
deleted file mode 100644
index 46bc71b75d..0000000000
--- a/meta-yocto/conf/machine/atom-pc.conf
+++ /dev/null
@@ -1,39 +0,0 @@
1#@TYPE: Machine
2#@NAME: Atom-PC
3
4#@DESCRIPTION: Machine configuration for Intel Atom based PCs. Currently supported machines are the Asus eee901, Acer Aspire One, Toshiba NB305, and Intel BlackSand development board.
5
6include conf/machine/include/tune-atom.inc
7
8MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 x86 wifi acpi alsa"
9
10KERNEL_IMAGETYPE = "bzImage"
11
12PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
13PREFERRED_VERSION_linux-yocto ?= "3.0%"
14PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
15XSERVER ?= "xserver-xorg \
16 xserver-xorg-extension-dri2 \
17 xserver-xorg-extension-glx \
18 xserver-xorg-extension-extmod \
19 xserver-xorg-extension-dbe \
20 xf86-input-mouse \
21 xf86-input-keyboard \
22 xf86-input-evdev \
23 xf86-input-synaptics \
24 xf86-video-intel \
25 mesa-dri-driver-i915"
26
27#MACHINE_EXTRA_RDEPENDS = "rt2860"
28
29MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
30
31IMAGE_FSTYPES ?= "ext3 cpio.gz live"
32
33APPEND += "usbcore.autosuspend=1"
34
35GLIBC_ADDONS = "nptl"
36
37EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi"
38
39ROOTLESS_X = "1"
diff --git a/meta-yocto/conf/machine/beagleboard.conf b/meta-yocto/conf/machine/beagleboard.conf
deleted file mode 100644
index aa8fa07be4..0000000000
--- a/meta-yocto/conf/machine/beagleboard.conf
+++ /dev/null
@@ -1,40 +0,0 @@
1#@TYPE: Machine
2#@NAME: Beagleboard machine
3#@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board
4
5PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg-lite"
6XSERVER ?= "xserver-xorg-lite \
7 xf86-input-evdev \
8 xf86-input-mouse \
9 xf86-video-omapfb \
10 xf86-input-keyboard"
11
12# Ship all kernel modules by default
13MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
14
15# Allow for MMC booting (required by the NAND-less Beagleboard XM)
16EXTRA_IMAGEDEPENDS += "u-boot x-load"
17
18# Uncomment the following line to enable the hard floating point abi. Note that
19# this breaks some binary libraries and 3D (neither of which ship with
20# meta-yocto). For maximum compatibility, leave this disabled.
21#DEFAULTTUNE ?= "cortexa8hf-neon"
22include conf/machine/include/tune-cortexa8.inc
23
24IMAGE_FSTYPES += "tar.bz2 jffs2"
25EXTRA_IMAGECMD_jffs2 = "-lnp "
26
27# 2.6.37 and later kernels use OMAP_SERIAL, ttyO2
28# earlier kernels use ttyS2
29SERIAL_CONSOLE = "115200 ttyO2"
30
31PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
32PREFERRED_VERSION_linux-yocto ?= "3.0%"
33
34KERNEL_IMAGETYPE = "uImage"
35
36UBOOT_MACHINE = "omap3_beagle_config"
37UBOOT_ENTRYPOINT = "0x80008000"
38UBOOT_LOADADDRESS = "0x80008000"
39
40MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa"
diff --git a/meta-yocto/conf/machine/mpc8315e-rdb.conf b/meta-yocto/conf/machine/mpc8315e-rdb.conf
deleted file mode 100644
index 266f9d4978..0000000000
--- a/meta-yocto/conf/machine/mpc8315e-rdb.conf
+++ /dev/null
@@ -1,31 +0,0 @@
1#@TYPE: Machine
2#@DESCRIPTION: Machine configuration for running
3
4TARGET_FPU = ""
5
6require conf/machine/include/tune-ppc603e.inc
7
8KERNEL_IMAGETYPE = "uImage"
9
10EXTRA_IMAGEDEPENDS += "u-boot"
11UBOOT_MACHINE_mpc8315e-rdb = "MPC8315ERDB_config"
12
13SERIAL_CONSOLE = "115200 ttyS0"
14
15MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
16
17PREFERRED_VERSION_linux-yocto ?= "3.4%"
18PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
19
20PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
21XSERVER ?= "xserver-xorg \
22 xserver-xorg-extension-extmod \
23 xf86-input-evdev \
24 xf86-video-fbdev"
25
26PREFERRED_VERSION_u-boot ?= "v2012.04%"
27UBOOT_ENTRYPOINT = "0x00000000"
28
29KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8315erdb.dts"
30
31MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
diff --git a/meta-yocto/conf/machine/routerstationpro.conf b/meta-yocto/conf/machine/routerstationpro.conf
deleted file mode 100644
index 707392d0c8..0000000000
--- a/meta-yocto/conf/machine/routerstationpro.conf
+++ /dev/null
@@ -1,26 +0,0 @@
1#@TYPE: Machine
2#@NAME: mti_malta32_be MIPS
3#@DESCRIPTION: mti_malta32_be
4
5require conf/machine/include/tune-mips32.inc
6
7MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 serial"
8
9KERNEL_IMAGETYPE = "vmlinux"
10KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
11
12PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
13PREFERRED_VERSION_linux-yocto ?= "3.4%"
14
15PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
16XSERVER ?= "xserver-xorg \
17 xserver-xorg-extension-extmod \
18 xf86-input-evdev \
19 xf86-video-fbdev"
20
21SERIAL_CONSOLE = "115200 ttyS0"
22
23MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
24
25IMAGE_FSTYPES ?= "jffs2 tar.bz2"
26