summaryrefslogtreecommitdiffstats
path: root/meta-yocto-bsp
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2013-08-26 21:15:18 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-27 09:55:08 (GMT)
commitbe5b80839e5a57c19f7e3ed0502b8b7c3184929f (patch)
treedd33904bf9c856cbe8ae729b79421d45f0ecb643 /meta-yocto-bsp
parentad8836134e92ee90526f6638b29c760999d5035e (diff)
downloadpoky-be5b80839e5a57c19f7e3ed0502b8b7c3184929f.tar.gz
meta-yocto-bsp: Purge atom-pc in favor of genericx86
genericx86 is a superset of atom-pc, so remove all references to atom-pc. Note that genericx86 only has 3.10 linux-yocto support, that leaves us with no x86 BSP in meta-yocto-bsp for the 3.4 kernel. As a general rule, new BSPs are targeted at the current kernel version, so this is normal, but something worth noting. (From meta-yocto rev: 7a8ce1a8ba5a74e16da054c5a04302f028118ce0) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Cc: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto-bsp')
-rw-r--r--meta-yocto-bsp/conf/machine/atom-pc.conf37
-rw-r--r--meta-yocto-bsp/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend1
-rw-r--r--meta-yocto-bsp/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bbappend1
-rw-r--r--meta-yocto-bsp/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bbappend1
-rw-r--r--meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend3
-rw-r--r--meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend3
-rw-r--r--meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend3
7 files changed, 0 insertions, 49 deletions
diff --git a/meta-yocto-bsp/conf/machine/atom-pc.conf b/meta-yocto-bsp/conf/machine/atom-pc.conf
deleted file mode 100644
index 6318d60..0000000
--- a/meta-yocto-bsp/conf/machine/atom-pc.conf
+++ /dev/null
@@ -1,37 +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.8%"
14PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
15XSERVER ?= "xserver-xorg \
16 xserver-xorg-extension-glx \
17 xf86-input-mouse \
18 xf86-input-keyboard \
19 xf86-input-evdev \
20 xf86-input-synaptics \
21 xf86-video-intel \
22 mesa-driver-i915 \
23 mesa-driver-i965"
24
25#MACHINE_EXTRA_RDEPENDS = "rt2860"
26
27MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
28
29IMAGE_FSTYPES ?= "ext3 cpio.gz live"
30
31APPEND += "usbcore.autosuspend=1"
32
33GLIBC_ADDONS = "nptl"
34
35EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi"
36
37ROOTLESS_X = "1"
diff --git a/meta-yocto-bsp/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend b/meta-yocto-bsp/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
index e3aa5e8..f86595c 100644
--- a/meta-yocto-bsp/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
+++ b/meta-yocto-bsp/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
@@ -1,3 +1,2 @@
1RDEPENDS_${PN}_append_atom-pc = " lttng-ust systemtap"
2RDEPENDS_${PN}_append_genericx86 = " lttng-ust systemtap" 1RDEPENDS_${PN}_append_genericx86 = " lttng-ust systemtap"
3 2
diff --git a/meta-yocto-bsp/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bbappend b/meta-yocto-bsp/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bbappend
index d7de19f..ddc54bb 100644
--- a/meta-yocto-bsp/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bbappend
+++ b/meta-yocto-bsp/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bbappend
@@ -1,2 +1 @@
1SDK-EXTRAS_atom-pc ?= " lttng-ust-dev"
2SDK-EXTRAS_genericx86 ?= " lttng-ust-dev" SDK-EXTRAS_genericx86 ?= " lttng-ust-dev"
diff --git a/meta-yocto-bsp/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bbappend b/meta-yocto-bsp/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bbappend
index d7de19f..ddc54bb 100644
--- a/meta-yocto-bsp/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bbappend
+++ b/meta-yocto-bsp/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bbappend
@@ -1,2 +1 @@
1SDK-EXTRAS_atom-pc ?= " lttng-ust-dev"
2SDK-EXTRAS_genericx86 ?= " lttng-ust-dev" SDK-EXTRAS_genericx86 ?= " lttng-ust-dev"
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 9639a56..5756e4c 100644
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,4 +1,3 @@
1KBRANCH_atom-pc = "standard/common-pc/atom-pc"
2KBRANCH_genericx86 = "standard/common-pc/base" 1KBRANCH_genericx86 = "standard/common-pc/base"
3KBRANCH_routerstationpro = "standard/routerstationpro" 2KBRANCH_routerstationpro = "standard/routerstationpro"
4KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" 3KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
@@ -6,7 +5,6 @@ KBRANCH_beagleboard = "standard/beagleboard"
6 5
7KMACHINE_genericx86 ?= "common-pc" 6KMACHINE_genericx86 ?= "common-pc"
8 7
9SRCREV_machine_atom-pc ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0"
10SRCREV_machine_genericx86 ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" 8SRCREV_machine_genericx86 ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0"
11SRCREV_machine_routerstationpro ?= "3991d03bd450e9363d5b6e97ede0628ba073db79" 9SRCREV_machine_routerstationpro ?= "3991d03bd450e9363d5b6e97ede0628ba073db79"
12SRCREV_machine_mpc8315e-rdb ?= "8d8339af518104db03f9c36b82f4372569e55b0a" 10SRCREV_machine_mpc8315e-rdb ?= "8d8339af518104db03f9c36b82f4372569e55b0a"
@@ -15,7 +13,6 @@ SRCREV_machine_beagleboard ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0"
15COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" 13COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
16COMPATIBLE_MACHINE_routerstationpro = "routerstationpro" 14COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
17COMPATIBLE_MACHINE_beagleboard = "beagleboard" 15COMPATIBLE_MACHINE_beagleboard = "beagleboard"
18COMPATIBLE_MACHINE_atom-pc = "atom-pc"
19COMPATIBLE_MACHINE_genericx86 = "genericx86" 16COMPATIBLE_MACHINE_genericx86 = "genericx86"
20 17
21# routerstationpro has a flash size of 16mb 18# routerstationpro has a flash size of 16mb
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend
index 160bcbb..7c2bd67 100644
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -1,9 +1,7 @@
1KBRANCH_atom-pc = "standard/common-pc/atom-pc"
2KBRANCH_routerstationpro = "standard/routerstationpro" 1KBRANCH_routerstationpro = "standard/routerstationpro"
3KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" 2KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
4KBRANCH_beagleboard = "standard/beagleboard" 3KBRANCH_beagleboard = "standard/beagleboard"
5 4
6SRCREV_machine_atom-pc ?= "cdd7a546922ca1c46c94adeec3b9c90dc9aaad2d"
7SRCREV_machine_genericx86 ?= "cdd7a546922ca1c46c94adeec3b9c90dc9aaad2d" 5SRCREV_machine_genericx86 ?= "cdd7a546922ca1c46c94adeec3b9c90dc9aaad2d"
8SRCREV_machine_routerstationpro ?= "62b86dc8ac794cd97c61a99418d7429e6a83ec1a" 6SRCREV_machine_routerstationpro ?= "62b86dc8ac794cd97c61a99418d7429e6a83ec1a"
9SRCREV_machine_mpc8315e-rdb ?= "b2f78892b3ff6cc940e4661f7b2017a73b289c73" 7SRCREV_machine_mpc8315e-rdb ?= "b2f78892b3ff6cc940e4661f7b2017a73b289c73"
@@ -12,7 +10,6 @@ SRCREV_machine_beagleboard ?= "cdd7a546922ca1c46c94adeec3b9c90dc9aaad2d"
12COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" 10COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
13COMPATIBLE_MACHINE_routerstationpro = "routerstationpro" 11COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
14COMPATIBLE_MACHINE_beagleboard = "beagleboard" 12COMPATIBLE_MACHINE_beagleboard = "beagleboard"
15COMPATIBLE_MACHINE_atom-pc = "atom-pc"
16 13
17# routerstationpro has a flash size of 16mb 14# routerstationpro has a flash size of 16mb
18KERNEL_IMAGE_MAXSIZE_append_routerstationpro = "16777216" 15KERNEL_IMAGE_MAXSIZE_append_routerstationpro = "16777216"
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend
index 51c3736..216b384 100644
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend
@@ -1,10 +1,8 @@
1KBRANCH_atom-pc = "standard/common-pc/atom-pc"
2KBRANCH_genericx86 = "standard/common-pc/base" 1KBRANCH_genericx86 = "standard/common-pc/base"
3KBRANCH_routerstationpro = "standard/routerstationpro" 2KBRANCH_routerstationpro = "standard/routerstationpro"
4KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" 3KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
5KBRANCH_beagleboard = "standard/beagleboard" 4KBRANCH_beagleboard = "standard/beagleboard"
6 5
7SRCREV_machine_atom-pc ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
8SRCREV_machine_genericx86 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87" 6SRCREV_machine_genericx86 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
9SRCREV_machine_routerstationpro ?= "4a94f39d429fa284ce69b13bb635b29b1319e372" 7SRCREV_machine_routerstationpro ?= "4a94f39d429fa284ce69b13bb635b29b1319e372"
10SRCREV_machine_mpc8315e-rdb ?= "f467c72937de0e4a2a66e21b9855c4aee844f936" 8SRCREV_machine_mpc8315e-rdb ?= "f467c72937de0e4a2a66e21b9855c4aee844f936"
@@ -13,7 +11,6 @@ SRCREV_machine_beagleboard ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
13COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" 11COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
14COMPATIBLE_MACHINE_routerstationpro = "routerstationpro" 12COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
15COMPATIBLE_MACHINE_beagleboard = "beagleboard" 13COMPATIBLE_MACHINE_beagleboard = "beagleboard"
16COMPATIBLE_MACHINE_atom-pc = "atom-pc"
17COMPATIBLE_MACHINE_genericx86 = "genericx86" 14COMPATIBLE_MACHINE_genericx86 = "genericx86"
18 15
19# routerstationpro has a flash size of 16mb 16# routerstationpro has a flash size of 16mb