diff options
Diffstat (limited to 'conf/machine')
46 files changed, 34 insertions, 50 deletions
diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf index 3977f50e2b..0b33e3478e 100644 --- a/conf/machine/a780.conf +++ b/conf/machine/a780.conf @@ -5,7 +5,7 @@ include conf/machine/include/motorola-ezx.conf TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}" +IPKG_EXTRA_ARCHS = "armv4 armv5te" PREFERRED_PROVIDER_xserver = "xserver-kdrive" diff --git a/conf/machine/amsdelta.conf b/conf/machine/amsdelta.conf index dbe74dea45..193048ae52 100644 --- a/conf/machine/amsdelta.conf +++ b/conf/machine/amsdelta.conf @@ -5,7 +5,6 @@ TARGET_ARCH = "arm" TARGET_FPU = "soft" -IPKG_ARCHS = "all arm ${MACHINE}" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-amsdelta-2.6" diff --git a/conf/machine/blueangel.conf b/conf/machine/blueangel.conf index 9c2b94df42..251dc8a806 100644 --- a/conf/machine/blueangel.conf +++ b/conf/machine/blueangel.conf @@ -7,7 +7,7 @@ KERNEL ?= "kernel26" OVERRIDES =. "${KERNEL}:" TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa blueangel" +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel_kernel26 = "xanadux-ba-2.6" PREFERRED_PROVIDER_virtual/kernel = "xanadux-ba-2.6" diff --git a/conf/machine/colinux.conf b/conf/machine/colinux.conf index 1af280c2b3..556944ef8e 100644 --- a/conf/machine/colinux.conf +++ b/conf/machine/colinux.conf @@ -3,6 +3,6 @@ #@DESCRIPTION: Machine configuration for Cooperative Linux running on an x86 compatible PC TARGET_ARCH = "i686" -IPKG_ARCHS = "all i686 i386 x86 ${MACHINE}" +IPKG_EXTRA_ARCHS = "i386 x86" PREFERRED_PROVIDER_virtual/kernel = "linux-colinux" BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules" diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 3e95848a35..0363f05e6b 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm ${MACHINE}" PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel ?= "collie-kernels-2.4-embedix" BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules-cs \ diff --git a/conf/machine/devkitidp-pxa255.conf b/conf/machine/devkitidp-pxa255.conf index 39ef40ae16..6bc632dbdd 100644 --- a/conf/machine/devkitidp-pxa255.conf +++ b/conf/machine/devkitidp-pxa255.conf @@ -5,7 +5,7 @@ TARGET_ARCH = "arm" GUI_MACHINE_CLASS = "bigscreen" -IPKG_ARCHS = "all arm armv5te ${MACHINE}" +IPKG_EXTRA_ARCHS = "armv5te" PREFERRED_PROVIDER_virtual/bootloader = "uboot-${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf index 40387b53a9..103bd13e4b 100644 --- a/conf/machine/efika.conf +++ b/conf/machine/efika.conf @@ -5,7 +5,7 @@ INHERIT += "linux_modules" TARGET_ARCH = "powerpc" -IPKG_ARCHS = "all ppc ${MACHINE}" +IPKG_EXTRA_ARCHS = "ppc" PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}" diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf index b1e620882d..4b044e838d 100644 --- a/conf/machine/ep93xx.conf +++ b/conf/machine/ep93xx.conf @@ -5,7 +5,7 @@ INHERIT += "linux_modules" TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm armv4t ${MACHINE}" +IPKG_EXTRA_ARCHS = "armv4t" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf index 0d3bcedee3..dd6b0f0b93 100644 --- a/conf/machine/epia.conf +++ b/conf/machine/epia.conf @@ -7,7 +7,7 @@ udevdir = "/dev" OLDEST_KERNEL = "2.6.5" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" -IPKG_ARCHS = "i386" +IPKG_EXTRA_ARCHS = "i386" include conf/machine/include/tune-c3.conf diff --git a/conf/machine/geodegx.conf b/conf/machine/geodegx.conf index e4f56f16e3..f9083615a4 100644 --- a/conf/machine/geodegx.conf +++ b/conf/machine/geodegx.conf @@ -3,7 +3,7 @@ # Released under the MIT license (see packages/COPYING) TARGET_ARCH = "i486" -IPKG_ARCHS = "all i486 geodegx" +IPKG_EXTRA_ARCHS = "geodegx" PREFERRED_PROVIDER_virtual/kernel = "linux-geodegx" BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" diff --git a/conf/machine/gumstix.conf b/conf/machine/gumstix.conf index 8da2f5ca3a..75c671a3d4 100644 --- a/conf/machine/gumstix.conf +++ b/conf/machine/gumstix.conf @@ -3,7 +3,6 @@ TARGET_VENDOR = "-oe" PREFERRED_PROVIDER_virtual/kernel = "linux-gumstix" OLDEST_KERNEL = "2.6.15" MODUTILS = "26" -IPKG_ARCHS = "arm ${MACHINE}" include conf/machine/include/tune-xscale.conf TARGET_CC_ARCH = "-Os -pipe -Os -march=armv5te -mtune=xscale -Wa,-mcpu=xscale" diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf index 7ebcccb293..a023118268 100644 --- a/conf/machine/h1910.conf +++ b/conf/machine/h1910.conf @@ -6,7 +6,7 @@ KERNEL ?= "kernel26" OVERRIDES =. "${KERNEL}:" TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm armv5te h1910" +IPKG_EXTRA_ARCHS = "armv5te" include conf/machine/include/tune-xscale.conf diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf index fb4dc8c710..b11e447ea0 100644 --- a/conf/machine/h1940.conf +++ b/conf/machine/h1940.conf @@ -2,7 +2,7 @@ #@NAME: h1940 #@DESCRIPTION: Machine configuration for the HP iPAQ h1930 and h1940 -IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te h1940" +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" TARGET_ARCH = arm PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-h1940" diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 40401daece..fab57cae38 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -4,7 +4,7 @@ TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa h2200" +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index b364758428..0261a84d64 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the Compaq iPAQ 36xx, Compaq iPAQ 37xx and Compaq iPAQ 38xx devices TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm ipaqsa h3600" +IPKG_EXTRA_ARCHS = "ipaqsa" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa" EXTRA_IMAGECMD_h3600_jffs2 = "-e 0x40000 -p" diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index cab50dbdf6..1611ed431a 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -8,7 +8,7 @@ KERNEL ?= "kernel24" OVERRIDES =. "${KERNEL}:" TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa h3900" +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa" PREFERRED_PROVIDER_virtual/kernel_kernel26 = "handhelds-pxa-2.6" diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf index 3f8b7d7115..33855e3a66 100644 --- a/conf/machine/h6300.conf +++ b/conf/machine/h6300.conf @@ -4,7 +4,7 @@ TARGET_ARCH = "arm" PACKAGE_ARCH = "arm" -IPKG_ARCHS = "all arm armv4" +IPKG_EXTRA_ARCHS = "armv4" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-h6300-omap1" diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf index 2dab2e2e40..93befb92ce 100644 --- a/conf/machine/include/ixp4xx.conf +++ b/conf/machine/include/ixp4xx.conf @@ -111,7 +111,7 @@ TARGET_PACKAGE_ARCH = "${TARGET_PACKAGE_ARCH_BASE}${BYTE_SEX_CHAR}" # because everything built here is no more specific than that. MACHINE_ARCH = "ixp4xx${ARCH_BYTE_SEX}" -# IPKG_ARCHS +# IPKG_EXTRA_ARCHS # The full list of package architectures which should run on the system. # This takes into account both the board level issues and the INPUTS set # by the distro. The arm list is derived from the architecture settings @@ -126,12 +126,12 @@ THUMB_ARCHITECTURES = "thumbe${BYTE_SEX_CHAR} thumbv4t${BYTE_SEX_CHAR} thumbv5t$ # NOTE: this list contains just the things which rootfs_ipk.bbclass does # not add, rootfs_ipk.bbclass evaluates: # -# ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_ARCHS} ${MACHINE}" +# ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_EXTRA_ARCHS} ${MACHINE}" # # This is a priority ordered list - most desireable architecture at the end, # so put <ARM_INSTRUCTION_SET>_ARCHITECTURES at the end and, if # THUMB_INTERWORK precede this with the other architectures. -IPKG_ARCHS = "ixp4xx ${MACHINE} \ +IPKG_EXTRA_ARCHS = "ixp4xx ${MACHINE} \ ${@(lambda arch_thumb, arch_arm, is_arm, interwork: \ (interwork and (is_arm and arch_thumb or arch_arm) + ' ' or '') \ + '${TARGET_ARCH} ' + (is_arm and arch_arm or arch_thumb)) \ @@ -146,7 +146,7 @@ IPKG_ARCHS = "ixp4xx ${MACHINE} \ # the removal of the raw "${MACHINE}" from the end of the list. ${MACHINE} and # ixp4xx are included at the start (lower priority) as the non-byte-sex specific # versions. -IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${IPKG_ARCHS}" +IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${IPKG_EXTRA_ARCHS}" #------------------------------------------------------------------------------- # Package versions diff --git a/conf/machine/include/tune-iwmmxt.conf b/conf/machine/include/tune-iwmmxt.conf index 2976e0a641..e46796fede 100644 --- a/conf/machine/include/tune-iwmmxt.conf +++ b/conf/machine/include/tune-iwmmxt.conf @@ -1,6 +1,6 @@ # Configurations for the Intel PXA27x Appications Processor Family. # Please use tune-xscale for PXA255/PXA26x based processors. -IPKG_ARCHS += "iwmmxt" +IPKG_EXTRA_ARCHS += "iwmmxt" TARGET_CC_ARCH = "-march=iwmmxt -mtune=iwmmxt" PACKAGE_ARCH = "iwmmxt" diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf index 1e3d3d7779..02666360ba 100644 --- a/conf/machine/include/zaurus-clamshell.conf +++ b/conf/machine/include/zaurus-clamshell.conf @@ -1,5 +1,5 @@ TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}" +IPKG_EXTRA_ARCHS = "armv4 armv5te" PREFERRED_PROVIDER_xserver = "xserver-kdrive" diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index 07753ccf64..f5cc893c9c 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU devices TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm armv4 armv5te ipaqpxa hx4700" +IPKG_EXTRA_ARCHS = "armv4 armv5te ipaqpxa hx4700" #use this for a hx47xx ipaq PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf index b3f54995c8..b5f8606cf5 100644 --- a/conf/machine/jornada56x.conf +++ b/conf/machine/jornada56x.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the SA1100 based HP Jornada 56x palmtop computer TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm ${MACHINE}" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa-2.6" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf index 5aa492f57d..6521d15981 100644 --- a/conf/machine/jornada6xx.conf +++ b/conf/machine/jornada6xx.conf @@ -3,6 +3,5 @@ #@DESCRIPTION: Machine configuration for the HITACHI SH3 based HP Jornada 6xx palmtop computer TARGET_ARCH = "sh3" -IPKG_ARCHS = "all ${TARGET_ARCH} ${MACHINE}" include conf/machine/include/tune-sh3.conf diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf index 82eff0b563..e8218138d5 100644 --- a/conf/machine/jornada7xx.conf +++ b/conf/machine/jornada7xx.conf @@ -3,6 +3,5 @@ #@DESCRIPTION: Machine configuration for the SA1100 based HP Jornada 7xx palmtop computer TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm ${MACHINE}" include conf/machine/include/tune-strongarm.conf
\ No newline at end of file diff --git a/conf/machine/ks8695.conf b/conf/machine/ks8695.conf index a3e7509e29..5d214f7cfb 100644 --- a/conf/machine/ks8695.conf +++ b/conf/machine/ks8695.conf @@ -6,7 +6,6 @@ TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm ${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}" require conf/machine/include/tune-arm920t.conf diff --git a/conf/machine/lite5200.conf b/conf/machine/lite5200.conf index 68efccef32..2bf6cc2d8e 100644 --- a/conf/machine/lite5200.conf +++ b/conf/machine/lite5200.conf @@ -1,5 +1,5 @@ TARGET_ARCH = "powerpc" -IPKG_ARCHS = "all ppc ${MACHINE}" +IPKG_EXTRA_ARCHS = "ppc" UBOOT_MACHINE = "Lite5200" SERIAL_CONSOLE="38400 ttyS0" diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf index a171a21393..de242242a7 100644 --- a/conf/machine/mainstone.conf +++ b/conf/machine/mainstone.conf @@ -5,7 +5,7 @@ TARGET_ARCH = "arm" GUI_MACHINE_CLASS = "smallscreen" -IPKG_ARCHS = "all arm armv5te ${MACHINE}" +IPKG_EXTRA_ARCHS = "armv5te" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" diff --git a/conf/machine/mtx-1.conf b/conf/machine/mtx-1.conf index 02c3164da1..3a5f047ae0 100644 --- a/conf/machine/mtx-1.conf +++ b/conf/machine/mtx-1.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the mtx-1 (aka MeshCube) TARGET_ARCH = "mipsel" -IPKG_ARCHS = "all mipsel ${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-1" #PREFERRED_VERSION_linux-mtx-1 = "2.4.24" diff --git a/conf/machine/native.conf b/conf/machine/native.conf index 4817b2e3f1..8caa6b9f1e 100644 --- a/conf/machine/native.conf +++ b/conf/machine/native.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for your build station TARGET_ARCH = "${BUILD_ARCH}" -IPKG_ARCHS = "all ${TARGET_ARCH}" TARGET_PREFIX = "" VENDOR = "-oe" diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf index bcad9ccbe0..9d483d4c55 100644 --- a/conf/machine/netvista.conf +++ b/conf/machine/netvista.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the IBM Netvista thin client TARGET_ARCH = "i386" -IPKG_ARCHS = "all i386" PREFERRED_PROVIDER_xserver = "xserver-xorg" PREFERRED_PROVIDER_virtual/kernel = "linux-netvista" BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils" diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index d24324a598..5708c78baf 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -2,7 +2,7 @@ #@NAME: Nokia 770 internet tablet #@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}" +IPKG_EXTRA_ARCHS = "armv4 armv5te" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap" PREFERRED_PROVIDER_virtual/bootloader = "" diff --git a/conf/machine/omap1510inn.conf b/conf/machine/omap1510inn.conf index 9c460b44b8..bd367d43a0 100644 --- a/conf/machine/omap1510inn.conf +++ b/conf/machine/omap1510inn.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the OMAP H2 development board with a 1610 processor TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm armv5te ${MACHINE}" +IPKG_EXTRA_ARCHS = "armv5te" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6" diff --git a/conf/machine/omap1610h2.conf b/conf/machine/omap1610h2.conf index 9c460b44b8..bd367d43a0 100644 --- a/conf/machine/omap1610h2.conf +++ b/conf/machine/omap1610h2.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the OMAP H2 development board with a 1610 processor TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm armv5te ${MACHINE}" +IPKG_EXTRA_ARCHS = "armv5te" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6" diff --git a/conf/machine/omap1710h3.conf b/conf/machine/omap1710h3.conf index 9c460b44b8..bd367d43a0 100644 --- a/conf/machine/omap1710h3.conf +++ b/conf/machine/omap1710h3.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the OMAP H2 development board with a 1610 processor TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm armv5te ${MACHINE}" +IPKG_EXTRA_ARCHS = "armv5te" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6" diff --git a/conf/machine/omap2420h4.conf b/conf/machine/omap2420h4.conf index db333b2e19..514069264e 100644 --- a/conf/machine/omap2420h4.conf +++ b/conf/machine/omap2420h4.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the OMAP H2 development board with a 1610 processor TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm armv5te armv6te ${MACHINE}" +IPKG_EXTRA_ARCHS = "armv5te armv6te" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6" diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index 822d766a98..dccc5a227b 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the OMAP Starter Kit with a 5912 processor TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm armv5te ${MACHINE}" +IPKG_EXTRA_ARCHS = "armv5te" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index 8c83416919..79915e4f74 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm armv4 armv5te poodle" +IPKG_EXTRA_ARCHS = "armv4 armv5te" ZKERNEL_VERSION ?= "2.4" include conf/machine/include/poodle-${ZKERNEL_VERSION}.conf diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf index f3edef9890..022eb7f598 100644 --- a/conf/machine/qemuarm.conf +++ b/conf/machine/qemuarm.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm armv4 armv5te qemuarm" +IPKG_EXTRA_ARCHS = "armv4 armv5te" PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index a6439783f3..43097d871e 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -8,7 +8,6 @@ KERNEL ?= "kernel24" OVERRIDES =. "${KERNEL}:" TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm ${MACHINE}" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel_kernel24 = "opensimpad-64+0" PREFERRED_PROVIDER_virtual/kernel_kernel26 = "handhelds-pxa-2.6" diff --git a/conf/machine/sun4cdm.conf b/conf/machine/sun4cdm.conf index d73ab85f87..5376be0dda 100644 --- a/conf/machine/sun4cdm.conf +++ b/conf/machine/sun4cdm.conf @@ -7,7 +7,5 @@ BOOTSTRAP_EXTRA_RDEPENDS = "kernel module-init-tools udev" udevdir = "/dev" OLDEST_KERNEL = "2.6.5" -IPKG_ARCHS = "sparc" - PREFERRED_PROVIDER_virtual/kernel = "linux-sun4cdm" diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index 3485937186..751b498f14 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the PXA255 based Sharp Zaurus SL-6000 device TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm armv4 armv5te tosa" +IPKG_EXTRA_ARCHS = "armv4 armv5te" ZKERNEL_VERSION ?= "2.4" include conf/machine/include/tosa-${ZKERNEL_VERSION}.conf diff --git a/conf/machine/triton.conf b/conf/machine/triton.conf index cb5c8fb9cd..671def34c3 100644 --- a/conf/machine/triton.conf +++ b/conf/machine/triton.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the XScale based triton boards from KaRo Electronics TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm armv5te ${MACHINE}" +IPKG_EXTRA_ARCHS = "armv5te" PREFERRED_PROVIDER_virtual/kernel = "triton-kernel" BOOTSTRAP_EXTRA_RDEPENDS = "virtual/kernel" diff --git a/conf/machine/wl500g.conf b/conf/machine/wl500g.conf index 18445ec17d..516d709110 100644 --- a/conf/machine/wl500g.conf +++ b/conf/machine/wl500g.conf @@ -4,4 +4,3 @@ TARGET_ARCH = "mipsel" TARGET_CC_ARCH = "-Os -mips2" -IPKG_ARCHS = "all mipsel ${MACHINE}" diff --git a/conf/machine/wrt54.conf b/conf/machine/wrt54.conf index 569d78b5a0..f61570a950 100644 --- a/conf/machine/wrt54.conf +++ b/conf/machine/wrt54.conf @@ -4,7 +4,6 @@ TARGET_ARCH = "mipsel" TARGET_CC_ARCH = "-Os" -IPKG_ARCHS = "all mipsel ${MACHINE}" SERIAL_CONSOLE = "tts/0" diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf index 02583c9fae..0210b87810 100644 --- a/conf/machine/x86.conf +++ b/conf/machine/x86.conf @@ -4,7 +4,7 @@ TARGET_ARCH = "i386" # TARGET_VENDOR = "-oe" -IPKG_ARCHS = "all i386 x86" +IPKG_EXTRA_ARCHS = "x86" PREFERRED_PROVIDER_virtual/kernel = "linux-x86" BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" diff --git a/conf/machine/xxs1500.conf b/conf/machine/xxs1500.conf index 7500181482..9cc47cdef7 100644 --- a/conf/machine/xxs1500.conf +++ b/conf/machine/xxs1500.conf @@ -5,7 +5,6 @@ # pad size and SREC_VMAADDR would need to be changed for the xxs1500 rev B. TARGET_ARCH = "mipsel" -IPKG_ARCHS = "all mipsel ${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "linux-xxs1500" |