diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2009-10-27 18:47:09 +0100 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2009-10-27 18:47:09 +0100 |
| commit | f07cd5560eabb7307f974cd3d0a5ced57ed5a3db (patch) | |
| tree | d975a55cee22832926572278497bd221ef18c421 | |
| parent | 6f36bd6e28bce49b72e5a3cff77e0c74b8f65e41 (diff) | |
| parent | 5642836ea59a6bff972b1c921d4df89e63eb5db3 (diff) | |
Merge branch 'org.openembedded.dev' of ssh://git@git.openembedded.net/openembedded into org.openembedded.dev
76 files changed, 3263 insertions, 2 deletions
diff --git a/classes/xfce46.bbclass b/classes/xfce46.bbclass new file mode 100644 index 0000000000..c24dfa4d8c --- /dev/null +++ b/classes/xfce46.bbclass @@ -0,0 +1,28 @@ +# xfce46.bbclass + +# Global class to help maintain XFCE 4.6.* packages + +HOMEPAGE = "http://www.xfce.org" +LICENSE = "LGPLv2" + +DEPENDS += "startup-notification" + +SECTION ?= "x11/xfce" + +XFCE_VERSION = ${PV} + +SRC_URI = "http://mocha.xfce.org/archive/src/xfce/${PN}/${@'${PV}'[0:3]}/${PN}-${PV}.tar.bz2" + +inherit autotools gtk-icon-cache pkgconfig + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +EXTRA_OECONF += "--with-pluginsdir=${libdir}/xfce4/panel-plugins/" + +# FIXME: Put icons in their own package too? + +FILES_${PN} += "${datadir}/icons/* ${datadir}/applications/* ${libdir}/xfce4/modules/*.so*" +FILES_${PN}-doc += "${datadir}/xfce4/doc" + +FILES_${PN}-dev += "${libdir}/xfce4/*/*.la" +FILES_${PN}-dbg += "${libdir}/xfce4/*/.debug" diff --git a/conf/checksums.ini b/conf/checksums.ini index 49e1a29ca3..1619c93f45 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1186,10 +1186,18 @@ sha256=c1f29cfd31c335a409bdc530c2e68661d20a1e3c2e5d64454470b6700a40681e md5=f0ef2cea8acfbcc58d865c05b0c7e1ff sha256=8c4c70bf487f2e432046dce07cf4b77ff181667d0905f9cb1203ff95ff5dd5ff +[http://www.us.xfce.org/archive/xfce-4.6.1/src/Terminal-0.2.12.tar.bz2] +md5=adb419d279c9fc16d02291c052190717 +sha256=352205b03e9ed1b9080c61235fbc0fa15609410e724237441055a232a3b603dc + [http://www.us.xfce.org/archive/xfce-4.4.2/src/Terminal-0.2.8.tar.bz2] md5=cfe660ecf50e9d3b073576bbc4af6ab2 sha256=20a58b96915f67c5b4f49fb1428e1876195f1f9fd7d37e0081352cadc13463e7 +[http://www.xfce.org/archive/src/apps/terminal/0.4/Terminal-0.4.2.tar.bz2] +md5=9754afef6b79fa1df9aaf41fb8cc6374 +sha256=4d5a07f3a1b68c9825cc3b82fc2672785ba91247a34e4ac462841f0b1ea21079 + [http://search.cpan.org/CPAN/authors/id/M/MA/MARKF/Test-Builder-Tester-1.01.tar.gz] md5=4751252f1e33af4f582c8af4c7b7666f sha256=62bc416ccb3f01c3911d9744d6c865d9fa4d008bd47dbecc2adde5c3892ce868 @@ -1218,6 +1226,10 @@ sha256=0b654cd39126333a0dab7fdd2fd0c5023f6eb45e72d1d8bf9fb3cab175002bc7 md5=0fc5008858661c0abd0399acbe30ef28 sha256=26c833b0bdf3281c61e03f1fb985feced88cf4a5cebce7bd055f05e025460037 +[http://www.us.xfce.org/archive/xfce-4.6.1/src/Thunar-1.0.1.tar.bz2] +md5=218373aa45d74b6ba8c69c4d5af3bb19 +sha256=7a2b6b493463756bbc9c54144fab2f2163bc84f0896b4c06fd225d11025a210d + [http://www.cpan.org/modules/by-module/Time/TimeDate-1.16.tar.gz] md5=b3cc35a7cabd106ac8829d2f2ff4bd9d sha256=7942ef0181b5828563a1b98a0a801a75bc0102773a1c942a09ac1d0b9fba6cb3 @@ -6222,6 +6234,14 @@ sha256=53082354ae893fd385051c96214640cbeba527131ccf9f5320626252a4aef8d5 md5=eb8b6d834d2224e17561593dc4158e4d sha256=418c3b9e099b96f7b8e1456c34b585b2f4bd10af88fb976116a154e4cb54fa9b +[http://www.us.xfce.org/archive/xfce-4.6.1/src/exo-0.3.101.tar.bz2] +md5=1c0eebb360f53eab70454b70e1bde36e +sha256=0016f6ff0d1d22ed42fb5c9bcecc5559a62572781446fdfd1444786b5d33e324 + +[http://mocha.xfce.org/archive/src/xfce/exo/0.3/exo-0.3.105.tar.bz2] +md5=ba87f84894498bf23ae39d849c55f98c +sha256=278f702d890c89bd3923ce1bdaf29bd9f2c800c2e4cfd9e902d99663bba337e5 + [http://www.us.xfce.org/archive/xfce-4.4.2/src/exo-0.3.4.tar.bz2] md5=7a1af943b1df32b6f89ae91823118a22 sha256=a5373e9bd6055caa7cd5d06128f6236cfd2f4f6657ea4a85d7bd9eafe5bf0538 @@ -8178,6 +8198,10 @@ sha256=3d3013fb5648b6060202a63c13c160899da8baf756140c7fd8f4ed432b40fdd2 md5=f492b6e3607aed801b77657f3808f5c1 sha256=3d3013fb5648b6060202a63c13c160899da8baf756140c7fd8f4ed432b40fdd2 +[http://files.uvena.de/gigolo/gigolo-0.3.2.tar.bz2] +md5=e810a525b495d08bce69317aa37d6134 +sha256=e4b20c058ba70f3aa0258ff16817e238303f5d1efb87dbac4acf016e628a7151 + [ftp://ftp.gimp.org/pub/gimp/v2.2/gimp-2.2.10.tar.bz2] md5=aa29506ed2272af02941a7a601a7a097 sha256=41f4befa851177e2ca9bbab2fad19926178c831454ca51f2cb91fec0ed9e243e @@ -10894,6 +10918,14 @@ sha256=cb2b353839a7f1dcd8f93a6cb32b5c54a6fe560dee432585edb2f5eebe526c50 md5=00eb6a62defe6867d28a18569b96d151 sha256=6fecdb590fa024db698de9027314c1be044f28feab9850f592aa60c3a79ede78 +[http://mocha.xfce.org/archive/src/xfce/gtk-xfce-engine/2.6/gtk-xfce-engine-2.6.0.tar.bz2] +md5=e836705d2933d0a77c6628285e10d982 +sha256=c817050b2526ac107e1971d344aa20e06b98b80b60c912e83fa96d7804b4e8ca + +[http://www.us.xfce.org/archive/xfce-4.6.1/src/gtk-xfce-engine-2.6.0.tar.bz2] +md5=e836705d2933d0a77c6628285e10d982 +sha256=c817050b2526ac107e1971d344aa20e06b98b80b60c912e83fa96d7804b4e8ca + [http://src.gentoo.pl/distfiles/gtk2-ssh-askpass-0.3.tar.gz] md5=14ca8c653ad19699b7299198d7a94e0a sha256=5b0a2b2ea2cbe26d7738a360ba5aad57d7d03297a662cf209a032c0b9725d33c @@ -16154,6 +16186,14 @@ sha256=8f3cd90d4ea258ffa35b8723c1eae7ace31409baa85361889664084c6c5d1b6d md5=5ffe66a3eeb884839806ce929e5d2776 sha256=192843e8fdd63e10ba431ca12265c654dbce9677ec9d330038eea462ca0e5c8e +[http://mocha.xfce.org/archive/src/xfce/libxfce4menu/4.6/libxfce4menu-4.6.1.tar.bz2] +md5=5dc9343885c2c6f931318b2a1cdcc9db +sha256=5442b458b0e4f6bbbb6ddfbf1a7789dde1d270ab85686a3be77731a4d5ef84da + +[http://www.us.xfce.org/archive/xfce-4.6.1/src/libxfce4menu-4.6.1.tar.bz2] +md5=5dc9343885c2c6f931318b2a1cdcc9db +sha256=5442b458b0e4f6bbbb6ddfbf1a7789dde1d270ab85686a3be77731a4d5ef84da + [http://www.us.xfce.org/archive/xfce-4.2.2/src/libxfce4util-4.2.2.tar.gz] md5=5f27635aa0ba5e40ffaf3031b530b36b sha256=8efb3416a37654050089234115fe7db9268c8da0ee0369ff3f5330cef3f15a66 @@ -16166,6 +16206,14 @@ sha256=988efce9b4fd7252475234be3ca3fe8b737125ebaadc8c448d1c5d4cbc8bb521 md5=261e7a5df039493ad746e0c359211092 sha256=f717dcdb4d8ee8f967ed0882e82aad06abe66c32481b9954737273312c937a6d +[http://mocha.xfce.org/archive/src/xfce/libxfce4util/4.6/libxfce4util-4.6.1.tar.bz2] +md5=eac51d58179cbcadc3f802450a8ec9cd +sha256=ceecdc7d3c89f547606c2d77a8a42ccf9975c809374fab84ff0833a08510c16b + +[http://www.us.xfce.org/archive/xfce-4.6.1/src/libxfce4util-4.6.1.tar.bz2] +md5=eac51d58179cbcadc3f802450a8ec9cd +sha256=ceecdc7d3c89f547606c2d77a8a42ccf9975c809374fab84ff0833a08510c16b + [http://www.us.xfce.org/archive/xfce-4.2.2/src/libxfcegui4-4.2.2.tar.gz] md5=e88d6e8379eae60cee6dd6122bf3ae59 sha256=bdd542e60ffbe4987b5ae765e581fe5bcfdfc4d623341d09aaff7794e90d4454 @@ -16182,6 +16230,14 @@ sha256=a3da5f3b70e65d6679cfb21fd2baf10baedceb8b099347987f9b6c5fa7cd329b md5=799a4869138c605126e8e71d58189bfd sha256=622c2585f61666d9c46841829ba141e86861c73bd9041a3a73452d1c8df5ee91 +[http://mocha.xfce.org/archive/src/xfce/libxfcegui4/4.6/libxfcegui4-4.6.1.tar.bz2] +md5=539cff747634b8ee6f0d2362ee78a286 +sha256=3468a9cb348bf54f8a0afa386366683eff1987b722d2e81326f9e7ec7dfbe093 + +[http://www.us.xfce.org/archive/xfce-4.6.1/src/libxfcegui4-4.6.1.tar.bz2] +md5=539cff747634b8ee6f0d2362ee78a286 +sha256=3468a9cb348bf54f8a0afa386366683eff1987b722d2e81326f9e7ec7dfbe093 + [http://xorg.freedesktop.org/releases/individual/lib/libxkbfile-1.0.4.tar.bz2] md5=12b4ceb5d42b520228b5fb40a96ae6c5 sha256=468ade4eaa3951a7c34b6ae1c290ab1a1d364ee36c5c455ef0df15550825b8ae @@ -18314,6 +18370,18 @@ sha256=48c456dfcadec2db472320e317fa37dc697f184e12f99006a1ec0b6512d2ebcd md5=326075ac933e5da38cedbc20e80b7026 sha256=f32cc263fb73b05c5bad17121073a2b37a7d5c8e411f780312c2701902e6637a +[http://mocha.xfce.org/archive/src/apps/mousepad/0.2/mousepad-0.2.16.tar.bz2] +md5=d98854edb76d823ac20b266fdf5a64a1 +sha256=86e593fd4b1b87d27cda9ebd8901078e795031b5880645850d6ef0b410f4e73e + +[http://mocha.xfce.org/archive/src/xfce/mousepad/0.2/mousepad-0.2.16.tar.bz2] +md5=d98854edb76d823ac20b266fdf5a64a1 +sha256=86e593fd4b1b87d27cda9ebd8901078e795031b5880645850d6ef0b410f4e73e + +[http://www.us.xfce.org/archive/xfce-4.6.1/src/mousepad-0.2.16.tar.bz2] +md5=d98854edb76d823ac20b266fdf5a64a1 +sha256=86e593fd4b1b87d27cda9ebd8901078e795031b5880645850d6ef0b410f4e73e + [http://www.stack.nl/~brama/mp3blaster/src/mp3blaster-3.1.3.tar.gz] md5=38beb6a5648cbca4ec87ee14b0982283 sha256=c1b110f2aa5ed8744f7f6eeabf24d6cd1cecc50f4b5473ec6ddf622935f360ee @@ -19634,6 +19702,18 @@ sha256=e0e33fae512e54ff27474c926a758cf687e35d2c3007f69d4c647b69d47352ae md5=0c69e4c20350c3000d49350991d3a520 sha256=ef08b96e5529f19a2f609525300fbea2019f1afb75fb3c85e474e6041f425abd +[http://mocha.xfce.org/archive/src/apps/orage/4.6/orage-4.6.1.tar.bz2] +md5=24fa43dd86ec5af5a4766620fd972cf2 +sha256=f1580f5f0082eff89f7a76a57da9dce7e7d5380804939771611499482523bd4d + +[http://mocha.xfce.org/archive/src/xfce/orage/4.6/orage-4.6.1.tar.bz2] +md5=24fa43dd86ec5af5a4766620fd972cf2 +sha256=f1580f5f0082eff89f7a76a57da9dce7e7d5380804939771611499482523bd4d + +[http://www.us.xfce.org/archive/xfce-4.6.1/src/orage-4.6.1.tar.bz2] +md5=24fa43dd86ec5af5a4766620fd972cf2 +sha256=f1580f5f0082eff89f7a76a57da9dce7e7d5380804939771611499482523bd4d + [http://ozlabs.org/people/dgibson/dldwd/orinoco-0.13e.tar.gz] md5=4cea186648c335752bc241418fd54038 sha256=07fbed267421ee26ee4b6bc410b68a10a284072d78e1e495c74865db0470306e @@ -22642,6 +22722,10 @@ sha256=654d6b190f4644d82c10b4ce5645b72405c2e78ea346ce3d8eb385fc3f3732de md5=2ea5f7cd44f79b64721ce60f1fc1c2b7 sha256=c3ab591b02afbb5b3f76a0c1406c607b9561138bdb0a62105981de559d2920dc +[http://goodies.xfce.org/releases/ristretto/ristretto-0.0.21.tar.gz] +md5=7774dcafdc365e70b8d981c0a52d6250 +sha256=b3e63ef1d4a582c2a3f4e99f097ec28273edf9feb51162b470d4c12c61a51378 + [http://heanet.dl.sourceforge.net/sourceforge/gkernel/rng-tools-2.tar.gz] md5=63d503191eabed630324c104cc024475 sha256=1126f0ecc8cab3af14a562cddc5d8ffeef47df7eba34a7aadcdee35a25ec2b1e @@ -23910,6 +23994,10 @@ sha256=8423027a1e7dc238d27ec227f47ce22d1317b4c9a0a9ee49a38b6e6f8da8a5c8 md5=a3c23391da4ebab0ac4a75021ddabf96 sha256=18948edbe06bac2c4307eea99bfb962643e4b82e5b7edd541b4d743748e12e21 +[http://squeeze.xfce.org/downloads/squeeze-0.2.3.tar.bz2] +md5=bd3cb0648b49be1f146fc4f675606176 +sha256=7b8dc13e0adf72c67bba12e1ed1285ec820946e65d0eec247f7bd159a2cfac2d + [http://www.squid-cache.org/Versions/v2/2.6/squid-2.6.STABLE14.tar.bz2] md5=eadb138d48320df8b99349121159c6bf sha256=dcb0c10965430862721b675e2f9f6a30819880e03124b5e9403bfce2c7f3b69a @@ -26306,6 +26394,10 @@ sha256=a4f15c73e2b67c888cbedfaa8093661dff6cb859357c197c60f3026baddb939e md5=4c6a93e00123d8bb7af48a009519aca4 sha256=4f923e24d674ac62ded3da402a4de6d402886d80e3d7cac91cf026921f32fcf7 +[http://djwillis.openpandora.org/pandora/wifi/wl1251-wireless-2009-08-30-2158.zip] +md5=b69ee5a5ffc825ff6d7970a62dcae46a +sha256=6641a438972acdc8113957c25a17db55d6d9c3ce037ed3ac5337ac6ee153d73f + [ftp://ftp.elmeg.de/artem/ClientCards/11b/linux/wl_lkm_718_release.tar.gz] md5=049c6c3d410e9f46884627b57485d3e7 sha256=a28c7ea94d57a5354b7de06cf5f6416d80a40596911c129d4b6a4087dc916831 @@ -28438,6 +28530,14 @@ sha256=a40832c874dda5a06c0208cd178a8d02cd61cb2379aa46cdffbe3fb592fd551c md5=119dd3f1daedfa41e3be89bad8997336 sha256=eba910fb99598e09fa4c41c4ab405216a2b59a837a3ab058656360ec2324314c +[http://mocha.xfce.org/archive/src/xfce/xfce-utils/4.6/xfce-utils-4.6.1.tar.bz2] +md5=1aa2362b11e79e56d52ce0d265faf1b6 +sha256=8310ad3694567dc7cbe0d57f4283712ca9e576ca73c9dc53a576b546f0b6b571 + +[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce-utils-4.6.1.tar.bz2] +md5=1aa2362b11e79e56d52ce0d265faf1b6 +sha256=8310ad3694567dc7cbe0d57f4283712ca9e576ca73c9dc53a576b546f0b6b571 + [http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce4-appfinder-4.2.2.tar.gz] md5=0ef8c944e8aa2db06719e02b2c40d70c sha256=4bca692e0af03c0f70c6cf62f2b60274e71899beaa45815c2d0f46f7f19c06d5 @@ -28450,10 +28550,26 @@ sha256=1e6c80b800dd02f6b1cbf69df36307cc0b341ab73438c5508ac760fd8be66232 md5=0bdd0b1e96a1e1cf50ce5d582758b992 sha256=bdf232505f240d0933ca3cd7d2a5c07c31477a70570d95111f94a1226bf7e59c +[http://mocha.xfce.org/archive/src/xfce/xfce4-appfinder/4.6/xfce4-appfinder-4.6.1.tar.bz2] +md5=a1bc7d88100cfd92714a300be531589b +sha256=5eab9a3ba822a1163c07efd917c3425eaf149c01c09df375ac38a0cb7ddf20a4 + +[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce4-appfinder-4.6.1.tar.bz2] +md5=a1bc7d88100cfd92714a300be531589b +sha256=5eab9a3ba822a1163c07efd917c3425eaf149c01c09df375ac38a0cb7ddf20a4 + [http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-dev-tools-4.4.0.1.tar.bz2] md5=7d09d161efc7ef86b3b48791d98c8ae8 sha256=1e7a506f08c8a4f368dd18648006ba3934a94eb96fd4545f5303d46aeae9cc3e +[http://www.us.xfce.org/archive/xfce-4.6.0/src/xfce4-dev-tools-4.6.0.tar.bz2] +md5=c9587fa78e877eee858a33391d0afd62 +sha256=4763a891ac7030c109c7ca03b1b0b834859c2aac4f8e359774ee01a6875694ac + +[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce4-dev-tools-4.6.0.tar.bz2] +md5=c9587fa78e877eee858a33391d0afd62 +sha256=4763a891ac7030c109c7ca03b1b0b834859c2aac4f8e359774ee01a6875694ac + [http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-icon-theme-4.4.2.tar.bz2] md5=d3e3e64596a7efa857d2e6bb0cbd09bb sha256=72178637c479ba848747285e0c7dc53a3abfe26b6517df5e75c7449542017350 @@ -28470,6 +28586,18 @@ sha256=6beda572195d6f7ed108e0659592d1ca6ad5088e769e3d219cc4114533f8b169 md5=c21cb5680f135dc86e5f0a6f9473003a sha256=b390241dfddbc10ae1b870d1326a7675b9ac99e13c89326ba2accea3bfecc47a +[http://mocha.xfce.org/archive/src/xfce/xfce4-mixer/4.6/xfce4-mixer-4.6.1.tar.bz2] +md5=a99e2455445480ef5081fe69454a46fc +sha256=cf7b8af6696b0e3795ab65d15a8b5d217123955919713f7bae86008b56abb5dd + +[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce4-mixer-4.6.1.tar.bz2] +md5=a99e2455445480ef5081fe69454a46fc +sha256=cf7b8af6696b0e3795ab65d15a8b5d217123955919713f7bae86008b56abb5dd + +[http://spuriousinterrupt.org/files/xfce4-notifyd/xfce4-notifyd-0.1.0.tar.bz2] +md5=659ecaf37f0f7ee9e31f7b25f9813778 +sha256=989b0e9ae9ff5bdbdbf56368a44eca039236033f84d05001e311c21c988bd0e1 + [http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce4-panel-4.2.2.tar.gz] md5=50699e6c8e4a79f0a4f962e12559c9d0 sha256=b29e8524c448b9712f5eff0d7702706289a4a2967125b82a92a50ca142cc2d66 @@ -28482,10 +28610,42 @@ sha256=1925b19457594b5e2a57f07f649375be428a038eb821c8b445dc1e7d2fe9c769 md5=8f26b32c442bf9926f98f285a3c251dd sha256=ddabfb0ccf04366820efdeb7c640ee3a648a55e51b5177c9861a5ab896e96ddd +[http://mocha.xfce.org/archive/src/xfce/xfce4-panel/4.6/xfce4-panel-4.6.1.tar.bz2] +md5=73a366b9892152266b465d7d9c35bef4 +sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83 + +[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce4-panel-4.6.1.tar.bz2] +md5=73a366b9892152266b465d7d9c35bef4 +sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83 + [http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-session-4.4.2.tar.bz2] md5=4c3d1acb8ce37ea4dd55d82aeb38e9e7 sha256=7394906dec7b50789407219f85143ae83b10938949d38adeecdd59eb50c8c1c6 +[http://mocha.xfce.org/archive/src/xfce/xfce4-session/4.6/xfce4-session-4.6.1.tar.bz2] +md5=7628be41ed3511a20cff5673d9d39858 +sha256=feed3f9053b83233697223a20f95ca0ad6efe9fedffcc098e4935a425e8f9f0e + +[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce4-session-4.6.1.tar.bz2] +md5=7628be41ed3511a20cff5673d9d39858 +sha256=feed3f9053b83233697223a20f95ca0ad6efe9fedffcc098e4935a425e8f9f0e + +[http://mocha.xfce.org/archive/src/xfce/xfce4-settings/4.6/xfce4-settings-4.6.1.tar.bz2] +md5=dc1c8704471c5b0104fa10c30eb60cb6 +sha256=36dda4d43366fad47ee95ea5d4fa336d0b14f79c524b4f29a2ac1b9ada4abf8d + +[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce4-settings-4.6.1.tar.bz2] +md5=dc1c8704471c5b0104fa10c30eb60cb6 +sha256=36dda4d43366fad47ee95ea5d4fa336d0b14f79c524b4f29a2ac1b9ada4abf8d + +[http://mocha.xfce.org/archive/src/xfce/xfconf/4.6/xfconf-4.6.1.tar.bz2] +md5=d4d3018767ea9eb4b57cc57d4038023b +sha256=22a596f73795be398382e82e9c11062423daa374339ce6db808f73a6ba19380e + +[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfconf-4.6.1.tar.bz2] +md5=d4d3018767ea9eb4b57cc57d4038023b +sha256=22a596f73795be398382e82e9c11062423daa374339ce6db808f73a6ba19380e + [http://xorg.freedesktop.org/releases/individual/app/xfd-1.0.1.tar.bz2] md5=c72abd90f50ef459bc14b39ec9fcc7f8 sha256=111baa16780429d6739ab69b7393a18d75a10b7615dcc8cd0b0878ab9a5e2e1e @@ -28510,6 +28670,14 @@ sha256=427df09a88f9b4a38fbed68d8154090bf0c11fbdc132c26247dc5568ee5ae910 md5=694601234e74903d0fccba064f411e0c sha256=7e50c13e45b1424924c49dd1e9daa6c16881ee57ac21e4e2c6f20c0eec227cdb +[http://mocha.xfce.org/archive/src/xfce/xfdesktop/4.6/xfdesktop-4.6.1.tar.bz2] +md5=ae15cacc3e3834cca7238a8e1035c50d +sha256=22aa4a654798dcfa728a9c0056486f73ae87a51239950c8f85aedef488cd571a + +[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfdesktop-4.6.1.tar.bz2] +md5=ae15cacc3e3834cca7238a8e1035c50d +sha256=22aa4a654798dcfa728a9c0056486f73ae87a51239950c8f85aedef488cd571a + [http://www.us.xfce.org/archive/xfce-4.2.0/src/xffm-4.2.0.tar.gz] md5=476b50335da473d46b12f43a07a28e83 sha256=dcd12681eaaf2b88dd512023949080b6d47426ff855efc03329790ab479280c9 @@ -28550,6 +28718,18 @@ sha256=4eee12555dbc296fa26afbfdbfabad3586000239d5666e54b6bfae7f8cd03e89 md5=be4802807e74dea30f4825102ceff5c5 sha256=b9bb03820a8ba1995ffe3e5b96b6d5ebbbc0347ad1202172f13bba63b2984d54 +[http://mocha.xfce.org/archive/src/archive/xfprint/4.6/xfprint-4.6.1.tar.bz2] +md5=d92fca97a42816085080baf07a99a62e +sha256=be0cc5d149234c22dee69db5f8cbddebc46bc21a4f96fefdec21df36b2a15f17 + +[http://mocha.xfce.org/archive/src/xfce/xfprint/4.6/xfprint-4.6.1.tar.bz2] +md5=d92fca97a42816085080baf07a99a62e +sha256=be0cc5d149234c22dee69db5f8cbddebc46bc21a4f96fefdec21df36b2a15f17 + +[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfprint-4.6.1.tar.bz2] +md5=d92fca97a42816085080baf07a99a62e +sha256=be0cc5d149234c22dee69db5f8cbddebc46bc21a4f96fefdec21df36b2a15f17 + [http://xorg.freedesktop.org/releases/individual/app/xfs-1.0.4.tar.bz2] md5=f43cb64d623b748208dfd9012d17b654 sha256=452dde2923c7ae5a2b8cb4b9735507c579c1c55a0e5e45a34210e52574ee641b @@ -28614,6 +28794,14 @@ sha256=3600267ba477217f065628454bffb30d8819731940c7fdbfd197c731bca9125f md5=21da77e50b07e72bba784bf3418ca067 sha256=710120122bc4acaaecdb0646656c5aa92f1d44c4c81d1a6775688abab04cca0a +[http://mocha.xfce.org/archive/src/xfce/xfwm4/4.6/xfwm4-4.6.1.tar.bz2] +md5=538ff2554a23bf877d336e573884da9a +sha256=0a808d19a7ddf1f5271d0b7009a5d0dc919562a85afab4071df060f51e9ee9ed + +[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfwm4-4.6.1.tar.bz2] +md5=538ff2554a23bf877d336e573884da9a +sha256=0a808d19a7ddf1f5271d0b7009a5d0dc919562a85afab4071df060f51e9ee9ed + [http://www.us.xfce.org/archive/xfce-4.2.0/src/xfwm4-themes-4.2.0.tar.gz] md5=a8d0676fbf9cd3b3514d76a39d4ecbe1 sha256=9aebac55dfc92a3533678a873d0f3babee285061b0ad5b26a56b6e72fb306ed4 @@ -28630,6 +28818,14 @@ sha256=10b2f7ffbf309c12ec82b4bc28b35014cb223208d3003bab3765b70dea9d96bd md5=fbea3ef7eec87fd669958f9cf597bfb8 sha256=d6f6052ec9bdc2a048dd34a79248ee56abd903055adc0d89d04715eb17ac1dc0 +[http://mocha.xfce.org/archive/src/art/xfwm4-themes/4.6/xfwm4-themes-4.6.0.tar.bz2] +md5=4dc5cb29cbd40e3b9dece12a85e20854 +sha256=9964ce221c1715a892c3ecb802739c0f5eae2b64912093d13fe7631710254c8c + +[http://www.us.xfce.org/archive/xfce-4.6.0/src/xfwm4-themes-4.6.0.tar.bz2] +md5=4dc5cb29cbd40e3b9dece12a85e20854 +sha256=9964ce221c1715a892c3ecb802739c0f5eae2b64912093d13fe7631710254c8c + [http://xorg.freedesktop.org/releases/individual/app/xfwp-1.0.1.tar.bz2] md5=0dbde8b3867032b9e4a383d46dfd7e48 sha256=cdd6ecb453c62086dd01808a26787641add419dd42469349f79d0adeb89a6d93 diff --git a/conf/machine/igep0020.conf b/conf/machine/igep0020.conf index 512a977748..deb17233cc 100644 --- a/conf/machine/igep0020.conf +++ b/conf/machine/igep0020.conf @@ -19,6 +19,8 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-igep2" KERNEL_IMAGETYPE = "uImage" +UBOOT_MACHINE = "omap3_igep0020b_config" + IMAGE_FSTYPES += "tar.bz2 ubi" # Guesswork diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 675249a064..bb750aad98 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -1,7 +1,7 @@ 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 = "r47" +MACHINE_KERNEL_PR = "r48" KERNEL_IMAGETYPE = "uImage" diff --git a/recipes/images/xfce46-image.bb b/recipes/images/xfce46-image.bb new file mode 100644 index 0000000000..8f8e240f3f --- /dev/null +++ b/recipes/images/xfce46-image.bb @@ -0,0 +1,14 @@ +export IMAGE_BASENAME = "xfce46-image" + +XSERVER ?= "xserver-xorg \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-video-fbdev \ + xf86-input-keyboard \ +" + +DEPENDS = "virtual/xserver ${MACHINE_TASK_PROVIDER} task-xfce46-base task-xfce46-extras" + +IMAGE_INSTALL = "${XSERVER} ${MACHINE_TASK_PROVIDER} task-xfce46-base task-xfce46-extras" + +inherit image diff --git a/recipes/linux/linux-igep2-2.6.28.10-0/twl-asoc-fix-record.diff b/recipes/linux/linux-igep2-2.6.28.10-0/twl-asoc-fix-record.diff new file mode 100644 index 0000000000..9c0ceaa2e0 --- /dev/null +++ b/recipes/linux/linux-igep2-2.6.28.10-0/twl-asoc-fix-record.diff @@ -0,0 +1,34 @@ +From linux-omap-owner@vger.kernel.org Sat Dec 06 02:14:21 2008 +Date: Fri, 5 Dec 2008 16:46:34 -0800 +From: "Steve Sakoman" <sakoman@gmail.com> +To: "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org> +Subject: [FYI PATCH] ASOC:TWL4030 Audio capture fix + +A couple of folks have noticed an issue with audio capture -- the +capture result is always silence. + +The patch below is a quick fix for those with this issue. There are +substantial changes to the codec driver that will be trickling down +from ASoC, and they deal with this issue differently. + +So consider this as a bandaid for those who don't want to wait for the +trickle down :-) + +Steve + + +diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c +index ee2f0d3..8b4aafb 100644 +--- a/sound/soc/codecs/twl4030.c ++++ b/sound/soc/codecs/twl4030.c +@@ -45,8 +45,8 @@ static const u8 twl4030_reg[TWL4030_CACHEREGNUM] = { + 0xc3, /* REG_OPTION (0x2) */ + 0x00, /* REG_UNKNOWN (0x3) */ + 0x00, /* REG_MICBIAS_CTL (0x4) */ +- 0x24, /* REG_ANAMICL (0x5) */ +- 0x04, /* REG_ANAMICR (0x6) */ ++ 0x34, /* REG_ANAMICL (0x5) */ ++ 0x14, /* REG_ANAMICR (0x6) */ + 0x0a, /* REG_AVADC_CTL (0x7) */ + 0x00, /* REG_ADCMICSEL (0x8) */ + 0x00, /* REG_DIGMIXING (0x9) */ diff --git a/recipes/linux/linux-igep2_2.6.28.10-0.bb b/recipes/linux/linux-igep2_2.6.28.10-0.bb index ebe291807a..c346da785c 100644 --- a/recipes/linux/linux-igep2_2.6.28.10-0.bb +++ b/recipes/linux/linux-igep2_2.6.28.10-0.bb @@ -10,4 +10,8 @@ DEFAULT_PREFERENCE_igep0020 = "1" SRC_URI = "http://downloads.myigep.com/sources/kernel/linux-omap-2.6.28.10-igep0020b-0.tar.gz \ file://defconfig" +SRC_URI_append = " \ + file://twl-asoc-fix-record.diff;patch=1 \ +" + S = "${WORKDIR}/linux-omap-2.6.28.10-igep0020b-0" diff --git a/recipes/tasks/task-xfce46-base.bb b/recipes/tasks/task-xfce46-base.bb new file mode 100644 index 0000000000..430d048a7d --- /dev/null +++ b/recipes/tasks/task-xfce46-base.bb @@ -0,0 +1,32 @@ +# task-xfce46-base + +DESCRIPTION = "All packages required for a base installation of XFCE 4.6.*" +PR = "r1" + +inherit task + +RDEPENDS_${PN} = " \ + xfwm4 \ + xfwm4-theme-default \ + xfce4-session \ + xfconf \ + xfdesktop \ + xfce4-panel \ + \ + gtk-xfce-engine \ + \ + xfce-utils \ + xfce4-panel-plugin-actions \ + xfce4-panel-plugin-clock \ + xfce4-panel-plugin-iconbox \ + xfce4-panel-plugin-launcher \ + xfce4-panel-plugin-pager \ + xfce4-panel-plugin-separator \ + xfce4-panel-plugin-showdesktop \ + xfce4-panel-plugin-systray \ + xfce4-panel-plugin-tasklist \ + xfce4-panel-plugin-windowlist \ + xfce4-settings \ + xfce-terminal \ + thunar \ +" diff --git a/recipes/tasks/task-xfce46-extras.bb b/recipes/tasks/task-xfce46-extras.bb new file mode 100644 index 0000000000..d10660b3d1 --- /dev/null +++ b/recipes/tasks/task-xfce46-extras.bb @@ -0,0 +1,38 @@ +# task-xfce46-extras + +DESCRIPTION = "Extra suggested packages to produce a recommended XFCE 4.6.* installation" +PR = "r3" + +inherit task + +XFCE_THEMES = " \ + xfwm4-theme-daloa \ + xfwm4-theme-moheli \ + xfwm4-theme-default-4.0 \ + xfwm4-theme-default-4.2 \ + xfwm4-theme-default-4.4 \ + xfwm4-theme-kokodi \ + xfwm4-theme-moheli \ + xfwm4-theme-sassandra \ + xfwm4-theme-stoneage \ + xfwm4-theme-therapy \ + xfwm4-theme-tyrex \ + xfwm4-theme-wallis \ +" + +RDEPENDS_${PN} = " \ + task-xfce46-base \ + \ + ${XFCE_THEMES} \ + \ + xfce4-notifyd \ + xfce4-mixer \ + xfce4-appfinder \ + xfprint \ + midori \ + orage \ + squeeze \ + ristretto \ + mousepad \ + gigolo \ +" diff --git a/recipes/u-boot/u-boot-2009.08/igep0020/add-board-support-for-IGEP-v2-series-rev-B.patch b/recipes/u-boot/u-boot-2009.08/igep0020/add-board-support-for-IGEP-v2-series-rev-B.patch new file mode 100644 index 0000000000..db523bfe2f --- /dev/null +++ b/recipes/u-boot/u-boot-2009.08/igep0020/add-board-support-for-IGEP-v2-series-rev-B.patch @@ -0,0 +1,1098 @@ +From 8a70b51444b755139bcc41c2a322fc9dc77fb46e Mon Sep 17 00:00:00 2001 +From: Enric Balletbo i Serra <eballetbo@iseebcn.com> +Date: Fri, 4 Sep 2009 13:48:06 +0200 +Subject: [PATCH 3/6] Add board support for IGEP v2.x series rev. B + + +Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com> +--- + Makefile | 3 + + board/omap3/igep0020b/Makefile | 49 +++++ + board/omap3/igep0020b/config.mk | 36 ++++ + board/omap3/igep0020b/igep0020b.c | 245 +++++++++++++++++++++++ + board/omap3/igep0020b/igep0020b.h | 399 +++++++++++++++++++++++++++++++++++++ + cpu/arm_cortexa8/omap3/board.c | 3 +- + include/configs/omap3_igep0020b.h | 282 ++++++++++++++++++++++++++ + 7 files changed, 1016 insertions(+), 1 deletions(-) + create mode 100644 board/omap3/igep0020b/Makefile + create mode 100644 board/omap3/igep0020b/config.mk + create mode 100644 board/omap3/igep0020b/igep0020b.c + create mode 100644 board/omap3/igep0020b/igep0020b.h + create mode 100644 include/configs/omap3_igep0020b.h + +diff --git a/Makefile b/Makefile +index 1cd9797..db31063 100644 +--- a/Makefile ++++ b/Makefile +@@ -3043,6 +3043,9 @@ VCMA9_config : unconfig + omap3_igep0020a_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 igep0020a omap3 omap3 + ++omap3_igep0020b_config : unconfig ++ @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 igep0020b omap3 omap3 ++ + ######################################################################### + # ARM supplied Versatile development boards + ######################################################################### +diff --git a/board/omap3/igep0020b/Makefile b/board/omap3/igep0020b/Makefile +new file mode 100644 +index 0000000..fe2f197 +--- /dev/null ++++ b/board/omap3/igep0020b/Makefile +@@ -0,0 +1,49 @@ ++# ++# (C) Copyright 2000, 2001, 2002 ++# Wolfgang Denk, DENX Software Engineering, wd@denx.de. ++# ++# See file CREDITS for list of people who contributed to this ++# project. ++# ++# This program is free software; you can redistribute it and/or ++# modify it under the terms of the GNU General Public License as ++# published by the Free Software Foundation; either version 2 of ++# the License, or (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++# MA 02111-1307 USA ++# ++ ++include $(TOPDIR)/config.mk ++ ++LIB = $(obj)lib$(BOARD).a ++ ++COBJS := igep0020b.o ++ ++SRCS := $(COBJS:.o=.c) ++OBJS := $(addprefix $(obj),$(COBJS)) ++ ++$(LIB): $(obj).depend $(OBJS) ++ $(AR) $(ARFLAGS) $@ $(OBJS) ++ ++clean: ++ rm -f $(OBJS) ++ ++distclean: clean ++ rm -f $(LIB) core *.bak $(obj).depend ++ ++######################################################################### ++ ++# defines $(obj).depend target ++include $(SRCTREE)/rules.mk ++ ++sinclude $(obj).depend ++ ++######################################################################### +diff --git a/board/omap3/igep0020b/config.mk b/board/omap3/igep0020b/config.mk +new file mode 100644 +index 0000000..6795797 +--- /dev/null ++++ b/board/omap3/igep0020b/config.mk +@@ -0,0 +1,36 @@ ++# ++# (C) Copyright 2009 ++# Integration Software and Electronics Engineering, <www.iseebcn.com> ++# ++# IGEP0020 uses OMAP3 (ARM-CortexA8) cpu ++# see http://www.ti.com/ for more information on Texas Instruments ++# ++# See file CREDITS for list of people who contributed to this ++# project. ++# ++# This program is free software; you can redistribute it and/or ++# modify it under the terms of the GNU General Public License as ++# published by the Free Software Foundation; either version 2 of ++# the License, or (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++# MA 02111-1307 USA ++# ++# Physical Address: ++# 8000'0000 (bank0) ++# A000/0000 (bank1) ++# Linux-Kernel is expected to be at 8000'8000, entry 8000'8000 ++# (mem base + reserved) ++ ++# For use with external or internal boots. ++# TEXT_BASE = 0x80e80000 ++# TEXT_BASE = 0x9fe80000 ++TEXT_BASE = 0x8ff00000 ++ +diff --git a/board/omap3/igep0020b/igep0020b.c b/board/omap3/igep0020b/igep0020b.c +new file mode 100644 +index 0000000..8328217 +--- /dev/null ++++ b/board/omap3/igep0020b/igep0020b.c +@@ -0,0 +1,245 @@ ++/* ++ * Maintainer: Integration Software and Electronics Engineering, <www.iseebcn.com> ++ * ++ * Derived from Beagle Board, 3430 SDP, and OMAP3EVM code by ++ * Richard Woodruff <r-woodruff2@ti.com> ++ * Syed Mohammed Khasim <khasim@ti.com> ++ * Sunil Kumar <sunilsaini05@gmail.com> ++ * Shashi Ranjan <shashiranjanmca05@gmail.com> ++ * ++ * (C) Copyright 2004-2008 ++ * Texas Instruments, <www.ti.com> ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++#include <common.h> ++#include <twl4030.h> ++#include <asm/io.h> ++#include <asm/arch/mem.h> ++#include <asm/arch/mux.h> ++#include <asm/arch/sys_proto.h> ++#include <asm/mach-types.h> ++#include "igep0020b.h" ++ ++/* ++ * Routine: board_init ++ * Description: Early hardware init. ++ */ ++int board_init(void) ++{ ++ DECLARE_GLOBAL_DATA_PTR; ++ ++ gpmc_init(); /* in SRAM or SDRAM, finish GPMC */ ++ /* board id for Linux */ ++ gd->bd->bi_arch_number = MACH_TYPE_IGEP0020; ++ /* boot param addr */ ++ gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100); ++ ++ return 0; ++} ++ ++/* ++ * Routine: dss_init ++ * Description: Draw into dss buffer. ++ */ ++void dss_init(void) ++{ ++ unsigned int i; ++ int offset = 0; ++ ++ /* assuming a resolution of 1280x720 - draw into dss buffer */ ++ /* fill in the blank */ ++ ++ for(i = 0; i<(720 - (offset/2/1280))*1280*2; i+=2) { ++ *((unsigned short *)(0x80500000 + i + offset)) = 0xffff; ++ } ++ ++ *((uint *) 0x48310034) = 0xfefffedf; ++ *((uint *) 0x48310094) = 0x01000120; ++ *((uint *) 0x48004D44) = 0x0001b00c; ++ *((uint *) 0x48004E40) = 0x00001006; ++ *((uint *) 0x48004D00) = 0x00370037; ++ *((uint *) 0x48050C00) = 0x00000002; ++ *((uint *) 0x48050C04) = 0x0000001B; ++ *((uint *) 0x48050C08) = 0x00000040; ++ *((uint *) 0x48050C0C) = 0x00000000; ++ *((uint *) 0x48050C10) = 0x00000000; ++ *((uint *) 0x48050C14) = 0x00008000; ++ *((uint *) 0x48050C18) = 0x00000000; ++ *((uint *) 0x48050C1C) = 0x00008359; ++ *((uint *) 0x48050C20) = 0x0000020C; ++ *((uint *) 0x48050C24) = 0x00000000; ++ *((uint *) 0x48050C28) = 0x043F2631; ++ *((uint *) 0x48050C2C) = 0x00000024; ++ *((uint *) 0x48050C30) = 0x00000130; ++ *((uint *) 0x48050C34) = 0x00000198; ++ *((uint *) 0x48050C38) = 0x000001C0; ++ *((uint *) 0x48050C3C) = 0x0000006A; ++ *((uint *) 0x48050C40) = 0x0000005C; ++ *((uint *) 0x48050C44) = 0x00000000; ++ *((uint *) 0x48050C48) = 0x00000001; ++ *((uint *) 0x48050C4C) = 0x0000003F; ++ *((uint *) 0x48050C50) = 0x21F07C1F; ++ *((uint *) 0x48050C54) = 0x00000000; ++ *((uint *) 0x48050C58) = 0x00000015; ++ *((uint *) 0x48050C5C) = 0x00001400; ++ *((uint *) 0x48050C60) = 0x00000000; ++ *((uint *) 0x48050C64) = 0x069300F4; ++ *((uint *) 0x48050C68) = 0x0016020C; ++ *((uint *) 0x48050C6C) = 0x00060107; ++ *((uint *) 0x48050C70) = 0x008D034E; ++ *((uint *) 0x48050C74) = 0x000F0359; ++ *((uint *) 0x48050C78) = 0x01A00000; ++ *((uint *) 0x48050C7C) = 0x020501A0; ++ *((uint *) 0x48050C80) = 0x01AC0024; ++ *((uint *) 0x48050C84) = 0x020D01AC; ++ *((uint *) 0x48050C88) = 0x00000006; ++ *((uint *) 0x48050C8C) = 0x00000000; ++ *((uint *) 0x48050C90) = 0x03480079; ++ *((uint *) 0x48050C94) = 0x02040024; ++ *((uint *) 0x48050C98) = 0x00000000; ++ *((uint *) 0x48050C9C) = 0x00000000; ++ *((uint *) 0x48050CA0) = 0x0001008A; ++ *((uint *) 0x48050CA4) = 0x01AC0106; ++ *((uint *) 0x48050CA8) = 0x01060006; ++ *((uint *) 0x48050CAC) = 0x00000000; ++ *((uint *) 0x48050CB0) = 0x00140001; ++ *((uint *) 0x48050CB4) = 0x00010001; ++ *((uint *) 0x48050CB8) = 0x00FF0000; ++ *((uint *) 0x48050CBC) = 0x00000000; ++ *((uint *) 0x48050CC0) = 0x00000000; ++ *((uint *) 0x48050CC4) = 0x0000000D; ++ *((uint *) 0x48050CC8) = 0x00000000; ++ *((uint *) 0x48050010) = 0x00000001; ++ *((uint *) 0x48050040) = 0x00000078; ++ *((uint *) 0x48050044) = 0x00000000; ++ *((uint *) 0x48050048) = 0x00000000; ++ *((uint *) 0x48050050) = 0x00000000; ++ *((uint *) 0x48050058) = 0x00000000; ++ *((uint *) 0x48050410) = 0x00002015; ++ *((uint *) 0x48050414) = 0x00000001; ++ *((uint *) 0x48050444) = 0x00000004; ++ *((uint *) 0x4805044c) = 0xFFFFFFFF; ++ *((uint *) 0x48050450) = 0x00000000; ++ *((uint *) 0x48050454) = 0x00000000; ++ *((uint *) 0x48050458) = 0x00000000; ++ *((uint *) 0x48050464) = 0x0ff03f31; ++ *((uint *) 0x48050468) = 0x01400504; ++ *((uint *) 0x4805046c) = 0x00007028; ++ *((uint *) 0x48050470) = 0x00010002; ++ *((uint *) 0x48050478) = 0x00ef027f; ++ *((uint *) 0x4805047c) = 0x02cf04ff; ++ *((uint *) 0x48050480) = 0x80500000; ++ *((uint *) 0x48050484) = 0x80500000; ++ *((uint *) 0x48050488) = 0x00000000; ++ *((uint *) 0x4805048c) = 0x02cf04ff; ++ *((uint *) 0x480504a0) = 0x0000008d; ++ *((uint *) 0x480504a4) = 0x03fc03bc; ++ *((uint *) 0x480504a8) = 0x00000400; ++ *((uint *) 0x480504ac) = 0x00000001; ++ *((uint *) 0x480504b0) = 0x00000001; ++ *((uint *) 0x480504b4) = 0x00000000; ++ *((uint *) 0x480504b8) = 0x807ff000; ++ udelay(1000); ++ *((uint *) 0x48050440) = 0x0001836b; ++ udelay(1000); ++ *((uint *) 0x48050440) = 0x0001836b; ++ udelay(1000); ++ *((uint *) 0x48050440) = 0x0001836b; ++ udelay(1000); ++} ++ ++/* ++ * Routine: misc_init_r ++ * Description: Configure board specific parts ++ */ ++int misc_init_r(void) ++{ ++ twl4030_power_init(); ++ twl4030_led_init(); ++ ++ dss_init(); ++ ++#if defined(CONFIG_CMD_NET) ++ setup_net_chip(); ++#endif ++ ++ dieid_num_r(); ++ ++ return 0; ++} ++ ++/* ++ * Routine: set_muxconf_regs ++ * Description: Setting up the configuration Mux registers specific to the ++ * hardware. Many pins need to be moved from protect to primary ++ * mode. ++ */ ++void set_muxconf_regs(void) ++{ ++ MUX_IGEP0020(); ++} ++ ++/* ++ * Routine: setup_net_chip ++ * Description: Setting up the configuration GPMC registers specific to the ++ * Ethernet hardware. ++ */ ++static void setup_net_chip(void) ++{ ++ struct gpio *gpio3_base = (struct gpio *)OMAP34XX_GPIO3_BASE; ++ struct ctrl *ctrl_base = (struct ctrl *)OMAP34XX_CTRL_BASE; ++ ++ /* Configure GPMC registers */ ++ writel(NET_GPMC_CONFIG1, &gpmc_cfg->cs[5].config1); ++ writel(NET_GPMC_CONFIG2, &gpmc_cfg->cs[5].config2); ++ writel(NET_GPMC_CONFIG3, &gpmc_cfg->cs[5].config3); ++ writel(NET_GPMC_CONFIG4, &gpmc_cfg->cs[5].config4); ++ writel(NET_GPMC_CONFIG5, &gpmc_cfg->cs[5].config5); ++ writel(NET_GPMC_CONFIG6, &gpmc_cfg->cs[5].config6); ++ writel(NET_GPMC_CONFIG7, &gpmc_cfg->cs[5].config7); ++ ++ /* Enable off mode for NWE in PADCONF_GPMC_NWE register */ ++ writew(readw(&ctrl_base ->gpmc_nwe) | 0x0E00, &ctrl_base->gpmc_nwe); ++ /* Enable off mode for NOE in PADCONF_GPMC_NADV_ALE register */ ++ writew(readw(&ctrl_base->gpmc_noe) | 0x0E00, &ctrl_base->gpmc_noe); ++ /* Enable off mode for ALE in PADCONF_GPMC_NADV_ALE register */ ++ writew(readw(&ctrl_base->gpmc_nadv_ale) | 0x0E00, ++ &ctrl_base->gpmc_nadv_ale); ++ ++ /* Make GPIO 64 as output pin */ ++ writel(readl(&gpio3_base->oe) & ~(GPIO0), &gpio3_base->oe); ++ ++ /* Now send a pulse on the GPIO pin */ ++ writel(GPIO0, &gpio3_base->setdataout); ++ udelay(1); ++ writel(GPIO0, &gpio3_base->cleardataout); ++ udelay(1); ++ writel(GPIO0, &gpio3_base->setdataout); ++} ++ ++int board_eth_init(bd_t *bis) ++{ ++ int rc = 0; ++#ifdef CONFIG_SMC911X ++ rc = smc911x_initialize(0, CONFIG_SMC911X_BASE); ++#endif ++ return rc; ++} ++ +diff --git a/board/omap3/igep0020b/igep0020b.h b/board/omap3/igep0020b/igep0020b.h +new file mode 100644 +index 0000000..b76dac9 +--- /dev/null ++++ b/board/omap3/igep0020b/igep0020b.h +@@ -0,0 +1,399 @@ ++/* ++ * (C) Copyright 2009 ++ * Integration Software and Electronics Engineering, <www.iseebcn.com> ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++#ifndef _IGEP0020_H_ ++#define _IGEP0020_H_ ++ ++const omap3_sysinfo sysinfo = { ++ DDR_STACKED, ++ "IGEP v2.x rev. B", ++ "ONENAND", ++}; ++ ++static void setup_net_chip(void); ++ ++/* ++ * IEN - Input Enable ++ * IDIS - Input Disable ++ * PTD - Pull type Down ++ * PTU - Pull type Up ++ * DIS - Pull type selection is inactive ++ * EN - Pull type selection is active ++ * M0 - Mode 0 ++ * The commented string gives the final mux configuration for that pin ++ */ ++#define MUX_IGEP0020() \ ++ /* SDRC */\ ++ MUX_VAL(CP(SDRC_D0), (IEN | PTD | DIS | M0)) /* SDRC_D0 */\ ++ MUX_VAL(CP(SDRC_D1), (IEN | PTD | DIS | M0)) /* SDRC_D1 */\ ++ MUX_VAL(CP(SDRC_D2), (IEN | PTD | DIS | M0)) /* SDRC_D2 */\ ++ MUX_VAL(CP(SDRC_D3), (IEN | PTD | DIS | M0)) /* SDRC_D3 */\ ++ MUX_VAL(CP(SDRC_D4), (IEN | PTD | DIS | M0)) /* SDRC_D4 */\ ++ MUX_VAL(CP(SDRC_D5), (IEN | PTD | DIS | M0)) /* SDRC_D5 */\ ++ MUX_VAL(CP(SDRC_D6), (IEN | PTD | DIS | M0)) /* SDRC_D6 */\ ++ MUX_VAL(CP(SDRC_D7), (IEN | PTD | DIS | M0)) /* SDRC_D7 */\ ++ MUX_VAL(CP(SDRC_D8), (IEN | PTD | DIS | M0)) /* SDRC_D8 */\ ++ MUX_VAL(CP(SDRC_D9), (IEN | PTD | DIS | M0)) /* SDRC_D9 */\ ++ MUX_VAL(CP(SDRC_D10), (IEN | PTD | DIS | M0)) /* SDRC_D10 */\ ++ MUX_VAL(CP(SDRC_D11), (IEN | PTD | DIS | M0)) /* SDRC_D11 */\ ++ MUX_VAL(CP(SDRC_D12), (IEN | PTD | DIS | M0)) /* SDRC_D12 */\ ++ MUX_VAL(CP(SDRC_D13), (IEN | PTD | DIS | M0)) /* SDRC_D13 */\ ++ MUX_VAL(CP(SDRC_D14), (IEN | PTD | DIS | M0)) /* SDRC_D14 */\ ++ MUX_VAL(CP(SDRC_D15), (IEN | PTD | DIS | M0)) /* SDRC_D15 */\ ++ MUX_VAL(CP(SDRC_D16), (IEN | PTD | DIS | M0)) /* SDRC_D16 */\ ++ MUX_VAL(CP(SDRC_D17), (IEN | PTD | DIS | M0)) /* SDRC_D17 */\ ++ MUX_VAL(CP(SDRC_D18), (IEN | PTD | DIS | M0)) /* SDRC_D18 */\ ++ MUX_VAL(CP(SDRC_D19), (IEN | PTD | DIS | M0)) /* SDRC_D19 */\ ++ MUX_VAL(CP(SDRC_D20), (IEN | PTD | DIS | M0)) /* SDRC_D20 */\ ++ MUX_VAL(CP(SDRC_D21), (IEN | PTD | DIS | M0)) /* SDRC_D21 */\ ++ MUX_VAL(CP(SDRC_D22), (IEN | PTD | DIS | M0)) /* SDRC_D22 */\ ++ MUX_VAL(CP(SDRC_D23), (IEN | PTD | DIS | M0)) /* SDRC_D23 */\ ++ MUX_VAL(CP(SDRC_D24), (IEN | PTD | DIS | M0)) /* SDRC_D24 */\ ++ MUX_VAL(CP(SDRC_D25), (IEN | PTD | DIS | M0)) /* SDRC_D25 */\ ++ MUX_VAL(CP(SDRC_D26), (IEN | PTD | DIS | M0)) /* SDRC_D26 */\ ++ MUX_VAL(CP(SDRC_D27), (IEN | PTD | DIS | M0)) /* SDRC_D27 */\ ++ MUX_VAL(CP(SDRC_D28), (IEN | PTD | DIS | M0)) /* SDRC_D28 */\ ++ MUX_VAL(CP(SDRC_D29), (IEN | PTD | DIS | M0)) /* SDRC_D29 */\ ++ MUX_VAL(CP(SDRC_D30), (IEN | PTD | DIS | M0)) /* SDRC_D30 */\ ++ MUX_VAL(CP(SDRC_D31), (IEN | PTD | DIS | M0)) /* SDRC_D31 */\ ++ MUX_VAL(CP(SDRC_CLK), (IEN | PTD | DIS | M0)) /* SDRC_CLK */\ ++ MUX_VAL(CP(SDRC_DQS0), (IEN | PTD | DIS | M0)) /* SDRC_DQS0*/\ ++ MUX_VAL(CP(SDRC_DQS1), (IEN | PTD | DIS | M0)) /* SDRC_DQS1*/\ ++ MUX_VAL(CP(SDRC_DQS2), (IEN | PTD | DIS | M0)) /* SDRC_DQS2*/\ ++ MUX_VAL(CP(SDRC_DQS3), (IEN | PTD | DIS | M0)) /* SDRC_DQS3*/\ ++ /* GPMC - General-Purpose Memory Controller */\ ++ MUX_VAL(CP(GPMC_A1), (IDIS | PTU | EN | M0)) /* GPMC_A1 */\ ++ MUX_VAL(CP(GPMC_A2), (IDIS | PTU | EN | M0)) /* GPMC_A2 */\ ++ MUX_VAL(CP(GPMC_A3), (IDIS | PTU | EN | M0)) /* GPMC_A3 */\ ++ MUX_VAL(CP(GPMC_A4), (IDIS | PTU | EN | M0)) /* GPMC_A4 */\ ++ MUX_VAL(CP(GPMC_A5), (IDIS | PTU | EN | M0)) /* GPMC_A5 */\ ++ MUX_VAL(CP(GPMC_A6), (IDIS | PTU | EN | M0)) /* GPMC_A6 */\ ++ MUX_VAL(CP(GPMC_A7), (IDIS | PTU | EN | M0)) /* GPMC_A7 */\ ++ MUX_VAL(CP(GPMC_A8), (IDIS | PTU | EN | M0)) /* GPMC_A8 */\ ++ MUX_VAL(CP(GPMC_A9), (IDIS | PTU | EN | M0)) /* GPMC_A9 */\ ++ MUX_VAL(CP(GPMC_A10), (IDIS | PTU | EN | M0)) /* GPMC_A10 */\ ++ MUX_VAL(CP(GPMC_D0), (IEN | PTU | EN | M0)) /* GPMC_D0 */\ ++ MUX_VAL(CP(GPMC_D1), (IEN | PTU | EN | M0)) /* GPMC_D1 */\ ++ MUX_VAL(CP(GPMC_D2), (IEN | PTU | EN | M0)) /* GPMC_D2 */\ ++ MUX_VAL(CP(GPMC_D3), (IEN | PTU | EN | M0)) /* GPMC_D3 */\ ++ MUX_VAL(CP(GPMC_D4), (IEN | PTU | EN | M0)) /* GPMC_D4 */\ ++ MUX_VAL(CP(GPMC_D5), (IEN | PTU | EN | M0)) /* GPMC_D5 */\ ++ MUX_VAL(CP(GPMC_D6), (IEN | PTU | EN | M0)) /* GPMC_D6 */\ ++ MUX_VAL(CP(GPMC_D7), (IEN | PTU | EN | M0)) /* GPMC_D7 */\ ++ MUX_VAL(CP(GPMC_D8), (IEN | PTU | EN | M0)) /* GPMC_D8 */\ ++ MUX_VAL(CP(GPMC_D9), (IEN | PTU | EN | M0)) /* GPMC_D9 */\ ++ MUX_VAL(CP(GPMC_D10), (IEN | PTU | EN | M0)) /* GPMC_D10 */\ ++ MUX_VAL(CP(GPMC_D11), (IEN | PTU | EN | M0)) /* GPMC_D11 */\ ++ MUX_VAL(CP(GPMC_D12), (IEN | PTU | EN | M0)) /* GPMC_D12 */\ ++ MUX_VAL(CP(GPMC_D13), (IEN | PTU | EN | M0)) /* GPMC_D13 */\ ++ MUX_VAL(CP(GPMC_D14), (IEN | PTU | EN | M0)) /* GPMC_D14 */\ ++ MUX_VAL(CP(GPMC_D15), (IEN | PTU | EN | M0)) /* GPMC_D15 */\ ++ MUX_VAL(CP(GPMC_NCS0), (IDIS | PTU | EN | M0)) /* GPMC_nCS0 */\ ++ MUX_VAL(CP(GPMC_NCS1), (IDIS | PTU | EN | M0)) /* GPMC_nCS1 */\ ++ MUX_VAL(CP(GPMC_NCS2), (IDIS | PTU | EN | M0)) /* GPMC_nCS2 */\ ++ MUX_VAL(CP(GPMC_NCS3), (IDIS | PTU | EN | M0)) /* GPMC_nCS3 */\ ++ MUX_VAL(CP(GPMC_NCS4), (IDIS | PTU | EN | M0)) /* GPMC_nCS4 */\ ++ MUX_VAL(CP(GPMC_NCS5), (IDIS | PTU | EN | M0)) /* GPMC_nCS5 */\ ++ MUX_VAL(CP(GPMC_NCS6), (IDIS | PTU | EN | M0)) /* GPMC_nCS6 */\ ++ MUX_VAL(CP(GPMC_NOE), (IDIS | PTD | DIS | M0)) /* GPMC_nOE */\ ++ MUX_VAL(CP(GPMC_NWE), (IDIS | PTD | DIS | M0)) /* GPMC_nWE */\ ++ \ ++ MUX_VAL(CP(GPMC_WAIT2), (IEN | PTU | EN | M4)) /* GPIO_64 -ETH_NRESET */\ ++ \ ++ MUX_VAL(CP(GPMC_NCS7), (IEN | PTU | EN | M1)) /* SYS_nDMA_REQ3 */\ ++ MUX_VAL(CP(GPMC_CLK), (IDIS | PTD | DIS | M0)) /* GPMC_CLK */\ ++ MUX_VAL(CP(GPMC_NBE1), (IEN | PTD | DIS | M0)) /* GPMC_nBE1 */\ ++ MUX_VAL(CP(GPMC_NADV_ALE), (IDIS | PTD | DIS | M0)) /* GPMC_nADV_ALE */\ ++ MUX_VAL(CP(GPMC_NBE0_CLE), (IDIS | PTD | DIS | M0)) /* GPMC_nBE0_CLE */\ ++ MUX_VAL(CP(GPMC_NWP), (IEN | PTD | DIS | M0)) /* GPMC_nWP */\ ++ MUX_VAL(CP(GPMC_WAIT0), (IEN | PTU | EN | M0)) /* GPMC_WAIT0 */\ ++ MUX_VAL(CP(GPMC_WAIT1), (IEN | PTU | EN | M0)) /* GPMC_WAIT1 */\ ++ MUX_VAL(CP(GPMC_WAIT3), (IEN | PTU | EN | M0)) /* GPMC_WAIT3 */\ ++ /* DSS */\ ++ MUX_VAL(CP(DSS_PCLK), (IDIS | PTD | DIS | M0)) /* DSS_PCLK */\ ++ MUX_VAL(CP(DSS_HSYNC), (IDIS | PTD | DIS | M0)) /* DSS_HSYNC */\ ++ MUX_VAL(CP(DSS_VSYNC), (IDIS | PTD | DIS | M0)) /* DSS_VSYNC */\ ++ MUX_VAL(CP(DSS_ACBIAS), (IDIS | PTD | DIS | M0)) /* DSS_ACBIAS */\ ++ MUX_VAL(CP(DSS_DATA0), (IDIS | PTD | DIS | M0)) /* DSS_DATA0 */\ ++ MUX_VAL(CP(DSS_DATA1), (IDIS | PTD | DIS | M0)) /* DSS_DATA1 */\ ++ MUX_VAL(CP(DSS_DATA2), (IDIS | PTD | DIS | M0)) /* DSS_DATA2 */\ ++ MUX_VAL(CP(DSS_DATA3), (IDIS | PTD | DIS | M0)) /* DSS_DATA3 */\ ++ MUX_VAL(CP(DSS_DATA4), (IDIS | PTD | DIS | M0)) /* DSS_DATA4 */\ ++ MUX_VAL(CP(DSS_DATA5), (IDIS | PTD | DIS | M0)) /* DSS_DATA5 */\ ++ MUX_VAL(CP(DSS_DATA6), (IDIS | PTD | DIS | M0)) /* DSS_DATA6 */\ ++ MUX_VAL(CP(DSS_DATA7), (IDIS | PTD | DIS | M0)) /* DSS_DATA7 */\ ++ MUX_VAL(CP(DSS_DATA8), (IDIS | PTD | DIS | M0)) /* DSS_DATA8 */\ ++ MUX_VAL(CP(DSS_DATA9), (IDIS | PTD | DIS | M0)) /* DSS_DATA9 */\ ++ MUX_VAL(CP(DSS_DATA10), (IDIS | PTD | DIS | M0)) /* DSS_DATA10 */\ ++ MUX_VAL(CP(DSS_DATA11), (IDIS | PTD | DIS | M0)) /* DSS_DATA11 */\ ++ MUX_VAL(CP(DSS_DATA12), (IDIS | PTD | DIS | M0)) /* DSS_DATA12 */\ ++ MUX_VAL(CP(DSS_DATA13), (IDIS | PTD | DIS | M0)) /* DSS_DATA13 */\ ++ MUX_VAL(CP(DSS_DATA14), (IDIS | PTD | DIS | M0)) /* DSS_DATA14 */\ ++ MUX_VAL(CP(DSS_DATA15), (IDIS | PTD | DIS | M0)) /* DSS_DATA15 */\ ++ MUX_VAL(CP(DSS_DATA16), (IDIS | PTD | DIS | M0)) /* DSS_DATA16 */\ ++ MUX_VAL(CP(DSS_DATA17), (IDIS | PTD | DIS | M0)) /* DSS_DATA17 */\ ++ MUX_VAL(CP(DSS_DATA18), (IDIS | PTD | DIS | M0)) /* DSS_DATA18 */\ ++ MUX_VAL(CP(DSS_DATA19), (IDIS | PTD | DIS | M0)) /* DSS_DATA19 */\ ++ MUX_VAL(CP(DSS_DATA20), (IDIS | PTD | DIS | M0)) /* DSS_DATA20 */\ ++ MUX_VAL(CP(DSS_DATA21), (IDIS | PTD | DIS | M0)) /* DSS_DATA21 */\ ++ MUX_VAL(CP(DSS_DATA22), (IDIS | PTD | DIS | M0)) /* DSS_DATA22 */\ ++ MUX_VAL(CP(DSS_DATA23), (IDIS | PTD | DIS | M0)) /* DSS_DATA23 */\ ++ /* Audio Interface */\ ++ MUX_VAL(CP(MCBSP2_FSX), (IEN | PTD | DIS | M0)) /* McBSP2_FSX */\ ++ MUX_VAL(CP(MCBSP2_CLKX), (IEN | PTD | DIS | M0)) /* McBSP2_CLKX */\ ++ MUX_VAL(CP(MCBSP2_DR), (IEN | PTD | DIS | M0)) /* McBSP2_DR */\ ++ MUX_VAL(CP(MCBSP2_DX), (IDIS | PTD | DIS | M0)) /* McBSP2_DX */\ ++ /* Expansion card 1 */\ ++ MUX_VAL(CP(MMC1_CLK), (IDIS | PTU | EN | M0)) /* MMC1_CLK */\ ++ MUX_VAL(CP(MMC1_CMD), (IEN | PTU | EN | M0)) /* MMC1_CMD */\ ++ MUX_VAL(CP(MMC1_DAT0), (IEN | PTU | EN | M0)) /* MMC1_DAT0 */\ ++ MUX_VAL(CP(MMC1_DAT1), (IEN | PTU | EN | M0)) /* MMC1_DAT1 */\ ++ MUX_VAL(CP(MMC1_DAT2), (IEN | PTU | EN | M0)) /* MMC1_DAT2 */\ ++ MUX_VAL(CP(MMC1_DAT3), (IEN | PTU | EN | M0)) /* MMC1_DAT3 */\ ++ \ ++ MUX_VAL(CP(MMC1_DAT4), (IEN | PTU | EN | M0)) /* MMC1_DAT4 */\ ++ MUX_VAL(CP(MMC1_DAT5), (IEN | PTU | EN | M0)) /* MMC1_DAT5 */\ ++ MUX_VAL(CP(MMC1_DAT6), (IEN | PTU | EN | M0)) /* MMC1_DAT6 */\ ++ MUX_VAL(CP(MMC1_DAT7), (IEN | PTU | EN | M0)) /* MMC1_DAT7 */\ ++ /* SDIO Interface to WIFI Module (EXPANSION CONNECTOR) */\ ++ MUX_VAL(CP(MMC2_CLK), (IEN | PTU | EN | M0)) /* MMC2_CLK */\ ++ MUX_VAL(CP(MMC2_CMD), (IEN | PTU | EN | M0)) /* MMC2_CMD */\ ++ MUX_VAL(CP(MMC2_DAT0), (IEN | PTU | EN | M0)) /* MMC2_DAT0 */\ ++ MUX_VAL(CP(MMC2_DAT1), (IEN | PTU | EN | M0)) /* MMC2_DAT1 */\ ++ MUX_VAL(CP(MMC2_DAT2), (IEN | PTU | EN | M0)) /* MMC2_DAT2 */\ ++ MUX_VAL(CP(MMC2_DAT3), (IEN | PTU | EN | M0)) /* MMC2_DAT3 */\ ++ \ ++ /* GSPI Interface to WIFI Module */ \ ++/* MUX_VAL(CP(MMC2_CLK), (IEN | PTD | DIS | M1)) McSPI3_CLK */\ ++/* MUX_VAL(CP(MMC2_CMD), (IEN | PTD | DIS | M1)) McSPI3_SIMO */\ ++/* MUX_VAL(CP(MMC2_DAT0), (IEN | PTD | DIS | M1)) McSPI3_SOMI */\ ++/* MUX_VAL(CP(MMC2_DAT1), (IEN | PTD | DIS | M4)) GPIO_133 */\ ++/* MUX_VAL(CP(MMC2_DAT2), (IEN | PTD | DIS | M4)) GPIO_134 */\ ++/* MUX_VAL(CP(MMC2_DAT3), (IEN | PTD | DIS | M4)) GPIO_135 (GPIO-Based CS) */\ ++ \ ++ MUX_VAL(CP(CAM_HS), (IDIS | PTD | DIS | M4)) /* GPIO_94 - PDN */\ ++ MUX_VAL(CP(CAM_VS), (IDIS | PTD | DIS | M4)) /* GPIO_95 - RESET_N_W */\ ++ \ ++ MUX_VAL(CP(MMC2_DAT4), (IEN | PTU | EN | M0)) /* MMC2_DIR_DAT0 */\ ++ MUX_VAL(CP(MMC2_DAT5), (IEN | PTU | EN | M0)) /* MMC2_DIR_DAT1 */\ ++ MUX_VAL(CP(MMC2_DAT6), (IEN | PTU | EN | M0)) /* MMC2_DIR_CMD */\ ++ MUX_VAL(CP(MMC2_DAT7), (IEN | PTU | EN | M0)) /* MMC2_CLKIN */\ ++ /* Bluetooth (EXPANSION CONNECTOR) */\ ++ MUX_VAL(CP(MCBSP3_DX), (IDIS | PTD | DIS | M0)) /* McBSP3_DX */\ ++ MUX_VAL(CP(MCBSP3_DR), (IEN | PTD | DIS | M0)) /* McBSP3_DR */\ ++ MUX_VAL(CP(MCBSP3_CLKX), (IEN | PTD | DIS | M0)) /* McBSP3_CLKX */\ ++ MUX_VAL(CP(MCBSP3_FSX), (IEN | PTD | DIS | M0)) /* McBSP3_FSX */\ ++ MUX_VAL(CP(UART2_CTS), (IEN | PTU | EN | M0)) /* UART2_CTS */\ ++ MUX_VAL(CP(UART2_RTS), (IDIS | PTD | DIS | M0)) /* UART2_RTS */\ ++ MUX_VAL(CP(UART2_TX), (IDIS | PTD | DIS | M0)) /* UART2_TX */\ ++ MUX_VAL(CP(UART2_RX), (IEN | PTD | DIS | M0)) /* UART2_RX */\ ++ /* 485 Interface */\ ++ MUX_VAL(CP(UART1_TX), (IDIS | PTD | DIS | M0)) /* UART1_TX */\ ++ MUX_VAL(CP(UART1_RTS), (IDIS | PTD | DIS | M0)) /* UART1_RTS */\ ++ MUX_VAL(CP(UART1_CTS), (IEN | PTU | DIS | M0)) /* UART1_CTS */\ ++ MUX_VAL(CP(UART1_RX), (IEN | PTD | DIS | M0)) /* UART1_RX */\ ++ MUX_VAL(CP(MCBSP4_CLKX), (IDIS | PTD | DIS | M4)) /* GPIO_152 */\ ++ /* Serial Interface */\ ++ MUX_VAL(CP(UART3_CTS_RCTX), (IEN | PTD | EN | M0)) /* UART3_CTS_RCTX*/\ ++ MUX_VAL(CP(UART3_RTS_SD), (IDIS | PTD | DIS | M0)) /* UART3_RTS_SD */\ ++ MUX_VAL(CP(UART3_RX_IRRX), (IEN | PTD | DIS | M0)) /* UART3_RX_IRRX*/\ ++ MUX_VAL(CP(UART3_TX_IRTX), (IDIS | PTD | DIS | M0)) /* UART3_TX_IRTX*/\ ++ MUX_VAL(CP(HSUSB0_CLK), (IEN | PTD | DIS | M0)) /* HSUSB0_CLK*/\ ++ MUX_VAL(CP(HSUSB0_STP), (IDIS | PTU | EN | M0)) /* HSUSB0_STP*/\ ++ MUX_VAL(CP(HSUSB0_DIR), (IEN | PTD | DIS | M0)) /* HSUSB0_DIR*/\ ++ MUX_VAL(CP(HSUSB0_NXT), (IEN | PTD | DIS | M0)) /* HSUSB0_NXT*/\ ++ MUX_VAL(CP(HSUSB0_DATA0), (IEN | PTD | DIS | M0)) /* HSUSB0_DATA0*/\ ++ MUX_VAL(CP(HSUSB0_DATA1), (IEN | PTD | DIS | M0)) /* HSUSB0_DATA1*/\ ++ MUX_VAL(CP(HSUSB0_DATA2), (IEN | PTD | DIS | M0)) /* HSUSB0_DATA2*/\ ++ MUX_VAL(CP(HSUSB0_DATA3), (IEN | PTD | DIS | M0)) /* HSUSB0_DATA3*/\ ++ MUX_VAL(CP(HSUSB0_DATA4), (IEN | PTD | DIS | M0)) /* HSUSB0_DATA4*/\ ++ MUX_VAL(CP(HSUSB0_DATA5), (IEN | PTD | DIS | M0)) /* HSUSB0_DATA5*/\ ++ MUX_VAL(CP(HSUSB0_DATA6), (IEN | PTD | DIS | M0)) /* HSUSB0_DATA6*/\ ++ MUX_VAL(CP(HSUSB0_DATA7), (IEN | PTD | DIS | M0)) /* HSUSB0_DATA7*/\ ++ MUX_VAL(CP(I2C1_SCL), (IEN | PTU | EN | M0)) /* I2C1_SCL*/\ ++ MUX_VAL(CP(I2C1_SDA), (IEN | PTU | EN | M0)) /* I2C1_SDA*/\ ++ MUX_VAL(CP(I2C2_SCL), (IEN | PTU | EN | M4)) /* GPIO_168*/\ ++ MUX_VAL(CP(I2C2_SDA), (IEN | PTU | EN | M4)) /* GPIO_183*/\ ++ MUX_VAL(CP(I2C3_SCL), (IEN | PTU | EN | M0)) /* I2C3_SCL*/\ ++ MUX_VAL(CP(I2C3_SDA), (IEN | PTU | EN | M0)) /* I2C3_SDA*/\ ++ MUX_VAL(CP(I2C4_SCL), (IEN | PTU | EN | M0)) /* I2C4_SCL*/\ ++ MUX_VAL(CP(I2C4_SDA), (IEN | PTU | EN | M0)) /* I2C4_SDA*/\ ++ MUX_VAL(CP(HDQ_SIO), (IDIS | PTU | EN | M4)) /* GPIO_170*/\ ++ /* SPI1 ADC121S101 */ \ ++ MUX_VAL(CP(MCSPI1_CLK), (IEN | PTD | DIS | M0)) /* McSPI1_CLK */\ ++ MUX_VAL(CP(MCSPI1_SIMO), (IEN | PTD | DIS | M0)) /* McSPI1_SIMO */\ ++ MUX_VAL(CP(MCSPI1_SOMI), (IEN | PTD | DIS | M0)) /* McSPI1_SOMI */\ ++ MUX_VAL(CP(MCSPI1_CS3), (IDIS | PTD | DIS | M0)) /* McSPI1_CS3 */\ ++ \ ++ MUX_VAL(CP(MCSPI1_CS0), (IEN | PTD | DIS | M4)) /* GPIO_174 */\ ++ MUX_VAL(CP(MCSPI1_CS1), (IEN | PTD | DIS | M4)) /* GPIO_175 */\ ++ MUX_VAL(CP(MCSPI1_CS2), (IEN | PTD | DIS | M4)) /* GPIO_176 */\ ++ /* SPI2 (25GHz RF PORT) */ \ ++ MUX_VAL(CP(MCSPI2_CLK), (IEN | PTD | DIS | M0)) /* McSPI2_CLK */\ ++ MUX_VAL(CP(MCSPI2_SIMO), (IEN | PTD | DIS | M0)) /* McSPI2_SIMO */\ ++ MUX_VAL(CP(MCSPI2_SOMI), (IEN | PTD | DIS | M0)) /* McSPI2_SOMI */\ ++ MUX_VAL(CP(MCSPI2_CS0), (IDIS | PTD | DIS | M0)) /* McSPI2_CS0 */\ ++ \ ++ MUX_VAL(CP(MCSPI2_CS1), (IEN | PTD | DIS | M4)) /* GPIO_182 */\ ++ /* Control and debug */\ ++ MUX_VAL(CP(SYS_32K), (IEN | PTD | DIS | M0)) /* SYS_32K*/\ ++ MUX_VAL(CP(SYS_CLKREQ), (IEN | PTD | DIS | M0)) /* SYS_CLKREQ*/\ ++ MUX_VAL(CP(SYS_NIRQ), (IEN | PTU | EN | M0)) /* SYS_nIRQ*/\ ++ MUX_VAL(CP(SYS_BOOT0), (IEN | PTD | DIS | M4)) /* GPIO_2*/\ ++ MUX_VAL(CP(SYS_BOOT1), (IEN | PTD | DIS | M4)) /* GPIO_3*/\ ++ MUX_VAL(CP(SYS_BOOT2), (IEN | PTD | DIS | M4)) /* GPIO_4 - MMC1_WP*/\ ++ MUX_VAL(CP(SYS_BOOT3), (IEN | PTD | DIS | M4)) /* GPIO_5*/\ ++ MUX_VAL(CP(SYS_BOOT4), (IEN | PTD | DIS | M4)) /* GPIO_6*/\ ++ MUX_VAL(CP(SYS_BOOT5), (IEN | PTD | DIS | M4)) /* GPIO_7*/\ ++ MUX_VAL(CP(SYS_BOOT6), (IDIS | PTD | DIS | M4)) /* GPIO_8*/ \ ++ /* VIO_1V8 */\ ++ MUX_VAL(CP(SYS_OFF_MODE), (IEN | PTD | DIS | M0)) /* SYS_OFF_MODE*/\ ++ MUX_VAL(CP(SYS_CLKOUT1), (IEN | PTD | DIS | M0)) /* SYS_CLKOUT1*/\ ++ MUX_VAL(CP(SYS_CLKOUT2), (IEN | PTU | EN | M4)) /* GPIO_186*/\ ++ /* USB EHCI (port 1) */ \ ++ MUX_VAL(CP(ETK_CLK_ES2), (IDIS | PTU | DIS | M3)) /* HSUSB1_STP */\ ++ MUX_VAL(CP(ETK_CTL_ES2), (IDIS | PTU | DIS | M3)) /* HSUSB1_CLK */\ ++ MUX_VAL(CP(ETK_D0_ES2), (IEN | PTU | DIS | M3)) /* HSUSB1_DATA0 */\ ++ MUX_VAL(CP(ETK_D1_ES2), (IEN | PTU | DIS | M3)) /* HSUSB1_DATA1 */\ ++ MUX_VAL(CP(ETK_D2_ES2), (IEN | PTU | DIS | M3)) /* HSUSB1_DATA2 */\ ++ MUX_VAL(CP(ETK_D3_ES2), (IEN | PTU | DIS | M3)) /* HSUSB1_DATA3 */\ ++ MUX_VAL(CP(ETK_D4_ES2), (IEN | PTU | DIS | M3)) /* HSUSB1_DATA4 */\ ++ MUX_VAL(CP(ETK_D5_ES2), (IEN | PTU | DIS | M3)) /* HSUSB1_DATA5 */\ ++ MUX_VAL(CP(ETK_D6_ES2), (IEN | PTU | DIS | M3)) /* HSUSB1_DATA6 */\ ++ MUX_VAL(CP(ETK_D7_ES2), (IEN | PTU | DIS | M3)) /* HSUSB1_DATA7 */\ ++ MUX_VAL(CP(ETK_D8_ES2), (IEN | PTU | DIS | M3)) /* HSUSB1_DIR */\ ++ MUX_VAL(CP(ETK_D9_ES2), (IEN | PTU | DIS | M3)) /* HSUSB1_NXT */\ ++ /* Generic IO (outputs) */\ ++ MUX_VAL(CP(ETK_D10_ES2), (IDIS | PTU | DIS | M4)) /* GPIO_24 - USB1HS_nRST */\ ++ MUX_VAL(CP(ETK_D12_ES2), (IDIS | PTU | DIS | M4)) /* GPIO_26 - LED1 */\ ++ MUX_VAL(CP(ETK_D13_ES2), (IDIS | PTU | DIS | M4)) /* GPIO_27 - LED0 */\ ++ MUX_VAL(CP(CAM_D6), (IDIS | PTU | DIS | M4)) /* GPIO_105 - RF_CTRL */\ ++ MUX_VAL(CP(CAM_D7), (IDIS | PTU | DIS | M4)) /* GPIO_106 - RF_STANDBY */\ ++ MUX_VAL(CP(CAM_D8), (IDIS | PTU | DIS | M4)) /* GPIO_107 - RF_INT */\ ++ MUX_VAL(CP(CAM_D9), (IDIS | PTU | DIS | M4)) /* GPIO_108 - RF_SYNCB */\ ++ /* Generic IO (inputs) */\ ++ MUX_VAL(CP(ETK_D11_ES2), (IEN | PTD | DIS | M4)) /* GPIO_25 */\ ++ MUX_VAL(CP(ETK_D14_ES2), (IEN | PTD | DIS | M4)) /* GPIO_28 */\ ++ MUX_VAL(CP(ETK_D15_ES2), (IEN | PTD | DIS | M4)) /* GPIO_29 */\ ++ MUX_VAL(CP(CAM_D0), (IEN | PTD | DIS | M4)) /* GPIO_99 */\ ++ MUX_VAL(CP(CAM_D1), (IEN | PTD | DIS | M4)) /* GPIO_100 */\ ++ MUX_VAL(CP(CSI2_DX0), (IEN | PTD | DIS | M4)) /* GPIO_112 */\ ++ MUX_VAL(CP(CSI2_DY0), (IEN | PTD | DIS | M4)) /* GPIO_113 */\ ++ MUX_VAL(CP(CSI2_DX1), (IEN | PTD | DIS | M4)) /* GPIO_114 */\ ++ MUX_VAL(CP(CSI2_DY1), (IEN | PTD | DIS | M4)) /* GPIO_115 */\ ++ \ ++ \ ++ /* LCD_INI */\ ++ MUX_VAL(CP(MCBSP4_DR), (IDIS | PTD | DIS | M4)) /* GPIO_153 */\ ++ /* LCD_ENVDD */\ ++ MUX_VAL(CP(MCBSP4_DX), (IDIS | PTD | DIS | M4)) /* GPIO_154 */\ ++ /* LCD_QVGA/nVGA */\ ++ MUX_VAL(CP(MCBSP4_FSX), (IDIS | PTD | DIS | M4)) /* GPIO_155 */\ ++ /* LCD_RESB */\ ++ MUX_VAL(CP(MCBSP1_CLKR), (IDIS | PTD | DIS | M4)) /* GPIO_156 */\ ++ MUX_VAL(CP(MCBSP1_FSR), (IDIS | PTU | EN | M4)) /* GPIO_157 */\ ++ MUX_VAL(CP(MCBSP1_DX), (IDIS | PTD | DIS | M4)) /* GPIO_158 */\ ++ MUX_VAL(CP(MCBSP1_DR), (IDIS | PTD | DIS | M4)) /* GPIO_159 */\ ++ MUX_VAL(CP(MCBSP_CLKS), (IEN | PTU | DIS | M0)) /* McBSP_CLKS */\ ++ MUX_VAL(CP(MCBSP1_FSX), (IDIS | PTD | DIS | M4)) /* GPIO_161 */\ ++ MUX_VAL(CP(MCBSP1_CLKX), (IDIS | PTD | DIS | M4)) /* GPIO_162 */\ ++ \ ++ /* CAMERA */\ ++ MUX_VAL(CP(CAM_XCLKA), (IDIS | PTD | DIS | M0)) /* CAM_XCLKA */\ ++ MUX_VAL(CP(CAM_PCLK), (IEN | PTU | EN | M0)) /* CAM_PCLK */\ ++ MUX_VAL(CP(CAM_FLD), (IDIS | PTD | DIS | M4)) /* GPIO_98 */\ ++ MUX_VAL(CP(CAM_D2), (IEN | PTD | DIS | M0)) /* CAM_D2 */\ ++ MUX_VAL(CP(CAM_D3), (IEN | PTD | DIS | M0)) /* CAM_D3 */\ ++ MUX_VAL(CP(CAM_D4), (IEN | PTD | DIS | M0)) /* CAM_D4 */\ ++ MUX_VAL(CP(CAM_D5), (IEN | PTD | DIS | M0)) /* CAM_D5 */\ ++ MUX_VAL(CP(CAM_D10), (IEN | PTD | DIS | M0)) /* CAM_D10 */\ ++ MUX_VAL(CP(CAM_D11), (IEN | PTD | DIS | M0)) /* CAM_D11 */\ ++ MUX_VAL(CP(CAM_XCLKB), (IDIS | PTD | DIS | M0)) /* CAM_XCLKB */\ ++ MUX_VAL(CP(CAM_WEN), (IEN | PTD | DIS | M4)) /* GPIO_167 */\ ++ MUX_VAL(CP(CAM_STROBE), (IDIS | PTD | DIS | M0)) /* CAM_STROBE*/\ ++ \ ++ MUX_VAL(CP(D2D_MCAD1), (IEN | PTD | EN | M0)) /*d2d_mcad1*/\ ++ MUX_VAL(CP(D2D_MCAD2), (IEN | PTD | EN | M0)) /*d2d_mcad2*/\ ++ MUX_VAL(CP(D2D_MCAD3), (IEN | PTD | EN | M0)) /*d2d_mcad3*/\ ++ MUX_VAL(CP(D2D_MCAD4), (IEN | PTD | EN | M0)) /*d2d_mcad4*/\ ++ MUX_VAL(CP(D2D_MCAD5), (IEN | PTD | EN | M0)) /*d2d_mcad5*/\ ++ MUX_VAL(CP(D2D_MCAD6), (IEN | PTD | EN | M0)) /*d2d_mcad6*/\ ++ MUX_VAL(CP(D2D_MCAD7), (IEN | PTD | EN | M0)) /*d2d_mcad7*/\ ++ MUX_VAL(CP(D2D_MCAD8), (IEN | PTD | EN | M0)) /*d2d_mcad8*/\ ++ MUX_VAL(CP(D2D_MCAD9), (IEN | PTD | EN | M0)) /*d2d_mcad9*/\ ++ MUX_VAL(CP(D2D_MCAD10), (IEN | PTD | EN | M0)) /*d2d_mcad10*/\ ++ MUX_VAL(CP(D2D_MCAD11), (IEN | PTD | EN | M0)) /*d2d_mcad11*/\ ++ MUX_VAL(CP(D2D_MCAD12), (IEN | PTD | EN | M0)) /*d2d_mcad12*/\ ++ MUX_VAL(CP(D2D_MCAD13), (IEN | PTD | EN | M0)) /*d2d_mcad13*/\ ++ MUX_VAL(CP(D2D_MCAD14), (IEN | PTD | EN | M0)) /*d2d_mcad14*/\ ++ MUX_VAL(CP(D2D_MCAD15), (IEN | PTD | EN | M0)) /*d2d_mcad15*/\ ++ MUX_VAL(CP(D2D_MCAD16), (IEN | PTD | EN | M0)) /*d2d_mcad16*/\ ++ MUX_VAL(CP(D2D_MCAD17), (IEN | PTD | EN | M0)) /*d2d_mcad17*/\ ++ MUX_VAL(CP(D2D_MCAD18), (IEN | PTD | EN | M0)) /*d2d_mcad18*/\ ++ MUX_VAL(CP(D2D_MCAD19), (IEN | PTD | EN | M0)) /*d2d_mcad19*/\ ++ MUX_VAL(CP(D2D_MCAD20), (IEN | PTD | EN | M0)) /*d2d_mcad20*/\ ++ MUX_VAL(CP(D2D_MCAD21), (IEN | PTD | EN | M0)) /*d2d_mcad21*/\ ++ MUX_VAL(CP(D2D_MCAD22), (IEN | PTD | EN | M0)) /*d2d_mcad22*/\ ++ MUX_VAL(CP(D2D_MCAD23), (IEN | PTD | EN | M0)) /*d2d_mcad23*/\ ++ MUX_VAL(CP(D2D_MCAD24), (IEN | PTD | EN | M0)) /*d2d_mcad24*/\ ++ MUX_VAL(CP(D2D_MCAD25), (IEN | PTD | EN | M0)) /*d2d_mcad25*/\ ++ MUX_VAL(CP(D2D_MCAD26), (IEN | PTD | EN | M0)) /*d2d_mcad26*/\ ++ MUX_VAL(CP(D2D_MCAD27), (IEN | PTD | EN | M0)) /*d2d_mcad27*/\ ++ MUX_VAL(CP(D2D_MCAD28), (IEN | PTD | EN | M0)) /*d2d_mcad28*/\ ++ MUX_VAL(CP(D2D_MCAD29), (IEN | PTD | EN | M0)) /*d2d_mcad29*/\ ++ MUX_VAL(CP(D2D_MCAD30), (IEN | PTD | EN | M0)) /*d2d_mcad30*/\ ++ MUX_VAL(CP(D2D_MCAD31), (IEN | PTD | EN | M0)) /*d2d_mcad31*/\ ++ MUX_VAL(CP(D2D_MCAD32), (IEN | PTD | EN | M0)) /*d2d_mcad32*/\ ++ MUX_VAL(CP(D2D_MCAD33), (IEN | PTD | EN | M0)) /*d2d_mcad33*/\ ++ MUX_VAL(CP(D2D_MCAD34), (IEN | PTD | EN | M0)) /*d2d_mcad34*/\ ++ MUX_VAL(CP(D2D_MCAD35), (IEN | PTD | EN | M0)) /*d2d_mcad35*/\ ++ MUX_VAL(CP(D2D_MCAD36), (IEN | PTD | EN | M0)) /*d2d_mcad36*/\ ++ MUX_VAL(CP(D2D_CLK26MI), (IEN | PTD | DIS | M0)) /*d2d_clk26mi*/\ ++ MUX_VAL(CP(D2D_NRESPWRON), (IEN | PTD | EN | M0)) /*d2d_nrespwron*/\ ++ MUX_VAL(CP(D2D_NRESWARM), (IEN | PTU | EN | M0)) /*d2d_nreswarm */\ ++ MUX_VAL(CP(D2D_ARM9NIRQ), (IEN | PTD | DIS | M0)) /*d2d_arm9nirq */\ ++ MUX_VAL(CP(D2D_UMA2P6FIQ), (IEN | PTD | DIS | M0)) /*d2d_uma2p6fiq*/\ ++ MUX_VAL(CP(D2D_SPINT), (IEN | PTD | EN | M0)) /*d2d_spint*/\ ++ MUX_VAL(CP(D2D_FRINT), (IEN | PTD | EN | M0)) /*d2d_frint*/\ ++ MUX_VAL(CP(D2D_DMAREQ0), (IEN | PTD | DIS | M0)) /*d2d_dmareq0*/\ ++ MUX_VAL(CP(D2D_DMAREQ1), (IEN | PTD | DIS | M0)) /*d2d_dmareq1*/\ ++ MUX_VAL(CP(D2D_DMAREQ2), (IEN | PTD | DIS | M0)) /*d2d_dmareq2*/\ ++ MUX_VAL(CP(D2D_DMAREQ3), (IEN | PTD | DIS | M0)) /*d2d_dmareq3*/\ ++ MUX_VAL(CP(D2D_N3GTRST), (IEN | PTD | DIS | M0)) /*d2d_n3gtrst*/\ ++ MUX_VAL(CP(D2D_N3GTDI), (IEN | PTD | DIS | M0)) /*d2d_n3gtdi*/\ ++ MUX_VAL(CP(D2D_N3GTDO), (IEN | PTD | DIS | M0)) /*d2d_n3gtdo*/\ ++ MUX_VAL(CP(D2D_N3GTMS), (IEN | PTD | DIS | M0)) /*d2d_n3gtms*/\ ++ MUX_VAL(CP(D2D_N3GTCK), (IEN | PTD | DIS | M0)) /*d2d_n3gtck*/\ ++ MUX_VAL(CP(D2D_N3GRTCK), (IEN | PTD | DIS | M0)) /*d2d_n3grtck*/\ ++ MUX_VAL(CP(D2D_MSTDBY), (IEN | PTU | EN | M0)) /*d2d_mstdby*/\ ++ MUX_VAL(CP(D2D_SWAKEUP), (IEN | PTD | EN | M0)) /*d2d_swakeup*/\ ++ MUX_VAL(CP(D2D_IDLEREQ), (IEN | PTD | DIS | M0)) /*d2d_idlereq*/\ ++ MUX_VAL(CP(D2D_IDLEACK), (IEN | PTU | EN | M0)) /*d2d_idleack*/\ ++ MUX_VAL(CP(D2D_MWRITE), (IEN | PTD | DIS | M0)) /*d2d_mwrite*/\ ++ MUX_VAL(CP(D2D_SWRITE), (IEN | PTD | DIS | M0)) /*d2d_swrite*/\ ++ MUX_VAL(CP(D2D_MREAD), (IEN | PTD | DIS | M0)) /*d2d_mread*/\ ++ MUX_VAL(CP(D2D_SREAD), (IEN | PTD | DIS | M0)) /*d2d_sread*/\ ++ MUX_VAL(CP(D2D_MBUSFLAG), (IEN | PTD | DIS | M0)) /*d2d_mbusflag*/\ ++ MUX_VAL(CP(D2D_SBUSFLAG), (IEN | PTD | DIS | M0)) /*d2d_sbusflag*/\ ++ MUX_VAL(CP(SDRC_CKE0), (IDIS | PTU | EN | M0)) /*sdrc_cke0*/\ ++ MUX_VAL(CP(SDRC_CKE1), (IDIS | PTD | DIS | M7)) /*sdrc_cke1*/ ++#endif +diff --git a/cpu/arm_cortexa8/omap3/board.c b/cpu/arm_cortexa8/omap3/board.c +index b8bd052..7259d16 100644 +--- a/cpu/arm_cortexa8/omap3/board.c ++++ b/cpu/arm_cortexa8/omap3/board.c +@@ -281,11 +281,12 @@ int dram_init(void) + * where it can be started. Early init code will init + * memory on CS0. + */ ++#if 0 + if ((sysinfo.mtype == DDR_COMBO) || (sysinfo.mtype == DDR_STACKED)) { + do_sdrc_init(CS1, NOT_EARLY); + make_cs1_contiguous(); + } +- ++#endif + size0 = get_sdr_cs_size(CS0); + size1 = get_sdr_cs_size(CS1); + +diff --git a/include/configs/omap3_igep0020b.h b/include/configs/omap3_igep0020b.h +new file mode 100644 +index 0000000..d89fc82 +--- /dev/null ++++ b/include/configs/omap3_igep0020b.h +@@ -0,0 +1,282 @@ ++/* ++ * Configuration settings for the IGEP v2.x series rev. B board. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++#ifndef __CONFIG_H ++#define __CONFIG_H ++#include <asm/sizes.h> ++ ++/* ++ * High Level Configuration Options ++ */ ++#define CONFIG_ARMCORTEXA8 1 /* This is an ARM V7 CPU core */ ++#define CONFIG_OMAP 1 /* in a TI OMAP core */ ++#define CONFIG_OMAP34XX 1 /* which is a 34XX */ ++#define CONFIG_OMAP3430 1 /* which is in a 3430 */ ++#define CONFIG_OMAP3_IGEP0020 1 /* working with IGEP0020 */ ++ ++#include <asm/arch/cpu.h> /* get chip and board defs */ ++#include <asm/arch/omap3.h> ++ ++/* ++ * Display CPU and Board information ++ */ ++#define CONFIG_DISPLAY_CPUINFO 1 ++#define CONFIG_DISPLAY_BOARDINFO 1 ++ ++/* Clock Defines */ ++#define V_OSCK 26000000 /* Clock output from T2 */ ++#define V_SCLK (V_OSCK >> 1) ++ ++#undef CONFIG_USE_IRQ /* no support for IRQs */ ++#define CONFIG_MISC_INIT_R ++ ++#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ ++#define CONFIG_SETUP_MEMORY_TAGS 1 ++#define CONFIG_INITRD_TAG 1 ++#define CONFIG_REVISION_TAG 1 ++ ++/* ++ * Size of malloc() pool ++ */ ++#define CONFIG_ENV_SIZE SZ_128K /* Total Size Environment */ ++ /* Sector */ ++#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_128K) ++#define CONFIG_SYS_GBL_DATA_SIZE 128 /* bytes reserved for */ ++ /* initial data */ ++ ++/* ++ * Hardware drivers ++ */ ++ ++/* ++ * NS16550 Configuration ++ */ ++#define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ ++ ++#define CONFIG_SYS_NS16550 ++#define CONFIG_SYS_NS16550_SERIAL ++#define CONFIG_SYS_NS16550_REG_SIZE (-4) ++#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK ++ ++/* ++ * select serial console configuration ++ */ ++#define CONFIG_CONS_INDEX 3 ++#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 ++#define CONFIG_SERIAL3 3 ++ ++/* allow to overwrite serial and ethaddr */ ++#define CONFIG_ENV_OVERWRITE ++#define CONFIG_BAUDRATE 115200 ++#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,115200} ++#define CONFIG_MMC 1 ++#define CONFIG_OMAP3_MMC 1 ++#define CONFIG_DOS_PARTITION 1 ++ ++/* commands to include */ ++#include <config_cmd_default.h> ++ ++#define CONFIG_CMD_EXT2 /* EXT2 Support */ ++#define CONFIG_CMD_FAT /* FAT support */ ++#define CONFIG_CMD_JFFS2 /* JFFS2 Support */ ++ ++#define CONFIG_CMD_I2C /* I2C serial bus support */ ++#define CONFIG_CMD_MMC /* MMC support */ ++/* (disabled) #define CONFIG_CMD_NAND NAND support */ ++#define CONFIG_CMD_ONENAND /* ONENAND support */ ++#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ ++#define CONFIG_CMD_DHCP ++#define CONFIG_CMD_PING ++ ++#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */ ++#undef CONFIG_CMD_FPGA /* FPGA configuration Support */ ++#undef CONFIG_CMD_IMI /* iminfo */ ++#undef CONFIG_CMD_IMLS /* List all found images */ ++#undef CONFIG_CMD_NFS /* NFS support */ ++ ++#define CONFIG_SYS_NO_FLASH ++#define CONFIG_SYS_I2C_SPEED 100000 ++#define CONFIG_SYS_I2C_SLAVE 1 ++#define CONFIG_SYS_I2C_BUS 0 ++#define CONFIG_SYS_I2C_BUS_SELECT 1 ++#define CONFIG_DRIVER_OMAP34XX_I2C 1 ++ ++/* ++ * TWL4030 ++ */ ++#define CONFIG_TWL4030_POWER 1 ++#define CONFIG_TWL4030_LED 1 ++ ++/* ++ * Board NAND Info. ++ */ ++#if defined(CONFIG_CMD_NAND) ++#define CONFIG_NAND_OMAP_GPMC ++#endif ++#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ ++ /* to access nand */ ++#define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ ++ /* to access nand at */ ++ /* CS0 */ ++#define GPMC_NAND_ECC_LP_x16_LAYOUT 1 ++ ++#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ ++ /* devices */ ++#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ ++ ++#define CONFIG_JFFS2_NAND ++/* nand device jffs2 lives on */ ++#define CONFIG_JFFS2_DEV "nand0" ++/* start of jffs2 partition */ ++#define CONFIG_JFFS2_PART_OFFSET 0x680000 ++#define CONFIG_JFFS2_PART_SIZE 0xf980000 /* size of jffs2 */ ++ /* partition */ ++ ++/* Environment information */ ++#define CONFIG_BOOTDELAY 3 ++ ++#define CONFIG_EXTRA_ENV_SETTINGS "\0" ++ ++#define CONFIG_BOOTCOMMAND "mmc init 0 ; fatload mmc 0 0x80000000 setup.ini ; source \0" ++ ++#define CONFIG_AUTO_COMPLETE 1 ++ ++/* ++ * Miscellaneous configurable options ++ */ ++#define V_PROMPT "U-Boot # " ++ ++#define CONFIG_SYS_LONGHELP /* undef to save memory */ ++#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ ++#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " ++#define CONFIG_SYS_PROMPT V_PROMPT ++#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ ++/* Print Buffer Size */ ++#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ ++ sizeof(CONFIG_SYS_PROMPT) + 16) ++#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ ++/* Boot Argument Buffer Size */ ++#define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE) ++ ++#define CONFIG_SYS_MEMTEST_START (OMAP34XX_SDRC_CS0) /* memtest */ ++ /* works on */ ++#define CONFIG_SYS_MEMTEST_END (OMAP34XX_SDRC_CS0 + \ ++ 0x01F00000) /* 31MB */ ++ ++#define CONFIG_SYS_LOAD_ADDR (OMAP34XX_SDRC_CS0) /* default */ ++ /* load address */ ++ ++/* ++ * OMAP3 has 12 GP timers, they can be driven by the system clock ++ * (12/13/16.8/19.2/38.4MHz) or by 32KHz clock. We use 13MHz (V_SCLK). ++ * This rate is divided by a local divisor. ++ */ ++#define CONFIG_SYS_TIMERBASE (OMAP34XX_GPT2) ++#define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ ++#define CONFIG_SYS_HZ 1000 ++ ++/*----------------------------------------------------------------------- ++ * Stack sizes ++ * ++ * The stack sizes are set up in start.S using the settings below ++ */ ++#define CONFIG_STACKSIZE SZ_128K /* regular stack */ ++#ifdef CONFIG_USE_IRQ ++#define CONFIG_STACKSIZE_IRQ SZ_4K /* IRQ stack */ ++#define CONFIG_STACKSIZE_FIQ SZ_4K /* FIQ stack */ ++#endif ++ ++/*----------------------------------------------------------------------- ++ * Physical Memory Map ++ */ ++#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ ++#define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0 ++#define PHYS_SDRAM_1_SIZE SZ_32M /* at least 32 meg */ ++#define PHYS_SDRAM_2 OMAP34XX_SDRC_CS1 ++ ++/* SDRAM Bank Allocation method */ ++#define SDRC_R_B_C 1 ++ ++/*----------------------------------------------------------------------- ++ * FLASH and environment organization ++ */ ++ ++/* **** PISMO SUPPORT *** */ ++ ++/* Configure the PISMO */ ++#define PISMO1_NAND_SIZE GPMC_SIZE_128M ++#define PISMO1_ONEN_SIZE GPMC_SIZE_128M ++ ++#define CONFIG_SYS_MAX_FLASH_SECT 520 /* max number of sectors on */ ++ /* one chip */ ++#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* max number of flash banks */ ++#define CONFIG_SYS_MONITOR_LEN SZ_256K /* Reserve 2 sectors */ ++ ++#define CONFIG_SYS_FLASH_BASE boot_flash_base ++ ++/* Monitor at start of flash */ ++#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE ++#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP ++ ++#define CONFIG_ENV_IS_IN_ONENAND 1 ++#define ONENAND_ENV_OFFSET 0x240000 /* environment starts here */ ++#define SMNAND_ENV_OFFSET 0x240000 /* environment starts here */ ++ ++#define CONFIG_SYS_ENV_SECT_SIZE boot_flash_sec ++#define CONFIG_ENV_OFFSET boot_flash_off ++#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET ++ ++/*----------------------------------------------------------------------- ++ * CFI FLASH driver setup ++ */ ++/* timeout values are in ticks */ ++#define CONFIG_SYS_FLASH_ERASE_TOUT (100 * CONFIG_SYS_HZ) ++#define CONFIG_SYS_FLASH_WRITE_TOUT (100 * CONFIG_SYS_HZ) ++ ++/* Flash banks JFFS2 should use */ ++#define CONFIG_SYS_MAX_MTD_BANKS (CONFIG_SYS_MAX_FLASH_BANKS + \ ++ CONFIG_SYS_MAX_NAND_DEVICE) ++#define CONFIG_SYS_JFFS2_MEM_NAND ++/* use flash_info[2] */ ++#define CONFIG_SYS_JFFS2_FIRST_BANK CONFIG_SYS_MAX_FLASH_BANKS ++#define CONFIG_SYS_JFFS2_NUM_BANKS 1 ++ ++/*---------------------------------------------------------------------------- ++ * SMSC911x Ethernet ++ */ ++#if defined(CONFIG_CMD_NET) ++ ++#define CONFIG_NET_MULTI ++#define CONFIG_SMC911X ++#define CONFIG_SMC911X_32_BIT ++#define CONFIG_SMC911X_BASE 0x2C000000 ++ ++ ++#endif /* (CONFIG_CMD_NET) */ ++ ++#ifndef __ASSEMBLY__ ++extern struct gpmc *gpmc_cfg; ++extern unsigned int boot_flash_base; ++extern volatile unsigned int boot_flash_env_addr; ++extern unsigned int boot_flash_off; ++extern unsigned int boot_flash_sec; ++extern unsigned int boot_flash_type; ++#endif ++ ++#endif /* __CONFIG_H */ +-- +1.5.4.3 + diff --git a/recipes/u-boot/u-boot-2009.08/igep0020/update-mach-types.patch b/recipes/u-boot/u-boot-2009.08/igep0020/update-mach-types.patch new file mode 100644 index 0000000000..ff3ef8a07e --- /dev/null +++ b/recipes/u-boot/u-boot-2009.08/igep0020/update-mach-types.patch @@ -0,0 +1,1206 @@ +From e1d07fcb1eaafadf79b75804057529ef5f246f5b Mon Sep 17 00:00:00 2001 +From: Enric Balletbo i Serra <eballetbo@iseebcn.com> +Date: Wed, 2 Sep 2009 13:32:11 +0200 +Subject: [PATCH 1/6] mach-types.h: Backport from kernel, add mach type for IGEP0010 and IGEP0020 boards + + +Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com> +--- + include/asm-arm/mach-types.h | 1127 +++++++++++++++++++++++++++++++++++++++++- + 1 files changed, 1116 insertions(+), 11 deletions(-) + +diff --git a/include/asm-arm/mach-types.h b/include/asm-arm/mach-types.h +index 5293d67..89ffd49 100644 +--- a/include/asm-arm/mach-types.h ++++ b/include/asm-arm/mach-types.h +@@ -1451,7 +1451,7 @@ extern unsigned int __machine_arch_type; + #define MACH_TYPE_H6044 1458 + #define MACH_TYPE_APP 1459 + #define MACH_TYPE_TCT_HAMMER 1460 +-#define MACH_TYPE_HERMES 1461 ++#define MACH_TYPE_HERALD 1461 + #define MACH_TYPE_ARTEMIS 1462 + #define MACH_TYPE_HTCTITAN 1463 + #define MACH_TYPE_QRANIUM 1464 +@@ -1765,7 +1765,7 @@ extern unsigned int __machine_arch_type; + #define MACH_TYPE_MI424WR 1778 + #define MACH_TYPE_AXS_ULTRAX 1779 + #define MACH_TYPE_AT572D940DEB 1780 +-#define MACH_TYPE_DAVINCI_DA8XX_EVM 1781 ++#define MACH_TYPE_DAVINCI_DA830_EVM 1781 + #define MACH_TYPE_EP9302 1782 + #define MACH_TYPE_AT572D940HFEB 1783 + #define MACH_TYPE_CYBOOK3 1784 +@@ -2241,6 +2241,91 @@ extern unsigned int __machine_arch_type; + #define MACH_TYPE_OMAP3_WL_FF 2258 + #define MACH_TYPE_SIMCOM 2259 + #define MACH_TYPE_MCWEBIO 2260 ++#define MACH_TYPE_OMAP3_PHRAZER 2261 ++#define MACH_TYPE_DARWIN 2262 ++#define MACH_TYPE_ORATISCOMU 2263 ++#define MACH_TYPE_RTSBC20 2264 ++#define MACH_TYPE_I780 2265 ++#define MACH_TYPE_GEMINI324 2266 ++#define MACH_TYPE_ORATISLAN 2267 ++#define MACH_TYPE_ORATISALOG 2268 ++#define MACH_TYPE_ORATISMADI 2269 ++#define MACH_TYPE_ORATISOT16 2270 ++#define MACH_TYPE_ORATISDESK 2271 ++#define MACH_TYPE_V2P_CA9 2272 ++#define MACH_TYPE_SINTEXO 2273 ++#define MACH_TYPE_CM3389 2274 ++#define MACH_TYPE_OMAP3_CIO 2275 ++#define MACH_TYPE_SGH_I900 2276 ++#define MACH_TYPE_BST100 2277 ++#define MACH_TYPE_PASSION 2278 ++#define MACH_TYPE_INDESIGN_AT91SAM 2279 ++#define MACH_TYPE_C4_BADGER 2280 ++#define MACH_TYPE_C4_VIPER 2281 ++#define MACH_TYPE_D2NET 2282 ++#define MACH_TYPE_BIGDISK 2283 ++#define MACH_TYPE_NOTALVISION 2284 ++#define MACH_TYPE_OMAP3_KBOC 2285 ++#define MACH_TYPE_CYCLONE 2286 ++#define MACH_TYPE_NINJA 2287 ++#define MACH_TYPE_AT91SAM9G20EK_2MMC 2288 ++#define MACH_TYPE_BCMRING 2289 ++#define MACH_TYPE_RESOL_DL2 2290 ++#define MACH_TYPE_IFOSW 2291 ++#define MACH_TYPE_HTCRHODIUM 2292 ++#define MACH_TYPE_HTCTOPAZ 2293 ++#define MACH_TYPE_MATRIX504 2294 ++#define MACH_TYPE_MRFSA 2295 ++#define MACH_TYPE_SC_P270 2296 ++#define MACH_TYPE_ATLAS5_EVB 2297 ++#define MACH_TYPE_PELCO_LOBOX 2298 ++#define MACH_TYPE_DILAX_PCU200 2299 ++#define MACH_TYPE_LEONARDO 2300 ++#define MACH_TYPE_ZORAN_APPROACH7 2301 ++#define MACH_TYPE_DP6XX 2302 ++#define MACH_TYPE_BCM2153_VESPER 2303 ++#define MACH_TYPE_MAHIMAHI 2304 ++#define MACH_TYPE_CLICKC 2305 ++#define MACH_TYPE_ZB_GATEWAY 2306 ++#define MACH_TYPE_TAZCARD 2307 ++#define MACH_TYPE_TAZDEV 2308 ++#define MACH_TYPE_ANNAX_CB_ARM 2309 ++#define MACH_TYPE_ANNAX_DM3 2310 ++#define MACH_TYPE_CEREBRIC 2311 ++#define MACH_TYPE_ORCA 2312 ++#define MACH_TYPE_PC9260 2313 ++#define MACH_TYPE_EMS285A 2314 ++#define MACH_TYPE_GEC2410 2315 ++#define MACH_TYPE_GEC2440 2316 ++#define MACH_TYPE_ARCH_MW903 2317 ++#define MACH_TYPE_MW2440 2318 ++#define MACH_TYPE_ECAC2378 2319 ++#define MACH_TYPE_TAZKIOSK 2320 ++#define MACH_TYPE_WHITERABBIT_MCH 2321 ++#define MACH_TYPE_SBOX9263 2322 ++#define MACH_TYPE_OREO 2323 ++#define MACH_TYPE_SMDK6442 2324 ++#define MACH_TYPE_OPENRD_BASE 2325 ++#define MACH_TYPE_INCREDIBLE 2326 ++#define MACH_TYPE_INCREDIBLEC 2327 ++#define MACH_TYPE_HEROCT 2328 ++#define MACH_TYPE_MMNET1000 2329 ++#define MACH_TYPE_DEVKIT8000 2330 ++#define MACH_TYPE_DEVKIT9000 2331 ++#define MACH_TYPE_MX31TXTR 2332 ++#define MACH_TYPE_U380 2333 ++#define MACH_TYPE_HUALU_BOARD 2334 ++#define MACH_TYPE_NPCMX50 2335 ++#define MACH_TYPE_MX51_LANGE51 2336 ++#define MACH_TYPE_MX51_LANGE52 2337 ++#define MACH_TYPE_RIOM 2338 ++#define MACH_TYPE_COMCAS 2339 ++#define MACH_TYPE_WSI_MX27 2340 ++#define MACH_TYPE_CM_T35 2341 ++#define MACH_TYPE_NET2BIG 2342 ++#define MACH_TYPE_MOTOROLA_A1600 2343 ++#define MACH_TYPE_IGEP0020 2344 ++#define MACH_TYPE_IGEP0010 2345 + + #ifdef CONFIG_ARCH_EBSA110 + # ifdef machine_arch_type +@@ -19510,14 +19595,14 @@ extern unsigned int __machine_arch_type; + # define machine_is_tct_hammer() (0) + #endif + +-#ifdef CONFIG_MACH_HERMES ++#ifdef CONFIG_MACH_HERALD + # ifdef machine_arch_type + # undef machine_arch_type + # define machine_arch_type __machine_arch_type + # else +-# define machine_arch_type MACH_TYPE_HERMES ++# define machine_arch_type MACH_TYPE_HERALD + # endif +-# define machine_is_herald() (machine_arch_type == MACH_TYPE_HERMES) ++# define machine_is_herald() (machine_arch_type == MACH_TYPE_HERALD) + #else + # define machine_is_herald() (0) + #endif +@@ -23278,16 +23363,16 @@ extern unsigned int __machine_arch_type; + # define machine_is_at572d940deb() (0) + #endif + +-#ifdef CONFIG_MACH_DAVINCI_DA8XX_EVM ++#ifdef CONFIG_MACH_DAVINCI_DA830_EVM + # ifdef machine_arch_type + # undef machine_arch_type + # define machine_arch_type __machine_arch_type + # else +-# define machine_arch_type MACH_TYPE_DAVINCI_DA8XX_EVM ++# define machine_arch_type MACH_TYPE_DAVINCI_DA830_EVM + # endif +-# define machine_is_davinci_da8xx_evm() (machine_arch_type == MACH_TYPE_DAVINCI_DA8XX_EVM) ++# define machine_is_davinci_da830_evm() (machine_arch_type == MACH_TYPE_DAVINCI_DA830_EVM) + #else +-# define machine_is_davinci_da8xx_evm() (0) ++# define machine_is_davinci_da830_evm() (0) + #endif + + #ifdef CONFIG_MACH_EP9302 +@@ -25601,9 +25686,9 @@ extern unsigned int __machine_arch_type; + # else + # define machine_arch_type MACH_TYPE_CPUIMX27 + # endif +-# define machine_is_cpuimx27() (machine_arch_type == MACH_TYPE_CPUIMX27) ++# define machine_is_eukrea_cpuimx27() (machine_arch_type == MACH_TYPE_CPUIMX27) + #else +-# define machine_is_cpuimx27() (0) ++# define machine_is_eukrea_cpuimx27() (0) + #endif + + #ifdef CONFIG_MACH_CHEFLUX +@@ -28990,6 +29075,1026 @@ extern unsigned int __machine_arch_type; + # define machine_is_mcwebio() (0) + #endif + ++#ifdef CONFIG_MACH_OMAP3_PHRAZER ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_OMAP3_PHRAZER ++# endif ++# define machine_is_omap3_phrazer() (machine_arch_type == MACH_TYPE_OMAP3_PHRAZER) ++#else ++# define machine_is_omap3_phrazer() (0) ++#endif ++ ++#ifdef CONFIG_MACH_DARWIN ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_DARWIN ++# endif ++# define machine_is_darwin() (machine_arch_type == MACH_TYPE_DARWIN) ++#else ++# define machine_is_darwin() (0) ++#endif ++ ++#ifdef CONFIG_MACH_ORATISCOMU ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_ORATISCOMU ++# endif ++# define machine_is_oratiscomu() (machine_arch_type == MACH_TYPE_ORATISCOMU) ++#else ++# define machine_is_oratiscomu() (0) ++#endif ++ ++#ifdef CONFIG_MACH_RTSBC20 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_RTSBC20 ++# endif ++# define machine_is_rtsbc20() (machine_arch_type == MACH_TYPE_RTSBC20) ++#else ++# define machine_is_rtsbc20() (0) ++#endif ++ ++#ifdef CONFIG_MACH_I780 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_I780 ++# endif ++# define machine_is_sgh_i780() (machine_arch_type == MACH_TYPE_I780) ++#else ++# define machine_is_sgh_i780() (0) ++#endif ++ ++#ifdef CONFIG_MACH_GEMINI324 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_GEMINI324 ++# endif ++# define machine_is_gemini324() (machine_arch_type == MACH_TYPE_GEMINI324) ++#else ++# define machine_is_gemini324() (0) ++#endif ++ ++#ifdef CONFIG_MACH_ORATISLAN ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_ORATISLAN ++# endif ++# define machine_is_oratislan() (machine_arch_type == MACH_TYPE_ORATISLAN) ++#else ++# define machine_is_oratislan() (0) ++#endif ++ ++#ifdef CONFIG_MACH_ORATISALOG ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_ORATISALOG ++# endif ++# define machine_is_oratisalog() (machine_arch_type == MACH_TYPE_ORATISALOG) ++#else ++# define machine_is_oratisalog() (0) ++#endif ++ ++#ifdef CONFIG_MACH_ORATISMADI ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_ORATISMADI ++# endif ++# define machine_is_oratismadi() (machine_arch_type == MACH_TYPE_ORATISMADI) ++#else ++# define machine_is_oratismadi() (0) ++#endif ++ ++#ifdef CONFIG_MACH_ORATISOT16 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_ORATISOT16 ++# endif ++# define machine_is_oratisot16() (machine_arch_type == MACH_TYPE_ORATISOT16) ++#else ++# define machine_is_oratisot16() (0) ++#endif ++ ++#ifdef CONFIG_MACH_ORATISDESK ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_ORATISDESK ++# endif ++# define machine_is_oratisdesk() (machine_arch_type == MACH_TYPE_ORATISDESK) ++#else ++# define machine_is_oratisdesk() (0) ++#endif ++ ++#ifdef CONFIG_MACH_V2P_CA9 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_V2P_CA9 ++# endif ++# define machine_is_v2_ca9() (machine_arch_type == MACH_TYPE_V2P_CA9) ++#else ++# define machine_is_v2_ca9() (0) ++#endif ++ ++#ifdef CONFIG_MACH_SINTEXO ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_SINTEXO ++# endif ++# define machine_is_sintexo() (machine_arch_type == MACH_TYPE_SINTEXO) ++#else ++# define machine_is_sintexo() (0) ++#endif ++ ++#ifdef CONFIG_MACH_CM3389 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_CM3389 ++# endif ++# define machine_is_cm3389() (machine_arch_type == MACH_TYPE_CM3389) ++#else ++# define machine_is_cm3389() (0) ++#endif ++ ++#ifdef CONFIG_MACH_OMAP3_CIO ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_OMAP3_CIO ++# endif ++# define machine_is_omap3_cio() (machine_arch_type == MACH_TYPE_OMAP3_CIO) ++#else ++# define machine_is_omap3_cio() (0) ++#endif ++ ++#ifdef CONFIG_MACH_SGH_I900 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_SGH_I900 ++# endif ++# define machine_is_sgh_i900() (machine_arch_type == MACH_TYPE_SGH_I900) ++#else ++# define machine_is_sgh_i900() (0) ++#endif ++ ++#ifdef CONFIG_MACH_BST100 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_BST100 ++# endif ++# define machine_is_bst100() (machine_arch_type == MACH_TYPE_BST100) ++#else ++# define machine_is_bst100() (0) ++#endif ++ ++#ifdef CONFIG_MACH_PASSION ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_PASSION ++# endif ++# define machine_is_passion() (machine_arch_type == MACH_TYPE_PASSION) ++#else ++# define machine_is_passion() (0) ++#endif ++ ++#ifdef CONFIG_MACH_INDESIGN_AT91SAM ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_INDESIGN_AT91SAM ++# endif ++# define machine_is_indesign_at91sam() (machine_arch_type == MACH_TYPE_INDESIGN_AT91SAM) ++#else ++# define machine_is_indesign_at91sam() (0) ++#endif ++ ++#ifdef CONFIG_MACH_C4_BADGER ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_C4_BADGER ++# endif ++# define machine_is_c4_badger() (machine_arch_type == MACH_TYPE_C4_BADGER) ++#else ++# define machine_is_c4_badger() (0) ++#endif ++ ++#ifdef CONFIG_MACH_C4_VIPER ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_C4_VIPER ++# endif ++# define machine_is_c4_viper() (machine_arch_type == MACH_TYPE_C4_VIPER) ++#else ++# define machine_is_c4_viper() (0) ++#endif ++ ++#ifdef CONFIG_MACH_D2NET ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_D2NET ++# endif ++# define machine_is_d2net() (machine_arch_type == MACH_TYPE_D2NET) ++#else ++# define machine_is_d2net() (0) ++#endif ++ ++#ifdef CONFIG_MACH_BIGDISK ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_BIGDISK ++# endif ++# define machine_is_bigdisk() (machine_arch_type == MACH_TYPE_BIGDISK) ++#else ++# define machine_is_bigdisk() (0) ++#endif ++ ++#ifdef CONFIG_MACH_NOTALVISION ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_NOTALVISION ++# endif ++# define machine_is_notalvision() (machine_arch_type == MACH_TYPE_NOTALVISION) ++#else ++# define machine_is_notalvision() (0) ++#endif ++ ++#ifdef CONFIG_MACH_OMAP3_KBOC ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_OMAP3_KBOC ++# endif ++# define machine_is_omap3_kboc() (machine_arch_type == MACH_TYPE_OMAP3_KBOC) ++#else ++# define machine_is_omap3_kboc() (0) ++#endif ++ ++#ifdef CONFIG_MACH_CYCLONE ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_CYCLONE ++# endif ++# define machine_is_cyclone() (machine_arch_type == MACH_TYPE_CYCLONE) ++#else ++# define machine_is_cyclone() (0) ++#endif ++ ++#ifdef CONFIG_MACH_NINJA ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_NINJA ++# endif ++# define machine_is_ninja() (machine_arch_type == MACH_TYPE_NINJA) ++#else ++# define machine_is_ninja() (0) ++#endif ++ ++#ifdef CONFIG_MACH_AT91SAM9G20EK_2MMC ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_AT91SAM9G20EK_2MMC ++# endif ++# define machine_is_at91sam9g20ek_2mmc() (machine_arch_type == MACH_TYPE_AT91SAM9G20EK_2MMC) ++#else ++# define machine_is_at91sam9g20ek_2mmc() (0) ++#endif ++ ++#ifdef CONFIG_MACH_BCMRING ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_BCMRING ++# endif ++# define machine_is_bcmring() (machine_arch_type == MACH_TYPE_BCMRING) ++#else ++# define machine_is_bcmring() (0) ++#endif ++ ++#ifdef CONFIG_MACH_RESOL_DL2 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_RESOL_DL2 ++# endif ++# define machine_is_resol_dl2() (machine_arch_type == MACH_TYPE_RESOL_DL2) ++#else ++# define machine_is_resol_dl2() (0) ++#endif ++ ++#ifdef CONFIG_MACH_IFOSW ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_IFOSW ++# endif ++# define machine_is_ifosw() (machine_arch_type == MACH_TYPE_IFOSW) ++#else ++# define machine_is_ifosw() (0) ++#endif ++ ++#ifdef CONFIG_MACH_HTCRHODIUM ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_HTCRHODIUM ++# endif ++# define machine_is_htcrhodium() (machine_arch_type == MACH_TYPE_HTCRHODIUM) ++#else ++# define machine_is_htcrhodium() (0) ++#endif ++ ++#ifdef CONFIG_MACH_HTCTOPAZ ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_HTCTOPAZ ++# endif ++# define machine_is_htctopaz() (machine_arch_type == MACH_TYPE_HTCTOPAZ) ++#else ++# define machine_is_htctopaz() (0) ++#endif ++ ++#ifdef CONFIG_MACH_MATRIX504 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_MATRIX504 ++# endif ++# define machine_is_matrix504() (machine_arch_type == MACH_TYPE_MATRIX504) ++#else ++# define machine_is_matrix504() (0) ++#endif ++ ++#ifdef CONFIG_MACH_MRFSA ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_MRFSA ++# endif ++# define machine_is_mrfsa() (machine_arch_type == MACH_TYPE_MRFSA) ++#else ++# define machine_is_mrfsa() (0) ++#endif ++ ++#ifdef CONFIG_MACH_SC_P270 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_SC_P270 ++# endif ++# define machine_is_sc_p270() (machine_arch_type == MACH_TYPE_SC_P270) ++#else ++# define machine_is_sc_p270() (0) ++#endif ++ ++#ifdef CONFIG_MACH_ATLAS5_EVB ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_ATLAS5_EVB ++# endif ++# define machine_is_atlas5_evb() (machine_arch_type == MACH_TYPE_ATLAS5_EVB) ++#else ++# define machine_is_atlas5_evb() (0) ++#endif ++ ++#ifdef CONFIG_MACH_PELCO_LOBOX ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_PELCO_LOBOX ++# endif ++# define machine_is_pelco_lobox() (machine_arch_type == MACH_TYPE_PELCO_LOBOX) ++#else ++# define machine_is_pelco_lobox() (0) ++#endif ++ ++#ifdef CONFIG_MACH_DILAX_PCU200 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_DILAX_PCU200 ++# endif ++# define machine_is_dilax_pcu200() (machine_arch_type == MACH_TYPE_DILAX_PCU200) ++#else ++# define machine_is_dilax_pcu200() (0) ++#endif ++ ++#ifdef CONFIG_MACH_LEONARDO ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_LEONARDO ++# endif ++# define machine_is_leonardo() (machine_arch_type == MACH_TYPE_LEONARDO) ++#else ++# define machine_is_leonardo() (0) ++#endif ++ ++#ifdef CONFIG_MACH_ZORAN_APPROACH7 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_ZORAN_APPROACH7 ++# endif ++# define machine_is_zoran_approach7() (machine_arch_type == MACH_TYPE_ZORAN_APPROACH7) ++#else ++# define machine_is_zoran_approach7() (0) ++#endif ++ ++#ifdef CONFIG_MACH_DP6XX ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_DP6XX ++# endif ++# define machine_is_dp6xx() (machine_arch_type == MACH_TYPE_DP6XX) ++#else ++# define machine_is_dp6xx() (0) ++#endif ++ ++#ifdef CONFIG_MACH_BCM2153_VESPER ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_BCM2153_VESPER ++# endif ++# define machine_is_bcm2153_vesper() (machine_arch_type == MACH_TYPE_BCM2153_VESPER) ++#else ++# define machine_is_bcm2153_vesper() (0) ++#endif ++ ++#ifdef CONFIG_MACH_MAHIMAHI ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_MAHIMAHI ++# endif ++# define machine_is_mahimahi() (machine_arch_type == MACH_TYPE_MAHIMAHI) ++#else ++# define machine_is_mahimahi() (0) ++#endif ++ ++#ifdef CONFIG_MACH_CLICKC ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_CLICKC ++# endif ++# define machine_is_clickc() (machine_arch_type == MACH_TYPE_CLICKC) ++#else ++# define machine_is_clickc() (0) ++#endif ++ ++#ifdef CONFIG_MACH_ZB_GATEWAY ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_ZB_GATEWAY ++# endif ++# define machine_is_zb_gateway() (machine_arch_type == MACH_TYPE_ZB_GATEWAY) ++#else ++# define machine_is_zb_gateway() (0) ++#endif ++ ++#ifdef CONFIG_MACH_TAZCARD ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_TAZCARD ++# endif ++# define machine_is_tazcard() (machine_arch_type == MACH_TYPE_TAZCARD) ++#else ++# define machine_is_tazcard() (0) ++#endif ++ ++#ifdef CONFIG_MACH_TAZDEV ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_TAZDEV ++# endif ++# define machine_is_tazdev() (machine_arch_type == MACH_TYPE_TAZDEV) ++#else ++# define machine_is_tazdev() (0) ++#endif ++ ++#ifdef CONFIG_MACH_ANNAX_CB_ARM ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_ANNAX_CB_ARM ++# endif ++# define machine_is_annax_cb_arm() (machine_arch_type == MACH_TYPE_ANNAX_CB_ARM) ++#else ++# define machine_is_annax_cb_arm() (0) ++#endif ++ ++#ifdef CONFIG_MACH_ANNAX_DM3 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_ANNAX_DM3 ++# endif ++# define machine_is_annax_dm3() (machine_arch_type == MACH_TYPE_ANNAX_DM3) ++#else ++# define machine_is_annax_dm3() (0) ++#endif ++ ++#ifdef CONFIG_MACH_CEREBRIC ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_CEREBRIC ++# endif ++# define machine_is_cerebric() (machine_arch_type == MACH_TYPE_CEREBRIC) ++#else ++# define machine_is_cerebric() (0) ++#endif ++ ++#ifdef CONFIG_MACH_ORCA ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_ORCA ++# endif ++# define machine_is_orca() (machine_arch_type == MACH_TYPE_ORCA) ++#else ++# define machine_is_orca() (0) ++#endif ++ ++#ifdef CONFIG_MACH_PC9260 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_PC9260 ++# endif ++# define machine_is_pc9260() (machine_arch_type == MACH_TYPE_PC9260) ++#else ++# define machine_is_pc9260() (0) ++#endif ++ ++#ifdef CONFIG_MACH_EMS285A ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_EMS285A ++# endif ++# define machine_is_ems285a() (machine_arch_type == MACH_TYPE_EMS285A) ++#else ++# define machine_is_ems285a() (0) ++#endif ++ ++#ifdef CONFIG_MACH_GEC2410 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_GEC2410 ++# endif ++# define machine_is_gec2410() (machine_arch_type == MACH_TYPE_GEC2410) ++#else ++# define machine_is_gec2410() (0) ++#endif ++ ++#ifdef CONFIG_MACH_GEC2440 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_GEC2440 ++# endif ++# define machine_is_gec2440() (machine_arch_type == MACH_TYPE_GEC2440) ++#else ++# define machine_is_gec2440() (0) ++#endif ++ ++#ifdef CONFIG_MACH_ARCH_MW903 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_ARCH_MW903 ++# endif ++# define machine_is_mw903() (machine_arch_type == MACH_TYPE_ARCH_MW903) ++#else ++# define machine_is_mw903() (0) ++#endif ++ ++#ifdef CONFIG_MACH_MW2440 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_MW2440 ++# endif ++# define machine_is_mw2440() (machine_arch_type == MACH_TYPE_MW2440) ++#else ++# define machine_is_mw2440() (0) ++#endif ++ ++#ifdef CONFIG_MACH_ECAC2378 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_ECAC2378 ++# endif ++# define machine_is_ecac2378() (machine_arch_type == MACH_TYPE_ECAC2378) ++#else ++# define machine_is_ecac2378() (0) ++#endif ++ ++#ifdef CONFIG_MACH_TAZKIOSK ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_TAZKIOSK ++# endif ++# define machine_is_tazkiosk() (machine_arch_type == MACH_TYPE_TAZKIOSK) ++#else ++# define machine_is_tazkiosk() (0) ++#endif ++ ++#ifdef CONFIG_MACH_WHITERABBIT_MCH ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_WHITERABBIT_MCH ++# endif ++# define machine_is_whiterabbit_mch() (machine_arch_type == MACH_TYPE_WHITERABBIT_MCH) ++#else ++# define machine_is_whiterabbit_mch() (0) ++#endif ++ ++#ifdef CONFIG_MACH_SBOX9263 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_SBOX9263 ++# endif ++# define machine_is_sbox9263() (machine_arch_type == MACH_TYPE_SBOX9263) ++#else ++# define machine_is_sbox9263() (0) ++#endif ++ ++#ifdef CONFIG_MACH_OREO ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_OREO ++# endif ++# define machine_is_oreo() (machine_arch_type == MACH_TYPE_OREO) ++#else ++# define machine_is_oreo() (0) ++#endif ++ ++#ifdef CONFIG_MACH_SMDK6442 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_SMDK6442 ++# endif ++# define machine_is_smdk6442() (machine_arch_type == MACH_TYPE_SMDK6442) ++#else ++# define machine_is_smdk6442() (0) ++#endif ++ ++#ifdef CONFIG_MACH_OPENRD_BASE ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_OPENRD_BASE ++# endif ++# define machine_is_openrd_base() (machine_arch_type == MACH_TYPE_OPENRD_BASE) ++#else ++# define machine_is_openrd_base() (0) ++#endif ++ ++#ifdef CONFIG_MACH_INCREDIBLE ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_INCREDIBLE ++# endif ++# define machine_is_incredible() (machine_arch_type == MACH_TYPE_INCREDIBLE) ++#else ++# define machine_is_incredible() (0) ++#endif ++ ++#ifdef CONFIG_MACH_INCREDIBLEC ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_INCREDIBLEC ++# endif ++# define machine_is_incrediblec() (machine_arch_type == MACH_TYPE_INCREDIBLEC) ++#else ++# define machine_is_incrediblec() (0) ++#endif ++ ++#ifdef CONFIG_MACH_HEROCT ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_HEROCT ++# endif ++# define machine_is_heroct() (machine_arch_type == MACH_TYPE_HEROCT) ++#else ++# define machine_is_heroct() (0) ++#endif ++ ++#ifdef CONFIG_MACH_MMNET1000 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_MMNET1000 ++# endif ++# define machine_is_mmnet1000() (machine_arch_type == MACH_TYPE_MMNET1000) ++#else ++# define machine_is_mmnet1000() (0) ++#endif ++ ++#ifdef CONFIG_MACH_DEVKIT8000 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_DEVKIT8000 ++# endif ++# define machine_is_devkit8000() (machine_arch_type == MACH_TYPE_DEVKIT8000) ++#else ++# define machine_is_devkit8000() (0) ++#endif ++ ++#ifdef CONFIG_MACH_DEVKIT9000 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_DEVKIT9000 ++# endif ++# define machine_is_devkit9000() (machine_arch_type == MACH_TYPE_DEVKIT9000) ++#else ++# define machine_is_devkit9000() (0) ++#endif ++ ++#ifdef CONFIG_MACH_MX31TXTR ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_MX31TXTR ++# endif ++# define machine_is_mx31txtr() (machine_arch_type == MACH_TYPE_MX31TXTR) ++#else ++# define machine_is_mx31txtr() (0) ++#endif ++ ++#ifdef CONFIG_MACH_U380 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_U380 ++# endif ++# define machine_is_u380() (machine_arch_type == MACH_TYPE_U380) ++#else ++# define machine_is_u380() (0) ++#endif ++ ++#ifdef CONFIG_MACH_HUALU_BOARD ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_HUALU_BOARD ++# endif ++# define machine_is_oamp3_hualu() (machine_arch_type == MACH_TYPE_HUALU_BOARD) ++#else ++# define machine_is_oamp3_hualu() (0) ++#endif ++ ++#ifdef CONFIG_MACH_NPCMX50 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_NPCMX50 ++# endif ++# define machine_is_npcmx50() (machine_arch_type == MACH_TYPE_NPCMX50) ++#else ++# define machine_is_npcmx50() (0) ++#endif ++ ++#ifdef CONFIG_MACH_MX51_LANGE51 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_MX51_LANGE51 ++# endif ++# define machine_is_mx51_lange51() (machine_arch_type == MACH_TYPE_MX51_LANGE51) ++#else ++# define machine_is_mx51_lange51() (0) ++#endif ++ ++#ifdef CONFIG_MACH_MX51_LANGE52 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_MX51_LANGE52 ++# endif ++# define machine_is_mx51_lange52() (machine_arch_type == MACH_TYPE_MX51_LANGE52) ++#else ++# define machine_is_mx51_lange52() (0) ++#endif ++ ++#ifdef CONFIG_MACH_RIOM ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_RIOM ++# endif ++# define machine_is_riom() (machine_arch_type == MACH_TYPE_RIOM) ++#else ++# define machine_is_riom() (0) ++#endif ++ ++#ifdef CONFIG_MACH_COMCAS ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_COMCAS ++# endif ++# define machine_is_comcas() (machine_arch_type == MACH_TYPE_COMCAS) ++#else ++# define machine_is_comcas() (0) ++#endif ++ ++#ifdef CONFIG_MACH_WSI_MX27 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_WSI_MX27 ++# endif ++# define machine_is_wsi_mx27() (machine_arch_type == MACH_TYPE_WSI_MX27) ++#else ++# define machine_is_wsi_mx27() (0) ++#endif ++ ++#ifdef CONFIG_MACH_CM_T35 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_CM_T35 ++# endif ++# define machine_is_cm_t35() (machine_arch_type == MACH_TYPE_CM_T35) ++#else ++# define machine_is_cm_t35() (0) ++#endif ++ ++#ifdef CONFIG_MACH_NET2BIG ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_NET2BIG ++# endif ++# define machine_is_net2big() (machine_arch_type == MACH_TYPE_NET2BIG) ++#else ++# define machine_is_net2big() (0) ++#endif ++ ++#ifdef CONFIG_MACH_MOTOROLA_A1600 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_MOTOROLA_A1600 ++# endif ++# define machine_is_motorola_a1600() (machine_arch_type == MACH_TYPE_MOTOROLA_A1600) ++#else ++# define machine_is_motorola_a1600() (0) ++#endif ++ ++#ifdef CONFIG_MACH_IGEP0020 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_IGEP0020 ++# endif ++# define machine_is_igep0020() (machine_arch_type == MACH_TYPE_IGEP0020) ++#else ++# define machine_is_igep0020() (0) ++#endif ++ ++#ifdef CONFIG_MACH_IGEP0010 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_IGEP0010 ++# endif ++# define machine_is_igep0010() (machine_arch_type == MACH_TYPE_IGEP0010) ++#else ++# define machine_is_igep0010() (0) ++#endif ++ + /* + * These have not yet been registered + */ +-- +1.5.4.3 + diff --git a/recipes/u-boot/u-boot_2009.08.bb b/recipes/u-boot/u-boot_2009.08.bb index d0e387cd03..b7f7851d9b 100644 --- a/recipes/u-boot/u-boot_2009.08.bb +++ b/recipes/u-boot/u-boot_2009.08.bb @@ -1,11 +1,17 @@ -PR = "r0" +PR = "r1" require u-boot.inc DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_at91sam9g20ek = "1" +DEFAULT_PREFERENCE_igep0020 = "1" SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 " +SRC_URI_append_igep0020 = " \ + file://update-mach-types.patch;patch=1 \ + file://add-board-support-for-IGEP-v2-series-rev-B.patch;patch=1 \ +" + TARGET_LDFLAGS = "" inherit base diff --git a/recipes/xfce-base/exo-0.3.105/exo-0.3.105-iocharset.patch b/recipes/xfce-base/exo-0.3.105/exo-0.3.105-iocharset.patch new file mode 100644 index 0000000000..a667f11665 --- /dev/null +++ b/recipes/xfce-base/exo-0.3.105/exo-0.3.105-iocharset.patch @@ -0,0 +1,79 @@ +diff --git a/exo-mount/exo-mount-hal.c b/exo-mount/exo-mount-hal.c +index 791a536..4b130c3 100644 +--- a/exo-mount/exo-mount-hal.c ++++ b/exo-mount/exo-mount-hal.c +@@ -34,6 +34,8 @@ + #include <unistd.h> + #endif + ++#include <langinfo.h> ++ + #include <libhal-storage.h> + + #include <exo-hal/exo-hal.h> +@@ -616,6 +618,30 @@ oom: g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOMEM, g_strerror (ENOMEM)) + + + /** ++ * exo_mount_hal_iocharset: ++ * ++ * Determines the preferred iocharset for filesystems ++ * that support it. ++ * ++ * Return value: iocharset string or %NULL if none. ++ **/ ++static const gchar* ++exo_mount_hal_iocharset () ++{ ++ const gchar* cs = g_getenv("EXO_MOUNT_IOCHARSET"); ++ if (cs != NULL) ++ return cs; ++ ++ const char* codeset = nl_langinfo (CODESET); ++ if (codeset && !strcmp (codeset, "UTF-8")) ++ return "utf8"; ++ ++ return NULL; ++} ++ ++ ++ ++/** + * exo_mount_hal_device_mount: + * @device : an #ExoMountHalDevice. + * @error : return location for errors or %NULL. +@@ -676,6 +702,12 @@ exo_mount_hal_device_mount (ExoMountHalDevice *device, + /* however this one is FreeBSD specific */ + options[n++] = g_strdup ("longnames"); + } ++ else if (strcmp (device->fsoptions[m], "iocharset=") == 0) ++ { ++ const gchar* iocharset = exo_mount_hal_iocharset(); ++ if (iocharset != NULL) ++ options[n++] = g_strdup_printf ("iocharset=%s", iocharset); ++ } + } + } + +diff --git a/exo-mount/main.c b/exo-mount/main.c +index 80eae1d..f442019 100644 +--- a/exo-mount/main.c ++++ b/exo-mount/main.c +@@ -39,6 +39,8 @@ + #include <string.h> + #endif + ++#include <locale.h> ++ + #include <glib/gstdio.h> + + #include <exo-hal/exo-hal.h> +@@ -97,6 +99,8 @@ main (int argc, char **argv) + /* initialize the i18n support */ + xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8"); + ++ setlocale(LC_CTYPE, ""); ++ + /* initialize GTK+ */ + if (!gtk_init_with_args (&argc, &argv, "Xfce mount", entries, GETTEXT_PACKAGE, &err)) + { diff --git a/recipes/xfce/exo/configure.patch b/recipes/xfce-base/exo/configure.patch index 2ccfcfc994..2ccfcfc994 100644 --- a/recipes/xfce/exo/configure.patch +++ b/recipes/xfce-base/exo/configure.patch diff --git a/recipes/xfce/exo/exo-no-tests.patch b/recipes/xfce-base/exo/exo-no-tests.patch index 1cb51ab600..1cb51ab600 100644 --- a/recipes/xfce/exo/exo-no-tests.patch +++ b/recipes/xfce-base/exo/exo-no-tests.patch diff --git a/recipes/xfce-base/exo_0.3.105.bb b/recipes/xfce-base/exo_0.3.105.bb new file mode 100644 index 0000000000..ab3b2a22e5 --- /dev/null +++ b/recipes/xfce-base/exo_0.3.105.bb @@ -0,0 +1,30 @@ +DESCRIPTION="XFCE extensions and framework library with session management support" +DEPENDS = "libxfce4util hal liburi-perl-native python-native cairo" +SECTION = "x11" +PR = "r1" + +inherit xfce46 + +XFCE_VERSION = "4.6.1" + +SRC_URI += " \ + file://exo-0.3.105-iocharset.patch;patch=1 \ + file://exo-no-tests.patch;patch=1 \ + file://configure.patch;patch=1 \ +" + +# Note: Python checking is broken +do_configure_prepend() { + sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.in +} + +do_stage() { + autotools_stage_all +} + +FILES_${PN} += "${datadir}/xfce4/ \ + ${libdir}/python*/site-packages/* \ + ${prefix}/share/pygtk/2.0/defs/exo-0.3/exo.defs \ +" + +FILES_${PN}-dbg += "${libdir}/python*/site-packages/*/.debug/*" diff --git a/recipes/xfce/exo_0.3.4.bb b/recipes/xfce-base/exo_0.3.4.bb index 17ea87d3d3..17ea87d3d3 100644 --- a/recipes/xfce/exo_0.3.4.bb +++ b/recipes/xfce-base/exo_0.3.4.bb diff --git a/recipes/xfce/gtk-xfce-engine_2.4.2.bb b/recipes/xfce-base/gtk-xfce-engine_2.4.2.bb index 0287f04485..0287f04485 100644 --- a/recipes/xfce/gtk-xfce-engine_2.4.2.bb +++ b/recipes/xfce-base/gtk-xfce-engine_2.4.2.bb diff --git a/recipes/xfce-base/gtk-xfce-engine_2.6.0.bb b/recipes/xfce-base/gtk-xfce-engine_2.6.0.bb new file mode 100644 index 0000000000..ce76eaabfd --- /dev/null +++ b/recipes/xfce-base/gtk-xfce-engine_2.6.0.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "XFCE theme for GTK" +DEPENDS += "gtk+" +SECTION = "x11" +PR = "r1" + +inherit xfce46 + +XFCE_VERSION = "4.6.1" + +FILES_${PN} += "${libdir}/gtk-2.0/*/engines/libxfce.so \ + ${datadir}/themes/" +FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug" diff --git a/recipes/xfce/libxfce4mcs_4.4.2.bb b/recipes/xfce-base/libxfce4mcs_4.4.2.bb index 20448240e2..20448240e2 100644 --- a/recipes/xfce/libxfce4mcs_4.4.2.bb +++ b/recipes/xfce-base/libxfce4mcs_4.4.2.bb diff --git a/recipes/xfce-base/libxfce4menu_4.6.1.bb b/recipes/xfce-base/libxfce4menu_4.6.1.bb new file mode 100644 index 0000000000..6b87387f6e --- /dev/null +++ b/recipes/xfce-base/libxfce4menu_4.6.1.bb @@ -0,0 +1,13 @@ +DESCRIPTION="a freedesktop.org compliant menu library for Xfce4" +HOMEPAGE="http://www.xfce.org/projects/libraries" +DEPENDS = "gettext pkgconfig libxfce4util intltool" +RDEPENDS = "gtk+ libxfce4util" + +LICENSE="LGPL-2 FDL-1.1" +PR = "r1" + +inherit xfce46 + +do_stage() { + autotools_stage_all +} diff --git a/recipes/xfce/libxfce4util_4.4.2.bb b/recipes/xfce-base/libxfce4util_4.4.2.bb index 3386ad57e3..3386ad57e3 100644 --- a/recipes/xfce/libxfce4util_4.4.2.bb +++ b/recipes/xfce-base/libxfce4util_4.4.2.bb diff --git a/recipes/xfce-base/libxfce4util_4.6.1.bb b/recipes/xfce-base/libxfce4util_4.6.1.bb new file mode 100644 index 0000000000..6c40d2d50f --- /dev/null +++ b/recipes/xfce-base/libxfce4util_4.6.1.bb @@ -0,0 +1,27 @@ +# libxfce4util OE build file + +DESCRIPTION = "Basic utility library for Xfce4" +SECTION = "x11/libs" +LICENSE = "GPL" +DEPENDS = "glib-2.0 xfce4-dev-tools " +PR = "r1" + +inherit xfce46 + +EXTRA_OECONF += "--disable-dependency-tracking --disable-static --with-broken-putenv=yes" + +MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4" + +do_stage() { + install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/libxfce4util + # The line below expands to the list of headers that native makefile + # would install. Complain and/or fix if it's not portable enough + for file in $(eval $(make -n -C libxfce4util install|grep "^list='[^.]\\+.h"|cut -d\; -f1); echo $list); do + install -m 644 libxfce4util/$file ${STAGING_INCDIR}/libxfce4util + done + + oe_libinstall -C libxfce4util -so libxfce4util ${STAGING_LIBDIR} + +} + +FILES_${PN}-dev += " ${datadir}/xfce4/m4" diff --git a/recipes/xfce/libxfcegui4_4.4.2.bb b/recipes/xfce-base/libxfcegui4_4.4.2.bb index d38269d6f8..d38269d6f8 100644 --- a/recipes/xfce/libxfcegui4_4.4.2.bb +++ b/recipes/xfce-base/libxfcegui4_4.4.2.bb diff --git a/recipes/xfce-base/libxfcegui4_4.6.1.bb b/recipes/xfce-base/libxfcegui4_4.6.1.bb new file mode 100644 index 0000000000..e5654b9857 --- /dev/null +++ b/recipes/xfce-base/libxfcegui4_4.6.1.bb @@ -0,0 +1,18 @@ +# libxfcegui4 OE build file + +DESCRIPTION = "Xfce Widget library and X Window System interaction" +DEPENDS = "gettext pkgconfig intltool virtual/libx11 libxfce4util xfconf dbh libxml2 gtk+ libglade" +RDEPENDS = "xfconf startup-notification " + +SECTION = "x11/libs" +PR = "r4" + +inherit xfce46 + +do_stage() { + autotools_stage_all +} + +LEAD_SONAME = "libxfcegui4.so.4" + +FILES_${PN} += "${libdir}/xfce4/modules ${libdir}/libglade/2.0/*.so ${datadir}/xfce4/mime ${datadir}/icons/hicolor" diff --git a/recipes/xfce/thunar_0.9.0.bb b/recipes/xfce-base/thunar_0.9.0.bb index 44afb06774..44afb06774 100644 --- a/recipes/xfce/thunar_0.9.0.bb +++ b/recipes/xfce-base/thunar_0.9.0.bb diff --git a/recipes/xfce-base/thunar_1.0.1.bb b/recipes/xfce-base/thunar_1.0.1.bb new file mode 100644 index 0000000000..96a494efc3 --- /dev/null +++ b/recipes/xfce-base/thunar_1.0.1.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "File manager for the Xfce Desktop Environment" +HOMEPAGE="http://thunar.xfce.org" +DEPENDS = "exo dbus-glib libexif xfce4-panel libice libsm gamin" +RDEPENDS = "libxfcegui4 exo dbus-glib libexif xfce4-panel libice libsm gamin" +RRECOMMENDS = "shared-mime-info" +SECTION = "x11" +PR = "r1" + +inherit xfce46 + +XFCE_VERSION = "4.6.1" + +SRC_URI = "http://www.us.xfce.org/archive/xfce-${XFCE_VERSION}/src/Thunar-${PV}.tar.bz2" + +S = "${WORKDIR}/Thunar-${PV}/" + +EXTRA_OECONF += "--disable-dependency-tracking --enable-dbus" + +FILES_${PN} += "${libdir}/thunarx-1/*.so \ + ${libdir}/thunarx-1/*.la \ + ${datadir}/dbus-1 \ + ${datadir}/thumbnailers \ + ${datadir}/Thunar \ + ${datadir}/xfce4" +FILES_${PN}-dbg += "${libdir}/thunarx-1/.debug/ ${libexecdir}/xfce4/panel-plugins/.debug/" + +do_stage () { + autotools_stage_all +} diff --git a/recipes/xfce/xfce-mcs-manager.inc b/recipes/xfce-base/xfce-mcs-manager.inc index 4edbf9d13b..4edbf9d13b 100644 --- a/recipes/xfce/xfce-mcs-manager.inc +++ b/recipes/xfce-base/xfce-mcs-manager.inc diff --git a/recipes/xfce/xfce-mcs-manager_4.4.2.bb b/recipes/xfce-base/xfce-mcs-manager_4.4.2.bb index 0b9fc43f70..0b9fc43f70 100644 --- a/recipes/xfce/xfce-mcs-manager_4.4.2.bb +++ b/recipes/xfce-base/xfce-mcs-manager_4.4.2.bb diff --git a/recipes/xfce/xfce-mcs-plugins_4.4.2.bb b/recipes/xfce-base/xfce-mcs-plugins_4.4.2.bb index 80037841fa..80037841fa 100644 --- a/recipes/xfce/xfce-mcs-plugins_4.4.2.bb +++ b/recipes/xfce-base/xfce-mcs-plugins_4.4.2.bb diff --git a/recipes/xfce/xfce-terminal/into-support.patch b/recipes/xfce-base/xfce-terminal/into-support.patch index 30540d0558..30540d0558 100644 --- a/recipes/xfce/xfce-terminal/into-support.patch +++ b/recipes/xfce-base/xfce-terminal/into-support.patch diff --git a/recipes/xfce-base/xfce-terminal_0.2.12.bb b/recipes/xfce-base/xfce-terminal_0.2.12.bb new file mode 100644 index 0000000000..e644521139 --- /dev/null +++ b/recipes/xfce-base/xfce-terminal_0.2.12.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Terminal emulator for the Xfce desktop environment" +DEPENDS = "exo vte dbus-glib gtk+" +RDEPENDS += "gnome-pty-helper" +PR = "r2" + +inherit xfce46 + +XFCE_VERSION = "4.6.1" + +SRC_URI = "http://www.us.xfce.org/archive/xfce-${XFCE_VERSION}/src/Terminal-${PV}.tar.bz2 \ +" + +S = "${WORKDIR}/Terminal-${PV}" + +FILES_${PN} += "${datadir}/Terminal" diff --git a/recipes/xfce/xfce-terminal_0.2.8.bb b/recipes/xfce-base/xfce-terminal_0.2.8.bb index c8c4903513..c8c4903513 100644 --- a/recipes/xfce/xfce-terminal_0.2.8.bb +++ b/recipes/xfce-base/xfce-terminal_0.2.8.bb diff --git a/recipes/xfce-base/xfce-terminal_0.4.2.bb b/recipes/xfce-base/xfce-terminal_0.4.2.bb new file mode 100644 index 0000000000..08c2e4e438 --- /dev/null +++ b/recipes/xfce-base/xfce-terminal_0.4.2.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Terminal emulator for the Xfce desktop environment" +DEPENDS = "exo vte dbus-glib gtk+" +RDEPENDS += "gnome-pty-helper" +PR = "r2" + +inherit xfce46 + +SRC_URI = "http://www.xfce.org/archive/src/apps/terminal/0.4/Terminal-${PV}.tar.bz2 \ +" + +S = "${WORKDIR}/Terminal-${PV}" + +FILES_${PN} += "${datadir}/Terminal" diff --git a/recipes/xfce/xfce-utils_4.4.2.bb b/recipes/xfce-base/xfce-utils_4.4.2.bb index d681fd7adb..d681fd7adb 100644 --- a/recipes/xfce/xfce-utils_4.4.2.bb +++ b/recipes/xfce-base/xfce-utils_4.4.2.bb diff --git a/recipes/xfce-base/xfce-utils_4.6.1.bb b/recipes/xfce-base/xfce-utils_4.6.1.bb new file mode 100644 index 0000000000..b9ff25e48f --- /dev/null +++ b/recipes/xfce-base/xfce-utils_4.6.1.bb @@ -0,0 +1,27 @@ +DESCRIPTION="XFCE4 Utilities" +DEPENDS = "virtual/libx11 libxfcegui4" +SECTION = "x11" +PR = "r3" + +inherit xfce46 + +FILES_${PN} += " \ + ${bindir}/* \ + ${datadir}/dbus-1/* \ + ${datadir}/xfce4/AUTHORS \ + ${datadir}/xfce4/BSD \ + ${datadir}/xfce4/COPYING \ + ${datadir}/xfce4/GPL \ + ${datadir}/xfce4/INFO* \ + ${datadir}/xfce4/LGPL \ + ${datadir}/xfce4/AUTHORS.html \ + ${datadir}/xfce4/BSD.html \ + ${datadir}/xfce4/COPYING.html \ + ${datadir}/xfce4/GPL.html \ + ${datadir}/xfce4/INFO.html \ + ${datadir}/xfce4/LGPL.html \ + ${datadir}/xsessions/xfce.desktop \ +" + +# NOTE: This package takes a --with-browser for the default browser +# NOTE: Works with gdm also gtkhtml diff --git a/recipes/xfce/xfce4-appfinder_4.4.2.bb b/recipes/xfce-base/xfce4-appfinder_4.4.2.bb index ddfa3e1e4e..ddfa3e1e4e 100644 --- a/recipes/xfce/xfce4-appfinder_4.4.2.bb +++ b/recipes/xfce-base/xfce4-appfinder_4.4.2.bb diff --git a/recipes/xfce-base/xfce4-appfinder_4.6.1.bb b/recipes/xfce-base/xfce4-appfinder_4.6.1.bb new file mode 100644 index 0000000000..0d1e1b29c4 --- /dev/null +++ b/recipes/xfce-base/xfce4-appfinder_4.6.1.bb @@ -0,0 +1,8 @@ +# xfce4-appfinder build file + +DESCRIPTION="XFCE Application Finder" +DEPENDS="libxfcegui4 libxfce4menu thunar" +SECTION = "x11" +PR = "r1" + +inherit xfce46 diff --git a/recipes/xfce/xfce4-dev-tools_4.4.0.1.bb b/recipes/xfce-base/xfce4-dev-tools_4.4.0.1.bb index 67c2d341de..67c2d341de 100644 --- a/recipes/xfce/xfce4-dev-tools_4.4.0.1.bb +++ b/recipes/xfce-base/xfce4-dev-tools_4.4.0.1.bb diff --git a/recipes/xfce-base/xfce4-dev-tools_4.6.0.bb b/recipes/xfce-base/xfce4-dev-tools_4.6.0.bb new file mode 100644 index 0000000000..9f96911d8d --- /dev/null +++ b/recipes/xfce-base/xfce4-dev-tools_4.6.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Xfce4 development tools" +SECTION = "x11/libs" +LICENSE = "GPL" +PR = "r1" + +inherit xfce46 + +inherit autotools autotools_stage + +XFCE_VERSION = ${PV} +SRC_URI = "http://www.us.xfce.org/archive/xfce-${XFCE_VERSION}/src/${PN}-${PV}.tar.bz2" + +do_stage() { + install -d ${STAGING_DATADIR}/aclocal + install -m 644 m4macros/*.m4 ${STAGING_DATADIR}/aclocal/ +} + +FILES_${PN}-dev += " ${datadir}/xfce4/dev-tools/m4macros/*.m4" diff --git a/recipes/xfce/xfce4-icon-theme_4.4.2.bb b/recipes/xfce-base/xfce4-icon-theme_4.4.2.bb index 69d9dacbac..69d9dacbac 100644 --- a/recipes/xfce/xfce4-icon-theme_4.4.2.bb +++ b/recipes/xfce-base/xfce4-icon-theme_4.4.2.bb diff --git a/recipes/xfce/xfce4-mixer_4.4.2.bb b/recipes/xfce-base/xfce4-mixer_4.4.2.bb index 60bb012810..60bb012810 100644 --- a/recipes/xfce/xfce4-mixer_4.4.2.bb +++ b/recipes/xfce-base/xfce4-mixer_4.4.2.bb diff --git a/recipes/xfce-base/xfce4-mixer_4.6.1.bb b/recipes/xfce-base/xfce4-mixer_4.6.1.bb new file mode 100644 index 0000000000..f6a42d0087 --- /dev/null +++ b/recipes/xfce-base/xfce4-mixer_4.6.1.bb @@ -0,0 +1,13 @@ +# xfce-mixer-plugin OE build file + +DESCRIPTION="XFCE panel mixer plugin" +DEPENDS="libwnck xfce4-panel" +RDEPENDS="xfce4-panel" +SECTION = "x11" +PR = "r2" + +inherit xfce46 + +FILES_${PN} += "${datadir}/xfce4/panel-plugins/*.desktop" +FILES_${PN} += "${libdir}/xfce4/modules/libxfce4mixer.so" +FILES_${PN}-dbg += "${libexecdir}/xfce4/panel-plugins/.debug/" diff --git a/recipes/xfce/xfce4-panel_4.4.2.bb b/recipes/xfce-base/xfce4-panel_4.4.2.bb index 2fd087733e..2fd087733e 100644 --- a/recipes/xfce/xfce4-panel_4.4.2.bb +++ b/recipes/xfce-base/xfce4-panel_4.4.2.bb diff --git a/recipes/xfce-base/xfce4-panel_4.6.1.bb b/recipes/xfce-base/xfce4-panel_4.6.1.bb new file mode 100644 index 0000000000..c19d6fdd48 --- /dev/null +++ b/recipes/xfce-base/xfce4-panel_4.6.1.bb @@ -0,0 +1,31 @@ +# xfce4-panel OE build file + +DESCRIPTION = "Xfce4 Panel" +DEPENDS = "virtual/libx11 startup-notification libxfcegui4 libxml2 exo libwnck" +SECTION = "x11" +PR = "r2" + +inherit xfce46 + +EXTRA_OECONF += " --enable-startup-notification" + +do_stage() { + autotools_stage_all +} + +do_install() { + oe_runmake DESTDIR=${D} install +} + +python populate_packages_prepend() { + plugin_dir = bb.data.expand('${libdir}/xfce4/panel-plugins/', d) + plugin_name = bb.data.expand('${PN}-plugin-%s', d) + do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name, + '${PN} plugin for %s', extra_depends='', prepend=True, + aux_files_pattern=['${datadir}/xfce4/panel-plugins/%s.desktop', + '${sysconfdir}/xdg/xfce/panel/%s-*', + '${datadir}/icons/hicolor/48x48/apps/*-%s.png', + '${bindir}/*%s*']) +} + +PACKAGES_DYNAMIC = "${PN}-plugin-*" diff --git a/recipes/xfce-base/xfce4-power-manager_4.6.1.bb b/recipes/xfce-base/xfce4-power-manager_4.6.1.bb new file mode 100644 index 0000000000..b5dd372532 --- /dev/null +++ b/recipes/xfce-base/xfce4-power-manager_4.6.1.bb @@ -0,0 +1 @@ +PR = "r1" diff --git a/recipes/xfce/xfce4-session_4.4.2.bb b/recipes/xfce-base/xfce4-session_4.4.2.bb index a572b80f55..a572b80f55 100644 --- a/recipes/xfce/xfce4-session_4.4.2.bb +++ b/recipes/xfce-base/xfce4-session_4.4.2.bb diff --git a/recipes/xfce-base/xfce4-session_4.6.1.bb b/recipes/xfce-base/xfce4-session_4.6.1.bb new file mode 100644 index 0000000000..181625b168 --- /dev/null +++ b/recipes/xfce-base/xfce4-session_4.6.1.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "xfce4-session is a session manager for Xfce 4 Desktop Environment" +DEPENDS = "libxfcegui4 libxfce4util dbus iceauth xfce-utils" +RDEPENDS = "iceauth xfce-utils" +SECTION = "x11" + +PR = "r3" + +inherit xfce46 + +FILES_${PN} += "${libdir}/xfce4/splash/engines/*.so" +FILES_${PN} += "${datadir}/xfce4/tips/*" +FILES_${PN} += "${datadir}/themes/Default/balou/*" + +FILES_${PN}-dbg += "${libdir}/xfce4/splash/engines/.debug/*.so" +FILES_${PN}-dbg += "${libdir}/xfce4/splash/engines/.debug/*.a" + +FILES_${PN}-dev += "${libdir}/xfce4/splash/engines/*.la" +FILES_${PN}-dev += "${libdir}/xfce4/splash/engines/*.a" diff --git a/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-configure.patch b/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-configure.patch new file mode 100644 index 0000000000..beb5857908 --- /dev/null +++ b/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-configure.patch @@ -0,0 +1,11 @@ +--- ./configure.ac.orig 2009-02-25 18:58:49.000000000 +0100 ++++ ./configure.ac 2009-03-01 11:14:33.000000000 +0100 +@@ -85,8 +85,8 @@ XDT_CHECK_PACKAGE([LIBXFCE4KBD_PRIVATE], + XDT_CHECK_PACKAGE([GLADE], [libglade-2.0], [2.0.0]) + XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0]) + XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.34]) +-XDT_CHECK_PACKAGE([XI], [xi], [1.0.0]) +-XDT_CHECK_PACKAGE([LIBX11], [x11], [1.0.0]) ++ XDT_CHECK_PACKAGE([XI], [xi], [1.0.0]) ++#XDT_CHECK_PACKAGE([LIBX11], [x11], [1.0.0]) + XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.12.0]) diff --git a/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-libxklavier.patch b/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-libxklavier.patch new file mode 100644 index 0000000000..3268ecad26 --- /dev/null +++ b/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-libxklavier.patch @@ -0,0 +1,12 @@ +diff -ur xfce4-settings-4.6.1.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c +--- xfce4-settings-4.6.1.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c 2009-03-02 19:48:00.000000000 +0200 ++++ xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c 2009-07-20 12:08:28.000000000 +0300 +@@ -378,7 +378,7 @@ + xkl_config_rec_get_from_server (settings->priv->xkl_rec_config, settings->priv->xkl_engine); + + settings->priv->xkl_registry = xkl_config_registry_get_instance (settings->priv->xkl_engine); +- xkl_config_registry_load (settings->priv->xkl_registry); ++ xkl_config_registry_load (settings->priv->xkl_registry, FALSE); + + /* Tab */ + xkb_tab_layout_vbox = glade_xml_get_widget (settings->priv->glade_xml, "xkb_tab_layout_vbox"); diff --git a/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-workspaces.c.patch b/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-workspaces.c.patch new file mode 100644 index 0000000000..6e604050e6 --- /dev/null +++ b/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-workspaces.c.patch @@ -0,0 +1,17 @@ +--- xfce4-settings-helper/workspaces.c.orig 2009-01-25 15:29:31.000000000 +0100 ++++ xfce4-settings-helper/workspaces.c 2009-01-27 13:32:51.000000000 +0100 +@@ -129,9 +129,14 @@ xfce_workspaces_helper_set_workspace_nam + wnck_screen_force_update(screen); + + /* walk all the workspaces on this screen */ ++#if 0 + workspaces = wnck_screen_get_workspaces(screen); + for(li = workspaces, i = 0; li != NULL; li = li->next, i++) { + workspace = WNCK_WORKSPACE(li->data); ++#else ++ for(i = 0; i < wnck_screen_get_workspace_count(screen); i++) { ++ workspace = wnck_screen_get_workspace(screen, i); ++#endif + + /* check if we have a valid name in the array */ + if(n_names > i && names[i] != NULL && names[i] != '\0') { diff --git a/recipes/xfce-base/xfce4-settings_4.6.1.bb b/recipes/xfce-base/xfce4-settings_4.6.1.bb new file mode 100644 index 0000000000..7d44e97a47 --- /dev/null +++ b/recipes/xfce-base/xfce4-settings_4.6.1.bb @@ -0,0 +1,20 @@ +DESCRIPTION="Xfce4 settings" +HOMEPAGE = "http://www.xfce.org" +SECTION = "x11/wm" +LICENSE = "GPL-2" + +DEPENDS = "virtual/libx11 virtual/xserver libxi libwnck xrandr exo libxfce4util" +RDEPENDS = "gtk+ libxfce4util libxfcegui4 xfconf exo" + +PR = "r1" + +inherit xfce46 + +SRC_URI += " \ + file://xfce4-settings-4.6.1-libxklavier.patch;patch=1 \ + file://xfce4-settings-4.6.1-configure.patch;patch=1 \ +" + +do_stage() { +autotools_stage_all +} diff --git a/recipes/xfce-base/xfconf_4.6.1.bb b/recipes/xfce-base/xfconf_4.6.1.bb new file mode 100644 index 0000000000..2e167cc01c --- /dev/null +++ b/recipes/xfce-base/xfconf_4.6.1.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Xfce configuration daemon and utilities" +HOMEPAGE = "http://www.xfce.org" +SECTION = "x11/wm" +LICENSE = "GPL-2" + +DEPENDS = "libxfce4util" +RDEPENDS = "libxfce4util" + +PR = "r1" + +inherit xfce46 + +do_stage() { +autotools_stage_all +} + +FILES_${PN} += "${datadir}/dbus-1/services/org.xfce.Xfconf.service" diff --git a/recipes/xfce/xfdesktop/fix-segfault-when-removable-icons-are-disabled.patch b/recipes/xfce-base/xfdesktop/fix-segfault-when-removable-icons-are-disabled.patch index af5bc4cd96..af5bc4cd96 100644 --- a/recipes/xfce/xfdesktop/fix-segfault-when-removable-icons-are-disabled.patch +++ b/recipes/xfce-base/xfdesktop/fix-segfault-when-removable-icons-are-disabled.patch diff --git a/recipes/xfce/xfdesktop/relocation-and-memleak.patch b/recipes/xfce-base/xfdesktop/relocation-and-memleak.patch index df9011d8da..df9011d8da 100644 --- a/recipes/xfce/xfdesktop/relocation-and-memleak.patch +++ b/recipes/xfce-base/xfdesktop/relocation-and-memleak.patch diff --git a/recipes/xfce/xfdesktop_4.4.2.bb b/recipes/xfce-base/xfdesktop_4.4.2.bb index 3129feba23..3129feba23 100644 --- a/recipes/xfce/xfdesktop_4.4.2.bb +++ b/recipes/xfce-base/xfdesktop_4.4.2.bb diff --git a/recipes/xfce-base/xfdesktop_4.6.1.bb b/recipes/xfce-base/xfdesktop_4.6.1.bb new file mode 100644 index 0000000000..9c1c2f4f33 --- /dev/null +++ b/recipes/xfce-base/xfdesktop_4.6.1.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "XFCE4 Desktop Manager" +SECTION = "x11/base" + +DEPENDS = "virtual/libx11 exo libxfcegui4 xfce4-panel thunar gtk+" +RDEPENDS = "libxfcegui4 libxml2 xfce4-panel thunar exo gtk+" +PR = "r2" + +inherit xfce46 + +do_configure() { + oe_runconf +} + +FILES_xfdesktop-backdrops = "${datadir}/xfce4/backdrops/*" +FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so \ + ${libdir}/xfce4/panel-plugins/xfce4-menu-plugin \ + ${datadir}/xfce4/panel-plugins/*.desktop" +FILES_${PN}-dbg += "${libexecdir}/xfce4/panel-plugins/.debug" diff --git a/recipes/xfce/xfwm4-themes_4.4.2.bb b/recipes/xfce-base/xfwm4-themes_4.4.2.bb index 63c5ab0296..63c5ab0296 100644 --- a/recipes/xfce/xfwm4-themes_4.4.2.bb +++ b/recipes/xfce-base/xfwm4-themes_4.4.2.bb diff --git a/recipes/xfce-base/xfwm4-themes_4.6.0.bb b/recipes/xfce-base/xfwm4-themes_4.6.0.bb new file mode 100644 index 0000000000..e3c86fbcc4 --- /dev/null +++ b/recipes/xfce-base/xfwm4-themes_4.6.0.bb @@ -0,0 +1,22 @@ +# xfwm4-themes OE build file + +DESCRIPTION="Xfce4 Window Manager Themes" +SECTION = "x11/wm" +PR = "r2" + +DEPENDS = "xfwm4 libglade libxml2" +RDEPENDS = "xfwm4 libglade libxml2" + +inherit xfce46 + +SRC_URI = "http://mocha.xfce.org/archive/src/art/xfwm4-themes/4.6/xfwm4-themes-${PV}.tar.bz2" + +# No ${PN} for this one +PACKAGES="" + +PACKAGES_DYNAMIC = "xfwm4-theme-*" + +python populate_packages_prepend () { + themedir = bb.data.expand('${datadir}/xfwm4/themes', d) + do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) +} diff --git a/recipes/xfce/xfwm4_4.4.2.bb b/recipes/xfce-base/xfwm4_4.4.2.bb index 8d1a1835cf..8d1a1835cf 100644 --- a/recipes/xfce/xfwm4_4.4.2.bb +++ b/recipes/xfce-base/xfwm4_4.4.2.bb diff --git a/recipes/xfce-base/xfwm4_4.6.1.bb b/recipes/xfce-base/xfwm4_4.6.1.bb new file mode 100644 index 0000000000..116006ada7 --- /dev/null +++ b/recipes/xfce-base/xfwm4_4.6.1.bb @@ -0,0 +1,28 @@ +# xfwm4 OE build file + +DESCRIPTION="XFCE4 Window Manager" +SECTION = "x11/wm" +PR = "r1" + +inherit xfce46 update-alternatives + +FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*" + +DEPENDS = "startup-notification virtual/libx11 libxpm libxfce4util libxfcegui4" +RDEPENDS = "xfwm4-theme-default" + +EXTRA_OECONF += " --enable-startup-notification" + +PACKAGES_DYNAMIC += "xfwm4-theme-*" + +python populate_packages_prepend () { + themedir = bb.data.expand('${datadir}/themes', d) + do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) +} + +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PATH = "${bindir}/xfce4-session" +ALTERNATIVE_PRIORITY = "30" + +FILES_${PN}-dbg += "${libexecdir}/xfce4/xfwm4/.debug/*" diff --git a/recipes/xfce-extras/gigolo_0.3.2.bb b/recipes/xfce-extras/gigolo_0.3.2.bb new file mode 100644 index 0000000000..22f83538ef --- /dev/null +++ b/recipes/xfce-extras/gigolo_0.3.2.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Gigolo is a frontend to easily manage connections to remote filesystems using GIO/GVfs." +DEPENDS = "pkgconfig gtk+" +RDEPENDS = "libxfce4util libxfcegui4" + +SECTION = "x11" +LICENSE = "GPL-2" +PR = "r1" + +inherit xfce46 + +XFCE_VERSION = "4.6.1" + +SRC_URI = "http://files.uvena.de/${PN}/${PN}-${PV}.tar.bz2" + +do_compile() { + oe_runmake +} diff --git a/recipes/xfce/mousepad_0.2.13.bb b/recipes/xfce-extras/mousepad_0.2.13.bb index c55ce5a047..c55ce5a047 100644 --- a/recipes/xfce/mousepad_0.2.13.bb +++ b/recipes/xfce-extras/mousepad_0.2.13.bb diff --git a/recipes/xfce-extras/mousepad_0.2.16.bb b/recipes/xfce-extras/mousepad_0.2.16.bb new file mode 100644 index 0000000000..b5671179f0 --- /dev/null +++ b/recipes/xfce-extras/mousepad_0.2.16.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "Text editor for Xfce based on Leafpad" +RDEPENDS = "libxfce4util hal" +SECTION = "x11" +PR = "r2" + +inherit xfce46 + +SRC_URI = "http://mocha.xfce.org/archive/src/apps/${PN}/${@'${PV}'[0:3]}/${PN}-${PV}.tar.bz2" + diff --git a/recipes/xfce/orage_4.4.2.bb b/recipes/xfce-extras/orage_4.4.2.bb index b8f5284454..b8f5284454 100644 --- a/recipes/xfce/orage_4.4.2.bb +++ b/recipes/xfce-extras/orage_4.4.2.bb diff --git a/recipes/xfce-extras/orage_4.6.1.bb b/recipes/xfce-extras/orage_4.6.1.bb new file mode 100644 index 0000000000..06f7296429 --- /dev/null +++ b/recipes/xfce-extras/orage_4.6.1.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Calendar application for the Xfce Desktop Environment" +DEPENDS = "libxfcegui4 exo xfce4-panel" +RDEPENDS = "xfce4-panel" +RREPLACES = "xfcalendar" + +SECTION = "x11" +PR = "r3" + +inherit xfce46 + +SRC_URI = "http://mocha.xfce.org/archive/src/apps/${PN}/${@'${PV}'[0:3]}/${PN}-${PV}.tar.bz2" + +XFCE_VERSION = "4.6.1" + +EXTRA_OECONF += " --disable-libxfce4mcs" + + +FILES_${PN} += "${datadir}/xfce4/panel-plugins/*.desktop \ + ${datadir}/dbus-1/services/* \ +" + +FILES_${PN}-dbg += "${libexecdir}/xfce4/panel-plugins/.debug/" diff --git a/recipes/xfce-extras/ristretto_0.0.21.bb b/recipes/xfce-extras/ristretto_0.0.21.bb new file mode 100644 index 0000000000..eff3d25b9b --- /dev/null +++ b/recipes/xfce-extras/ristretto_0.0.21.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Ristretto is a picture-viewer for XFCE" +DEPENDS = "thunar libxfce4util libxfcegui4 libexif dbus" +RDEPENDS = "thunar libxfce4util libxfcegui4" + +SECTION = "x11" +PR = "r1" + +inherit xfce46 + +XFCE_VERSION = "4.6.1" + +SRC_URI = "http://goodies.xfce.org/releases/ristretto/${PN}-${PV}.tar.gz" diff --git a/recipes/xfce-extras/squeeze_0.2.3.bb b/recipes/xfce-extras/squeeze_0.2.3.bb new file mode 100644 index 0000000000..ce784c2ea8 --- /dev/null +++ b/recipes/xfce-extras/squeeze_0.2.3.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Squeeze is an archive manager for the Xfce Desktop Environment" +DEPENDS = "pkgconfig dbus gtk+ thunar" +RDEPENDS = "libxfce4util" + +SECTION = "x11" +PR = "r1" + +inherit xfce46 + +XFCE_VERSION = "4.6.1" + +SRC_URI = "http://squeeze.xfce.org/downloads/${PN}-${PV}.tar.bz2" diff --git a/recipes/xfcalendar/xfcalendar.inc b/recipes/xfce-extras/xfcalendar.inc index 987d8b4d67..987d8b4d67 100644 --- a/recipes/xfcalendar/xfcalendar.inc +++ b/recipes/xfce-extras/xfcalendar.inc diff --git a/recipes/xfcalendar/xfcalendar_4.2.0.bb b/recipes/xfce-extras/xfcalendar_4.2.0.bb index 987d8b4d67..987d8b4d67 100644 --- a/recipes/xfcalendar/xfcalendar_4.2.0.bb +++ b/recipes/xfce-extras/xfcalendar_4.2.0.bb diff --git a/recipes/xfcalendar/xfcalendar_4.2.2.bb b/recipes/xfce-extras/xfcalendar_4.2.2.bb index 41b0db2a51..41b0db2a51 100644 --- a/recipes/xfcalendar/xfcalendar_4.2.2.bb +++ b/recipes/xfce-extras/xfcalendar_4.2.2.bb diff --git a/recipes/xfcalendar/xfcalendar_4.2.3.bb b/recipes/xfce-extras/xfcalendar_4.2.3.bb index ebab53efcd..ebab53efcd 100644 --- a/recipes/xfcalendar/xfcalendar_4.2.3.bb +++ b/recipes/xfce-extras/xfcalendar_4.2.3.bb diff --git a/recipes/xfce-extras/xfce4-notifyd_0.1.0.bb b/recipes/xfce-extras/xfce4-notifyd_0.1.0.bb new file mode 100644 index 0000000000..961b7862b3 --- /dev/null +++ b/recipes/xfce-extras/xfce4-notifyd_0.1.0.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Notification daemon for the Xfce desktop." +DEPENDS = "pkgconfig dbus gtk+ libsexy" +RDEPENDS = "libxfce4util libxfcegui4 libnotify xfconf" + +SECTION = "x11" +PR = "r1" + +inherit xfce46 + +XFCE_VERSION = "4.6.1" + +SRC_URI = "http://spuriousinterrupt.org/files/${PN}/${PN}-${PV}.tar.bz2" + +FILES_${PN} = "\ + ${datadir}/dbus-1/services \ + ${datadir}/themes \ + ${datadir}/icons \ + ${datadir}/applications \ + ${libexecdir}/xfce4-notifyd \ + ${bindir}/xfce4-notifyd-config \ +" diff --git a/recipes/xfprint/xfprint_4.3.99.2.bb b/recipes/xfce-extras/xfprint_4.3.99.2.bb index 7e349ce881..7e349ce881 100644 --- a/recipes/xfprint/xfprint_4.3.99.2.bb +++ b/recipes/xfce-extras/xfprint_4.3.99.2.bb diff --git a/recipes/xfce/xfprint_4.4.2.bb b/recipes/xfce-extras/xfprint_4.4.2.bb index 19bfa0dde3..19bfa0dde3 100644 --- a/recipes/xfce/xfprint_4.4.2.bb +++ b/recipes/xfce-extras/xfprint_4.4.2.bb diff --git a/recipes/xfce-extras/xfprint_4.6.1.bb b/recipes/xfce-extras/xfprint_4.6.1.bb new file mode 100644 index 0000000000..74d619af66 --- /dev/null +++ b/recipes/xfce-extras/xfprint_4.6.1.bb @@ -0,0 +1,13 @@ +# xfprint OE build file + +DESCRIPTION="XFCE4 Print Manager" +SECTION = "x11/base" + +PR = "r2" + +DEPENDS="libxfcegui4" + +inherit xfce46 + +FILES_${PN} += "${libdir}/xfce4/xfprint-plugins/*.so" +FILES_${PN}-dev += "${libdir}/xfce4/xfprint-plugins/*.a" |