diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-22 14:59:46 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-25 12:08:52 +0100 |
commit | 04efff115c0d0e91fde021b7a264d51b85916daf (patch) | |
tree | 73b762571ca48f1a8910eee406519c850d44ee3e /meta-yocto | |
parent | d74176473ae8672856c94d91d2058d3fd3bdab29 (diff) | |
download | poky-04efff115c0d0e91fde021b7a264d51b85916daf.tar.gz |
meta-yocto: Sync with TARGET_ARCH removal changes
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto')
-rw-r--r-- | meta-yocto/conf/machine/atom-pc.conf | 2 | ||||
-rw-r--r-- | meta-yocto/conf/machine/beagleboard.conf | 1 | ||||
-rw-r--r-- | meta-yocto/conf/machine/mpc8315e-rdb.conf | 2 | ||||
-rw-r--r-- | meta-yocto/conf/machine/routerstationpro.conf | 2 |
4 files changed, 0 insertions, 7 deletions
diff --git a/meta-yocto/conf/machine/atom-pc.conf b/meta-yocto/conf/machine/atom-pc.conf index 993cbabd2d..6ac012f2df 100644 --- a/meta-yocto/conf/machine/atom-pc.conf +++ b/meta-yocto/conf/machine/atom-pc.conf | |||
@@ -3,8 +3,6 @@ | |||
3 | 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. | 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 | 5 | ||
6 | TARGET_ARCH = "i586" | ||
7 | |||
8 | include conf/machine/include/tune-atom.inc | 6 | include conf/machine/include/tune-atom.inc |
9 | 7 | ||
10 | MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi \ | 8 | MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi \ |
diff --git a/meta-yocto/conf/machine/beagleboard.conf b/meta-yocto/conf/machine/beagleboard.conf index fddacf92e9..0b3cebc1da 100644 --- a/meta-yocto/conf/machine/beagleboard.conf +++ b/meta-yocto/conf/machine/beagleboard.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | #@TYPE: Machine | 1 | #@TYPE: Machine |
2 | #@NAME: Beagleboard machine | 2 | #@NAME: Beagleboard machine |
3 | #@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board | 3 | #@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board |
4 | TARGET_ARCH = "arm" | ||
5 | 4 | ||
6 | PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86-lite" | 5 | PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86-lite" |
7 | XSERVER = "xserver-xf86-lite \ | 6 | XSERVER = "xserver-xf86-lite \ |
diff --git a/meta-yocto/conf/machine/mpc8315e-rdb.conf b/meta-yocto/conf/machine/mpc8315e-rdb.conf index 3f946a08e5..eb527cf9b2 100644 --- a/meta-yocto/conf/machine/mpc8315e-rdb.conf +++ b/meta-yocto/conf/machine/mpc8315e-rdb.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | #@TYPE: Machine | 1 | #@TYPE: Machine |
2 | #@DESCRIPTION: Machine configuration for running | 2 | #@DESCRIPTION: Machine configuration for running |
3 | 3 | ||
4 | TARGET_ARCH = "powerpc" | ||
5 | TARGET_FPU = "hard" | 4 | TARGET_FPU = "hard" |
6 | 5 | ||
7 | require conf/machine/include/tune-ppc603e.inc | 6 | require conf/machine/include/tune-ppc603e.inc |
@@ -17,7 +16,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" | |||
17 | PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" | 16 | PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" |
18 | XSERVER = "xserver-kdrive-fbdev" | 17 | XSERVER = "xserver-kdrive-fbdev" |
19 | 18 | ||
20 | |||
21 | UBOOT_ENTRYPOINT = "0x00000000" | 19 | UBOOT_ENTRYPOINT = "0x00000000" |
22 | 20 | ||
23 | KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8315erdb.dts" | 21 | KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8315erdb.dts" |
diff --git a/meta-yocto/conf/machine/routerstationpro.conf b/meta-yocto/conf/machine/routerstationpro.conf index 37af0ab485..e6f89d848c 100644 --- a/meta-yocto/conf/machine/routerstationpro.conf +++ b/meta-yocto/conf/machine/routerstationpro.conf | |||
@@ -2,8 +2,6 @@ | |||
2 | #@NAME: mti_malta32_be MIPS | 2 | #@NAME: mti_malta32_be MIPS |
3 | #@DESCRIPTION: mti_malta32_be | 3 | #@DESCRIPTION: mti_malta32_be |
4 | 4 | ||
5 | TARGET_ARCH = "mips" | ||
6 | |||
7 | require conf/machine/include/tune-mips32.inc | 5 | require conf/machine/include/tune-mips32.inc |
8 | 6 | ||
9 | MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 \ | 7 | MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 \ |