diff options
Diffstat (limited to 'conf')
43 files changed, 82 insertions, 57 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index b5b25407c3..9ce51821b1 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -86,10 +86,15 @@ TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS' TARGET_PREFIX = "${TARGET_SYS}-" TARGET_CC_ARCH = "" -PACKAGE_ARCH = "${HOST_ARCH}" +BASE_PACKAGE_ARCH = "${HOST_ARCH}" +PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}" +MULTIMACH_ARCH = "${PACKAGE_ARCH}" +MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" +MULTIMACH_HOST_SYS = "${MULTIMACH_ARCH}${HOST_VENDOR}-${HOST_OS}" + # select proper CPU to get binary locales generated QEMU_OPTIONS = "" QEMU_OPTIONS_iwmmxt = "-cpu pxa270-c5" @@ -160,6 +165,8 @@ RPROVIDES = "" MULTI_PROVIDER_WHITELIST = "virtual/libintl" PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale" +#enable this when bitbake is upgraded to cope with ++ values in the field +#PACKAGES_DYNAMIC = "${PN}-locale-*" FILES = "" FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ @@ -209,8 +216,8 @@ SVNDIR = "${CO_DIR}/svn" GITDIR = "${CO_DIR}/git" BZRDIR = "${CO_DIR}/bzr" -STAMP = "${TMPDIR}/stamps/${PF}" -WORKDIR = "${TMPDIR}/work/${PF}" +STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PF}" +WORKDIR = "${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PF}" T = "${WORKDIR}/temp" D = "${WORKDIR}/image" S = "${WORKDIR}/${P}" @@ -246,7 +253,7 @@ DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images" DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools" -PKGDATA_DIR = "${STAGING_DIR}/pkgdata" +PKGDATA_DIR = "${STAGING_DIR}/pkgdata/${MULTIMACH_TARGET_SYS}" SDK_NAME = "${DISTRO}/${TARGET_ARCH}" SDK_PREFIX = "/usr/local/${SDK_NAME}" @@ -256,7 +263,7 @@ SDK_PREFIX = "/usr/local/${SDK_NAME}" ################################################################## OLDEST_KERNEL = "2.4.0" -STAGING_KERNEL_DIR = "${STAGING_DIR_HOST}/kernel" +STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/kernel" ################################################################## # Specific image creation and rootfs population info. @@ -380,6 +387,7 @@ export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \ ALLOWED_FLAGS = "-O -mcpu -march -pipe" # Pass parallel make options to the compile task only +EXTRA_OEMAKE_prepend_task_do_compile = "${PARALLEL_MAKE} " EXTRA_OEMAKE_prepend_task-compile = "${PARALLEL_MAKE} " ################################################################## diff --git a/conf/checksums.ini b/conf/checksums.ini index 6c63dff5d7..b3d2f441a3 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -12310,9 +12310,9 @@ sha256=ff32a0d3bc696cadc3457be9c85e9818af2b6daa2f159188bb01aad7e932a0e1 md5=84ab290758d2c177df5924e10bff4835 sha256=522ded5292b80289e13dc8af9a0c11d35417f7079779969835cc8af55a38d006 -[ftp://mama.indstate.edu/linux/tree/tree-1.5.1.tgz] -md5=274ca4d36ee6fb216fa6cf01ad5eaa84 -sha256=1cda1c4d43c6e11ac2214e0a886f1d184bf59d49252cb489b110697f686f809c +[ftp://mama.indstate.edu/linux/tree/tree-1.5.2.tgz] +md5=b86a3091ec93e1e13e81020fa33b6270 +sha256=d830f5c79fa86bd5b40ce99e70408e7e734361a14dc0bea5bffa0586cfde9715 [http://www.southern-storm.com.au/download/treecc-0.3.6.tar.gz] md5=56426279e6017af909353176e582fb28 diff --git a/conf/distro/celinux-test.conf b/conf/distro/celinux-test.conf index 03dcd22d79..ad7a34d97c 100644 --- a/conf/distro/celinux-test.conf +++ b/conf/distro/celinux-test.conf @@ -11,9 +11,6 @@ # we want IPKG packages and Debian style naming INHERIT += " package_ipk debian" -# enable if build for many machines -#INHERIT += " multimachine" - # we want images supporting the following features (for task-base) DISTRO_FEATURES = "nfs pcmcia usbhost" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index bbdbe7f80b..4ada4a89d4 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -35,9 +35,6 @@ MAINTAINER = "Angstrom Developers <angstrom-distro-devel@linuxtogo.org>" #use debian style naming INHERIT += "debian" -#use multimachine buildrules -INHERIT += "multimachine" - #activate config checker INHERIT += "sanity" diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 9043345134..66a7201cf0 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -3,8 +3,8 @@ SRCREV_pn-dfu-util ?= "${AUTOREV}" SRCREV_pn-dfu-util-native ?= "${AUTOREV}" SRCREV_pn-diversity-daemon ?= "${AUTOREV}" SRCREV_pn-diversity-nav ?= "${AUTOREV}" -SRCREV_pn-illume ?= "${AUTOREV}" -SRCREV_pn-illume-theme ?= "${AUTOREV}" +#SRCREV_pn-illume ?= "${AUTOREV}" +#SRCREV_pn-illume-theme ?= "${AUTOREV}" SRCREV_pn-libgsmd ?= "${AUTOREV}" SRCREV_pn-libjana ?= "${AUTOREV}" SRCREV_pn-libmokogsmd2 ?= "${AUTOREV}" diff --git a/conf/distro/include/oplinux.inc b/conf/distro/include/oplinux.inc index a7eac524bc..36eca58241 100644 --- a/conf/distro/include/oplinux.inc +++ b/conf/distro/include/oplinux.inc @@ -9,9 +9,6 @@ BB_MIN_VERSION = "1.8.10" #OPLinux and OPLinux-uclibc source mirrors INHERIT += "oplinux-mirrors" -#oplinux is a multimachine distro -INHERIT += "multimachine" - # check for required tools and minimal BitBake version INHERIT += "sanity" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index feb237cea6..cdd4c6f993 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -48,8 +48,8 @@ SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f" SRCREV_pn-gtkhtml2 ?= "1158" SRCREV_pn-gypsy ?= "134" SRCREV_pn-hildon-1 ?= "14429" -SRCREV_pn-illume ?= "124" -SRCREV_pn-illume-theme ?= "124" +SRCREV_pn-illume ?= "134" +SRCREV_pn-illume-theme ?= "134" SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" SRCREV_pn-libcalenabler2 ?= "1410" @@ -141,6 +141,8 @@ SRCREV_pn-openocd-native ?= "517" SRCREV_pn-opkg ?= "4488" SRCREV_pn-opkg-native ?= "4491" SRCREV_pn-opkg-sdk ?= "4488" +SRCREV_pn-opkg-utils ?= "4534" +SRCREV_pn-opkg-utils-native ?= "4534" SRCREV_pn-oprofileui ?= "173" SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5" SRCREV_pn-psplash ?= "249" @@ -164,7 +166,7 @@ SRCREV_pn-settings-daemon ?= "2006" SRCREV_pn-sjf2410-linux-native ?= "4268" SRCREV_pn-sphyrna ?= "45" SRCREV_pn-tmut ?= "60" -SRCREV_pn-u-boot-openmoko ?= "4297" +SRCREV_pn-u-boot-openmoko ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" SRCREV_pn-usbpath ?= "3172" SRCREV_pn-usbpath-native ?= "3172" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 8661e5b065..b149f65f11 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -42,7 +42,7 @@ TARGET_FPU = "soft" # glib-2.0 builds require USE_NLS to be overridden USE_NLS_glib-2.0 = "yes" -INHERIT += "package_ipk debian multimachine" +INHERIT += "package_ipk debian" # FULL_OPTIMIZATION # Optimization settings. Os works fine and is significantly better than O2. diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index b8c7dae22e..d5b994c55c 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -81,7 +81,7 @@ PREFERRED_VERSION_busybox = "1.9.1" #<>It will use different folders depending on Arch (set in local.conf) #<>------------------------------------------------------------------< SRC_DIST_LOCAL = "copy" -INHERIT += "package_ipk package_tar multimachine src_distribute_local" +INHERIT += "package_ipk package_tar src_distribute_local" BBINCLUDELOGS = "yes" IMAGE_FSTYPES = "tar.bz2" TARGET_OS = "linux" diff --git a/conf/distro/jlime-henchman.conf b/conf/distro/jlime-henchman.conf index 68353b0bd9..646d335390 100644 --- a/conf/distro/jlime-henchman.conf +++ b/conf/distro/jlime-henchman.conf @@ -32,7 +32,7 @@ IMAGE_NAME = "${IMAGE_BASENAME}-Henchman-${MACHINE}" # # Naming schemes # -INHERIT += "debian multimachine" +INHERIT += "debian" # # Packaging and output format diff --git a/conf/distro/jlime-mongo.conf b/conf/distro/jlime-mongo.conf index 6fb00f1452..e2b2e8b7db 100644 --- a/conf/distro/jlime-mongo.conf +++ b/conf/distro/jlime-mongo.conf @@ -32,7 +32,7 @@ IMAGE_NAME = "${IMAGE_BASENAME}-Mongo-${MACHINE}" # # Naming schemes # -INHERIT += "debian multimachine" +INHERIT += "debian" # # Packaging and output format diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index b54b0c8c8b..e86cf5cd4f 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -19,7 +19,7 @@ DISTRO_TYPE = "debug" # # Naming schemes # -INHERIT += "debian multimachine" +INHERIT += "debian" # # Packaging and output format diff --git a/conf/distro/openprotium.conf b/conf/distro/openprotium.conf index 533b41526b..4b620fe6be 100644 --- a/conf/distro/openprotium.conf +++ b/conf/distro/openprotium.conf @@ -17,7 +17,7 @@ MACHINE_TASK_PROVIDER = "task-openprotium" # # Naming schemes # -INHERIT += "debian multimachine" +INHERIT += "debian" # # Packaging and output format diff --git a/conf/machine/at91-l9260.conf b/conf/machine/at91-l9260.conf new file mode 100644 index 0000000000..16d0705a24 --- /dev/null +++ b/conf/machine/at91-l9260.conf @@ -0,0 +1,24 @@ +#@TYPE: Machine +#@Name: Olimex eval board for the AT91SAM9260 +#@DESCRIPTION: Machine.inciguration for the AT91SAM9260 development board with a at91sam9260 processor + +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4t armv5te" + +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_VERSION_linux = "2.6.25" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" + +KERNEL_IMAGETYPE = "uImage" + +#don't try to access tty1 +USE_VT = "0" + +MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget" + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" + +require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf index 65a82d1e0b..4657d48b79 100644 --- a/conf/machine/h6300.conf +++ b/conf/machine/h6300.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_ARCH = "arm" +BASE_PACKAGE_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t" #Use OMAP 1510 cpu specifig arm9tdmi options for gcc diff --git a/conf/machine/htckaiser.conf b/conf/machine/htckaiser.conf index f5f6cb5c66..eba677fae7 100644 --- a/conf/machine/htckaiser.conf +++ b/conf/machine/htckaiser.conf @@ -13,7 +13,7 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "320" TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s" FEED_ARCH = "armv6" -PACKAGE_ARCH = "armv6" +BASE_PACKAGE_ARCH = "armv6" IMAGE_FSTYPES ?= "tar.gz cpio.gz" diff --git a/conf/machine/include/tune-arm1136jf-s.inc b/conf/machine/include/tune-arm1136jf-s.inc index a69df825c0..0f5aef5ea4 100644 --- a/conf/machine/include/tune-arm1136jf-s.inc +++ b/conf/machine/include/tune-arm1136jf-s.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp" FEED_ARCH = "armv6" -PACKAGE_ARCH = "armv6" +BASE_PACKAGE_ARCH = "armv6" diff --git a/conf/machine/include/tune-arm920t.inc b/conf/machine/include/tune-arm920t.inc index b142d3325a..1f7a04bb3b 100644 --- a/conf/machine/include/tune-arm920t.inc +++ b/conf/machine/include/tune-arm920t.inc @@ -1,4 +1,4 @@ FEED_ARCH = "armv4t" -PACKAGE_ARCH = "armv4t" +BASE_PACKAGE_ARCH = "armv4t" TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" diff --git a/conf/machine/include/tune-arm926ejs.inc b/conf/machine/include/tune-arm926ejs.inc index c3e8d7aefc..e80ef10490 100644 --- a/conf/machine/include/tune-arm926ejs.inc +++ b/conf/machine/include/tune-arm926ejs.inc @@ -4,4 +4,4 @@ FEED_ARCH = "armv5te" #TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" # For gcc 4.x you need: TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s" -PACKAGE_ARCH = "armv5te" +BASE_PACKAGE_ARCH = "armv5te" diff --git a/conf/machine/include/tune-arm9tdmi.inc b/conf/machine/include/tune-arm9tdmi.inc index ded2c1b732..50aaec1320 100644 --- a/conf/machine/include/tune-arm9tdmi.inc +++ b/conf/machine/include/tune-arm9tdmi.inc @@ -1,3 +1,3 @@ FEED_ARCH = "armv4t" -PACKAGE_ARCH = "armv4t" +BASE_PACKAGE_ARCH = "armv4t" TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi" diff --git a/conf/machine/include/tune-armv7.inc b/conf/machine/include/tune-armv7.inc index 6276fe6798..96c8c64904 100644 --- a/conf/machine/include/tune-armv7.inc +++ b/conf/machine/include/tune-armv7.inc @@ -3,4 +3,4 @@ # This will NOT compile programs in 'ARM' mode, which is what you really want TARGET_CC_ARCH = "-march=armv7 -mfpu=vfp -mfloat-abi=softfp" FEED_ARCH = "armv7" -PACKAGE_ARCH = "armv7" +BASE_PACKAGE_ARCH = "armv7" diff --git a/conf/machine/include/tune-at32ap7000.inc b/conf/machine/include/tune-at32ap7000.inc index 2efe0bb3e2..666dd21a01 100644 --- a/conf/machine/include/tune-at32ap7000.inc +++ b/conf/machine/include/tune-at32ap7000.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-march=ap" -PACKAGE_ARCH = "avr32" +BASE_PACKAGE_ARCH = "avr32" FEED_ARCH = "avr32" diff --git a/conf/machine/include/tune-athlonmp.inc b/conf/machine/include/tune-athlonmp.inc index 167559aa85..313300d9cd 100644 --- a/conf/machine/include/tune-athlonmp.inc +++ b/conf/machine/include/tune-athlonmp.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-march=i686" -PACKAGE_ARCH = "i686" +BASE_PACKAGE_ARCH = "i686" FEED_ARCH = "i686" diff --git a/conf/machine/include/tune-c3.inc b/conf/machine/include/tune-c3.inc index 00db9d0445..43849086f4 100644 --- a/conf/machine/include/tune-c3.inc +++ b/conf/machine/include/tune-c3.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-march=c3 -mtune=c3" -PACKAGE_ARCH = "i586" +BASE_PACKAGE_ARCH = "i586" FEED_ARCH = "i586" diff --git a/conf/machine/include/tune-cortexa8.inc b/conf/machine/include/tune-cortexa8.inc index 51f6f3d72b..4216255102 100644 --- a/conf/machine/include/tune-cortexa8.inc +++ b/conf/machine/include/tune-cortexa8.inc @@ -5,4 +5,4 @@ TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp" FEED_ARCH = "armv7a" -PACKAGE_ARCH = "armv7a" +BASE_PACKAGE_ARCH = "armv7a" diff --git a/conf/machine/include/tune-cortexm1.inc b/conf/machine/include/tune-cortexm1.inc index a0d18b69c6..6c4a70a24d 100644 --- a/conf/machine/include/tune-cortexm1.inc +++ b/conf/machine/include/tune-cortexm1.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-march=armv7 -mtune=cortex-m1 -mfpu=vfp -mfloat-abi=softfp" FEED_ARCH = "armv6" -PACKAGE_ARCH = "armv6" +BASE_PACKAGE_ARCH = "armv6" diff --git a/conf/machine/include/tune-cortexm3.inc b/conf/machine/include/tune-cortexm3.inc index 3598998a74..6da9aeedda 100644 --- a/conf/machine/include/tune-cortexm3.inc +++ b/conf/machine/include/tune-cortexm3.inc @@ -1,4 +1,4 @@ # valid options for -march: `armv7', `armv7-m' TARGET_CC_ARCH = "-march=armv7-m -mtune=cortex-m3 -mfpu=vfp -mfloat-abi=softfp" FEED_ARCH = "armv7" -PACKAGE_ARCH = "armv7" +BASE_PACKAGE_ARCH = "armv7" diff --git a/conf/machine/include/tune-cortexr4.inc b/conf/machine/include/tune-cortexr4.inc index 93c82e8607..b8bb7f50ae 100644 --- a/conf/machine/include/tune-cortexr4.inc +++ b/conf/machine/include/tune-cortexr4.inc @@ -1,4 +1,4 @@ # valid options for -march: `armv7', `armv7-r' TARGET_CC_ARCH = "-march=armv7-r -mtune=cortex-r4 -mfpu=vfp -mfloat-abi=softfp" FEED_ARCH = "armv7" -PACKAGE_ARCH = "armv7" +BASE_PACKAGE_ARCH = "armv7" diff --git a/conf/machine/include/tune-ep9312.inc b/conf/machine/include/tune-ep9312.inc index 76ccc1a1e3..7da1cb50c8 100644 --- a/conf/machine/include/tune-ep9312.inc +++ b/conf/machine/include/tune-ep9312.inc @@ -2,6 +2,6 @@ TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312 -mcpu=ep9312" # add "-mfp=maverick" for newer gcc versions > 4.0 #set arch to ep9312 for all generated packages -PACKAGE_ARCH = "ep9312" +BASE_PACKAGE_ARCH = "ep9312" FEED_ARCH = "ep9312" diff --git a/conf/machine/include/tune-geodelx.inc b/conf/machine/include/tune-geodelx.inc index c167515d46..7e6562ad46 100644 --- a/conf/machine/include/tune-geodelx.inc +++ b/conf/machine/include/tune-geodelx.inc @@ -2,6 +2,6 @@ # in older versions k6-2 is closest # TARGET_CC_ARCH = "-march=k6-2" -PACKAGE_ARCH = "geode" +BASE_PACKAGE_ARCH = "geode" FEED_ARCH = "geode" diff --git a/conf/machine/include/tune-iwmmxt.inc b/conf/machine/include/tune-iwmmxt.inc index 20fe82b584..aa5aaee901 100644 --- a/conf/machine/include/tune-iwmmxt.inc +++ b/conf/machine/include/tune-iwmmxt.inc @@ -1,7 +1,7 @@ # Configurations for the Intel PXA27x Appications Processor Family. # Please use tune-xscale for PXA255/PXA26x based processors. TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt" -PACKAGE_ARCH = "iwmmxt" +BASE_PACKAGE_ARCH = "iwmmxt" PACKAGE_EXTRA_ARCHS += "iwmmxt" FEED_ARCH = "iwmmxt" diff --git a/conf/machine/include/tune-pentium.inc b/conf/machine/include/tune-pentium.inc index 008d63daa8..6b8c9b521f 100644 --- a/conf/machine/include/tune-pentium.inc +++ b/conf/machine/include/tune-pentium.inc @@ -1,4 +1,4 @@ TARGET_CC_ARCH = "-march=pentium" -PACKAGE_ARCH = "i586" +BASE_PACKAGE_ARCH = "i586" FEED_ARCH = "i586" diff --git a/conf/machine/include/tune-pentium4c.inc b/conf/machine/include/tune-pentium4c.inc index 092f705d1d..302eb3c4a0 100644 --- a/conf/machine/include/tune-pentium4c.inc +++ b/conf/machine/include/tune-pentium4c.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-march=prescott" -PACKAGE_ARCH = "i686p4c" +BASE_PACKAGE_ARCH = "i686p4c" diff --git a/conf/machine/include/tune-pentiumpro.inc b/conf/machine/include/tune-pentiumpro.inc index 3406bb0c71..88fe7d7445 100644 --- a/conf/machine/include/tune-pentiumpro.inc +++ b/conf/machine/include/tune-pentiumpro.inc @@ -1,4 +1,4 @@ TARGET_CC_ARCH = "-march=pentiumpro" -PACKAGE_ARCH = "i686" +BASE_PACKAGE_ARCH = "i686" FEED_ARCH = "i686" diff --git a/conf/machine/include/tune-ppc405.inc b/conf/machine/include/tune-ppc405.inc index f798df837c..a54aec0336 100644 --- a/conf/machine/include/tune-ppc405.inc +++ b/conf/machine/include/tune-ppc405.inc @@ -1,5 +1,5 @@ #default to soft-floats if distro/machine/local.conf don't define anything else TARGET_FPU ?= "soft" TARGET_CC_ARCH = "-mcpu=405" -PACKAGE_ARCH = "ppc405" +BASE_PACKAGE_ARCH = "ppc405" FEED_ARCH = "ppc405" diff --git a/conf/machine/include/tune-ppc440.inc b/conf/machine/include/tune-ppc440.inc index d38adac008..7d7ca0ea11 100644 --- a/conf/machine/include/tune-ppc440.inc +++ b/conf/machine/include/tune-ppc440.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-mcpu=440" -PACKAGE_ARCH = "ppc440" +BASE_PACKAGE_ARCH = "ppc440" FEED_ARCH = "ppc440" diff --git a/conf/machine/include/tune-ppc440e.inc b/conf/machine/include/tune-ppc440e.inc index 539fa2d065..cbcef8a573 100644 --- a/conf/machine/include/tune-ppc440e.inc +++ b/conf/machine/include/tune-ppc440e.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-mcpu=440fp -mhard-float" -PACKAGE_ARCH = "ppc440e" +BASE_PACKAGE_ARCH = "ppc440e" FEED_ARCH = "ppc440e" diff --git a/conf/machine/include/tune-ppc603e.inc b/conf/machine/include/tune-ppc603e.inc index 0305a129b9..f48dc26e05 100644 --- a/conf/machine/include/tune-ppc603e.inc +++ b/conf/machine/include/tune-ppc603e.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-mcpu=603e -mhard-float" -PACKAGE_ARCH = "ppc603e" +BASE_PACKAGE_ARCH = "ppc603e" FEED_ARCH = "ppc603e" diff --git a/conf/machine/include/tune-ppce300c2.inc b/conf/machine/include/tune-ppce300c2.inc index ddf9de00ce..41ddd4151a 100644 --- a/conf/machine/include/tune-ppce300c2.inc +++ b/conf/machine/include/tune-ppce300c2.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-mcpu=e300c2" -PACKAGE_ARCH = "ppce300c2" +BASE_PACKAGE_ARCH = "ppce300c2" FEED_ARCH = "ppce300c2" diff --git a/conf/machine/include/tune-ppce300c3.inc b/conf/machine/include/tune-ppce300c3.inc index 769c18720d..24af11a8ba 100644 --- a/conf/machine/include/tune-ppce300c3.inc +++ b/conf/machine/include/tune-ppce300c3.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-mcpu=e300c3" -PACKAGE_ARCH = "ppce300c3" +BASE_PACKAGE_ARCH = "ppce300c3" FEED_ARCH = "ppce300c3" diff --git a/conf/machine/include/tune-ppce500.inc b/conf/machine/include/tune-ppce500.inc index 7a0476e5b7..9c8c68c342 100644 --- a/conf/machine/include/tune-ppce500.inc +++ b/conf/machine/include/tune-ppce500.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-mcpu=8540" -PACKAGE_ARCH = "ppce500" +BASE_PACKAGE_ARCH = "ppce500" FEED_ARCH = "ppce500" diff --git a/conf/machine/include/tune-supersparc.inc b/conf/machine/include/tune-supersparc.inc index 5fbfabe8d3..a402e7cd2b 100644 --- a/conf/machine/include/tune-supersparc.inc +++ b/conf/machine/include/tune-supersparc.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-mcpu=supersparc" -PACKAGE_ARCH = "supersparc" +BASE_PACKAGE_ARCH = "supersparc" FEED_ARCH = "supersparc" diff --git a/conf/machine/include/tune-xscale.inc b/conf/machine/include/tune-xscale.inc index d5ef105e97..eb16651ae3 100644 --- a/conf/machine/include/tune-xscale.inc +++ b/conf/machine/include/tune-xscale.inc @@ -2,4 +2,4 @@ FEED_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale" -PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" +BASE_PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" |