summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf5
-rw-r--r--conf/checksums.ini100
-rw-r--r--conf/collections.inc133
-rw-r--r--conf/distro/include/sane-srcrevs.inc16
-rw-r--r--conf/distro/openmoko.conf4
-rw-r--r--conf/machine/at32stk1000.conf4
-rw-r--r--conf/machine/at91cap9adk.conf29
-rw-r--r--conf/machine/at91sam9260ek.conf10
-rw-r--r--conf/machine/at91sam9261ek.conf10
-rw-r--r--conf/machine/at91sam9263ek.conf13
-rw-r--r--conf/machine/at91sam9g20ek.conf29
-rw-r--r--conf/machine/at91sam9rlek.conf31
-rw-r--r--conf/machine/atngw100.conf11
-rw-r--r--conf/machine/beagleboard.conf14
-rw-r--r--conf/machine/include/omap3.inc13
-rw-r--r--conf/machine/include/zaurus-2.6.inc7
-rw-r--r--conf/machine/include/zaurus-clamshell.inc3
-rw-r--r--conf/machine/omap3-pandora.conf7
-rw-r--r--conf/machine/omap3evm.conf8
-rw-r--r--conf/machine/overo.conf7
20 files changed, 401 insertions, 53 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index a0d652a26d..f31e56de89 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -162,6 +162,10 @@ EXTENDPEVER = "${@['','${PE\x7d:'][bb.data.getVar('PE',d,1) > 0]}"
EXTENDPV = "${EXTENDPEVER}${PV}-${PR}${DISTRO_PR}"
P = "${PN}-${PV}"
+# Define a PR for kernels that machines can override so things like
+# modules get rebuilt
+MACHINE_KERNEL_PR ?= "r0"
+
# Base package name
# Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial"
# otherwise it is the same as PN and P
@@ -625,6 +629,7 @@ OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUIL
# Include the rest of the config files.
##################################################################
+require conf/collections.inc
include conf/site.conf
include conf/auto.conf
include conf/local.conf
diff --git a/conf/checksums.ini b/conf/checksums.ini
index fbe1bc77bb..c638792cb8 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1846,10 +1846,22 @@ sha256=3ec786e6df9e1a935aff4848b6989cad8f87c1fa8813dc033b338e18b17138d8
md5=b47d4fa958aaf83916b6a917626102cd
sha256=9d1fff10d391cb64890bb8e0050d3f023520a8dd5aee43c4d3f9c6f8611da668
+[ftp://www.at91.com/pub/buildroot/at91bootstrap-2.10.tar.bz2]
+md5=a3bcd50138d29c1d23a0d378edb52dfe
+sha256=019b98442d4debcd74d759043884b4b0ed48a2bef425649bfe3061d00e854fc5
+
[ftp://www.at91.com/pub/buildroot/at91bootstrap-2.3.tar.bz2]
md5=a29b3f07e623d20894ab23335daf5da5
sha256=d598d078c24a24b13eac8a219a4ab05499909404cbd4efcb8641fdcde28464c0
+[ftp://www.at91.com/pub/buildroot/at91bootstrap-2.4.tar.bz2]
+md5=10161158f116e0b171582a2f66854af1
+sha256=c01e579401453ae97bd7671997d4b3d3b63e25e7e1e9cec02611a944ad1727fa
+
+[ftp://www.at91.com/pub/buildroot/at91bootstrap-2.8.tar.bz2]
+md5=117b73e2bf1f8d52afe6e742e33444a6
+sha256=a5647ea3761560d7ee1baecea3f09c942f10441e60c6ddd3bad6a450d84a3918
+
[ftp://ftp.debian.org/debian/pool/main/a/at/at_3.1.8-11.tar.gz]
md5=81dbae5162aaa8a398a81424d6631c77
sha256=0d77c73a3c151a7da647dd924f32151e5ee4574530568fd65067882f79cd5a44
@@ -1958,6 +1970,10 @@ sha256=fce50bc26351bbbe31154d9a734cb433ec8fb404efc5febd50c149e5eaf62449
md5=dc3fc7209752207c23e7c94ab886b340
sha256=636eef7f400c2f3df489c0d2fa21507e88692113561e75a40a26c52bc422d7fc
+[ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz]
+md5=9de56d4a161a723228220b0f425dc711
+sha256=f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e
+
[ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.57.tar.bz2]
md5=407ea53787ce13f5ca427e9a51e05bc2
sha256=e1035aa2c21fae2a934d1ab56c774ce9d22717881dab8a1a5b16d294fb793489
@@ -2550,6 +2566,10 @@ sha256=6fe3c4b2d45a50582f832bc77deb4e3da74a15ea8e09dbb214b9c44e7c3378fc
md5=9d22ee4dafa3a194457caf4706f9cf01
sha256=487a33a452f0edcf1f8bb8fc23dff5c7a82edec3f3f8b65632b6c945e961ee9b
+[http://downloads.sourceforge.net/mingw/binutils-2.19.1-src.tar.gz]
+md5=ad3f2b5fdcd599a772ad75fec2c384d8
+sha256=2df529b1ac0a621efb87b5b53dbc0167c566f8bebbd6a8ce19964b05845fd2e7
+
[ftp://ftp.gnu.org/gnu/binutils/binutils-2.19.1.tar.bz2]
md5=09a8c5821a2dfdbb20665bc0bd680791
sha256=3e8225b4d7ace0a2039de752e11fd6922d3b89a7259a292c347391c4788739f6
@@ -6918,14 +6938,26 @@ sha256=37b3286c2bfb68da9df983f60721f868e29897f7a426306748fee93b25c5fb61
md5=88785071f29ed0e0b6b61057a1079442
sha256=1159457a0e4c054b709547ae21ff624aebab2033e0d9e5bf46c9cf88b1970606
+[http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2]
+md5=88785071f29ed0e0b6b61057a1079442
+sha256=1159457a0e4c054b709547ae21ff624aebab2033e0d9e5bf46c9cf88b1970606
+
[ftp://ftp.gnu.org/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2]
md5=ad9f97a4d04982ccf4fd67cb464879f3
sha256=985cbb23a486570a8783395a42a8689218f5218a0ccdd6bec590eef341367bb7
+[http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2]
+md5=ad9f97a4d04982ccf4fd67cb464879f3
+sha256=985cbb23a486570a8783395a42a8689218f5218a0ccdd6bec590eef341367bb7
+
[ftp://ftp.gnu.org/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2]
md5=a4a3eb15c96030906d8494959eeda23c
sha256=cfc0efbcc6fcde0d416a32dfb246c9df022515a312683fac412578c4fd09a9bc
+[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2]
+md5=a4a3eb15c96030906d8494959eeda23c
+sha256=cfc0efbcc6fcde0d416a32dfb246c9df022515a312683fac412578c4fd09a9bc
+
[http://ftp.nluug.nl/languages/gcc/snapshots/4.2-20060513/gcc-4.2-20060513.tar.bz2]
md5=ac6d19831220c4aeef4475492725486f
sha256=98bdb26cd2644f2290e34453d9115b88bcff940bd1feb88db5a0fc557ec0ea5e
@@ -6934,30 +6966,58 @@ sha256=98bdb26cd2644f2290e34453d9115b88bcff940bd1feb88db5a0fc557ec0ea5e
md5=cba410e6ff70f7d7f4be7a0267707fd0
sha256=ca0a12695b3bccfa8628509e08cb9ed7d8ed48deff0a299e4cb8de87d2c1fced
+[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.1/gcc-4.2.1.tar.bz2]
+md5=cba410e6ff70f7d7f4be7a0267707fd0
+sha256=ca0a12695b3bccfa8628509e08cb9ed7d8ed48deff0a299e4cb8de87d2c1fced
+
[ftp://ftp.gnu.org/gnu/gcc/gcc-4.2.2/gcc-4.2.2.tar.bz2]
md5=7ae33781417a35a2eb03ee098a9f4490
sha256=673b85d780a082c014ded4ac11f8269a3fe893b4dbb584d65b8602d50b3872b1
+[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.2/gcc-4.2.2.tar.bz2]
+md5=7ae33781417a35a2eb03ee098a9f4490
+sha256=673b85d780a082c014ded4ac11f8269a3fe893b4dbb584d65b8602d50b3872b1
+
[ftp://ftp.gnu.org/gnu/gcc/gcc-4.2.3/gcc-4.2.3.tar.bz2]
md5=ef2a4d9991b3644115456ea05b2b8163
sha256=5df9a267091eea09179651ad2a2302fe99f780ac7e598278e7f47b2339fa2e80
+[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.3/gcc-4.2.3.tar.bz2]
+md5=ef2a4d9991b3644115456ea05b2b8163
+sha256=5df9a267091eea09179651ad2a2302fe99f780ac7e598278e7f47b2339fa2e80
+
[ftp://ftp.gnu.org/gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2]
md5=d79f553e7916ea21c556329eacfeaa16
sha256=afba845e2d38547a63bd3976e90245c81ea176786f9e6966339c6d3761f1133a
+[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2]
+md5=d79f553e7916ea21c556329eacfeaa16
+sha256=afba845e2d38547a63bd3976e90245c81ea176786f9e6966339c6d3761f1133a
+
[ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.1/gcc-4.3.1.tar.bz2]
md5=4afa0290cc3a41ac8822666f1110de98
sha256=66596b80995f88cb66aaaf937598df7a9af10cc06799c3a7a64879e20b552fd5
+[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.1/gcc-4.3.1.tar.bz2]
+md5=4afa0290cc3a41ac8822666f1110de98
+sha256=66596b80995f88cb66aaaf937598df7a9af10cc06799c3a7a64879e20b552fd5
+
[ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2]
md5=5dfac5da961ecd5f227c3175859a486d
sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165
+[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2]
+md5=5dfac5da961ecd5f227c3175859a486d
+sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165
+
[ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.3/gcc-4.3.3.tar.bz2]
md5=cc3c5565fdb9ab87a05ddb106ba0bd1f
sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de
+[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.3/gcc-4.3.3.tar.bz2]
+md5=cc3c5565fdb9ab87a05ddb106ba0bd1f
+sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de
+
[http://gcc.releasenotes.org/releases/gcc-4.3.3/gcc-4.3.3.tar.bz2]
md5=cc3c5565fdb9ab87a05ddb106ba0bd1f
sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de
@@ -7798,6 +7858,10 @@ sha256=cea63cddf79864d306198c7a84091af0b4685816b352ae253a3e2bfac5e67cb7
md5=7f2a8cee97e62ebfa284363dc93b3178
sha256=9605f7aee1b8d58cac10dd514c2bdfa340089d85b149db828816d18ac3ebaff8
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-bluetooth/2.27/gnome-bluetooth-2.27.1.tar.bz2]
+md5=4a7c977086af47fe43ea08b29ab93503
+sha256=939c8a8f819b8c39e4e355a764b2a47c6959d57029c5134a51a282d7cccd60c5
+
[http://ftp.gnome.org/pub/GNOME/sources/gnome-common/2.18/gnome-common-2.18.0.tar.bz2]
md5=567172e685fc0783b1d6ab9843a85d6a
sha256=ba28c1017e7e4212db16ada3f44cb446b6637c9c4fe16c0e2c2a51c94c46bc5b
@@ -9218,6 +9282,10 @@ sha256=5149991a219e8f2059350ed9d52bb110c0695da6eb9fe256e9e213e69f83929f
md5=5bfa5605d9565ff01138d7a574cc2614
sha256=fc029984019736eab2b0f10ce28d48ff88f8ceed7a1739cb4b71b851c4b89b91
+[http://downloads.sourceforge.net/gsoap2/gsoap_2.7.13.tar.gz]
+md5=fffb49eb1db7ff03643a4313115dc3b1
+sha256=3d40a528b8f3309f392945dca2ecaee5a698f4ee00a6036907a57c4f25a6a479
+
[http://downloads.sourceforge.net/gsoap2/gsoap_2.7.7.tar.gz]
md5=a0bbbfdc135034cd778537f979121df7
sha256=7b531f1b6481fbe1a21620a86649f42cb2de9cf086e7bdde46335137d3ca11dc
@@ -14134,6 +14202,10 @@ sha256=59e835a57e6df03e4d2253b2357253f3d13da9473ff465563a3b9833a744fc36
md5=8c198831cc0495596c78134b8849e9ad
sha256=59e835a57e6df03e4d2253b2357253f3d13da9473ff465563a3b9833a744fc36
+[http://ftp.gnome.org/pub/GNOME/sources/libunique/1.0/libunique-1.0.8.tar.bz2]
+md5=02b9e41c70ca738e1aa914f400fc1f05
+sha256=d627a10f523af14e9ead655ebab3a26e7faeea006bdfa7739bc4c04058ddf4c6
+
[http://downloads.sourceforge.net/upnp/libupnp-1.3.1.tar.gz]
md5=6646be5e31e58188e8f47c6ce64faa4c
sha256=4d0d6a5302222757fb36ee21d8f8e1b3de849c2de658ab1105272f32ff78767d
@@ -18230,6 +18302,10 @@ sha256=362e4b4473f2f7a3bfa28ea73e80ec00a2fe525a1aceb5f66e1c528a900bd735
md5=b97d3a725ab93662adf09acfbc49efeb
sha256=56fc9e6324539537324b071e5b51c3388df9bfa92fb7e210b989b463122fc333
+[https://alioth.debian.org/frs/download.php/2795/pcsc-lite-1.5.2.tar.bz2]
+md5=d7d466621bec39354351f09349f6374c
+sha256=a0c11b0b5cc46d4c4ec499b875cfdc4e766fdf12fe2f6ea635e1b11ab7b8821e
+
[http://handhelds.org/~zecke/oe_packages/pdamaze_V1.0.0.tar.gz]
md5=bf27dd51fe03c8b475080b74de043a13
sha256=99d6bc6b360baabd6044e8883d467cc6ed7955f9ab66d8f87f61e3cc757fb97a
@@ -18650,6 +18726,10 @@ sha256=91f75eb29c07271fcbfa2082c8300690efe4a72f2fbf35dace98108b0c6f7ba3
md5=b05e1d7f0cac9cc4e096aa21409dee55
sha256=91f75eb29c07271fcbfa2082c8300690efe4a72f2fbf35dace98108b0c6f7ba3
+[ftp://ftp-archives.postgresql.org/pub/source/v8.2.4/postgresql-8.2.4.tar.bz2]
+md5=af7ec100a33c41bfb8d87b5e0ec2f44a
+sha256=8ff6afab743e894c0d96e668dcf9b3d3c1044719d6def45ef7390c64b54ed268
+
[http://www.povray.org/redirect/www.povray.org/ftp/pub/povray/Official/Unix/povray-3.6.1.tar.bz2]
md5=b5789bb7eeaed0809c5c82d0efda571d
sha256=4e8a7fecd44807343b6867e1f2440aa0e09613d6d69a7385ac48f4e5e7737a73
@@ -21150,6 +21230,10 @@ sha256=489bb2f9fb69922e9befc27ae1b8d19d31c83c586f55b7ecc503cb4f5e767da4
md5=6df271fd6a92d7641d7b060dedf7fec6
sha256=7eedc4ece1c82668c06222ef85457206139253e24a50e5b5d2401a41baee28c1
+[http://www.dest-unreach.org/socat/download/Archive/socat-1.3.2.1.tar.bz2]
+md5=860fe417ea5e9ca2d2b2225192b85b87
+sha256=ecfbca297c26eff6cb04c2c45af1ee5c21d4a123a05f8b056a1c81ffcdfa1e3a
+
[http://www.dest-unreach.org/socat/download/socat-1.3.2.1.tar.bz2]
md5=860fe417ea5e9ca2d2b2225192b85b87
sha256=ecfbca297c26eff6cb04c2c45af1ee5c21d4a123a05f8b056a1c81ffcdfa1e3a
@@ -22650,6 +22734,14 @@ sha256=8ab07cd758a1775642629e624f70e376fa8e84a2f879dee4544158d9c90cde2a
md5=ca12b805b4f2bdcf15733be3fe22e896
sha256=096aa286d923b7cc356bbe0dda0a29a701369deeb27ada1a2f053155aa403c31
+[ftp://ftp.denx.de/pub/u-boot/u-boot-2008.10.tar.bz2]
+md5=9d7758c475068a8452430f18d1751566
+sha256=5cd64b5ac52720a7f60015e01696422277ecc459e89dce8b16d457f30a9409ab
+
+[ftp://ftp.denx.de/pub/u-boot/u-boot-2009.01.tar.bz2]
+md5=cb11d3d74eee4d31124523d90d8c31fa
+sha256=0c0afa2816482e087987f71958b656ff0c122032f5e3897a8d17daca5bc14115
+
[http://linux.omap.com/pub/bootloader/2430sdp/source/u-boot-SEP1106.tar.gz]
md5=49c07dec9e1be69fd01d46f47ec03731
sha256=a090786113b02647413ebc15888af269f2e6d50f73cbb94b0619cc1702911dae
@@ -23118,6 +23210,10 @@ sha256=7f2f0492b0e1f9f96bd416e6c7a34e77c46faa20eeaff28c81c5932c91534ffc
md5=5e6c4ce07091725d9afdac7cf00e553c
sha256=d0425be8572be85b8a7ae802a19bcb73fdeac74906f7bcbbc129697ea6a86f3a
+[http://download.gnome.org/sources/vala/0.6/vala-0.6.0.tar.bz2]
+md5=9e5888a79757eb0f47df118b39762ed6
+sha256=9d1cb3661e6c15059e4eecce323b3f118c243d1f17a1883e2b2d7ca0a16987e5
+
[http://www.valgrind.org/downloads/valgrind-3.2.1.tar.bz2]
md5=9407d33961186814cef0e6ecedfd6318
sha256=7f9a15d7be16ca03a0912191e8d55a486bf69690e11bb76ccece3eaff3730a33
@@ -23378,6 +23474,10 @@ sha256=c762525fdbf5f5dd32c6c950f2a63d8c1b15ec3dc7afca5d2dc3dbd1b129a00d
md5=66480128b9dabcced2e4c8db3e60fa50
sha256=6c5bfb2edae5c289233b6cd65393bb7414a2d30ad4d1239c207a659a4232d91a
+[http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/watchdog-5.6.tar.gz]
+md5=6df285569dd1d85528b983c98c9b2b7c
+sha256=a2c7d6726e092315dbb047211b754528e4532521678a30e16f60a31bb86a7f74
+
[http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/watchdog_5.3.1.tar.gz]
md5=ba97ddce396bfccd8d409bc3141d7ef4
sha256=b7bf9feeedea26d7e06935369a1a556089426e94f9ead946018526c96cd9b12e
diff --git a/conf/collections.inc b/conf/collections.inc
new file mode 100644
index 0000000000..abd9bd383b
--- /dev/null
+++ b/conf/collections.inc
@@ -0,0 +1,133 @@
+# Take a list of directories in COLLECTIONS, in priority order (highest to
+# lowest), and use those to populate BBFILES, BBFILE_COLLECTIONS,
+# BBFILE_PATTERN_*, and BBFILE_PRIORITY_*. By default, COLLECTIONS is
+# prepopulated with the locations the user specified in their BBPATH.
+# Note that it will not overwrite existing BBFILES or BBFILE_* variables, so
+# you'll need to remove those from your config in order to use this.
+#
+# Specifying an archive in COLLECTIONS is also supported. Any archives of a
+# supported format will be unpacked into COLLECTIONS_UNPACKDIR and used from
+# there.
+
+COLLECTIONS = "${@' '.join(d.getVar('BBPATH', 1).split(':'))}"
+COLLECTIONS_UNPACKDIR = "${TMPDIR}/collections"
+
+def collection_unpack(collection, name, d):
+ """ Unpack a collection archive and return the path to it. """
+ import bb
+ import os
+ from md5 import md5
+
+ handlers = {
+ ("tar"): "tar x --no-same-owner -f %s",
+ ("tar.gz", "tgz", "tar.Z"): "tar xz --no-same-owner -f %s",
+ ("tar.bz2", "tbz", "tbz2"): "tar xj --no-same-owner -f %s",
+ ("zip", "jar"): "unzip -q -o %s",
+ }
+
+ outpath = os.path.join(d.getVar("COLLECTIONS_UNPACKDIR", 1), name)
+
+ try:
+ collectiondata = open(collection, "r").read()
+ except IOError:
+ bb.fatal("Unable to open %s to calculate md5 sum" % collection)
+
+ md5obj = md5()
+ md5obj.update(collectiondata)
+ md5sum = md5obj.hexdigest()
+
+ md5file = os.path.join(outpath, "md5")
+ if os.path.exists(md5file):
+ try:
+ oldmd5sum = open(md5file).read()
+ except IOError:
+ pass
+ else:
+ if oldmd5sum == md5sum:
+ bb.debug(1, "Using existing %s for collection %s" % (outpath, name))
+ return outpath
+
+ bb.note("Removing old unpacked collection at %s" % outpath)
+ os.system("rm -rf %s" % outpath)
+
+ try:
+ cmd = (cmd for (exts, cmd) in handlers.iteritems()
+ for e in exts
+ if collection.endswith(e)).next()
+ cmd = "cd %s && PATH=\"%s\" %s" % (outpath, d.getVar("PATH", 1), cmd)
+ except StopIteration:
+ bb.fatal("Unable to find unpack handler for %s" % collection)
+
+ if not os.path.isdir(outpath):
+ os.makedirs(outpath)
+
+ bb.note("Unpacking %s to %s/" % (collection, outpath))
+ ret = os.system(cmd % collection)
+ if ret != 0:
+ bb.fatal("Unable to unpack %s" % collection)
+
+ md5out = open(md5file, "w")
+ md5out.write(md5sum)
+ md5out.close()
+ return outpath
+
+def collections_setup(d):
+ """ Populate collection and bbfiles metadata from the COLLECTIONS var. """
+ import bb
+ import os
+ from itertools import izip, chain
+ from glob import glob
+
+ def setifunset(k, v):
+ if d.getVar(k, 0) is None:
+ d.setVar(k, v)
+
+ collections = d.getVar("COLLECTIONS", 1)
+ if not collections:
+ return
+ globbed = (glob(path) for path in collections.split())
+ collections = list(chain(*globbed))
+
+ collectionmap = {}
+ namemap = {}
+ for collection in collections:
+ if collection.endswith(os.sep):
+ collection = collection[:-1]
+ basename = os.path.basename(collection).split(os.path.extsep)[0]
+ if namemap.get(basename):
+ basename = "%s-%s" % (basename, hash(collection))
+ namemap[basename] = collection
+ collectionmap[collection] = basename
+
+ for (collection, priority) in izip(collectionmap, xrange(len(collections), 0, -1)):
+ if not os.path.exists(collection):
+ bb.fatal("Collection %s does not exist" % collection)
+
+ name = collectionmap[collection]
+ if not name:
+ bb.fatal("Unable to determine collection name for %s" % collection)
+
+ if not os.path.isdir(collection):
+ del collectionmap[collection]
+ unpacked = collection_unpack(collection, name, d)
+ if unpacked:
+ collection = unpacked
+ collectionmap[collection] = name
+ else:
+ bb.fatal("Unable to unpack collection %s" % collection)
+
+ setifunset("BBFILE_PATTERN_%s" % name, "^%s/" % collection)
+ setifunset("BBFILE_PRIORITY_%s" % name, str(priority))
+
+ setifunset("BBFILE_COLLECTIONS", " ".join(collectionmap.values()))
+ setifunset("BBFILES", " ".join(collectionmap.keys()))
+
+addhandler collections_eh
+python collections_eh () {
+ from bb.event import getName
+
+ if getName(e) == "ConfigParsed":
+ collections_setup(e.data)
+
+ return NotHandled
+}
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index bb9b75bece..1f7a5fdf5b 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -39,8 +39,8 @@ SRCREV_pn-dfu-util-native ?= "4160"
SRCREV_pn-diversity-daemon ?= "571"
SRCREV_pn-diversity-radar ?= "453"
SRCREV_pn-eds-dbus ?= "736"
-SRCREV_pn-eglibc ?= "7467"
-SRCREV_pn-eglibc-initial ?= "7467"
+SRCREV_pn-eglibc ?= "8139"
+SRCREV_pn-eglibc-initial ?= "8139"
SRCREV_pn-enlazar ?= "37"
SRCREV_pn-essential-dialer ?= "60"
SRCREV_pn-exalt ?= "79"
@@ -64,6 +64,14 @@ SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
SRCREV_pn-fso-monitord ?= "0f64979a11d6263c7b7ed0e945a0889744f295f1"
SRCREV_pn-fso-sounds ?= "3d2cf5231cb0e81770a246530574142bd2b8bbff"
SRCREV_pn-fstests ?= "204"
+SRCREV_pn-gabriel ?= "38"
+SRCREV_pn-gabriel-native ?= "38"
+GCCREV ?= "145550"
+SRCREV_pn-gcc ?= ${GCCREV}
+SRCREV_pn-gcc-cross ?= ${GCCREV}
+SRCREV_pn-gcc-cross-initial ?= ${GCCREV}
+SRCREV_pn-gcc-cross-intermediate ?= ${GCCREV}
+SRCREV_pn-gcc-cross-sdk ?= ${GCCREV}
SRCREV_pn-gconf-dbus ?= "641"
SRCREV_pn-gnuradio ?= "10302"
SRCREV_pn-gpe-conf ?= "9798"
@@ -235,7 +243,7 @@ SRCREV_pn-uclibc-initial ?= "25712"
SRCREV_pn-usbpath ?= "3172"
SRCREV_pn-usbpath-native ?= "3172"
SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b"
-SRCREV_pn-vala-native ?= "54a924505856a839ad02dc95baa482e994e94a57"
+SRCREV_pn-vala-native ?= "6cf030120cd7f6a76a5d766d7420aea847e02cfd"
SRCREV_pn-webkit-gtk ?= "42127"
SRCREV_pn-wlan-ng-modules ?= "1859"
SRCREV_pn-wlan-ng-utils ?= "1859"
@@ -248,7 +256,7 @@ SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924"
# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
-EFL_SRCREV ?= "39786"
+EFL_SRCREV ?= "39886"
SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
SRCREV_pn-edb ?= "${EFL_SRCREV}"
SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index cb1513de4b..36461087bd 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -20,9 +20,9 @@ OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:buil
INHERIT += "packaged-staging"
-CVS_TARBALL_STASH += "http://downloads.openmoko.org/sources/"
+CVS_TARBALL_STASH += "http://downloads.openmoko.org/developer/sources/"
-PREMIRRORS = "(ftp|https?)$://.*/.* http://downloads.openmoko.org/sources/"
+PREMIRRORS = "(ftp|https?)$://.*/.* http://downloads.openmoko.org/developer/sources/"
DISTRO_FEED_PREFIX ?= "om-dev"
DISTRO_FEED_URI ?= "http://downloads.openmoko.org/repository/testing"
diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf
index 7a7370263a..d821d661a9 100644
--- a/conf/machine/at32stk1000.conf
+++ b/conf/machine/at32stk1000.conf
@@ -2,10 +2,10 @@
#@Name: Atmel STK1000 AVR32AP7000 Development Platform
#@DESCRIPTION: Atmel STK1000 AVR32AP7000 Development Platform
-
TARGET_ARCH = "avr32"
PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.28"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
#don't try to access tty1
@@ -22,7 +22,7 @@ ROOT_FLASH_SIZE = "8"
EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "1.3.2"
+PREFERRED_VERSION_u-boot = "2009.01"
UBOOT_MACHINE = "atstk1002_config"
UBOOT_ENTRYPOINT = "0x90000000"
diff --git a/conf/machine/at91cap9adk.conf b/conf/machine/at91cap9adk.conf
new file mode 100644
index 0000000000..50549dabf6
--- /dev/null
+++ b/conf/machine/at91cap9adk.conf
@@ -0,0 +1,29 @@
+#@TYPE: Machine
+#@Name: Atmel AT91CAP9ADK Development Platform
+#@DESCRIPTION: Machine configuration for the at91cap9adk development board with a at91cap9500 processor
+
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.28"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+KERNEL_IMAGETYPE = "uImage"
+PREFERRED_VERSION_u-boot = "2009.01"
+UBOOT_MACHINE = "at91cap9adk_config"
+
+PREFERRED_VERSION_at91bootstrap = "2.10"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen"
+EXTRA_IMAGEDEPENDS += "u-boot"
+#EXTRA_IMAGEDEPENDS += "at91bootstrap"
+
+# 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/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf
index 59ef577480..3882c118fb 100644
--- a/conf/machine/at91sam9260ek.conf
+++ b/conf/machine/at91sam9260ek.conf
@@ -1,18 +1,26 @@
#@TYPE: Machine
#@Name: Atmel AT91SAM9260EK Development Platform
-#@DESCRIPTION: Machine.inciguration for the at91sam9260ek development board with a at91sam9260 processor
+#@DESCRIPTION: Machine configuration for the at91sam9260ek development board with a at91sam9260 processor
TARGET_ARCH = "arm"
+#PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.28"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
KERNEL_IMAGETYPE = "uImage"
+PREFERRED_VERSION_u-boot = "2009.01"
+UBOOT_MACHINE = "at92sam9260ek_config"
+
+PREFERRED_VERSION_at91bootstrap = "2.10"
#don't try to access tty1
USE_VT = "0"
MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget"
+EXTRA_IMAGEDEPENDS += "u-boot"
+EXTRA_IMAGEDEPENDS += "at91bootstrap"
# used by sysvinit_2
SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/at91sam9261ek.conf b/conf/machine/at91sam9261ek.conf
index 570ff165f7..a3a9be6dc1 100644
--- a/conf/machine/at91sam9261ek.conf
+++ b/conf/machine/at91sam9261ek.conf
@@ -1,18 +1,26 @@
#@TYPE: Machine
#@Name: Atmel AT91SAM9261EK Development Platform
-#@DESCRIPTION: Machine.inciguration for the at91sam9261ek development board with a at91sam9261 processor
+#@DESCRIPTION: Machine configuration for the at91sam9261ek development board with a at91sam9261 processor
TARGET_ARCH = "arm"
+#PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.28"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
KERNEL_IMAGETYPE = "uImage"
+PREFERRED_VERSION_u-boot = "2009.01"
+UBOOT_MACHINE = "at92sam9261ek_config"
+
+PREFERRED_VERSION_at91bootstrap = "2.10"
#don't try to access tty1
USE_VT = "0"
MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen"
+EXTRA_IMAGEDEPENDS += "u-boot"
+EXTRA_IMAGEDEPENDS += "at91bootstrap"
# used by sysvinit_2
SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf
index 9fd34f95a0..e633148172 100644
--- a/conf/machine/at91sam9263ek.conf
+++ b/conf/machine/at91sam9263ek.conf
@@ -3,14 +3,24 @@
#@DESCRIPTION: Machine configuration for the at91sam9263ek development board with a at91sam9263 processor
TARGET_ARCH = "arm"
+#PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.28"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+KERNEL_IMAGETYPE = "uImage"
+PREFERRED_VERSION_u-boot = "2009.01"
+UBOOT_MACHINE = "at91sam9263ek_config"
+
+PREFERRED_VERSION_at91bootstrap = "2.10"
+
#don't try to access tty1
USE_VT = "0"
-MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen"
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen"
+EXTRA_IMAGEDEPENDS += "u-boot"
+EXTRA_IMAGEDEPENDS += "at91bootstrap"
# used by sysvinit_2
SERIAL_CONSOLE = "115200 ttyS0"
@@ -19,4 +29,3 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
require conf/machine/include/tune-arm926ejs.inc
-KERNEL_IMAGETYPE = "uImage"
diff --git a/conf/machine/at91sam9g20ek.conf b/conf/machine/at91sam9g20ek.conf
new file mode 100644
index 0000000000..df19389d9f
--- /dev/null
+++ b/conf/machine/at91sam9g20ek.conf
@@ -0,0 +1,29 @@
+#@TYPE: Machine
+#@Name: Atmel AT91SAM9G20EK Development Platform
+#@DESCRIPTION: Machine configuration for the at91sam9g20ek development board with a at91sam9g20 processor
+
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.28"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+KERNEL_IMAGETYPE = "uImage"
+PREFERRED_VERSION_u-boot = "2009.01"
+UBOOT_MACHINE = "at92sam9g20ek_config"
+
+PREFERRED_VERSION_at91bootstrap = "2.10"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget"
+#EXTRA_IMAGEDEPENDS += "u-boot"
+#EXTRA_IMAGEDEPENDS += "at91bootstrap"
+
+# 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/at91sam9rlek.conf b/conf/machine/at91sam9rlek.conf
new file mode 100644
index 0000000000..ba19cb3e00
--- /dev/null
+++ b/conf/machine/at91sam9rlek.conf
@@ -0,0 +1,31 @@
+#@TYPE: Machine
+#@Name: Atmel AT91SAM9RLEK Development Platform
+#@DESCRIPTION: Machine configuration for the at91sam9rlek development board with a at91sam9rl64 processor
+
+TARGET_ARCH = "arm"
+#PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.28"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+KERNEL_IMAGETYPE = "uImage"
+PREFERRED_VERSION_u-boot = "2009.01"
+UBOOT_MACHINE = "at92sam9rlek_config"
+
+PREFERRED_VERSION_at91bootstrap = "2.10"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen"
+EXTRA_IMAGEDEPENDS += "u-boot"
+#EXTRA_IMAGEDEPENDS += "at91bootstrap"
+
+# 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/atngw100.conf b/conf/machine/atngw100.conf
index d7e17aa896..ecfd2d4fee 100644
--- a/conf/machine/atngw100.conf
+++ b/conf/machine/atngw100.conf
@@ -1,16 +1,17 @@
#@TYPE: Machine
-#@Name: Atmel ATNGW100 Network Gateway Kit
+#@Name: Atmel ATNGW100 AVR32AP7000 Network Gateway Kit
#@DESCRIPTION: Atmel ATNGW100 Network Gateway Kit
TARGET_ARCH = "avr32"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.28"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
#don't try to access tty1
USE_VT = "0"
-MACHINE_FEATURES = "kernel26 ext2 usbgadget"
-PREFERRED_PROVIDER_virtual/kernel = "linux"
+MACHINE_FEATURES = "kernel26 alsa ext2 usbgadget"
# used by sysvinit_2
SERIAL_CONSOLE = "115200 ttyS0"
@@ -20,11 +21,11 @@ IMAGE_FSTYPES ?= "tar.bz2 jffs2"
ROOT_FLASH_SIZE = "8"
EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
-PREFERRED_VERSION_u-boot = "1.1.4"
KERNEL_IMAGETYPE = "uImage"
+PREFERRED_VERSION_u-boot = "2009.01"
+UBOOT_MACHINE = "atngw100_config"
UBOOT_ENTRYPOINT = "0x90000000"
UBOOT_LOADADDRESS = "0x10000000"
-
require conf/machine/include/tune-at32ap7000.inc
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index 78c63019ae..69cdec6f1f 100644
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -13,23 +13,14 @@ XSERVER = "xserver-xorg \
# Only has DVI connector for external screen
GUI_MACHINE_CLASS = "bigscreen"
-#include conf/machine/include/tune-arm1136jf-s.inc
-# requires gcc 4.3.0:
-include conf/machine/include/tune-cortexa8.inc
+require conf/machine/include/omap3.inc
-
-IMAGE_FSTYPES += "tar.bz2 jffs2"
+IMAGE_FSTYPES += "tar.bz2 ubi"
EXTRA_IMAGECMD_jffs2 = "-lnp "
# Guesswork
SERIAL_CONSOLE = "115200 ttyS2"
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
-
-KERNEL_IMAGETYPE = "uImage"
-
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
UBOOT_MACHINE = "omap3_beagle_config"
# do ubiattach /dev/ubi_ctrl -m 4
@@ -49,7 +40,6 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
PREFERRED_VERSION_u-boot = "git"
-EXTRA_IMAGEDEPENDS += "u-boot x-load"
MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
# and sdio
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
new file mode 100644
index 0000000000..3b06e8fcf7
--- /dev/null
+++ b/conf/machine/include/omap3.inc
@@ -0,0 +1,13 @@
+require conf/machine/include/tune-cortexa8.inc
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
+# Increase this everytime you change something in the kernel
+MACHINE_KERNEL_PR = "r25"
+
+KERNEL_IMAGETYPE = "uImage"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+EXTRA_IMAGEDEPENDS += "u-boot x-load"
+
+MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 5ce1cdca6a..5e4e1ac579 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -10,8 +10,8 @@ ERASEBLOCKSIZE_akita = "0x20000"
EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n"
-ZAURUS-UPDATER = "zaurus-updater"
-EXTRA_IMAGEDEPENDS += "${ZAURUS-UPDATER}"
+EXTRA_IMAGEDEPENDS += "zaurus-updater"
+KEXECBOOT_IMAGEDEPENDS = "zaurus-updater"
SERIAL_CONSOLE = "115200 ttyS0"
@@ -38,7 +38,8 @@ GUI_MACHINE_CLASS_poodle = "smallscreen"
KERNEL_IMAGE_MAXSIZE = "1294336"
-KERNEL_IMAGETYPE ?= "zImage"
+ZAURUS_KERNEL_IMAGETYPE ?= "zImage"
+KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}"
MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc
index df4e243eef..714380e9aa 100644
--- a/conf/machine/include/zaurus-clamshell.inc
+++ b/conf/machine/include/zaurus-clamshell.inc
@@ -3,9 +3,8 @@ include conf/machine/include/tune-xscale.inc
UBOOT_ENTRYPOINT = "0x80008000"
UBOOT_LOADADDRESS = "0x80008000"
-
-LEGACY_IMAGEDEPENDS = "${ZAURUS-UPDATER} sharp-flash-header-c700"
EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
+KEXECBOOT_IMAGEDEPENDS += "sharp-flash-header-c700"
IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \
--output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \
diff --git a/conf/machine/omap3-pandora.conf b/conf/machine/omap3-pandora.conf
index 5bfbb712f2..99d92d5512 100644
--- a/conf/machine/omap3-pandora.conf
+++ b/conf/machine/omap3-pandora.conf
@@ -3,7 +3,7 @@
#@DESCRIPTION: Machine configuration for the Pandora http://www.openpandora.org/ Handheld Console
TARGET_ARCH = "arm"
-include conf/machine/include/tune-cortexa8.inc
+require conf/machine/include/omap3.inc
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
XSERVER = "xserver-xorg \
@@ -28,12 +28,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp "
SERIAL_CONSOLE = "115200 ttyS0"
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
-#KERNEL_IMAGETYPE = "uImage"
-
-#UBOOT_ENTRYPOINT = "0x80008000"
-#UBOOT_LOADADDRESS = "0x80008000"
#UBOOT_ARCH = "arm"
#UBOOT_MACHINE = "omap3_pandora_config"
diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf
index 610b1dfc12..8780b827f5 100644
--- a/conf/machine/omap3evm.conf
+++ b/conf/machine/omap3evm.conf
@@ -13,9 +13,7 @@ XSERVER = "xserver-xorg \
GUI_MACHINE_CLASS = "smallscreen"
-#include conf/machine/include/tune-arm1136jf-s.inc
-# requires gcc 4.3.0:
-include conf/machine/include/tune-cortexa8.inc
+require conf/machine/include/omap3.inc
# Ship all kernel modules
MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules kernel-modules"
@@ -27,10 +25,6 @@ SERIAL_CONSOLE = "115200 ttyS0"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-omap-pm"
-KERNEL_IMAGETYPE = "uImage"
-
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
UBOOT_ARCH = "arm"
UBOOT_MACHINE = "omap3_evm_config"
diff --git a/conf/machine/overo.conf b/conf/machine/overo.conf
index 2a93ab069d..cb32539928 100644
--- a/conf/machine/overo.conf
+++ b/conf/machine/overo.conf
@@ -2,18 +2,13 @@
#@NAME: overo machine
#@DESCRIPTION: Machine configuration for the Gumstix Overo
-include conf/machine/include/tune-cortexa8.inc
+require conf/machine/include/omap3.inc
TARGET_ARCH = "arm"
MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa touchscreen"
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
UBOOT_MACHINE_overo = "omap3_overo_config"
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
-
-KERNEL_IMAGETYPE = "uImage"
SERIAL_CONSOLE = "115200 ttyS2"
IMAGE_FSTYPES += "tar.bz2"
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-23 21:33:13 +0000