From cab70860b89f0fd856c5de1c37c6a3d31fd3cc9d Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Wed, 11 Mar 2009 16:51:26 +0100 Subject: proftpd: yet another ftp daemon; created recipe --- conf/checksums.ini | 4 ++++ packages/proftpd/proftpd_1.3.2.bb | 8 ++++++++ 2 files changed, 12 insertions(+) create mode 100644 packages/proftpd/proftpd_1.3.2.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 93efff1bdd..60d003f4cf 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -18354,6 +18354,10 @@ sha256=6d52c706401af197bd9d7e0187c35b4a3463ea720392ffa0c020d94899b361e5 md5=f490bca772b16472962c7b9f23b1e97d sha256=b439e04adab9b1e66e11f59c4331680da48f1722f2123123f7c16dfbed2c38dc +[ftp://ftp.nl.uu.net/pub/unix/ftp/proftpd/ftp/distrib/source/proftpd-1.3.2.tar.gz] +md5=756f762883cc8eed03d99dc3b1c56a8e +sha256=5e00c20d74bbf98fb8bcc63bd4aecfd08480a87ec731dae8955bd9fca6a01bb3 + [http://downloads.sourceforge.net/progear/progear-ac-0.1.tar.gz] md5=60a89c2c907fb5ff2293ce3dfbcdace6 sha256=4124e24726369b42ed0a7aff33e5c572de5e4a0f46edd4e1e81125412c4bdf24 diff --git a/packages/proftpd/proftpd_1.3.2.bb b/packages/proftpd/proftpd_1.3.2.bb new file mode 100644 index 0000000000..13442b1412 --- /dev/null +++ b/packages/proftpd/proftpd_1.3.2.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "Secure ftp daemon" +SECTION = "console/network" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "ftp://ftp.nl.uu.net/pub/unix/ftp/proftpd/ftp/distrib/source/${PN}-${PV}.tar.gz \ + " + -- cgit v1.2.3 From 15fe207f429369799b7cae0e9a745cd5af005577 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Wed, 11 Mar 2009 20:47:20 +0100 Subject: zope: added __init__.py* files to python-zopeinterface, otherwie the package does not work! --- packages/zope/zope_3.3.1.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/zope/zope_3.3.1.bb b/packages/zope/zope_3.3.1.bb index cd854250b6..05df3dd48d 100644 --- a/packages/zope/zope_3.3.1.bb +++ b/packages/zope/zope_3.3.1.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" DEPENDS = "python" RDEPENDS = "python-core python-shell" LICENSE = "ZPL" -PR = "r7" +PR = "r8" SRC_URI = "http://www.zope.org/Products/Zope3/${PV}/Zope-${PV}.tgz" S = "${WORKDIR}/Zope-${PV}" @@ -43,5 +43,7 @@ ${libdir}/${PYTHON_DIR}/zope/i18nmessageid/.debug \ ${libdir}/${PYTHON_DIR}/ZODB/.debug" FILES_python-zopeinterface-dbg += "${libdir}/${PYTHON_DIR}/zope/interface/.debug " -FILES_python-zopeinterface = "${libdir}/${PYTHON_DIR}/zope/interface/*.* ${libdir}/${PYTHON_DIR}/zope/interface/common" +FILES_python-zopeinterface = " ${libdir}/${PYTHON_DIR}/zope/__init__.py* \ + ${libdir}/${PYTHON_DIR}/zope/interface/*.* \ + ${libdir}/${PYTHON_DIR}/zope/interface/common" -- cgit v1.2.3 From 706987bb34a58b80e5f2f89d1dad073dd9336293 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Wed, 11 Mar 2009 20:48:45 +0100 Subject: python-coherence_0.6.0.bb: removed (should have been moved to 0.6.2 but a new 0.6.2 was made, so dropping this one now) --- packages/python/python-coherence_0.6.0.bb | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 packages/python/python-coherence_0.6.0.bb diff --git a/packages/python/python-coherence_0.6.0.bb b/packages/python/python-coherence_0.6.0.bb deleted file mode 100644 index bf9d964f99..0000000000 --- a/packages/python/python-coherence_0.6.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Coherence is a DLNA/UPnP mediaserver + backends" -SECTION = "devel/python" -LICENSE = "MIT" -HOMEPAGE = "http://coherence.beebits.net/wiki" -PR = "r5" - -inherit setuptools - -SRC_URI = "http://coherence.beebits.net/download/Coherence-${PV}.tar.gz" -S = "${WORKDIR}/Coherence-${PV}" - -FILES_${PN} += "${datadir}" -RDEPENDS_${PN} += "python-gst python-dbus python-configobj python-twisted python-twisted-core python-misc python-zopeinterface zope python-modules" - - -- cgit v1.2.3 From 3e60916fa54b1f7262bb76ef3904d3dc50620164 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Wed, 11 Mar 2009 20:51:02 +0100 Subject: python-coherence: updated DEPENDS (removed unneeded zope, added a few missing ones) --- packages/python/python-coherence_0.6.2.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/python/python-coherence_0.6.2.bb b/packages/python/python-coherence_0.6.2.bb index 7d25f0868e..54eed59574 100644 --- a/packages/python/python-coherence_0.6.2.bb +++ b/packages/python/python-coherence_0.6.2.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Coherence is a DLNA/UPnP mediaserver + backends" SECTION = "devel/python" LICENSE = "MIT" HOMEPAGE = "http://coherence.beebits.net/wiki" -PR = "r0" +PR = "r1" inherit setuptools @@ -12,6 +12,9 @@ S = "${WORKDIR}/Coherence-${PV}" FILES_${PN} += "${datadir}" DEPENDS = "libxml2 libxml2-native" -RDEPENDS_${PN} += "python-gst python-dbus python-configobj python-twisted python-twisted-core python-misc python-zopeinterface zope python-modules" +RDEPENDS_${PN} += "python-twisted-pair python-divmodepsilon python-nevow python-gst python-dbus \ + python-configobj python-twisted python-twisted-core python-twisted-protocols python-misc \ + python-zopeinterface python-modules python-pygobject python-gdata \ + python-divmodaxiom" -- cgit v1.2.3 From f3ddf3a7f46546a3fc792643a36503edc6b5e9ce Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 11 Mar 2009 22:01:46 +0100 Subject: checksums.ini: add more checksums --- conf/checksums.ini | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 93efff1bdd..235c481845 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -10706,6 +10706,14 @@ sha256=18b269b1bfad7230384681e89189c6af18584e19cddbf92208c0acef814046ab md5=a965452442cdbfc94caba57d0dd25a8f sha256=18b269b1bfad7230384681e89189c6af18584e19cddbf92208c0acef814046ab +[http://downloads.sourceforge.net/jamvm/jamvm-1.5.1.tar.gz] +md5=5a82751b50391eb092c906ce64f3b6bf +sha256=663895bd69caf3a1fda6af5eea8263d90a5fd35ca8f4c32e2210ac410788901a + +[http://heanet.dl.sourceforge.net/jamvm/jamvm-1.5.1.tar.gz] +md5=5a82751b50391eb092c906ce64f3b6bf +sha256=663895bd69caf3a1fda6af5eea8263d90a5fd35ca8f4c32e2210ac410788901a + [http://downloads.sourceforge.net/jamvm/jamvm-1.5.2.tar.gz] md5=2a564045670b459e9aed857b5f8a3391 sha256=76c976616d344a3b1abd8896be6610c4d97a58af6960e1bc2f442b774bdda839 @@ -18438,6 +18446,10 @@ sha256=1ae8b587759b33ad954e717728fab6df58bd28088d0ac8faf22e90253b774975 md5=fa121f8e5dd4b98d65096de1b6c84021 sha256=6cc4aff778275f087cfbd65d2040b1587cafc588749499a452eb496329505ab0 +[http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.14.tar.gz] +md5=0ed1115222d1d8c64cc14961cccb2eb0 +sha256=e6129f9239235981d329de40eeffa55041e6815a93aaa994d1eae242ea7446b5 + [http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.5.tar.gz] md5=99b5d9efd4fce35cabb4ae5d0ebb230d sha256=cd82eabcf9fa310a64b58b621730cebe5d3edae7596a9c121155db455b1e58f6 -- cgit v1.2.3 From 9bf2becd7b6596eae1d7078038910ed59a319fa5 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Thu, 12 Mar 2009 11:06:50 +0100 Subject: wt3: created: wt 3.* (including 2.99); retain package wt (which is for 2.*) as 2.* and 3.* are not compatible --- conf/checksums.ini | 36 ++++++++++++++++------------- packages/wt/wt3-2.99.0/ext.patch | 7 ++++++ packages/wt/wt3-2.99.0/src.patch | 18 +++++++++++++++ packages/wt/wt3-2.99.0/wgooglemap.patch | 15 ++++++++++++ packages/wt/wt3_2.99.0.bb | 41 +++++++++++++++++++++++++++++++++ 5 files changed, 101 insertions(+), 16 deletions(-) create mode 100644 packages/wt/wt3-2.99.0/ext.patch create mode 100644 packages/wt/wt3-2.99.0/src.patch create mode 100644 packages/wt/wt3-2.99.0/wgooglemap.patch create mode 100644 packages/wt/wt3_2.99.0.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index a7b7ab578a..7aeba9b9dd 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -630,14 +630,6 @@ sha256=fbd907dde45054227568f3117df0418a7819cfee02875d3723779432e8a66dc9 md5=f766680bb237ca2f837c005efba54efa sha256=fbd907dde45054227568f3117df0418a7819cfee02875d3723779432e8a66dc9 -[http://download.java.net/openjdk/jdk6/promoted/b12/openjdk-6-src-b12-28_aug_2008.tar.gz] -md5=b53e1ef643909ce82721ee4c970d958b -sha256=f099b3b1f3c22b8cea950403b992267ec69f43ad8a80bbcb84448b26340807ab - -[http://download.java.net/openjdk/jdk6/promoted/b14/openjdk-6-src-b14-25_nov_2008.tar.gz] -md5=9f9773a822156dd3d576d83d794364ce -sha256=1272f975052e51d3faf2d7ac13d0b8b4ac68019a688bffe03d9b684a9e3b4480 - [http://downloads.sourceforge.net/openjade/OpenSP-1.5.tar.gz] md5=87f56e79ae0c20397f4207d61d154303 sha256=987eeb9460185950e066e5db3b5fa531e53e213742b545288405552a5a7bb704 @@ -5438,6 +5430,10 @@ sha256=7754930742d3c3cc2a05af38263ba58ba416b7359f8a0c598ae0f7377277d3b3 md5=6505c9d18ef6b5ce13fe2a668eb5724b sha256=f7ff9bf972139b303616018a6937aa4c6df4e93c935ffd004b30845e2ad41ea6 +[http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/f9d938ede196.tar.gz] +md5=c8f78d48ac83987bc2adebeebcd354e9 +sha256=89952cf8bbe1bcce91c2c1fcf9a071991a890b3f8a783dee741cdb23c8ac763a + [http://downloads.sourceforge.net/faac/faac-1.24.tar.gz] md5=e72dc74db17b42b06155613489077ad7 sha256=a5844ff3bce0d7c885af71f41da01395d3253dcfc33863306a027a78a7cfad9e @@ -9934,10 +9930,6 @@ sha256=af40399fe434678454ae8ea100db6cba0482aa65b8972a05098c779cac57bc48 md5=faa08f321fefd2c61ce4c9355a62fe31 sha256=ca7ef124cde06883fbf28c7e78ce1e4c5526434bbe5672ef0a3e85a61a9d0b5f -[http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/f9d938ede196.tar.gz] -md5=c8f78d48ac83987bc2adebeebcd354e9 -sha256=89952cf8bbe1bcce91c2c1fcf9a071991a890b3f8a783dee741cdb23c8ac763a - [http://www.porchdogsoft.com/download/howl-0.9.7.tar.gz] md5=85fbe016e2ebad99108b1212ae4b1d6f sha256=f8766c44291aac92b2b4abc762e1b11e3504dd9f2a855fdde371b5abd730fe9f @@ -10122,10 +10114,6 @@ sha256=ef6b1c8def236f16ea914eccbb050c84ee314c0028b03c560ed20ff96776f74c md5=641ec45fe377529c7fd914f77b11b44f sha256=9ff8360375432a7a5c476cc6d55b3fdea9d6f3edc080d295a60421d8f47b1834 -[http://jalimo.evolvis.org/repository/sources/icepick-0.0+hg20080118.tar.bz2] -md5=ce7b1827e6f4cbe73b9ffa90b0d45a6a -sha256=63170836095f8451498c813a1f93a9ec70a1164d82aa30650c0f2216ca4377ab - [http://icedtea.classpath.org/download/source/icedtea6-1.3.1.tar.gz] md5=6865c25cbc087e4142031a846b71ae56 sha256=c15fb24475ad93e064ba252f2739c020f9981a808bde6cbd6c41eae38dd0143d @@ -10134,6 +10122,10 @@ sha256=c15fb24475ad93e064ba252f2739c020f9981a808bde6cbd6c41eae38dd0143d md5=6428ca1b0c38111cca230f5b69460b03 sha256=4f23aadcee80a9a03c858e36a8eaaa92149987ce0a3eac276e3003c9b2462739 +[http://jalimo.evolvis.org/repository/sources/icepick-0.0+hg20080118.tar.bz2] +md5=ce7b1827e6f4cbe73b9ffa90b0d45a6a +sha256=63170836095f8451498c813a1f93a9ec70a1164d82aa30650c0f2216ca4377ab + [http://ftp.de.debian.org/debian/pool/main/i/iceweasel/iceweasel_3.0.1-1.diff.gz] md5=7124ea3c13369ff27bcff0080aca678f sha256=1d70e21e1c20e8d88bf3d2590de75c3e65b12da335097716adc58712cea41dad @@ -16846,6 +16838,14 @@ sha256=1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1 md5=7df692e3186109cc00db6825b777201e sha256=1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1 +[http://download.java.net/openjdk/jdk6/promoted/b12/openjdk-6-src-b12-28_aug_2008.tar.gz] +md5=b53e1ef643909ce82721ee4c970d958b +sha256=f099b3b1f3c22b8cea950403b992267ec69f43ad8a80bbcb84448b26340807ab + +[http://download.java.net/openjdk/jdk6/promoted/b14/openjdk-6-src-b14-25_nov_2008.tar.gz] +md5=9f9773a822156dd3d576d83d794364ce +sha256=1272f975052e51d3faf2d7ac13d0b8b4ac68019a688bffe03d9b684a9e3b4480 + [http://jalimo.evolvis.org/repository/sources/openjdk-langtools-jdk7-b31.tar.bz2] md5=670931f67b2e4ac46c6e0cd15418f2fa sha256=f8b8820e410c137d279d14dec7e7a93217cc371acdfe1b3343b2278d1728932e @@ -23042,6 +23042,10 @@ sha256=f91445e5e1a02ee16f0bc1eb31a1cdfa53c4bb1e1cb4f76fae33436d472e9345 md5=2f4c34f1e092451d3c4d2e7f8c250015 sha256=c6f692956d93765f12402a0b22617566decc52a9bb1a707b4e8d12affd1528d3 +[http://downloads.sourceforge.net/witty/wt-2.99.0.tar.gz] +md5=3d35c181dfab7dfd3fe898738dffb421 +sha256=64e6bd25d18e838e1c60693eccbd11926c65b228d6ac69c4dafc7ebe7341dbbf + [http://downloads.sourceforge.net/wvware/wv-1.2.0.tar.gz] md5=b6319d5e75611fe2210453b5feb82c0c sha256=a76f44468e78591e6d510d326702e7c3999d2b9dd3ab8ab8c1c9811fd5b111e4 diff --git a/packages/wt/wt3-2.99.0/ext.patch b/packages/wt/wt3-2.99.0/ext.patch new file mode 100644 index 0000000000..89246ebbf6 --- /dev/null +++ b/packages/wt/wt3-2.99.0/ext.patch @@ -0,0 +1,7 @@ +--- wt-2.99.0/src/Wt/Ext/CMakeLists.txt 2009-03-11 21:30:10.000000000 +0100 ++++ wt-2.99.0/src/Wt/Ext/CMakeLists.txt.new 2009-03-11 21:31:33.000000000 +0100 +@@ -1,2 +1,3 @@ +-INSTALL_FILES(/include/Wt/Ext "...+[^Ch~]$") ++# avoid CMake* getting included ++INSTALL_FILES(/include/Wt/Ext "^[A-Z][a-z].*[^Ch~]$") + INSTALL_FILES(/include/Wt/Ext ExtDllDefs.h) diff --git a/packages/wt/wt3-2.99.0/src.patch b/packages/wt/wt3-2.99.0/src.patch new file mode 100644 index 0000000000..a3ac249af0 --- /dev/null +++ b/packages/wt/wt3-2.99.0/src.patch @@ -0,0 +1,18 @@ +--- wt-2.99.0/src/CMakeLists.txt 2009-03-06 16:36:30.000000000 +0100 ++++ wt-2.99.0/src/CMakeLists.txt.new 2009-03-11 21:39:06.000000000 +0100 +@@ -33,8 +33,13 @@ + + LINK_DIRECTORIES(${BOOST_LIB_DIRS}) + +-ADD_EXECUTABLE(filetostring web/skeleton/FileToString.C) +-GET_TARGET_PROPERTY(FILE_TO_STRING_EXE filetostring LOCATION) ++IF(CMAKE_CROSSCOMPILING) ++ ADD_EXECUTABLE(filetostring web/skeleton/FileToString.C) ++ GET_TARGET_PROPERTY(FILE_TO_STRING_EXE filetostring LOCATION) ++ELSE(CMAKE_CROSSCOMPILING) ++ SET(FILE_TO_STRING_EXE ${CMAKE_CURRENT_SOURCE_DIR}/filetostring) ++ENDIF(CMAKE_CROSSCOMPILING) ++ + + MACRO (FILE_TO_STRING infile outfile var) + ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${outfile} diff --git a/packages/wt/wt3-2.99.0/wgooglemap.patch b/packages/wt/wt3-2.99.0/wgooglemap.patch new file mode 100644 index 0000000000..071597fba6 --- /dev/null +++ b/packages/wt/wt3-2.99.0/wgooglemap.patch @@ -0,0 +1,15 @@ +--- wt-2.99.0/src/Wt/WGoogleMap.C.orig 2009-03-12 09:52:56.000000000 +0100 ++++ wt-2.99.0/src/Wt/WGoogleMap.C 2009-03-12 10:13:21.000000000 +0100 +@@ -18,6 +18,12 @@ + #include + #include + #include ++ ++#if not defined(_GLIBCXX_HAVE__SINL) && not defined(acosl) ++#define cosl cos ++#define acosl acos ++#define sinl sin ++#endif + + using std::string; + using std::vector; diff --git a/packages/wt/wt3_2.99.0.bb b/packages/wt/wt3_2.99.0.bb new file mode 100644 index 0000000000..fea28494ca --- /dev/null +++ b/packages/wt/wt3_2.99.0.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "A C++ Web Toolkit" +PRIORITY = "optional" +SECTION = "devel" +LICENSE = "GPL" +HOMEPAGE = "http://www.webtoolkit.eu/wt" +DEPENDS = "boost zlib openssl" +PR = "r0" + +# package wt3 is for wt 2.99 and wt 3.* +# the api of these versions is incompatible with 2.* + +SRC_URI = "${SOURCEFORGE_MIRROR}/witty/wt-${PV}.tar.gz \ + file://src.patch;patch=1 \ + file://ext.patch;patch=1 \ + file://wgooglemap.patch;patch=1" + +CXXFLAGS += "-Dsinl=sin -Dcosl=cos -Dasinl=asin" + +FILES_${PN} += "${datadir}/Wt" +FILES_${PN}-dev += "${datadir}/cmake-2.*" + +S = "${WORKDIR}/wt-${PV}" + +inherit cmake + +STAGE_TEMP = "${WORKDIR}/temp-staging" + +do_configure_append() { + ${BUILD_CXX} ${BUILD_CXXFLAGS} -o src/filetostring src/web/skeleton/FileToString.C +} + +do_stage() { + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + oe_runmake DESTDIR="${STAGE_TEMP}" install + cp -pPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR} + cp -pPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR} + cp -pPR ${STAGE_TEMP}/${datadir}/cmake-2.* ${STAGING_DATADIR} + rm -rf ${STAGE_TEMP} +} + -- cgit v1.2.3 From efb0de87134a7ad4620505c6a959db71bcb047e7 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Thu, 12 Mar 2009 11:09:24 +0100 Subject: angstrom/build-feeds.sh: added proftpd and wt3 to the feed --- contrib/angstrom/build-feeds.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index af66e229da..7e5f1b6f83 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -241,6 +241,7 @@ do povray \ prboom \ prelink \ + proftpd \ pushover \ python \ python-pybluez \ @@ -308,6 +309,7 @@ do wireshark \ wpa-gui \ wt \ + wt3 \ x11vnc \ xf86-input-evdev \ xf86-input-keyboard \ -- cgit v1.2.3 From 3b9da5b3349bcd84295dbc51f6b56a4c842e873d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 12 Mar 2009 12:25:07 +0100 Subject: checksums: add ti codeccs --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 2a373d137c..947173c2bf 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -16778,6 +16778,10 @@ sha256=1bb805b13ca5fe4b889f21b74feff0cdbf2a4603c9570a2b0050ae51db7c6306 md5=1b48bbb5df6b4c12ebb42b92ae1bf1f9 sha256=908a69340b020f7d865acf70724e37837016a81a0cb499fb83441759cbef7616 +[http://software-dl.ti.com/sdo/sdo_apps_public_sw/omap3530_dvsdk_combos_tspa/omap3530_dvsdk_combos_tspa-3_16-Linux-x86.bin] +md5=8347c8980ccf6cc46039ca75e8b0f543 +sha256=f9bd3921377ab64138c7dd550d5753e3668e99de37d743cf112b88ad933d4420 + [http://www.devzero.net/openmoko/dist/omext-0.2.tar.gz] md5=3c1fcd85f0a0cd3ccc4d7b4f26996b47 sha256=3d3cc3e4f92f7e0b6a352c3f68a337a599a90f4e4b6e6743adc0c70b570639f5 -- cgit v1.2.3 From 9f26d3e3f1c639e02d556516e72f8e25c41ba14f Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 12 Mar 2009 19:53:33 +0800 Subject: sane-srcrevs: update fso-abyss, libgsm0710 and libgsm0710mux rev. --- conf/distro/include/sane-srcrevs.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 3581a170a7..e0b8dba733 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -56,7 +56,7 @@ SRCREV_pn-flashrom ?= "3682" SRCREV_pn-frameworkd ?= "b652f9cc4efbccc1df941c0d93e156631879f174" SRCREV_pn-frameworkd-devel ?= "858c8d58d1f7e807f2c09532787c4e7b1a5daa52" SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136" -SRCREV_pn-fso-abyss ?= "fc4324a328834eb55c35d1670efc53f6e8c892a1" +SRCREV_pn-fso-abyss ?= "6ed342f833930474ac506cbaad705c0d8beaa71f" SRCREV_pn-fso-apm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa" SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0" SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4" @@ -84,8 +84,8 @@ SRCREV_pn-libexalt-dbus ?= "76" SRCREV_pn-libfakekey ?= "1455" SRCREV_pn-libframeworkd-glib ?= "e90f7c208356b53c34e025585248ea0a7a2ea13c" SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f" -SRCREV_pn-libgsm0710 ?= "243ef1b0db523a1ff163803e8277dc02e7c7b0b8" -SRCREV_pn-libgsm0710mux ?= "092fcf31f56a3755d402d470d082df8f5373b2e0" +SRCREV_pn-libgsm0710 ?= "6fdfbc2bb50c6ce49d644b92cd371a1df5942e1d" +SRCREV_pn-libgsm0710mux ?= "a97b263f939f9a09d0a38c3346807215c72a6197" SRCREV_pn-libgsmd ?= "4505" SRCREV_pn-libiac ?= "1590" SRCREV_pn-libjana ?= "713" -- cgit v1.2.3 From 67037d2f8cba886e728d89e3296498394e3e0d4f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 12 Mar 2009 12:58:19 +0100 Subject: gstreamer-ti: bump PR --- packages/dsplink/gstreamer-ti_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/dsplink/gstreamer-ti_svn.bb b/packages/dsplink/gstreamer-ti_svn.bb index 824bbd21fe..bcfaa3458b 100644 --- a/packages/dsplink/gstreamer-ti_svn.bb +++ b/packages/dsplink/gstreamer-ti_svn.bb @@ -4,7 +4,7 @@ SRC_URI = "svn://gforge.ti.com/svn/gstreamer_ti/trunk;module=gstreamer_ti;proto= file://gst-buffsize.diff;patch=1" SRCREV = "127" -PR = "r4" +PR = "r5" # Again, no '.' in PWD allowed :( PV = "0+svnr${SRCREV}" -- cgit v1.2.3 From 9fa9bd2cb92f37a505db22cf8764652212dc0124 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 12 Mar 2009 15:25:55 +0100 Subject: llvm-native 2.5: New recipe. checksums.ini: Added llvm 2.5 entry. --- conf/checksums.ini | 4 ++++ packages/llvm/llvm-native_2.5.bb | 15 +++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 packages/llvm/llvm-native_2.5.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 9cca8c60cb..bcfe02c48a 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -14546,6 +14546,10 @@ sha256=8cabd422f249ada736d864fc8a1f4d14aabefacb6f860c9beefbc53f93e0f96c md5=bf43eee98c364fd79c7d2b72e645a15e sha256=5fc295b3cf3de019962aee3be1c5efb49d6bf5041dae59451f6c0f544eb36bdc +[http://llvm.org/releases/2.5/llvm-2.5.tar.gz] +md5=55df2ea8665c8094ad2ef85187b9fc74 +sha256=8f3d69e63bc5d1ee2c2ee49ff07ccb7e070070a0e937813d2a6179b9e2e173ed + [http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-2.10.1.tar.gz] md5=cdc857b78e813b88cbf8be92441aa299 sha256=a332cacfa9d0eed6e9158c394db714e536f38c27451d7df08b9634952118fa1b diff --git a/packages/llvm/llvm-native_2.5.bb b/packages/llvm/llvm-native_2.5.bb new file mode 100644 index 0000000000..010f49ab32 --- /dev/null +++ b/packages/llvm/llvm-native_2.5.bb @@ -0,0 +1,15 @@ +require llvm.inc + +SRC_URI = "http://llvm.org/releases/2.5/llvm-${PV}.tar.gz" + +inherit native + +S = "${WORKDIR}/llvm-${PV}" + +do_stage() { + install -m 755 ${S}/Release/bin/* ${STAGING_BINDIR_NATIVE}/ +} + +do_rm_work() { + : +} -- cgit v1.2.3 From 994c99d5111f9cf7214cba7f3c2686c7398a07fc Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 12 Mar 2009 16:01:41 +0100 Subject: checksums.ini: Added cmake 2.6.3 entry. --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index bcfe02c48a..80849c3244 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -3530,6 +3530,10 @@ sha256=f20607d4f33376ea648307681630574662d0c3f59d88a7a02ad547b6320631f1 md5=e95ae003672dfc6c8151a1ee49a0d4a6 sha256=4999d3054a04e6cf4847a72316e32e9e98e6152b1fd72adc87d15e305f990f27 +[http://www.cmake.org/files/v2.6/cmake-2.6.3.tar.gz] +md5=5ba47a94ce276f326abca1fd72a7e7c6 +sha256=3c3af80526a32bc2afed616e8f486b847144f2fa3a8e441908bd39c38b146450 + [http://install.tarball.in.source.dir/codec_engine_2_10_01.tar.gz] md5=32b0df93b285ee094e053552d9301cb6 sha256=eb9f4b4b5973f444d16920201dfea217fb30542fea23107cf80a1f189408b321 -- cgit v1.2.3 From b9fece3136a4bb83b5c34b9ac3ea324aa559d6eb Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 12 Mar 2009 16:04:42 +0100 Subject: cmake-native 2.6.3: New recipe. --- packages/cmake/cmake-native_2.6.3.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/cmake/cmake-native_2.6.3.bb diff --git a/packages/cmake/cmake-native_2.6.3.bb b/packages/cmake/cmake-native_2.6.3.bb new file mode 100644 index 0000000000..faf397614b --- /dev/null +++ b/packages/cmake/cmake-native_2.6.3.bb @@ -0,0 +1,11 @@ +inherit native +require cmake.inc + +do_stage() { + oe_runmake install + autotools_stage_all +} + +do_install() { + : +} -- cgit v1.2.3 From 005826c1b83843cda0e5e1fb07f0abb220f567a3 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Thu, 12 Mar 2009 17:23:24 +0100 Subject: proftpd: previous recipe was no good; fixed it; this one is without pam and might require some more chown's --- packages/proftpd/proftpd_1.3.2.bb | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/packages/proftpd/proftpd_1.3.2.bb b/packages/proftpd/proftpd_1.3.2.bb index 13442b1412..04ffacaf6b 100644 --- a/packages/proftpd/proftpd_1.3.2.bb +++ b/packages/proftpd/proftpd_1.3.2.bb @@ -1,8 +1,34 @@ DESCRIPTION = "Secure ftp daemon" SECTION = "console/network" LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp.nl.uu.net/pub/unix/ftp/proftpd/ftp/distrib/source/${PN}-${PV}.tar.gz \ + file://make.patch;patch=1 \ " + +EXTRA_OECONF = "ac_cv_func_setpgrp_void=yes ac_cv_func_setgrent_void=yes" +LDFLAGS += "-Llib" +PARALLEL_MAKE = "" + +do_configure () { + ./configure \ + --disable-auth-pam \ + --build=${BUILD_SYS} \ + --host=${HOST_SYS} \ + --target=${TARGET_SYS} \ + --prefix=${D} \ + --includedir=/usr/include \ + ${EXTRA_OECONF} \ + $@; +} + +do_install () { + oe_runmake DESTDIR=${D} install +} + +pkg_postinst () { + # more chown's might be needed + chown root:root /usr/sbin/proftpd +} -- cgit v1.2.3 From bf59c40c3eccf42e098c7374e2bcfe7f2ec2f77d Mon Sep 17 00:00:00 2001 From: "Jader H. Silva" Date: Thu, 12 Mar 2009 10:10:12 -0300 Subject: Kernel bbclass "too many open files" bugfix tempfile.mkstemp() is used to create a temporary file. This function return a tuple with an OS file descriptor and a filename. Filename is stored in "tmpfile" but descriptor is not stored anywhere, but it is still open because it's only an integer to python so it is not closed at the end of the function. For each iteration in which this function is called, a new OS file descriptor is opened, but not closed. The solution is to store the file descriptor and close it. --- classes/kernel.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 86f00da5cf..4c1dbda35c 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -295,12 +295,14 @@ python populate_packages_prepend () { def extract_modinfo(file): import tempfile, os, re tempfile.tempdir = bb.data.getVar("WORKDIR", d, 1) - tmpfile = tempfile.mkstemp()[1] + tf = tempfile.mkstemp() + tmpfile = tf[1] cmd = "PATH=\"%s\" %sobjcopy -j .modinfo -O binary %s %s" % (bb.data.getVar("PATH", d, 1), bb.data.getVar("HOST_PREFIX", d, 1) or "", file, tmpfile) os.system(cmd) f = open(tmpfile) l = f.read().split("\000") f.close() + os.close(tf[0]) os.unlink(tmpfile) exp = re.compile("([^=]+)=(.*)") vals = {} -- cgit v1.2.3 From 5ad2cf5ec3d4a172bdb6b5e71d9e05917fd935ab Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Thu, 12 Mar 2009 19:19:01 +0100 Subject: proftpd: added missing make.patch --- packages/proftpd/files/make.patch | 51 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 packages/proftpd/files/make.patch diff --git a/packages/proftpd/files/make.patch b/packages/proftpd/files/make.patch new file mode 100644 index 0000000000..66ebf2ce89 --- /dev/null +++ b/packages/proftpd/files/make.patch @@ -0,0 +1,51 @@ +Index: proftpd-1.3.2/Makefile.in +=================================================================== +--- proftpd-1.3.2.orig/Makefile.in ++++ proftpd-1.3.2/Makefile.in +@@ -76,7 +76,6 @@ check: proftpd$(EXEEXT) + $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libdir)/proftpd $(DESTDIR)$(libexecdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(rundir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8: + @if [ ! -d $@ ]; then \ + mkdir -p $@; \ +- chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \ + chmod 0755 $@; \ + fi + +@@ -86,7 +85,6 @@ install-proftpd: proftpd $(DESTDIR)$(inc + rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \ + fi + ln -s proftpd $(DESTDIR)$(sbindir)/in.proftpd +- -chown -h $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(sbindir)/in.proftpd + + install-libs: $(DESTDIR)$(libdir)/proftpd + cd lib/ && $(MAKE) install +@@ -121,11 +119,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DE + $(INSTALL_SBIN) ftpshut $(DESTDIR)$(sbindir)/ftpshut + $(INSTALL_BIN) ftptop $(DESTDIR)$(bindir)/ftptop + $(INSTALL_BIN) ftpwho $(DESTDIR)$(bindir)/ftpwho +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs ++ $(INSTALL) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs + + install-conf: $(DESTDIR)$(sysconfdir) + if [ ! -f $(DESTDIR)$(sysconfdir)/proftpd.conf ] ; then \ +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 \ ++ $(INSTALL) -m 0644 \ + $(top_srcdir)/sample-configurations/basic.conf \ + $(DESTDIR)$(sysconfdir)/proftpd.conf ; \ + fi +Index: proftpd-1.3.2/Make.rules.in +=================================================================== +--- proftpd-1.3.2.orig/Make.rules.in ++++ proftpd-1.3.2/Make.rules.in +@@ -29,9 +29,9 @@ UTILS_LIBS=@UTILS_LIBS@ @LIBS@ + INSTALL=@INSTALL@ + INSTALL_USER=@install_user@ + INSTALL_GROUP=@install_group@ +-INSTALL_BIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 +-INSTALL_SBIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 +-INSTALL_MAN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 ++INSTALL_BIN=$(INSTALL) @INSTALL_STRIP@ -m 0755 ++INSTALL_SBIN=$(INSTALL) @INSTALL_STRIP@ -m 0755 ++INSTALL_MAN=$(INSTALL) -m 0644 + + RM=rm -f + SHELL=/bin/sh -- cgit v1.2.3 From 971a08f5570890efe12d1a1fbd71f5f166ffd0cc Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Thu, 12 Mar 2009 19:38:29 +0100 Subject: proftpd: fixed paths --- packages/proftpd/proftpd_1.3.2.bb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/proftpd/proftpd_1.3.2.bb b/packages/proftpd/proftpd_1.3.2.bb index 04ffacaf6b..1a9736dbf3 100644 --- a/packages/proftpd/proftpd_1.3.2.bb +++ b/packages/proftpd/proftpd_1.3.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Secure ftp daemon" SECTION = "console/network" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.nl.uu.net/pub/unix/ftp/proftpd/ftp/distrib/source/${PN}-${PV}.tar.gz \ file://make.patch;patch=1 \ @@ -18,10 +18,12 @@ do_configure () { --build=${BUILD_SYS} \ --host=${HOST_SYS} \ --target=${TARGET_SYS} \ - --prefix=${D} \ - --includedir=/usr/include \ - ${EXTRA_OECONF} \ - $@; + --prefix=/usr \ + --sysconfdir=/etc \ + --sharedstatedir=/com \ + --localstatedir=/var \ + ${EXTRA_OECONF} \ + $@; } do_install () { -- cgit v1.2.3 From 0bd2004ded71983d0cc555eb13efec27ebf4fe50 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Thu, 12 Mar 2009 21:49:49 +0100 Subject: preferred-om-2008-versions.inc: Update to version that are available --- conf/distro/include/preferred-om-2008-versions.inc | 27 +++++++++++----------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 538e0527d2..2c3b338cce 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -56,8 +56,8 @@ PREFERRED_VERSION_aumix ?= "2.8" PREFERRED_VERSION_autoconf ?= "2.61" PREFERRED_VERSION_autoconf-native ?= "2.61" PREFERRED_VERSION_autofs ?= "4.1.4" -PREFERRED_VERSION_automake ?= "1.10" -PREFERRED_VERSION_automake-native ?= "1.10" +PREFERRED_VERSION_automake ?= "1.10.2" +PREFERRED_VERSION_automake-native ?= "1.10.2" PREFERRED_VERSION_avahi ?= "0.6.22" PREFERRED_VERSION_avahi-python ?= "0.6.21" PREFERRED_VERSION_avahi-ui ?= "0.6.21" @@ -179,8 +179,8 @@ PREFERRED_VERSION_connman ?= "0.10" PREFERRED_VERSION_conserver ?= "8.1.14" PREFERRED_VERSION_console-tools ?= "0.3.2" PREFERRED_VERSION_contacts ?= "0.7" -PREFERRED_VERSION_coreutils ?= "5.3.0" -PREFERRED_VERSION_coreutils-native ?= "5.3.0" +PREFERRED_VERSION_coreutils ?= "7.1" +PREFERRED_VERSION_coreutils-native ?= "7.1" PREFERRED_VERSION_corkscrew ?= "2.0" PREFERRED_VERSION_corsair ?= "0.2.6" PREFERRED_VERSION_cpio ?= "2.5" @@ -536,7 +536,6 @@ PREFERRED_VERSION_gpe-edit ?= "0.40" PREFERRED_VERSION_gpe-expenses ?= "0.0.6" PREFERRED_VERSION_gpe-filemanager ?= "0.30" PREFERRED_VERSION_gpe-fsi ?= "0.1" -PREFERRED_VERSION_gpe-gallery ?= "0.97" PREFERRED_VERSION_gpe-go ?= "0.05" PREFERRED_VERSION_gpe-helpviewer ?= "1.0" PREFERRED_VERSION_gpe-icons ?= "0.25" @@ -589,7 +588,7 @@ PREFERRED_VERSION_gpicview ?= "0.1.5" PREFERRED_VERSION_gpm ?= "1.20.1" PREFERRED_VERSION_gpp ?= "2.21" PREFERRED_VERSION_gpsbabel ?= "1.3.3" -PREFERRED_VERSION_gpsd ?= "2.37" +PREFERRED_VERSION_gpsd ?= "2.38" PREFERRED_VERSION_gpsdrive ?= "2.10pre4" PREFERRED_VERSION_gpstk ?= "1.2" PREFERRED_VERSION_gqview ?= "2.1.1" @@ -606,16 +605,16 @@ PREFERRED_VERSION_gsoap ?= "2.7.7" PREFERRED_VERSION_gsoap-native ?= "2.7.7" PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6" PREFERRED_VERSION_gspcav1 ?= "20070110" -PREFERRED_VERSION_gst-ffmpeg ?= "0.10.2" +PREFERRED_VERSION_gst-ffmpeg ?= "0.10.6" PREFERRED_VERSION_gst-meta-base ?= "0.10" PREFERRED_VERSION_gst-plugin-pulse ?= "0.9.7" PREFERRED_VERSION_gst-plugins-bad ?= "0.10.6" -PREFERRED_VERSION_gst-plugins-base ?= "0.10.17" +PREFERRED_VERSION_gst-plugins-base ?= "0.10.22" PREFERRED_VERSION_gst-plugins-farsight ?= "0.10.1" -PREFERRED_VERSION_gst-plugins-good ?= "0.10.7" -PREFERRED_VERSION_gst-plugins-ugly ?= "0.10.7" +PREFERRED_VERSION_gst-plugins-good ?= "0.10.13" +PREFERRED_VERSION_gst-plugins-ugly ?= "0.10.10" PREFERRED_VERSION_gst-pulse = "0.9.7" -PREFERRED_VERSION_gstreamer ?= "0.10.17" +PREFERRED_VERSION_gstreamer ?= "0.10.22" PREFERRED_VERSION_gthumb ?= "2.6.9" PREFERRED_VERSION_gtk+ ?= "2.12.11" PREFERRED_VERSION_gtk2-ssh-askpass ?= "0.3" @@ -1928,8 +1927,8 @@ PREFERRED_VERSION_util-macros ?= "1.1.5" PREFERRED_VERSION_util-macros-native ?= "1.1.5" PREFERRED_VERSION_uucp ?= "1.07" PREFERRED_VERSION_v4l2apps ?= "20020317" -PREFERRED_VERSION_vala ?= "0.5.6" -PREFERRED_VERSION_vala-native ?= "0.5.6" +PREFERRED_VERSION_vala ?= "0.5.7" +PREFERRED_VERSION_vala-native ?= "0.5.7" PREFERRED_VERSION_vde ?= "2.0.2" PREFERRED_VERSION_vectoroids ?= "1.1.0" PREFERRED_VERSION_videoplayer ?= "0.1" @@ -1949,7 +1948,7 @@ PREFERRED_VERSION_void11 ?= "0.2.0" PREFERRED_VERSION_vorbis-tools ?= "1.0.1" PREFERRED_VERSION_vpnc ?= "0.3.3" PREFERRED_VERSION_vsftpd ?= "2.0.5" -PREFERRED_VERSION_vte ?= "0.16.13" +PREFERRED_VERSION_vte ?= "0.16.14" PREFERRED_VERSION_vtun ?= "2.6" PREFERRED_VERSION_w3cam ?= "0.7.2" PREFERRED_VERSION_wakelan ?= "1.1" -- cgit v1.2.3 From 5422d5ba5400acc1c08683c241b13475f6e06d49 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 12 Mar 2009 10:38:59 -0300 Subject: dm355-leopard: add board file for the dm355 leopard board --- conf/machine/dm355-leopard.conf | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 conf/machine/dm355-leopard.conf diff --git a/conf/machine/dm355-leopard.conf b/conf/machine/dm355-leopard.conf new file mode 100644 index 0000000000..a9699499b7 --- /dev/null +++ b/conf/machine/dm355-leopard.conf @@ -0,0 +1,19 @@ +#@TYPE: Machine +#@NAME: Leopard "beagle buddy" DM355 based IP cam board +#@DESCRIPTION: Machine configuration for the DM355 leopard board + +TARGET_ARCH = "arm" + +PREFERRED_PROVIDER_virtual/kernel = "linux-davinci" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" + +PREFERRED_VERSION_u-boot = "1.2.0" +UBOOT_MACHINE = "dm355_leopard_config" +UBOOT_ENTRYPOINT = "0x80008000" + +SERIAL_CONSOLE ?= "115200 ttyS0" + +MACHINE_FEATURES = "kernel26 alsa" + +require conf/machine/include/tune-arm926ejs.inc + -- cgit v1.2.3 From ca12f35c0611eab719c9e4cee282eccd928d5963 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 12 Mar 2009 11:13:10 -0300 Subject: u-boot 1.2.0: add support for dm355-leopard --- packages/u-boot/u-boot-1.2.0/dm355-leopard.diff | 48455 ++++++++++++++++++++++ packages/u-boot/u-boot_1.2.0.bb | 2 + 2 files changed, 48457 insertions(+) create mode 100644 packages/u-boot/u-boot-1.2.0/dm355-leopard.diff diff --git a/packages/u-boot/u-boot-1.2.0/dm355-leopard.diff b/packages/u-boot/u-boot-1.2.0/dm355-leopard.diff new file mode 100644 index 0000000000..b614522f42 --- /dev/null +++ b/packages/u-boot/u-boot-1.2.0/dm355-leopard.diff @@ -0,0 +1,48455 @@ + Makefile | 36 + board/davinci/Makefile | 47 + board/davinci/config.mk | 27 + board/davinci/davinci.c | 417 + + board/davinci/dm644x_emac.c | 491 + + board/davinci/dm644x_emac.h | 290 + board/davinci/flash.c | 686 + + board/davinci/flash_params.h | 319 + board/davinci/lowlevel_init.S | 764 ++ + board/davinci/nand.c | 111 + board/davinci/soc.h | 339 + board/davinci/timer.c | 73 + board/davinci/timer.h | 51 + board/davinci/types.h | 46 + board/davinci/u-boot.lds | 52 + board/dm355_evm/Makefile | 47 + board/dm355_evm/config.mk | 25 + board/dm355_evm/dm355_evm.c | 598 + + board/dm355_evm/flash.c | 758 ++ + board/dm355_evm/flash_params.h | 319 + board/dm355_evm/lowlevel_init.S | 766 ++ + board/dm355_evm/nand.c | 805 ++ + board/dm355_evm/timer.c | 72 + board/dm355_evm/timer.h | 51 + board/dm355_evm/types.h | 46 + board/dm355_evm/u-boot.lds | 52 + board/dm355_ipnc/Makefile | 47 + board/dm355_ipnc/config.mk | 25 + board/dm355_ipnc/dm355_ipnc.c | 671 + + board/dm355_ipnc/flash.c | 758 ++ + board/dm355_ipnc/flash_params.h | 319 + board/dm355_ipnc/lowlevel_init.S | 766 ++ + board/dm355_ipnc/nand.c | 830 ++ + board/dm355_ipnc/timer.c | 72 + board/dm355_ipnc/timer.h | 51 + board/dm355_ipnc/types.h | 46 + board/dm355_ipnc/u-boot.lds | 52 + board/dm355_leopard/Makefile | 47 + board/dm355_leopard/config.mk | 25 + board/dm355_leopard/dm355_leopard.c | 671 + + board/dm355_leopard/flash.c | 758 ++ + board/dm355_leopard/flash_params.h | 319 + board/dm355_leopard/lowlevel_init.S | 766 ++ + board/dm355_leopard/nand.c | 830 ++ + board/dm355_leopard/timer.c | 72 + board/dm355_leopard/timer.h | 51 + board/dm355_leopard/types.h | 46 + board/dm355_leopard/u-boot.lds | 52 + board/dm700/Makefile | 47 + board/dm700/config.mk | 26 + board/dm700/davinci_hd.c | 203 + board/dm700/dm646x_emac.c | 506 + + board/dm700/dm646x_emac.h | 321 + board/dm700/flash.c | 686 + + board/dm700/flash_params.h | 319 + board/dm700/lowlevel_init.S | 725 ++ + board/dm700/nand.c | 111 + board/dm700/soc.h | 349 + + board/dm700/timer.c | 73 + board/dm700/timer.h | 51 + board/dm700/types.h | 46 + board/dm700/u-boot.lds | 52 + common/cmd_nand.c | 11 + common/env_nand.c | 14 + cpu/arm926ejs/config.mk | 4 + cpu/arm926ejs/interrupts.c | 148 + cpu/arm926ejs/interrupts.c.orig | 191 + doc/README.SBC8560 | 57 + doc/README.sbc8560 | 53 + drivers/Makefile | 4 + drivers/davinci_i2c.c | 296 + drivers/davinci_i2c.h | 87 + drivers/dm9000.c | 370 + + drivers/dm9000.h | 181 + drivers/dm9000x.c | 124 + drivers/nand/nand_base.c | 1404 ++-- + drivers/nand/nand_bbt.c | 17 + drivers/nand/nand_ids.c | 44 + drivers/nand/nand_util.c | 3 + examples/hello_world.bin |binary + examples/hello_world.srec | 36 + include/asm-arm/arch-arm926ejs/emif_defs.h | 59 + include/asm-arm/arch-arm926ejs/nand_defs.h | 92 + include/asm-arm/arch-arm926ejs/types.h | 31 + include/asm-arm/arch/emif_defs.h | 59 + include/asm-arm/arch/nand_defs.h | 92 + include/asm-arm/arch/sizes.h | 51 + include/asm-arm/arch/types.h | 31 + include/asm-arm/proc/domain.h | 50 + include/asm-arm/proc/processor.h | 74 + include/asm-arm/proc/ptrace.h | 109 + include/asm-arm/proc/system.h | 199 + include/asm/arch-arm1136/bits.h | 48 + include/asm/arch-arm1136/clocks.h | 112 + include/asm/arch-arm1136/i2c.h | 107 + include/asm/arch-arm1136/mem.h | 156 + include/asm/arch-arm1136/mux.h | 158 + include/asm/arch-arm1136/omap2420.h | 221 + include/asm/arch-arm1136/sizes.h | 49 + include/asm/arch-arm1136/sys_info.h | 82 + include/asm/arch-arm1136/sys_proto.h | 54 + include/asm/arch-arm720t/hardware.h | 43 + include/asm/arch-arm720t/netarm_dma_module.h | 182 + include/asm/arch-arm720t/netarm_eni_module.h | 121 + include/asm/arch-arm720t/netarm_eth_module.h | 160 + include/asm/arch-arm720t/netarm_gen_module.h | 186 + include/asm/arch-arm720t/netarm_mem_module.h | 184 + include/asm/arch-arm720t/netarm_registers.h | 96 + include/asm/arch-arm720t/netarm_ser_module.h | 347 + include/asm/arch-arm720t/s3c4510b.h | 272 + include/asm/arch-arm925t/sizes.h | 50 + include/asm/arch-arm926ejs/emif_defs.h | 59 + include/asm/arch-arm926ejs/nand_defs.h | 92 + include/asm/arch-arm926ejs/sizes.h | 51 + include/asm/arch-arm926ejs/types.h | 31 + include/asm/arch-at91rm9200/AT91RM9200.h | 762 ++ + include/asm/arch-at91rm9200/hardware.h | 77 + include/asm/arch-imx/imx-regs.h | 577 + + include/asm/arch-ixp/ixp425.h | 543 + + include/asm/arch-ixp/ixp425pci.h | 312 + include/asm/arch-ks8695/platform.h | 306 + include/asm/arch-omap/sizes.h | 52 + include/asm/arch-pxa/bitfield.h | 112 + include/asm/arch-pxa/hardware.h | 158 + include/asm/arch-pxa/mmc.h | 200 + include/asm/arch-pxa/pxa-regs.h | 2399 ++++++ + include/asm/arch-s3c24x0/memory.h | 162 + include/asm/arch-s3c44b0/hardware.h | 281 + include/asm/arch-sa1100/bitfield.h | 112 + include/asm/arch/emif_defs.h | 59 + include/asm/arch/nand_defs.h | 92 + include/asm/arch/sizes.h | 51 + include/asm/arch/types.h | 31 + include/asm/atomic.h | 113 + include/asm/bitops.h | 144 + include/asm/byteorder.h | 32 + include/asm/errno.h | 138 + include/asm/global_data.h | 66 + include/asm/hardware.h | 18 + include/asm/io.h | 307 + include/asm/mach-types.h | 9415 +++++++++++++++++++++++++++ + include/asm/memory.h | 137 + include/asm/posix_types.h | 79 + include/asm/proc-armv/domain.h | 50 + include/asm/proc-armv/processor.h | 74 + include/asm/proc-armv/ptrace.h | 109 + include/asm/proc-armv/system.h | 199 + include/asm/proc/domain.h | 50 + include/asm/proc/processor.h | 74 + include/asm/proc/ptrace.h | 109 + include/asm/proc/system.h | 199 + include/asm/processor.h | 134 + include/asm/ptrace.h | 33 + include/asm/setup.h | 269 + include/asm/sizes.h | 52 + include/asm/string.h | 47 + include/asm/types.h | 50 + include/asm/u-boot-arm.h | 62 + include/asm/u-boot.h | 60 + include/config.h | 2 + include/config.mk | 3 + include/configs/SBC8560.h | 410 - + include/configs/davinci.h | 222 + include/configs/dm355_evm.h | 227 + include/configs/dm355_ipnc.h | 234 + include/configs/dm355_leopard.h | 234 + include/configs/dm700.h | 204 + include/configs/omap2420h4.h | 2 + include/configs/sbc8560.h | 408 + + include/flash.h | 2 + include/linux/mtd/nand.h | 190 + include/linux/mtd/nand_ids.h | 1 + include/version_autogenerated.h | 1 + lib_arm/board.c | 8 + tools/crc32.c | 198 + tools/environment.c | 214 + 176 files changed, 44713 insertions(+), 982 deletions(-) +diff -Nurd u-boot-1.2.0/Makefile u-boot-1.2.0-leopard/Makefile +--- u-boot-1.2.0/Makefile 2007-01-06 20:13:11.000000000 -0300 ++++ u-boot-1.2.0-leopard/Makefile 2009-03-10 02:16:35.000000000 -0300 +@@ -125,7 +125,7 @@ + CROSS_COMPILE = powerpc-linux- + endif + ifeq ($(ARCH),arm) +-CROSS_COMPILE = arm-linux- ++CROSS_COMPILE = arm_v5t_le- + endif + ifeq ($(ARCH),i386) + ifeq ($(HOSTARCH),i386) +@@ -233,10 +233,12 @@ + __OBJS := $(subst $(obj),,$(OBJS)) + __LIBS := $(subst $(obj),,$(LIBS)) + ++U-BOOT = u-boot-1.2.0-$(BOARD).bin ++ + ######################################################################### + ######################################################################### + +-ALL = $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map $(U_BOOT_NAND) ++ALL = $(obj)u-boot.srec $(obj)$(U-BOOT) $(obj)System.map $(U_BOOT_NAND) + + all: $(ALL) + +@@ -249,7 +251,10 @@ + $(obj)u-boot.bin: $(obj)u-boot + $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@ + +-$(obj)u-boot.img: $(obj)u-boot.bin ++$(obj)$(U-BOOT): $(obj)u-boot ++ $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@ ++ ++$(obj)u-boot.img: $(obj)$(U-BOOT) + ./tools/mkimage -A $(ARCH) -T firmware -C none \ + -a $(TEXT_BASE) -e 0 \ + -n $(shell sed -n -e 's/.*U_BOOT_VERSION//p' $(VERSION_FILE) | \ +@@ -277,8 +282,8 @@ + $(NAND_SPL): version + $(MAKE) -C nand_spl/board/$(BOARDDIR) all + +-$(U_BOOT_NAND): $(NAND_SPL) $(obj)u-boot.bin +- cat $(obj)nand_spl/u-boot-spl-16k.bin $(obj)u-boot.bin > $(obj)u-boot-nand.bin ++$(U_BOOT_NAND): $(NAND_SPL) $(obj)$(U-BOOT) ++ cat $(obj)nand_spl/u-boot-spl-16k.bin $(obj)$(U-BOOT) > $(obj)u-boot-nand.bin + + version: + @echo -n "#define U_BOOT_VERSION \"U-Boot " > $(VERSION_FILE); \ +@@ -320,7 +325,7 @@ + + ######################################################################### + else +-all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \ ++all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)$(U-BOOT) \ + $(obj)u-boot.img $(obj)u-boot.dis $(obj)u-boot \ + $(SUBDIRS) version gdbtools updater env depend \ + dep tags ctags etags $(obj)System.map: +@@ -336,7 +341,7 @@ + ######################################################################### + + unconfig: +- @rm -f $(obj)include/config.h $(obj)include/config.mk \ ++ @rm -rf $(obj)include/config.h $(obj)include/config.mk \ + $(obj)board/*/config.tmp $(obj)board/*/*/config.tmp + + #======================================================================== +@@ -1858,6 +1863,21 @@ + mx1fs2_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm920t mx1fs2 NULL imx + ++davinci_config : unconfig ++ @$(MKCONFIG) $(@:_config=) arm arm926ejs davinci ++ ++dm700_config : unconfig ++ @$(MKCONFIG) $(@:_config=) arm arm926ejs dm700 ++ ++dm355_evm_config : unconfig ++ @$(MKCONFIG) $(@:_config=) arm arm926ejs dm355_evm ++ ++dm355_ipnc_config : unconfig ++ @$(MKCONFIG) $(@:_config=) arm arm926ejs dm355_ipnc ++ ++dm355_leopard_config: unconfig ++ @$(MKCONFIG) $(@:_config=) arm arm926ejs dm355_leopard ++ + netstar_32_config \ + netstar_config: unconfig + @mkdir -p $(obj)include +@@ -2333,7 +2353,7 @@ + rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL) + rm -f $(obj)tools/crc32.c $(obj)tools/environment.c $(obj)tools/env/crc32.c + rm -f $(obj)tools/inca-swap-bytes $(obj)cpu/mpc824x/bedbug_603e.c +- rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm ++ rm -rf $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm + [ ! -d $(OBJTREE)/nand_spl ] || find $(obj)nand_spl -lname "*" -print | xargs rm -f + + ifeq ($(OBJTREE),$(SRCTREE)) +diff -Nurd u-boot-1.2.0/board/davinci/Makefile u-boot-1.2.0-leopard/board/davinci/Makefile +--- u-boot-1.2.0/board/davinci/Makefile 1969-12-31 21:00:00.000000000 -0300 ++++ u-boot-1.2.0-leopard/board/davinci/Makefile 2007-12-04 07:50:28.000000000 -0300 +@@ -0,0 +1,47 @@ ++# ++# (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 = lib$(BOARD).a ++ ++OBJS := davinci.o flash.o timer.o dm644x_emac.o nand.o ++SOBJS := lowlevel_init.o ++ ++$(LIB): $(OBJS) $(SOBJS) ++ $(AR) crv $@ $^ ++ ++clean: ++ rm -f $(SOBJS) $(OBJS) ++ ++distclean: clean ++ rm -f $(LIB) core *.bak .depend ++ ++######################################################################### ++ ++.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c) ++ $(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@ ++ ++-include .depend ++ ++######################################################################### +diff -Nurd u-boot-1.2.0/board/davinci/config.mk u-boot-1.2.0-leopard/board/davinci/config.mk +--- u-boot-1.2.0/board/davinci/config.mk 1969-12-31 21:00:00.000000000 -0300 ++++ u-boot-1.2.0-leopard/board/davinci/config.mk 2007-12-04 07:50:28.000000000 -0300 +@@ -0,0 +1,27 @@ ++# ++# (C) Copyright 2002 ++# Gary Jennejohn, DENX Software Engineering, ++# David Mueller, ELSOFT AG, ++# ++# (C) Copyright 2003 ++# Texas Instruments, ++# Swaminathan ++# ++# Davinci EVM board (ARM925EJS) cpu ++# see http://www.ti.com/ for more information on Texas Instruments ++# ++# Davinci EVM has 1 bank of 256 MB DDR RAM ++# Physical Address: ++# 8000'0000 to 9000'0000 ++# ++# ++# Linux-Kernel is expected to be at 8000'8000, entry 8000'8000 ++# (mem base + reserved) ++# ++# we load ourself to 8100 '0000 ++# ++# ++ ++#Provide a atleast 16MB spacing between us and the Linux Kernel image ++TEXT_BASE = 0x81080000 ++BOARDLIBS = drivers/nand/libnand.a +diff -Nurd u-boot-1.2.0/board/davinci/davinci.c u-boot-1.2.0-leopard/board/davinci/davinci.c +--- u-boot-1.2.0/board/davinci/davinci.c 1969-12-31 21:00:00.000000000 -0300 ++++ u-boot-1.2.0-leopard/board/davinci/davinci.c 2007-12-04 07:50:28.000000000 -0300 +@@ -0,0 +1,417 @@ ++/* ++ * ++ * Copyright (C) 2004 Texas Instruments. ++ * ++ * ---------------------------------------------------------------------------- ++ * ++ * 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., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ---------------------------------------------------------------------------- ++ Modifications: ++ ver. 1.0: Oct 2005, Swaminathan S ++ * ++ */ ++ ++#include ++#include ++ ++#if 0 ++void flash__init (void); ++void ether__init (void); ++#endif ++#define PLL1_PLLM *(volatile unsigned int *)0x01c40910 ++#define PLL2_PLLM *(volatile unsigned int *)0x01c40D10 ++#define PLL2_DIV2 *(volatile unsigned char *)0x01c40D1C ++ ++void davinci_psc_all_enable(void); ++ ++/******************************************* ++ Routine: delay ++ Description: Delay function ++*******************************************/ ++static inline void delay (unsigned long loops) ++{ ++ __asm__ volatile ("1:\n" ++ "subs %0, %1, #1\n" ++ "bne 1b":"=r" (loops):"0" (loops)); ++} ++ ++/******************************************* ++ Routine: board_init ++ Description: Board Initialization routine ++*******************************************/ ++int board_init (void) ++{ ++ DECLARE_GLOBAL_DATA_PTR; ++ ++ /* arch number of DaVinci DVDP-Board */ ++ gd->bd->bi_arch_number = 901; ++ ++ /* adress of boot parameters */ ++ gd->bd->bi_boot_params = LINUX_BOOT_PARAM_ADDR; ++ /* Configure MUX settings */ ++ ++ /* Power on required peripherals */ ++ davinci_psc_all_enable(); ++#if 0 ++ /* this speeds up your boot a quite a bit. However to make it ++ * work, you need make sure your kernel startup flush bug is fixed. ++ * ... rkw ... ++ */ ++ icache_enable (); ++#endif ++ inittimer (); ++ ++ return 0; ++} ++ ++/* PSC Domains */ ++#define LPSC_VPSSMSTR 0 // VPSS Master LPSC ++#define LPSC_VPSSSLV 1 // VPSS Slave LPSC ++#define LPSC_TPCC 2 // TPCC LPSC ++#define LPSC_TPTC0 3 // TPTC0 LPSC ++#define LPSC_TPTC1 4 // TPTC1 LPSC ++#define LPSC_EMAC 5 // EMAC LPSC ++#define LPSC_EMAC_WRAPPER 6 // EMAC WRAPPER LPSC ++#define LPSC_MDIO 7 // MDIO LPSC ++#define LPSC_IEEE1394 8 // IEEE1394 LPSC ++#define LPSC_USB 9 // USB LPSC ++#define LPSC_ATA 10 // ATA LPSC ++#define LPSC_VLYNQ 11 // VLYNQ LPSC ++#define LPSC_UHPI 12 // UHPI LPSC ++#define LPSC_DDR_EMIF 13 // DDR_EMIF LPSC ++#define LPSC_AEMIF 14 // AEMIF LPSC ++#define LPSC_MMC_SD 15 // MMC_SD LPSC ++#define LPSC_MEMSTICK 16 // MEMSTICK LPSC ++#define LPSC_McBSP 17 // McBSP LPSC ++#define LPSC_I2C 18 // I2C LPSC ++#define LPSC_UART0 19 // UART0 LPSC ++#define LPSC_UART1 20 // UART1 LPSC ++#define LPSC_UART2 21 // UART2 LPSC ++#define LPSC_SPI 22 // SPI LPSC ++#define LPSC_PWM0 23 // PWM0 LPSC ++#define LPSC_PWM1 24 // PWM1 LPSC ++#define LPSC_PWM2 25 // PWM2 LPSC ++#define LPSC_GPIO 26 // GPIO LPSC ++#define LPSC_TIMER0 27 // TIMER0 LPSC ++#define LPSC_TIMER1 28 // TIMER1 LPSC ++#define LPSC_TIMER2 29 // TIMER2 LPSC ++#define LPSC_SYSTEM_SUBSYS 30 // SYSTEM SUBSYSTEM LPSC ++#define LPSC_ARM 31 // ARM LPSC ++#define LPSC_SCR2 32 // SCR2 LPSC ++#define LPSC_SCR3 33 // SCR3 LPSC ++#define LPSC_SCR4 34 // SCR4 LPSC ++#define LPSC_CROSSBAR 35 // CROSSBAR LPSC ++#define LPSC_CFG27 36 // CFG27 LPSC ++#define LPSC_CFG3 37 // CFG3 LPSC ++#define LPSC_CFG5 38 // CFG5 LPSC ++#define LPSC_GEM 39 // GEM LPSC ++#define LPSC_IMCOP 40 // IMCOP LPSC ++ ++#define CHP_SHRTSW *( volatile unsigned int* )( 0x01C40038 ) ++#define GBLCTL *( volatile unsigned int* )( 0x01C41010 ) ++#define EPCPR *( volatile unsigned int* )( 0x01C41070 ) ++#define EPCCR *( volatile unsigned int* )( 0x01C41078 ) ++#define PTCMD *( volatile unsigned int* )( 0x01C41120 ) ++#define PTSTAT *( volatile unsigned int* )( 0x01C41128 ) ++#define PDSTAT *( volatile unsigned int* )( 0x01C41200 ) ++#define PDSTAT1 *( volatile unsigned int* )( 0x01C41204 ) ++#define PDCTL *( volatile unsigned int* )( 0x01C41300 ) ++#define PDCTL1 *( volatile unsigned int* )( 0x01C41304 ) ++#define VBPR *( volatile unsigned int* )( 0x20000020 ) ++ ++/************************************** ++ Routine: board_setup_psc_on ++ Description: Enable a PSC domain ++**************************************/ ++void board_setup_psc_on( unsigned int domain, unsigned int id ) ++{ ++ volatile unsigned int* mdstat = ( unsigned int* )( 0x01C41800 + 4 * id ); ++ volatile unsigned int* mdctl = ( unsigned int* )( 0x01C41A00 + 4 * id ); ++ ++ *mdctl |= 0x00000003; // Set PowerDomain to turn on ++ ++ if ( ( PDSTAT & 0x00000001 ) == 0 ) ++ { ++ PDCTL1 |= 0x1; ++ PTCMD = ( 1 << domain ); ++ while ( ( ( ( EPCPR >> domain ) & 1 ) == 0 ) ); ++ ++ PDCTL1 |= 0x100 ; ++ while( ! ( ( ( PTSTAT >> domain ) & 1 ) == 0 ) ); ++ } ++ else ++ { ++ PTCMD = ( 1<> domain ) & 1 ) == 0 ) ); ++ } ++ ++ while( ! ( ( *mdstat & 0x0000001F ) == 0x3 ) ); ++} ++ ++/************************************** ++ Routine: davinci_psc_all_enable ++ Description: Enable all PSC domains ++**************************************/ ++void davinci_psc_all_enable(void) ++{ ++#define PSC_ADDR 0x01C41000 ++#define PTCMD (PSC_ADDR+0x120) ++#define PTSTAT (PSC_ADDR+0x128) ++ ++ unsigned int alwaysOnPdNum = 0, dspPdNum = 1, i; ++ int waiting; ++ unsigned int state; ++ ++ /* This function turns on all clocks in the ALWAYSON and DSP Power ++ * Domains. Note this function assumes that the Power Domains are ++ * already on. ++ */ ++#if 0 ++ /* Write ENABLE (0x3) to all 41 MDCTL[i].NEXT bit fields. */ ++ for( i = 0; i < 41; i++){ ++ *(volatile unsigned int*) (PSC_ADDR+0xA00+4*i) = ++ *(volatile unsigned int*) (PSC_ADDR+0xA00+4*i) | 0x3; ++ } ++ ++ /* For special workaround: Set MDCTL[i].EMURSTIE to 0x1 for all of the ++ * following Modules. VPSSSLV, EMAC, EMACCTRL, MDIO, USB, ATA, VLYNQ, ++ * HPI, DDREMIF, AEMIF, MMCSD, MEMSTICK, ASP, GPIO, IMCOP. ++ */ ++ /**(unsigned int*) (PSC_ADDR+0xA00+4*1) = *(unsigned int*) (PSC_ADDR+0xA00+4*1) | 0x203;*/ ++ *(unsigned int*) (PSC_ADDR+0xA00+4*5) = *(unsigned int*) (PSC_ADDR+0xA00+4*5) | 0x203; ++ *(unsigned int*) (PSC_ADDR+0xA00+4*6) = *(unsigned int*) (PSC_ADDR+0xA00+4*6) | 0x203; ++ *(unsigned int*) (PSC_ADDR+0xA00+4*7) = *(unsigned int*) (PSC_ADDR+0xA00+4*7) | 0x203; ++ /**(unsigned int*) (PSC_ADDR+0xA00+4*9) = *(unsigned int*) (PSC_ADDR+0xA00+4*9) | 0x203; ++ *(unsigned int*) (PSC_ADDR+0xA00+4*10) = *(unsigned int*) (PSC_ADDR+0xA00+4*10) | 0x203; ++ *(unsigned int*) (PSC_ADDR+0xA00+4*11) = *(unsigned int*) (PSC_ADDR+0xA00+4*11) | 0x203; ++ *(unsigned int*) (PSC_ADDR+0xA00+4*12) = *(unsigned int*) (PSC_ADDR+0xA00+4*12) | 0x203;*/ ++ *(unsigned int*) (PSC_ADDR+0xA00+4*13) = *(unsigned int*) (PSC_ADDR+0xA00+4*13) | 0x203; ++ *(unsigned int*) (PSC_ADDR+0xA00+4*14) = *(unsigned int*) (PSC_ADDR+0xA00+4*14) | 0x203; ++ /**(unsigned int*) (PSC_ADDR+0xA00+4*15) = *(unsigned int*) (PSC_ADDR+0xA00+4*15) | 0x203; ++ *(unsigned int*) (PSC_ADDR+0xA00+4*16) = *(unsigned int*) (PSC_ADDR+0xA00+4*16) | 0x203; ++ *(unsigned int*) (PSC_ADDR+0xA00+4*17) = *(unsigned int*) (PSC_ADDR+0xA00+4*17) | 0x203;*/ ++ *(unsigned int*) (PSC_ADDR+0xA00+4*19) = *(unsigned int*) (PSC_ADDR+0xA00+4*19) | 0x203; ++ /**(unsigned int*) (PSC_ADDR+0xA00+4*26) = *(unsigned int*) (PSC_ADDR+0xA00+4*26) | 0x203; ++ *(unsigned int*) (PSC_ADDR+0xA00+4*40) = *(unsigned int*) (PSC_ADDR+0xA00+4*40) | 0x203;*/ ++#endif ++ ++ /* For special workaround: Clear MDCTL[i].EMURSTIE to 0x0 for all of the following Modules. ++ * VPSSSLV, EMAC, EMACCTRL, MDIO, USB, ATA, VLYNQ, ++ * HPI, DDREMIF, AEMIF, MMCSD, MEMSTICK, ASP, GPIO, IMCOP. ++ */ ++ /**(unsigned int*) (PSC_ADDR+0xA00+4*1) = *(unsigned int*) (PSC_ADDR+0xA00+4*1) & 0x003;*/ ++ *(volatile unsigned int*) (PSC_ADDR+0xA00+4*5) = *(unsigned int*) (PSC_ADDR+0xA00+4*5) | 0x003; ++ *(volatile unsigned int*) (PSC_ADDR+0xA00+4*6) = *(unsigned int*) (PSC_ADDR+0xA00+4*6) | 0x003; ++ *(volatile unsigned int*) (PSC_ADDR+0xA00+4*7) = *(unsigned int*) (PSC_ADDR+0xA00+4*7) | 0x003; ++ /**(unsigned int*) (PSC_ADDR+0xA00+4*9) = *(unsigned int*) (PSC_ADDR+0xA00+4*9) & 0x003; ++ *(unsigned int*) (PSC_ADDR+0xA00+4*10) = *(unsigned int*) (PSC_ADDR+0xA00+4*10) & 0x003; ++ *(unsigned int*) (PSC_ADDR+0xA00+4*11) = *(unsigned int*) (PSC_ADDR+0xA00+4*11) & 0x003; ++ *(unsigned int*) (PSC_ADDR+0xA00+4*12) = *(unsigned int*) (PSC_ADDR+0xA00+4*12) & 0x003;*/ ++ *(volatile unsigned int*) (PSC_ADDR+0xA00+4*13) = *(unsigned int*) (PSC_ADDR+0xA00+4*13) | 0x003; ++ *(volatile unsigned int*) (PSC_ADDR+0xA00+4*14) = *(unsigned int*) (PSC_ADDR+0xA00+4*14) | 0x003; ++ /**(unsigned int*) (PSC_ADDR+0xA00+4*15) = *(unsigned int*) (PSC_ADDR+0xA00+4*15) & 0x003; ++ *(unsigned int*) (PSC_ADDR+0xA00+4*16) = *(unsigned int*) (PSC_ADDR+0xA00+4*16) & 0x003; ++ *(unsigned int*) (PSC_ADDR+0xA00+4*17) = *(unsigned int*) (PSC_ADDR+0xA00+4*17) & 0x003;*/ ++ *(volatile unsigned int*) (PSC_ADDR+0xA00+4*19) = *(unsigned int*) (PSC_ADDR+0xA00+4*19) | 0x003; ++ *(volatile unsigned int*) (PSC_ADDR+0xA00+4*18) = *(unsigned int*) (PSC_ADDR+0xA00+4*18) | 0x003; ++ *(volatile unsigned int*) (PSC_ADDR+0xA00+4*28) = *(unsigned int*) (PSC_ADDR+0xA00+4*28) | 0x003; ++ /**(unsigned int*) (PSC_ADDR+0xA00+4*26) = *(unsigned int*) (PSC_ADDR+0xA00+4*26) & 0x003; ++ *(unsigned int*) (PSC_ADDR+0xA00+4*40) = *(unsigned int*) (PSC_ADDR+0xA00+4*40) & 0x003;*/ ++ ++ /* Set PTCMD.GO0 to 0x1 to initiate the state transtion for Modules in ++ * the ALWAYSON Power Domain ++ */ ++ *(volatile unsigned int*) PTCMD = (1<> alwaysOnPdNum) & 0x00000001) == 0)); ++ ++ /* DO GEM AND IMCOP INITIALIZATION, ONLY IF DSP POWER DOMAIN IS OFF... */