[oe-commits] org.oe.dev merge of '45ca967807a5074a8c64f0c1a767ad0f29409890'

[likewise commit]

merge of '45ca967807a5074a8c64f0c1a767ad0f29409890'
     and '8ae475c0143b6d98f3471fe738ec908cded6e02d'

Author: likewise at openembedded.org
Branch: org.openembedded.dev
Revision: 958bac4da4de63f8fadb3d84361a07eee1bd3246
ViewMTN: http://monotone.openembedded.org/revision.psp?id=958bac4da4de63f8fadb3d84361a07eee1bd3246
Files:
1
packages/linux/linux.inc
conf/machine/include/tune-x86-nocona.conf
conf/machine/x86-32-nocona.conf
conf/machine/x86-prescott.conf
Diffs:

#
# mt diff -r45ca967807a5074a8c64f0c1a767ad0f29409890 -r958bac4da4de63f8fadb3d84361a07eee1bd3246
#
# 
# 
# patch "packages/linux/linux.inc"
#  from [dc3b9967453c0f1b6a4df03cd2af7dcb8f517b02]
#    to [acd09fd5582e642f6a65a35eceb99a809355eb33]
# 
============================================================
--- packages/linux/linux.inc	dc3b9967453c0f1b6a4df03cd2af7dcb8f517b02
+++ packages/linux/linux.inc	acd09fd5582e642f6a65a35eceb99a809355eb33
@@ -64,7 +64,7 @@ do_deploy() {
             ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
             rm -f linux.bin.gz
             gzip -9 linux.bin
-            uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME} Kernel for ${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
+            uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
             rm -f linux.bin.gz
         fi
 }


#
# mt diff -r8ae475c0143b6d98f3471fe738ec908cded6e02d -r958bac4da4de63f8fadb3d84361a07eee1bd3246
#
# 
# 
# add_file "conf/machine/include/tune-x86-nocona.conf"
#  content [e3055e1b7d16571baa2b5057e57bea5bafce0eff]
# 
# add_file "conf/machine/x86-32-nocona.conf"
#  content [b522dc4b9b621d931cd9f477e2bcf5a9797b1184]
# 
# patch "conf/machine/x86-prescott.conf"
#  from [b8d329ec5b9571027699938a2c508f2cbe3b7859]
#    to [4dfd059cbf58a8516ce7da5aac28fa268f23eb8e]
# 
============================================================
--- conf/machine/include/tune-x86-nocona.conf	e3055e1b7d16571baa2b5057e57bea5bafce0eff
+++ conf/machine/include/tune-x86-nocona.conf	e3055e1b7d16571baa2b5057e57bea5bafce0eff
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-march=nocona"
+TARGET_CC_KERNEL_ARCH = "-march=nocona"
============================================================
--- conf/machine/x86-32-nocona.conf	b522dc4b9b621d931cd9f477e2bcf5a9797b1184
+++ conf/machine/x86-32-nocona.conf	b522dc4b9b621d931cd9f477e2bcf5a9797b1184
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@NAME: x86-nocona
+#@DESCRIPTION: Machine configuration for Intel 'Nocona' processor in 32-bit mode
+#
+
+TARGET_ARCH = "i686"
+MACHINE_ARCH = "x86-32-nocona"
+PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686"
+
+require conf/machine/include/tune-x86-nocona.conf
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
+OLDEST_KERNEL = "2.6.20"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+IMAGE_FSTYPES = "ext2.gz"
+
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" 
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
+MACHINE_TASK_PROVIDER = "task-base"
+
============================================================
--- conf/machine/x86-prescott.conf	b8d329ec5b9571027699938a2c508f2cbe3b7859
+++ conf/machine/x86-prescott.conf	4dfd059cbf58a8516ce7da5aac28fa268f23eb8e
@@ -1,9 +1,9 @@ TARGET_ARCH = "i686"
 #@TYPE: Machine
 #@NAME: x86-prescott
 #@DESCRIPTION: Machine configuration for a generic i686 machine
 
 TARGET_ARCH = "i686"
-PACKAGE_ARCH = "x86-prescott"
+MACHINE_ARCH = "x86-prescott"
 PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686"
 
 require conf/machine/include/tune-x86-prescott.conf