[oe-commits] org.oe.dev merge of '3ab13564266d48c610004a9570479df65c0ee659'
koen commit
openembedded-commits at lists.openembedded.org
Wed Oct 10 09:31:58 UTC 2007
merge of '3ab13564266d48c610004a9570479df65c0ee659'
and '5ac8d930d208290aa8f5f13dd67120ed845441ed'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: af0790bf9393bac4ed622dfd962d7bf5512bd7e4
ViewMTN: http://monotone.openembedded.org/revision/info/af0790bf9393bac4ed622dfd962d7bf5512bd7e4
Files:
1
packages/mtd/mtd-utils-native.inc
conf/machine/alix.conf
conf/machine/at91sam9260ek.conf
conf/machine/at91sam9261ek.conf
conf/machine/bd-neon.conf
Diffs:
#
# mt diff -r3ab13564266d48c610004a9570479df65c0ee659 -raf0790bf9393bac4ed622dfd962d7bf5512bd7e4
#
#
#
# patch "packages/mtd/mtd-utils-native.inc"
# from [0309b110bda9ca2e08821d9b012301798020d40f]
# to [bb4d53a8d3252ecdb226d54e867ad04c6414b94c]
#
============================================================
--- packages/mtd/mtd-utils-native.inc 0309b110bda9ca2e08821d9b012301798020d40f
+++ packages/mtd/mtd-utils-native.inc bb4d53a8d3252ecdb226d54e867ad04c6414b94c
@@ -1,10 +1,4 @@ FILESDIR = "${@os.path.dirname(bb.data.g
inherit native
DEPENDS = "zlib-native lzo-native"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/mtd-utils"
-do_stage () {
- for binary in ${mtd_utils}; do
- install -m 0755 $binary ${STAGING_BINDIR}
- done
-}
-
#
# mt diff -r5ac8d930d208290aa8f5f13dd67120ed845441ed -raf0790bf9393bac4ed622dfd962d7bf5512bd7e4
#
#
#
# patch "conf/machine/alix.conf"
# from [53d221f82557e515e40af9234547d38664a2dff9]
# to [90e038b4d86ef5e8c9da5f1dd54113de80f39dee]
#
# patch "conf/machine/at91sam9260ek.conf"
# from [b2ddde0c3e0cef0cf1b8e532844b6ef3fe88dc8d]
# to [38a8c8ebda8664ef620ae8fafbb355c20430263e]
#
# patch "conf/machine/at91sam9261ek.conf"
# from [204547873976da00125a4cbc9c924be5401f0a02]
# to [5fe4817f77fa73006d1e4c63a597bcf912350daf]
#
# patch "conf/machine/bd-neon.conf"
# from [8163d0993343ccd839b0f5feeae78282aea520b0]
# to [56e19dd3d98c36386762f59131fe8f87fb92ee0d]
#
============================================================
--- conf/machine/alix.conf 53d221f82557e515e40af9234547d38664a2dff9
+++ conf/machine/alix.conf 90e038b4d86ef5e8c9da5f1dd54113de80f39dee
@@ -1,6 +1,6 @@
#@TYPE: Machine
#@NAME: Alix
-#@DESCRIPTION: Machine configuration for PC Engines Alix1c board
+#@DESCRIPTION: Machine.inciguration for PC Engines Alix1c board
#
# http://pcengines.ch/alix1c.htm
@@ -17,7 +17,7 @@ MACHINE_FEATURES = "kernel26 usbhost ext
MACHINE_FEATURES = "kernel26 usbhost ext2 pci screen alsa acpi x86"
-require conf/machine/include/tune-geodelx.conf
+require.inc/machine/include/tune-geodelx.inc
IMAGE_FSTYPES += "tar.gz"
============================================================
--- conf/machine/at91sam9260ek.conf b2ddde0c3e0cef0cf1b8e532844b6ef3fe88dc8d
+++ conf/machine/at91sam9260ek.conf 38a8c8ebda8664ef620ae8fafbb355c20430263e
@@ -1,6 +1,6 @@
#@TYPE: Machine
#@Name: Atmel AT91SAM9260EK Development Platform
-#@DESCRIPTION: Machine configuration for the at91sam9260ek development board with a at91sam9260 processor
+#@DESCRIPTION: Machine.inciguration for the at91sam9260ek development board with a at91sam9260 processor
TARGET_ARCH = "arm"
PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
@@ -8,6 +8,8 @@ PREFERRED_PROVIDER_xserver = "xserver-kd
PREFERRED_PROVIDER_virtual/kernel = "linux"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+KERNEL_IMAGETYPE = "uImage"
+
#don't try to access tty1
USE_VT = "0"
@@ -17,4 +19,4 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-e
SERIAL_CONSOLE = "115200 ttyS0"
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+require.inc/machine/include/tune-arm926ejs.inc
-require conf/machine/include/tune-arm926ejs.conf
============================================================
--- conf/machine/at91sam9261ek.conf 204547873976da00125a4cbc9c924be5401f0a02
+++ conf/machine/at91sam9261ek.conf 5fe4817f77fa73006d1e4c63a597bcf912350daf
@@ -1,6 +1,6 @@
#@TYPE: Machine
#@Name: Atmel AT91SAM9261EK Development Platform
-#@DESCRIPTION: Machine configuration for the at91sam9261ek development board with a at91sam9261 processor
+#@DESCRIPTION: Machine.inciguration for the at91sam9261ek development board with a at91sam9261 processor
TARGET_ARCH = "arm"
PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
@@ -8,6 +8,8 @@ PREFERRED_PROVIDER_xserver = "xserver-kd
PREFERRED_PROVIDER_virtual/kernel = "linux"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+KERNEL_IMAGETYPE = "uImage"
+
#don't try to access tty1
USE_VT = "0"
@@ -17,4 +19,4 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-e
SERIAL_CONSOLE = "115200 ttyS0"
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+require.inc/machine/include/tune-arm926ejs.inc
-require conf/machine/include/tune-arm926ejs.conf
============================================================
--- conf/machine/bd-neon.conf 8163d0993343ccd839b0f5feeae78282aea520b0
+++ conf/machine/bd-neon.conf 56e19dd3d98c36386762f59131fe8f87fb92ee0d
@@ -1,6 +1,6 @@
#@TYPE: Machine
#@NAME: Boundary Devices NEON
-#@DESCRIPTION: Machine configuration for the Boundary Devices NEON board
+#@DESCRIPTION: Machine.inciguration for the Boundary Devices NEON board
#
# Hardware-based properties
@@ -9,10 +9,10 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
+require.inc/machine/include/tune-xscale.inc
# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-#require conf/machine/include/tune-iwmmxt.conf
+#require.inc/machine/include/tune-iwmmxt.inc
ROOT_FLASH_SIZE = "60"
VOLATILE_STORAGE_SIZE = "128"
More information about the Openembedded-commits
mailing list