diff --git a/README b/README index 133cd937c..d371aac32 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -This just a simple set of scripts to rebuild a known working kernel for ARM devices.. +This just a simple set of scripts to rebuild a known working kernel for omap devices.. Script Bugs: "bugs@rcn-ee.com" diff --git a/build_deb.sh b/build_deb.sh index ed7ce37ba..077d64169 100755 --- a/build_deb.sh +++ b/build_deb.sh @@ -96,7 +96,7 @@ function make_dtbs_pkg { cd ${DIR}/ } -/bin/bash -e ${DIR}/tools/host_det.sh || { exit 1 ; } + /bin/bash -e ${DIR}/tools/host_det.sh || { exit 1 ; } if [ -e ${DIR}/system.sh ] ; then unset CC @@ -105,12 +105,18 @@ if [ -e ${DIR}/system.sh ] ; then unset LINUX_GIT unset LOCAL_PATCH_DIR source ${DIR}/system.sh - /bin/bash -e "${DIR}/scripts/gcc.sh" || { exit 1 ; } source ${DIR}/version.sh export LINUX_GIT export LATEST_GIT + if [ "x${GCC_OVERRIDE}" != "x" ] ; then + GCC="${GCC_OVERRIDE}" + fi + echo "" + echo "Debug: using $(LC_ALL=C ${CC}gcc --version)" + echo "" + if [ "${LATEST_GIT}" ] ; then echo "" echo "Warning LATEST_GIT is enabled from system.sh I hope you know what your doing.." @@ -122,7 +128,7 @@ if [ -e ${DIR}/system.sh ] ; then CONFIG_DEBUG_SECTION="CONFIG_DEBUG_SECTION_MISMATCH=y" fi - /bin/bash -e "${DIR}/scripts/git.sh" || { exit 1 ; } + /bin/bash -e "${DIR}/scripts/git.sh" patch_kernel copy_defconfig make_menuconfig diff --git a/build_kernel.sh b/build_kernel.sh index bf0e004e2..03d08397d 100755 --- a/build_kernel.sh +++ b/build_kernel.sh @@ -147,7 +147,7 @@ function make_headers_pkg { cd ${DIR}/ } -/bin/bash -e ${DIR}/tools/host_det.sh || { exit 1 ; } + /bin/bash -e ${DIR}/tools/host_det.sh || { exit 1 ; } if [ -e ${DIR}/system.sh ] ; then unset CC @@ -156,12 +156,18 @@ if [ -e ${DIR}/system.sh ] ; then unset LINUX_GIT unset LOCAL_PATCH_DIR source ${DIR}/system.sh - /bin/bash -e "${DIR}/scripts/gcc.sh" || { exit 1 ; } source ${DIR}/version.sh export LINUX_GIT export LATEST_GIT + if [ "x${GCC_OVERRIDE}" != "x" ] ; then + GCC="${GCC_OVERRIDE}" + fi + echo "" + echo "Debug: using $(LC_ALL=C ${CC}gcc --version)" + echo "" + if [ "${LATEST_GIT}" ] ; then echo "" echo "Warning LATEST_GIT is enabled from system.sh I hope you know what your doing.." @@ -173,7 +179,7 @@ if [ -e ${DIR}/system.sh ] ; then CONFIG_DEBUG_SECTION="CONFIG_DEBUG_SECTION_MISMATCH=y" fi - /bin/bash -e "${DIR}/scripts/git.sh" || { exit 1 ; } + /bin/bash -e "${DIR}/scripts/git.sh" patch_kernel copy_defconfig make_menuconfig diff --git a/create_dsp_package.sh b/create_dsp_package.sh index d185b2b6e..355309dd1 100755 --- a/create_dsp_package.sh +++ b/create_dsp_package.sh @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -VERSION="v2012.02-1" +VERSION="v2012.06-0" unset BUILD unset CC @@ -82,7 +82,7 @@ cat > ${DIR}/DSP/opt/dsp < -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -VERSION="v2012.08-1" - -unset DIR - -DIR=$PWD - -if [ $(uname -m) == "armv7l" ] ; then - echo "ERROR: This script can only be run on an x86 system. (TI *.bin is an x86 executable)" - exit -fi - -# Check if the host is X86_64 -PLATFORM=$(uname -m 2>/dev/null) -if [ "$PLATFORM" == "x86_64" ]; then - echo "Note: on the x86_64 platform, this script needs (ia32-libs)..." - echo "--------------------------------------------------------------" -fi - -#SGX_VERSION=3_01_00_06 -#SGX_VERSION=3_01_00_07 -#SGX_BIN_NAME="OMAP35x_Graphics_SDK_setuplinux" - -#SGX_VERSION=4_00_00_01 -#SGX_VERSION=4_03_00_01 -SGX_VERSION=4_03_00_02 -SGX_BIN_NAME="Graphics_SDK_setuplinux" - -SGX_BIN=${SGX_BIN_NAME}_${SGX_VERSION}.bin -TAROPTS="--owner=root --group=root" - -rm -rf ${DIR}/SDK/ || true -mkdir -p ${DIR}/SDK/ -mkdir -p ${DIR}/SDK_BIN/ - -function sgx_setup { -if [ -e ${DIR}/${SGX_BIN} ]; then - echo "${SGX_BIN} found" - if [ -e ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/Makefile ]; then - echo "Extracted ${SGX_BIN} found" - echo "" - else - echo "${SGX_BIN} needs to be executable" - echo "" - chmod +x ${DIR}/${SGX_BIN} - echo "running ${SGX_BIN}" - echo "" - ${DIR}/${SGX_BIN} --mode console --prefix ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION} < ${DIR}/SDK/libs/opt/pvr </dev/null - rmmod omaplfb 2>/dev/null - rmmod pvrsrvkm 2>/dev/null -fi - -if [ "\$1" = "stop" ]; then - exit 0 -fi - -echo Starting PVR -modprobe omaplfb -modprobe bufferclass_ti - -pvr_maj=\$(grep "pvrsrvkm$" /proc/devices | cut -b1,2,3) -bc_maj=\$(grep "bc" /proc/devices | cut -b1,2,3) - -if [ -e /dev/pvrsrvkm ] ; then - rm -f /dev/pvrsrvkm -fi - -mknod /dev/pvrsrvkm c \$pvr_maj 0 -chmod 666 /dev/pvrsrvkm - -touch /etc/powervr-esrev - -SAVED_ESREVISION="\$(cat /etc/powervr-esrev)" - -devmem2 0x48004B48 w 0x2 > /dev/null -devmem2 0x48004B10 w 0x1 > /dev/null -devmem2 0x48004B00 w 0x2 > /dev/null - -ES_REVISION="\$(devmem2 0x50000014 | sed -e s:0x10205:5: -e s:0x10201:3: -e s:0x10003:2: | tail -n1 | awk -F': ' '{print \$2}')" - -if [ "\${ES_REVISION}" != "\${SAVED_ESREVISION}" ] ; then - - echo -n "Starting SGX fixup for" - echo " ES\${ES_REVISION}.x" - cp -a /usr/lib/ES\${ES_REVISION}.0/* /usr/lib - cp -a /usr/bin/ES\${ES_REVISION}.0/* /usr/bin - echo "\${ES_REVISION}" > /etc/powervr-esrev -fi - -/usr/bin/pvrsrvinit - -pvrscript - -} - -function file-install-SGX { - -cat > ${DIR}/SDK/install-SGX.sh </dev/null 2>&1 && [ "\$(lsb_release -is)" = Ubuntu ]; then - - if [ ! \$(which devmem2) ];then - if [ -f /devmem2*_armel.deb ] ; then - sudo dpkg -i /devmem2*_armel.deb - fi - fi - - if [ -f /devmem2*_armel.deb ] ; then - sudo rm -f /devmem2*_armel.deb - fi - - if [ \$(lsb_release -sc) == "jaunty" ]; then - sudo cp /opt/pvr /etc/rcS.d/S60pvr.sh - sudo chmod +x /etc/rcS.d/S60pvr.sh - else - #karmic/lucid/maverick/natty etc - sudo update-rc.d -f pvr remove - if [ -f /etc/init.d/pvr ] ; then - sudo rm -f /etc/init.d/pvr || true - fi - sudo cp /opt/pvr /etc/init.d/pvr - sudo chmod +x /etc/init.d/pvr - sudo update-rc.d pvr defaults - fi - - else - - sudo cp /opt/pvr /etc/init.d/pvr - sudo chmod +x /etc/init.d/pvr - sudo update-rc.d pvr defaults - - fi - - else - echo "target_libs.tar.gz is missing" - exit - fi - -else - echo "This script is to be run on an armv7 platform" - exit -fi - -installSGX - -} - -function file-run-SGX { - -cat > ${DIR}/SDK/run-SGX.sh </dev/null 2>&1 && [ "\$(lsb_release -is)" = Ubuntu ]; then - if [ \$(lsb_release -sc) == "jaunty" ]; then - sudo /etc/rcS.d/S60pvr.sh restart - else - sudo /etc/init.d/pvr restart - fi - else - sudo /etc/init.d/pvr restart - fi - -else - echo "This script is to be run on an armv7 platform" - exit -fi - -runSGX - -} - -function copy_sgx_system_files { - rm -rf ${DIR}/SDK/ - mkdir -p ${DIR}/SDK/libs/usr/lib/ES2.0 - mkdir -p ${DIR}/SDK/libs/usr/bin/ES2.0 - - mkdir -p ${DIR}/SDK/libs/usr/lib/ES3.0 - mkdir -p ${DIR}/SDK/libs/usr/bin/ES3.0 - - mkdir -p ${DIR}/SDK/libs/usr/lib/ES5.0 - mkdir -p ${DIR}/SDK/libs/usr/bin/ES5.0 - - mkdir -p ${DIR}/SDK/libs/opt/ - - #Copy all Libaries - FILE_PREFIX="*.so*" - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es2.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/lib/ES2.0 - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es3.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/lib/ES3.0 - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es5.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/lib/ES5.0 - - FILE_PREFIX="*.a" - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es2.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/lib/ES2.0 - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es3.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/lib/ES3.0 - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es5.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/lib/ES5.0 - - FILE_PREFIX="*_test" - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es2.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/bin/ES2.0 - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es3.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/bin/ES3.0 - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es5.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/bin/ES5.0 - - FILE_PREFIX="*gl*" - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es2.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/bin/ES2.0 - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es3.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/bin/ES3.0 - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es5.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/bin/ES5.0 - - FILE_PREFIX="p[dv]*" - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es2.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/bin/ES2.0 - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es3.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/bin/ES3.0 - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es5.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/bin/ES5.0 - - FILE_PREFIX="xgle*" - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es2.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/bin/ES2.0 - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es3.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/bin/ES3.0 - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es5.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/bin/ES5.0 - -file-pvr-startup - - cd ${DIR}/SDK/libs - - #download devmem2 - rm -f /tmp/index.html || true - wget --directory-prefix=/tmp http://ports.ubuntu.com/pool/universe/d/devmem2/ - DEVMEM2=$(cat /tmp/index.html | grep _armel.deb | head -1 | awk -F"\"" '{print $8}') - wget -c http://ports.ubuntu.com/pool/universe/d/devmem2/${DEVMEM2} - - tar czf ${DIR}/SDK/target_libs.tar.gz $TAROPTS * - cd ${DIR} - rm -rf ${DIR}/SDK/libs || true - -file-install-SGX - chmod +x ./SDK/install-SGX.sh -file-run-SGX - chmod +x ./SDK/run-SGX.sh - - cd ${DIR}/SDK - tar czf ${DIR}/GFX_${SGX_VERSION}_libs.tar.gz $TAROPTS * - cd ${DIR} - - rm -rf ${DIR}/SDK/ || true - echo "SGX libs are in: GFX_${SGX_VERSION}_libs.tar.gz" -} - -function tar_up_examples { - cd ${DIR} - mkdir -p ${DIR}/SDK/ - cp -r ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/GFX_Linux_SDK ${DIR}/SDK/ - echo "" - echo "taring SDK example files for use on the OMAP board" - - echo "removing windows binaries" - find ${DIR}/SDK/ -name "*.exe" -exec rm -rf {} \; - find ${DIR}/SDK/ -name "*.dll" -exec rm -rf {} \; - find ${DIR}/SDK/ -type d -name "Win32" | xargs rm -r - find ${DIR}/SDK/ -type d -name "MacOS" | xargs rm -r - - cd ${DIR}/SDK/GFX_Linux_SDK - tar czf ${DIR}/SDK/GFX_Linux_SDK/OGLES.tar.gz $TAROPTS ./OGLES - rm -rf ${DIR}/SDK/GFX_Linux_SDK/OGLES - tar czf ${DIR}/SDK/GFX_Linux_SDK/OGLES2.tar.gz $TAROPTS ./OGLES2 - rm -rf ${DIR}/SDK/GFX_Linux_SDK/OGLES2 - tar czf ${DIR}/SDK/GFX_Linux_SDK/OVG.tar.gz $TAROPTS ./OVG - rm -rf ${DIR}/SDK/GFX_Linux_SDK/OVG - - cd ${DIR}/SDK - tar czfv ${DIR}/GFX_Linux_SDK.tar.gz $TAROPTS ./GFX_Linux_SDK - echo "SGX examples are in: GFX_Linux_SDK.tar.gz" - cd ${DIR} -} - - sgx_setup - copy_sgx_system_files - tar_up_examples - - echo "" - echo "Script Version ${VERSION}" - echo "Email Bugs: bugs@rcn-ee.com" - echo "-----------------------------" - echo "" - diff --git a/create_sgx_package_2.6.37.sh b/create_sgx_package_2.6.37.sh deleted file mode 100755 index e4c60863c..000000000 --- a/create_sgx_package_2.6.37.sh +++ /dev/null @@ -1,358 +0,0 @@ -#!/bin/bash -e -# -# Copyright (c) 2009-2012 Robert Nelson -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -VERSION="v2012.08-2.6.37-1" - -unset DIR - -DIR=$PWD - -if [ $(uname -m) == "armv7l" ] ; then - echo "ERROR: This script can only be run on an x86 system. (TI *.bin is an x86 executable)" - exit -fi - -# Check if the host is X86_64 -PLATFORM=$(uname -m 2>/dev/null) -if [ "$PLATFORM" == "x86_64" ]; then - echo "Note: on the x86_64 platform, this script needs (ia32-libs)..." - echo "--------------------------------------------------------------" -fi - -#SGX_VERSION=3_01_00_06 -#SGX_VERSION=3_01_00_07 -#SGX_BIN_NAME="OMAP35x_Graphics_SDK_setuplinux" - -SGX_VERSION=4_00_00_01 -SGX_BIN_NAME="Graphics_SDK_setuplinux" - -SGX_BIN=${SGX_BIN_NAME}_${SGX_VERSION}.bin -TAROPTS="--owner=root --group=root" - -rm -rf ${DIR}/SDK/ || true -mkdir -p ${DIR}/SDK/ -mkdir -p ${DIR}/SDK_BIN/ - -function sgx_setup { -if [ -e ${DIR}/${SGX_BIN} ]; then - echo "${SGX_BIN} found" - if [ -e ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/Makefile ]; then - echo "Extracted ${SGX_BIN} found" - echo "" - else - echo "${SGX_BIN} needs to be executable" - echo "" - chmod +x ${DIR}/${SGX_BIN} - echo "running ${SGX_BIN}" - echo "" - ${DIR}/${SGX_BIN} --mode console --prefix ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION} < ${DIR}/SDK/libs/opt/pvr </dev/null - rmmod omaplfb 2>/dev/null - rmmod pvrsrvkm 2>/dev/null -fi - -if [ "\$1" = "stop" ]; then - exit 0 -fi - -echo Starting PVR -modprobe omaplfb -modprobe bufferclass_ti - -pvr_maj=\$(grep "pvrsrvkm$" /proc/devices | cut -b1,2,3) -bc_maj=\$(grep "bc" /proc/devices | cut -b1,2,3) - -if [ -e /dev/pvrsrvkm ] ; then - rm -f /dev/pvrsrvkm -fi - -mknod /dev/pvrsrvkm c \$pvr_maj 0 -chmod 666 /dev/pvrsrvkm - -touch /etc/powervr-esrev - -SAVED_ESREVISION="\$(cat /etc/powervr-esrev)" - -devmem2 0x48004B48 w 0x2 > /dev/null -devmem2 0x48004B10 w 0x1 > /dev/null -devmem2 0x48004B00 w 0x2 > /dev/null - -ES_REVISION="\$(devmem2 0x50000014 | sed -e s:0x10205:5: -e s:0x10201:3: -e s:0x10003:2: | tail -n1 | awk -F': ' '{print \$2}')" - -if [ "\${ES_REVISION}" != "\${SAVED_ESREVISION}" ] ; then - - echo -n "Starting SGX fixup for" - echo " ES\${ES_REVISION}.x" - cp -a /usr/lib/ES\${ES_REVISION}.0/* /usr/lib - cp -a /usr/bin/ES\${ES_REVISION}.0/* /usr/bin - echo "\${ES_REVISION}" > /etc/powervr-esrev -fi - -/usr/bin/pvrsrvinit - -pvrscript - -} - -function file-install-SGX { - -cat > ${DIR}/SDK/install-SGX.sh </dev/null 2>&1 && [ "\$(lsb_release -is)" = Ubuntu ]; then - - if [ ! \$(which devmem2) ];then - if [ -f /devmem2*_armel.deb ] ; then - sudo dpkg -i /devmem2*_armel.deb - fi - fi - - if [ -f /devmem2*_armel.deb ] ; then - sudo rm -f /devmem2*_armel.deb - fi - - if [ \$(lsb_release -sc) == "jaunty" ]; then - sudo cp /opt/pvr /etc/rcS.d/S60pvr.sh - sudo chmod +x /etc/rcS.d/S60pvr.sh - else - #karmic/lucid/maverick/natty etc - sudo update-rc.d -f pvr remove - if [ -f /etc/init.d/pvr ] ; then - sudo rm -f /etc/init.d/pvr || true - fi - sudo cp /opt/pvr /etc/init.d/pvr - sudo chmod +x /etc/init.d/pvr - sudo update-rc.d pvr defaults - fi - - else - - sudo cp /opt/pvr /etc/init.d/pvr - sudo chmod +x /etc/init.d/pvr - sudo update-rc.d pvr defaults - - fi - - else - echo "target_libs.tar.gz is missing" - exit - fi - -else - echo "This script is to be run on an armv7 platform" - exit -fi - -installSGX - -} - -function file-run-SGX { - -cat > ${DIR}/SDK/run-SGX.sh </dev/null 2>&1 && [ "\$(lsb_release -is)" = Ubuntu ]; then - if [ \$(lsb_release -sc) == "jaunty" ]; then - sudo /etc/rcS.d/S60pvr.sh restart - else - sudo /etc/init.d/pvr restart - fi - else - sudo /etc/init.d/pvr restart - fi - -else - echo "This script is to be run on an armv7 platform" - exit -fi - -runSGX - -} - -function copy_sgx_system_files { - rm -rf ${DIR}/SDK/ - mkdir -p ${DIR}/SDK/libs/usr/lib/ES2.0 - mkdir -p ${DIR}/SDK/libs/usr/bin/ES2.0 - - mkdir -p ${DIR}/SDK/libs/usr/lib/ES3.0 - mkdir -p ${DIR}/SDK/libs/usr/bin/ES3.0 - - mkdir -p ${DIR}/SDK/libs/usr/lib/ES5.0 - mkdir -p ${DIR}/SDK/libs/usr/bin/ES5.0 - - mkdir -p ${DIR}/SDK/libs/opt/ - - #Copy all Libaries - FILE_PREFIX="*.so*" - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es2.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/lib/ES2.0 - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es3.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/lib/ES3.0 - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es5.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/lib/ES5.0 - - FILE_PREFIX="*.a" - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es2.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/lib/ES2.0 - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es3.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/lib/ES3.0 - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es5.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/lib/ES5.0 - - FILE_PREFIX="*_test" - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es2.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/bin/ES2.0 - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es3.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/bin/ES3.0 - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es5.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/bin/ES5.0 - - FILE_PREFIX="*gl*" - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es2.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/bin/ES2.0 - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es3.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/bin/ES3.0 - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es5.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/bin/ES5.0 - - FILE_PREFIX="p[dv]*" - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es2.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/bin/ES2.0 - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es3.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/bin/ES3.0 - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es5.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/bin/ES5.0 - - FILE_PREFIX="xgle*" - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es2.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/bin/ES2.0 - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es3.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/bin/ES3.0 - cp ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/gfx_rel_es5.x/${FILE_PREFIX} ${DIR}/SDK/libs/usr/bin/ES5.0 - -file-pvr-startup - - cd ${DIR}/SDK/libs - - #download devmem2 - rm -f /tmp/index.html || true - wget --directory-prefix=/tmp http://ports.ubuntu.com/pool/universe/d/devmem2/ - DEVMEM2=$(cat /tmp/index.html | grep _armel.deb | head -1 | awk -F"\"" '{print $8}') - wget -c http://ports.ubuntu.com/pool/universe/d/devmem2/${DEVMEM2} - - tar czf ${DIR}/SDK/target_libs.tar.gz $TAROPTS * - cd ${DIR} - rm -rf ${DIR}/SDK/libs || true - -file-install-SGX - chmod +x ./SDK/install-SGX.sh -file-run-SGX - chmod +x ./SDK/run-SGX.sh - - cd ${DIR}/SDK - tar czf ${DIR}/GFX_${SGX_VERSION}_libs.tar.gz $TAROPTS * - cd ${DIR} - - rm -rf ${DIR}/SDK/ || true - echo "SGX libs are in: GFX_${SGX_VERSION}_libs.tar.gz" -} - -function tar_up_examples { - cd ${DIR} - mkdir -p ${DIR}/SDK/ - cp -r ${DIR}/SDK_BIN/${SGX_BIN_NAME}_${SGX_VERSION}/GFX_Linux_SDK ${DIR}/SDK/ - echo "" - echo "taring SDK example files for use on the OMAP board" - - echo "removing windows binaries" - find ${DIR}/SDK/ -name "*.exe" -exec rm -rf {} \; - find ${DIR}/SDK/ -name "*.dll" -exec rm -rf {} \; - find ${DIR}/SDK/ -type d -name "Win32" | xargs rm -r - find ${DIR}/SDK/ -type d -name "MacOS" | xargs rm -r - - cd ${DIR}/SDK/GFX_Linux_SDK - tar czf ${DIR}/SDK/GFX_Linux_SDK/OGLES.tar.gz $TAROPTS ./OGLES - rm -rf ${DIR}/SDK/GFX_Linux_SDK/OGLES - tar czf ${DIR}/SDK/GFX_Linux_SDK/OGLES2.tar.gz $TAROPTS ./OGLES2 - rm -rf ${DIR}/SDK/GFX_Linux_SDK/OGLES2 - tar czf ${DIR}/SDK/GFX_Linux_SDK/OVG.tar.gz $TAROPTS ./OVG - rm -rf ${DIR}/SDK/GFX_Linux_SDK/OVG - - cd ${DIR}/SDK - tar czfv ${DIR}/GFX_Linux_SDK.tar.gz $TAROPTS ./GFX_Linux_SDK - echo "SGX examples are in: GFX_Linux_SDK.tar.gz" - cd ${DIR} -} - - sgx_setup - copy_sgx_system_files - tar_up_examples - - echo "" - echo "Script Version ${VERSION}" - echo "Email Bugs: bugs@rcn-ee.com" - echo "-----------------------------" - echo "" - diff --git a/patch.sh b/patch.sh index 3e5668c34..f5da3d424 100644 --- a/patch.sh +++ b/patch.sh @@ -24,9 +24,6 @@ # DIR=`pwd` -git="git am" -#git="git am --whitespace=fix" - echo "Starting patch.sh" git_add () { @@ -35,7 +32,7 @@ git_add () { } cleanup () { - git format-patch -18 -o ${DIR}/patches/ + git format-patch -7 -o ${DIR}/patches/ exit } @@ -44,187 +41,137 @@ distro () { git am "${DIR}/patches/distro/0001-kbuild-deb-pkg-set-host-machine-after-dpkg-gencontro.patch" } -omap_cpufreq () { - echo "omap-cpufreq" - ${git} "${DIR}/patches/omap_cpufreq/0001-cpufreq-OMAP-cleanup-for-multi-SoC-support-move-into.patch" - ${git} "${DIR}/patches/omap_cpufreq/0002-cpufreq-OMAP-Add-SMP-support-for-OMAP4.patch" - ${git} "${DIR}/patches/omap_cpufreq/0003-cpufreq-OMAP-Enable-all-CPUs-in-shared-policy-mask.patch" - ${git} "${DIR}/patches/omap_cpufreq/0004-cpufreq-OMAP-notify-even-with-bad-boot-frequency.patch" - ${git} "${DIR}/patches/omap_cpufreq/0005-cpufreq-OMAP-move-clk-name-decision-to-init.patch" - ${git} "${DIR}/patches/omap_cpufreq/0006-cpufreq-OMAP-deny-initialization-if-no-mpudev.patch" - ${git} "${DIR}/patches/omap_cpufreq/0007-cpufreq-OMAP-dont-support-freq_table.patch" - ${git} "${DIR}/patches/omap_cpufreq/0008-cpufreq-OMAP-only-supports-OPP-library.patch" - ${git} "${DIR}/patches/omap_cpufreq/0009-cpufreq-OMAP-put-clk-if-cpu_init-failed.patch" - ${git} "${DIR}/patches/omap_cpufreq/0010-cpufreq-OMAP-fix-freq_table-leak.patch" - ${git} "${DIR}/patches/omap_cpufreq/0011-cpufreq-OMAP-fixup-for-omap_device-changes-include-l.patch" -} - -micrel_zippy2 () { - echo "Micrel KZ8851 patches for: zippy2" - #originaly from: - #ftp://www.micrel.com/ethernet/8851/beagle_zippy_patches.tar.gz 137 KB 04/10/2010 12:26:00 AM - - ${git} "${DIR}/patches/micrel_zippy2/0001-ksz8851-eeprom-93cx6-add-drive_data.patch" - ${git} "${DIR}/patches/micrel_zippy2/0002-ksz8851-eeprom-93cx6-add-eeprom_93cx6_write.patch" - ${git} "${DIR}/patches/micrel_zippy2/0003-ksz8851-read_mac_addr.patch" - ${git} "${DIR}/patches/micrel_zippy2/0004-ksz8851-93cx6-eeprom-access.patch" - ${git} "${DIR}/patches/micrel_zippy2/0005-ks8851.h-it-helps-to-include-the-include-file.patch" - ${git} "${DIR}/patches/micrel_zippy2/0006-ksz8851-move-to-header.patch" - ${git} "${DIR}/patches/micrel_zippy2/0007-ksz8851-move-more-to-header.patch" - ${git} "${DIR}/patches/micrel_zippy2/0008-ksz8851-share-ks8851_tx_hdr-union.patch" - ${git} "${DIR}/patches/micrel_zippy2/0009-ksz8851-add-is_level_irq.patch" - ${git} "${DIR}/patches/micrel_zippy2/0010-ksz8851-turn-off-hardware-interrupt-druing-receive-p.patch" - ${git} "${DIR}/patches/micrel_zippy2/0011-ksz8851-make-sure-is-awake-before-writing-mac.patch" - ${git} "${DIR}/patches/micrel_zippy2/0012-ksz8851-add-mutex-lock-unlock-to-ks.patch" - ${git} "${DIR}/patches/micrel_zippy2/0013-ksz8851-add-ks8851_tx_check.patch" - ${git} "${DIR}/patches/micrel_zippy2/0014-ksz8851-move-ks8851_set_powermode.patch" -} - sakoman () { echo "Patches from: Sakoman git tree" - ${git} "${DIR}/patches/sakoman/0001-OMAP-DSS2-add-bootarg-for-selecting-svideo.patch" - ${git} "${DIR}/patches/sakoman/0002-video-add-timings-for-hd720.patch" - ${git} "${DIR}/patches/sakoman/0003-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch" + git am "${DIR}/patches/sakoman/0001-OMAP-DSS2-add-bootarg-for-selecting-svideo.patch" + git am "${DIR}/patches/sakoman/0002-video-add-timings-for-hd720.patch" } beagle () { echo "Board Patches for: BeagleBoard" - ${git} "${DIR}/patches/beagle/0001-expansion-add-buddy-param-for-expansionboard-names.patch" - ${git} "${DIR}/patches/beagle/0002-expansion-add-mmc-regulator-and-ds1307-rtc.patch" - ${git} "${DIR}/patches/beagle/0003-expansion-add-zippy.patch" - ${git} "${DIR}/patches/beagle/0004-expansion-add-zippy2.patch" - ${git} "${DIR}/patches/beagle/0005-expansion-add-trainer.patch" - ${git} "${DIR}/patches/beagle/0006-expansion-add-ulcd.patch" - ${git} "${DIR}/patches/beagle/0007-beagleboard-reinstate-usage-of-hi-speed-PLL-divider.patch" - ${git} "${DIR}/patches/beagle/0008-Turn-on-the-USB-regulator-on-Beagle-xM-explicitly.patch" - ${git} "${DIR}/patches/beagle/0009-meego-modedb-add-Toshiba-LTA070B220F-800x480-support.patch" - ${git} "${DIR}/patches/beagle/0010-beagleboard-fix-uLCD7-support.patch" - ${git} "${DIR}/patches/beagle/0011-default-to-fifo-mode-5-for-old-musb-beagles.patch" - ${git} "${DIR}/patches/beagle/0012-backlight-Add-TLC59108-backlight-control-driver.patch" - ${git} "${DIR}/patches/beagle/0013-tlc59108-adjust-for-beagleboard-uLCD7.patch" - ${git} "${DIR}/patches/beagle/0014-expansion-add-wifi.patch" - ${git} "${DIR}/patches/beagle/0015-ASoC-omap-add-MODULE_ALIAS-to-mcbsp-and-pcm-drivers.patch" - ${git} "${DIR}/patches/beagle/0016-ASoC-omap-convert-per-board-modules-to-platform-driv.patch" - ${git} "${DIR}/patches/beagle/0017-Beagle-expansion-zippy1-2-rework-mmc-i2c-handling.patch" - ${git} "${DIR}/patches/beagle/0018-Beagle-expansion-add-beaglefpga.patch" - ${git} "${DIR}/patches/beagle/0019-Enable-buddy-spidev.patch" - ${git} "${DIR}/patches/beagle/0020-zeroMAP-Open-your-eyes.patch" -} -devkit8000 () { - echo "Board Patches for: devkit8000" - ${git} "${DIR}/patches/devkit8000/0001-arm-omap-devkit8000-for-lcd-use-samsung_lte_panel.patch" + git am "${DIR}/patches/beagle/expansion/0001-Beagle-expansion-add-buddy-param-for-expansionboard-.patch" + git am "${DIR}/patches/beagle/expansion/0002-Beagle-expansion-add-zippy.patch" + git am "${DIR}/patches/beagle/expansion/0003-Beagle-expansion-add-zippy2.patch" + git am "${DIR}/patches/beagle/expansion/0004-Beagle-expansion-add-trainer.patch" + git am "${DIR}/patches/beagle/expansion/0005-Beagle-expansion-add-CircuitCo-ulcd-Support.patch" + git am "${DIR}/patches/beagle/expansion/0006-Beagle-expansion-add-wifi.patch" + git am "${DIR}/patches/beagle/expansion/0007-Beagle-expansion-add-beaglefpga.patch" + git am "${DIR}/patches/beagle/expansion/0008-Enable-buddy-spidev.patch" + + #v3.5: looks to be removed: + #http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=commit;h=b6e695abe710ee1ae248463d325169efac487e17 + #git am "${DIR}/patches/beagle/0001-beagleboard-reinstate-usage-of-hi-speed-PLL-divider.patch" + + git am "${DIR}/patches/beagle/0002-Turn-on-the-USB-regulator-on-Beagle-xM-explicitly.patch" + git am "${DIR}/patches/beagle/0003-meego-modedb-add-Toshiba-LTA070B220F-800x480-support.patch" + git am "${DIR}/patches/beagle/0004-default-to-fifo-mode-5-for-old-musb-beagles.patch" + git am "${DIR}/patches/beagle/0005-omap3_beagle-init-uart2-for-beagle-rev-AX-BX-only.patch" + git am "${DIR}/patches/beagle/0006-backlight-Add-TLC59108-backlight-control-driver.patch" + git am "${DIR}/patches/beagle/0007-tlc59108-adjust-for-beagleboard-uLCD7.patch" + git am "${DIR}/patches/beagle/0008-zeroMAP-Open-your-eyes.patch" + git am "${DIR}/patches/beagle/0009-OMAP3-USB-EHCI-fix.patch" } -igep0020 () { - echo "Board Patches for: igep0020" - ${git} "${DIR}/patches/igep0020/0001-ARM-OMAP2-nand-Make-board_onenand_init-visible-to-bo.patch" - ${git} "${DIR}/patches/igep0020/0002-OMAP3-igep0020-Add-support-for-Micron-NAND-Flash-sto.patch" +sprz319_erratum () { + echo "sprz319 erratum 2.1" + git am "${DIR}/patches/sprz319-erratum-2.1/0001-Fix-sprz319-erratum-2.1.patch" } -touchbook () { - echo "Board Patches for: Touchbook" - ${git} "${DIR}/patches/touchbook/0001-omap3-touchbook-remove-mmc-gpio_wp.patch" - ${git} "${DIR}/patches/touchbook/0002-omap3-touchbook-drop-u-boot-readonly.patch" +devkit8000 () { + echo "Board Patches for: devkit8000" + git am "${DIR}/patches/devkit8000/0001-arm-omap-devkit8000-for-lcd-use-samsung_lte_panel.patch" } panda () { echo "Board Patches for: PandaBoard" - ${git} "${DIR}/patches/panda/0001-panda-fix-wl12xx-regulator.patch" - ${git} "${DIR}/patches/panda/0002-panda-enable-bluetooth.patch" - ${git} "${DIR}/patches/panda/0003-ti-st-st-kim-fixing-firmware-path.patch" - ${git} "${DIR}/patches/panda/0004-panda-enable-asoc.patch" + git am "${DIR}/patches/panda/0001-panda-fix-wl12xx-regulator.patch" + git am "${DIR}/patches/panda/0002-ti-st-st-kim-fixing-firmware-path.patch" + git am "${DIR}/patches/panda/0003-staging-OMAP4-thermal-introduce-bandgap-temperature-.patch" + git am "${DIR}/patches/panda/0004-staging-omap-thermal-common-code-to-expose-driver-to.patch" + git am "${DIR}/patches/panda/0005-staging-omap-thermal-add-OMAP4-data-structures.patch" } omap_fixes () { echo "omap cherry pick fixes" - ${git} "${DIR}/patches/omap_fixes/0001-omap3-Increase-limit-on-bootarg-mpurate.patch" -# ${git} "${DIR}/patches/omap_fixes/0002-Fix-sprz319-erratum-2.1.patch" - ${git} "${DIR}/patches/omap_fixes/0003-ARM-OMAP-AM3517-3505-fix-crash-on-boot-due-to-incorr.patch" - ${git} "${DIR}/patches/omap_fixes/0004-ARM-OMAP4-hwmod-Don-t-wait-for-the-idle-status-if-mo.patch" - ${git} "${DIR}/patches/omap_fixes/0005-ARM-OMAP4-clock-Add-CPU-local-timer-clock-node.patch" - ${git} "${DIR}/patches/omap_fixes/0006-ARM-OMAP3-hwmod-data-disable-multiblock-reads-on-MMC.patch" - ${git} "${DIR}/patches/omap_fixes/0007-OMAP-HWMOD-add-es3plus-to-am36xx-am35xx.patch" + git am "${DIR}/patches/omap_fixes/0021-Enable-1-GHz-clock-for-Beagleboard-xM.patch" + git am "${DIR}/patches/omap_fixes/0002-OMAP2-UART-enable-tx-wakeup-bit-for-wer-reg.patch" + git am "${DIR}/patches/omap_fixes/0003-OMAP2-UART-replace-omap34xx-omap4xx-cpu-checks-with-.patch" + #in 3.5.2 + #git am "${DIR}/patches/omap_fixes/0004-only-call-smp_send_stop-on-SMP.patch" } -led () { - echo "led fixes" - ${git} "${DIR}/patches/led/0001-leds-heartbeat-stop-on-shutdown-reboot-or-panic.patch" -} - -sgx () { -echo "merge in ti sgx modules" -patch -s -p1 < "${DIR}/patches/sgx/0001-OMAP3-SGX-Merge-TI-3.01.00.02-Kernel-Modules.patch" -patch -s -p1 < "${DIR}/patches/sgx/0001-OMAP3-SGX-enable-driver-building.patch" - -#3.01.00.06 -patch -s -p1 < "${DIR}/patches/sgx/0001-OMAP3-SGX-Merge-TI-3.01.00.06-into-TI-3.01.00.02.patch" +omapdrm () { + echo "omap testing omapdrm/kms" -#3.01.00.07 'the first wget-able release!!' -patch -s -p1 < "${DIR}/patches/sgx/0001-OMAP3-SGX-Merge-TI-3.01.00.07-into-TI-3.01.00.06.patch" + #posted: 13 Mar 2012 for 3.4 + git am "${DIR}/patches/drm/0001-omap2-add-drm-device.patch" -#4.00.00.01 adds ti8168 support, drops bc_cat.c patch -patch -s -p1 < "${DIR}/patches/sgx/0001-OMAP3-SGX-Merge-TI-4.00.00.01-into-TI-3.01.00.07.patch" - -#4.03.00.01 -#Note: git am has problems with this patch... -patch -s -p1 < "${DIR}/patches/sgx/0001-OMAP3-SGX-Merge-TI-4.03.00.01-into-TI-4.00.00.01.patch" - -#4.03.00.02 (main *.bin drops omap4) -patch -s -p1 < "${DIR}/patches/sgx/0001-OMAP3-SGX-Merge-TI-4.03.00.02-into-TI-4.03.00.01.patch" - -#4.03.00.02 -patch -s -p1 < "${DIR}/patches/sgx/0001-OMAP3-SGX-TI-4.03.00.02-2.6.32-PSP.patch" - -#4.03.00.02 + 2.6.38-merge (2.6.37-git5) -patch -s -p1 < "${DIR}/patches/sgx/0001-OMAP3-SGX-TI-4.03.00.02-2.6.38-merge-AUTOCONF_INCLUD.patch" - -#4.03.00.02 + 2.6.38-rc3 -patch -s -p1 < "${DIR}/patches/sgx/0001-OMAP3-SGX-TI-4.03.00.02-2.6.38-rc3-_console_sem-to-c.patch" - -#4.03.00.01 -patch -s -p1 < "${DIR}/patches/sgx/0001-OMAP3-SGX-TI-4.03.00.01-add-outer_cache.clean_all.patch" + #might be merged in 3.4 + git am "${DIR}/patches/drm/0002-ARM-OMAP2-3-HWMOD-Add-missing-flags-for-dispc-class.patch" + git am "${DIR}/patches/drm/0003-ARM-OMAP2-3-HWMOD-Add-missing-flag-for-rfbi-class.patch" + git am "${DIR}/patches/drm/0004-ARM-OMAP3-HWMOD-Add-omap_hwmod_class_sysconfig-for-d.patch" +} -#4.03.00.02 -#omap3 doesn't work on omap3630 -patch -s -p1 < "${DIR}/patches/sgx/0001-OMAP3-SGX-TI-4.03.00.02-use-omap3630-as-TI_PLATFORM.patch" +dsp () { + echo "dsp patches" + git am "${DIR}/patches/dsp/0001-dsp-add-memblock-include.patch" +} -#4.03.00.02 + 2.6.39 (2.6.38-git2) -patch -s -p1 < "${DIR}/patches/sgx/0001-OMAP3-SGX-TI-4.03.00.02-2.6.39-rc-SPIN_LOCK_UNLOCKED.patch" +sgx_mainline () { + echo "patches needed for external sgx bins" + git am "${DIR}/patches/sgx/0001-Revert-drm-kill-drm_sman.patch" +} -#4.03.00.02 + 2.6.40 (2.6.39-git11) -patch -s -p1 < "${DIR}/patches/sgx/0001-OMAP3-SGX-TI-4.03.00.02-2.6.40-display.h-to-omapdss..patch" +mainline_fixes () { + echo "mainline patches" + git am "${DIR}/patches/mainline-fixes/0001-arm-add-definition-of-strstr-to-decompress.c.patch" +} -#with v3.0-git16 -#drivers/staging/omap3-sgx/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c:324:15: error: ‘OMAP_DSS_UPDATE_AUTO’ undeclared (first use in this function) -#drivers/staging/omap3-sgx/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c:327:15: error: ‘OMAP_DSS_UPDATE_MANUAL’ undeclared (first use in this function) -#drivers/staging/omap3-sgx/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c:330:15: error: ‘OMAP_DSS_UPDATE_DISABLED’ undeclared (first use in this function) -#drivers/staging/omap3-sgx/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c:337:16: error: ‘struct omap_dss_driver’ has no member named ‘set_update_mode’ -#drivers/staging/omap3-sgx/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c:312:28: warning: unused variable ‘eDSSMode’ -#make[4]: *** [drivers/staging/omap3-sgx/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.o] Error 1 -#make[3]: *** [drivers/staging/omap3-sgx/services4/3rdparty/dc_omapfb3_linux] Error 2 -#make[2]: *** [drivers/staging/omap3-sgx] Error 2 -#for <3.2 -#patch -s -p1 < "${DIR}/patches/sgx/0001-Revert-OMAP-DSS2-remove-update_mode-from-omapdss.patch" -#for >3.2 -patch -s -p1 < "${DIR}/patches/sgx/0001-Revert-OMAP-DSS2-remove-update_mode-from-omapdss-v3.2.patch" +cpuidle () { + echo "cpuidle" + git am "${DIR}/patches/cpuidle/0001-cpuidle-remove-unused-hrtimer_peek_ahead_timers-call.patch" + git am "${DIR}/patches/cpuidle/0002-cpuidle-add-checks-to-avoid-NULL-pointer-dereference.patch" + git am "${DIR}/patches/cpuidle/0003-cpuidle-refactor-out-cpuidle_enter_state.patch" + git am "${DIR}/patches/cpuidle/0004-cpuidle-fix-error-handling-in-__cpuidle_register_dev.patch" + git am "${DIR}/patches/cpuidle/0005-cpuidle-add-support-for-states-that-affect-multiple-.patch" + git am "${DIR}/patches/cpuidle/0006-cpuidle-coupled-add-parallel-barrier-function.patch" + git am "${DIR}/patches/cpuidle/0007-cpuidle-move-field-disable-from-per-driver-to-per-cp.patch" + git am "${DIR}/patches/cpuidle/0008-PM-cpuidle-Add-driver-reference-counter.patch" + git am "${DIR}/patches/cpuidle/0009-PM-Domains-Add-preliminary-support-for-cpuidle-v2.patch" + git am "${DIR}/patches/cpuidle/0010-PM-cpuidle-System-resume-hang-fix-with-cpuidle.patch" + git am "${DIR}/patches/cpuidle/0011-cpuidle-coupled-fix-sleeping-while-atomic-in-cpu-not.patch" + git am "${DIR}/patches/cpuidle/0012-cpuidle-Prevent-null-pointer-dereference-in-cpuidle_.patch" +} +cpuidle_omap () { + echo "cpuidle_omap" + git am "${DIR}/patches/cpuidle_omap/0001-ARM-OMAP-timer-allow-gp-timer-clock-event-to-be-used.patch" + git am "${DIR}/patches/cpuidle_omap/0002-ARM-OMAP4-CPUidle-Use-coupled-cpuidle-states-to-impl.patch" + git am "${DIR}/patches/cpuidle_omap/0003-ARM-OMAP4-CPUidle-add-synchronization-for-coupled-id.patch" + git am "${DIR}/patches/cpuidle_omap/0004-ARM-OMAP4-CPUidle-Open-broadcast-clock-event-device.patch" + git am "${DIR}/patches/cpuidle_omap/0005-ARM-OMAP4-sleep-Save-the-complete-used-register-stac.patch" + git am "${DIR}/patches/cpuidle_omap/0006-cpufreq-OMAP-Handle-missing-frequency-table-on-SMP-s.patch" + git am "${DIR}/patches/cpuidle_omap/0007-ARM-OMAP4-Register-the-OPP-table-only-for-4430-devic.patch" } distro -omap_cpufreq -micrel_zippy2 sakoman beagle + +#disabled as it breaks beagle c4... +sprz319_erratum + devkit8000 -igep0020 -touchbook panda omap_fixes -led +omapdrm +dsp +sgx_mainline +mainline_fixes -#dont push -sgx +cpuidle +cpuidle_omap echo "patch.sh ran successful" diff --git a/patches/beagle/0007-beagleboard-reinstate-usage-of-hi-speed-PLL-divider.patch b/patches/beagle/0001-beagleboard-reinstate-usage-of-hi-speed-PLL-divider.patch similarity index 64% rename from patches/beagle/0007-beagleboard-reinstate-usage-of-hi-speed-PLL-divider.patch rename to patches/beagle/0001-beagleboard-reinstate-usage-of-hi-speed-PLL-divider.patch index 519575160..d18c60480 100644 --- a/patches/beagle/0007-beagleboard-reinstate-usage-of-hi-speed-PLL-divider.patch +++ b/patches/beagle/0001-beagleboard-reinstate-usage-of-hi-speed-PLL-divider.patch @@ -1,7 +1,7 @@ -From 6c3d808b753df82e19967b570470ad5a6c775337 Mon Sep 17 00:00:00 2001 +From 4969670b5491b201e472d1fa40b8ba218a696997 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 25 Jan 2012 15:48:36 +0100 -Subject: [PATCH 07/16] beagleboard: reinstate usage of hi-speed PLL divider +Subject: [PATCH 1/8] beagleboard: reinstate usage of hi-speed PLL divider Signed-off-by: Koen Kooi --- @@ -9,11 +9,11 @@ Signed-off-by: Koen Kooi 1 file changed, 5 insertions(+) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index a546c2b..e28ae72 100644 +index e15798a..f97d03e 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c -@@ -308,6 +308,11 @@ static struct omap_dss_device beagle_dvi_device = { - .driver_name = "dvi", +@@ -400,6 +400,11 @@ static struct omap_dss_device beagle_dvi_device = { + .driver_name = "tfp410", .data = &dvi_panel, .phy.dpi.data_lines = 24, + .clocks = { @@ -21,9 +21,9 @@ index a546c2b..e28ae72 100644 + .dispc_fclk_src = OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC, + }, + }, - .reset_gpio = -EINVAL, }; + static struct omap_dss_device beagle_tv_device = { -- -1.7.10 +1.7.10.4 diff --git a/patches/beagle/0008-Turn-on-the-USB-regulator-on-Beagle-xM-explicitly.patch b/patches/beagle/0002-Turn-on-the-USB-regulator-on-Beagle-xM-explicitly.patch similarity index 83% rename from patches/beagle/0008-Turn-on-the-USB-regulator-on-Beagle-xM-explicitly.patch rename to patches/beagle/0002-Turn-on-the-USB-regulator-on-Beagle-xM-explicitly.patch index 415c0d8ff..33c31605f 100644 --- a/patches/beagle/0008-Turn-on-the-USB-regulator-on-Beagle-xM-explicitly.patch +++ b/patches/beagle/0002-Turn-on-the-USB-regulator-on-Beagle-xM-explicitly.patch @@ -1,7 +1,7 @@ -From 83c6d832cc95e9c2aecc9ca9ef96dcef27d99030 Mon Sep 17 00:00:00 2001 +From 31e2e1c159ea9c2d59ca83597b67299f5274a52a Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Thu, 23 Feb 2012 09:23:10 -0600 -Subject: [PATCH 08/16] Turn on the USB regulator on Beagle xM explicitly +Subject: [PATCH 2/8] Turn on the USB regulator on Beagle xM explicitly Turn on the USB regulator on Beagle xM explicitly when the USB subsystem asks for it, rather than relying on u-boot to do it. @@ -14,10 +14,10 @@ Signed-off-by: Robert Nelson 1 file changed, 19 insertions(+) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index e28ae72..30cb2f0 100644 +index f97d03e..a2527aa 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c -@@ -411,6 +411,24 @@ static struct regulator_consumer_supply beagle_vsim_supply[] = { +@@ -526,6 +526,24 @@ static struct regulator_consumer_supply beagle_vsim_supply[] = { REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.0"), }; @@ -42,7 +42,7 @@ index e28ae72..30cb2f0 100644 static struct gpio_led gpio_leds[]; static int beagle_twl_gpio_setup(struct device *dev, -@@ -513,6 +531,7 @@ static struct twl4030_platform_data beagle_twldata = { +@@ -642,6 +660,7 @@ static struct twl4030_platform_data beagle_twldata = { .gpio = &beagle_gpio_data, .vmmc1 = &beagle_vmmc1, .vsim = &beagle_vsim, @@ -51,5 +51,5 @@ index e28ae72..30cb2f0 100644 static struct i2c_board_info __initdata beagle_i2c_eeprom[] = { -- -1.7.10 +1.7.10.4 diff --git a/patches/beagle/0002-expansion-add-mmc-regulator-and-ds1307-rtc.patch b/patches/beagle/0002-expansion-add-mmc-regulator-and-ds1307-rtc.patch deleted file mode 100644 index 6e1bab86a..000000000 --- a/patches/beagle/0002-expansion-add-mmc-regulator-and-ds1307-rtc.patch +++ /dev/null @@ -1,57 +0,0 @@ -From a06cd4d0e7a1d5ea012be5808192963d223824b2 Mon Sep 17 00:00:00 2001 -From: Robert Nelson -Date: Mon, 10 Oct 2011 11:13:49 -0500 -Subject: [PATCH 02/13] expansion: add mmc regulator and ds1307 rtc - -Signed-off-by: Robert Nelson ---- - arch/arm/mach-omap2/board-omap3beagle.c | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index 6f8cf47..9f5706b 100644 ---- a/arch/arm/mach-omap2/board-omap3beagle.c -+++ b/arch/arm/mach-omap2/board-omap3beagle.c -@@ -257,6 +257,12 @@ static struct omap2_hsmmc_info mmc[] = { - .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, - .gpio_wp = -EINVAL, - }, -+ { -+ .mmc = 2, -+ .caps = MMC_CAP_4_BIT_DATA, -+ .transceiver = true, -+ .ocr_mask = 0x00100000, /* 3.3V */ -+ }, - {} /* Terminator */ - }; - -@@ -378,6 +384,18 @@ static struct i2c_board_info __initdata beagle_i2c_eeprom[] = { - }, - }; - -+#if defined(CONFIG_RTC_DRV_DS1307) || \ -+ defined(CONFIG_RTC_DRV_DS1307_MODULE) -+ -+static struct i2c_board_info __initdata beagle_i2c2_boardinfo[] = { -+ { -+ I2C_BOARD_INFO("ds1307", 0x68), -+ }, -+}; -+#else -+static struct i2c_board_info __initdata beagle_i2c2_boardinfo[] = {}; -+#endif -+ - static int __init omap3_beagle_i2c_init(void) - { - omap3_pmic_get_config(&beagle_twldata, -@@ -388,6 +406,7 @@ static int __init omap3_beagle_i2c_init(void) - beagle_twldata.vpll2->constraints.name = "VDVI"; - - omap3_pmic_init("twl4030", &beagle_twldata); -+ omap_register_i2c_bus(2, 400, beagle_i2c2_boardinfo, ARRAY_SIZE(beagle_i2c2_boardinfo)); - /* Bus 3 is attached to the DVI port where devices like the pico DLP - * projector don't work reliably with 400kHz */ - omap_register_i2c_bus(3, 100, beagle_i2c_eeprom, ARRAY_SIZE(beagle_i2c_eeprom)); --- -1.7.9.5 - diff --git a/patches/beagle/0003-expansion-add-zippy.patch b/patches/beagle/0003-expansion-add-zippy.patch deleted file mode 100644 index 9f519a250..000000000 --- a/patches/beagle/0003-expansion-add-zippy.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 83dab61b77a99db2a7eea3bc571838fea758cba1 Mon Sep 17 00:00:00 2001 -From: Robert Nelson -Date: Mon, 10 Oct 2011 11:16:12 -0500 -Subject: [PATCH 03/13] expansion: add zippy - -Signed-off-by: Robert Nelson ---- - arch/arm/mach-omap2/board-omap3beagle.c | 51 +++++++++++++++++++++++++++++++ - 1 file changed, 51 insertions(+) - -diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index 9f5706b..6ffafd6 100644 ---- a/arch/arm/mach-omap2/board-omap3beagle.c -+++ b/arch/arm/mach-omap2/board-omap3beagle.c -@@ -159,6 +159,48 @@ static void __init omap3_beagle_init_rev(void) - - char expansionboard_name[16]; - -+#if defined(CONFIG_ENC28J60) || defined(CONFIG_ENC28J60_MODULE) -+ -+#include -+#include -+ -+#define OMAP3BEAGLE_GPIO_ENC28J60_IRQ 157 -+ -+static struct omap2_mcspi_device_config enc28j60_spi_chip_info = { -+ .turbo_mode = 0, -+ .single_channel = 1, /* 0: slave, 1: master */ -+}; -+ -+static struct spi_board_info omap3beagle_zippy_spi_board_info[] __initdata = { -+ { -+ .modalias = "enc28j60", -+ .bus_num = 4, -+ .chip_select = 0, -+ .max_speed_hz = 20000000, -+ .controller_data = &enc28j60_spi_chip_info, -+ }, -+}; -+ -+static void __init omap3beagle_enc28j60_init(void) -+{ -+ if ((gpio_request(OMAP3BEAGLE_GPIO_ENC28J60_IRQ, "ENC28J60_IRQ") == 0) && -+ (gpio_direction_input(OMAP3BEAGLE_GPIO_ENC28J60_IRQ) == 0)) { -+ gpio_export(OMAP3BEAGLE_GPIO_ENC28J60_IRQ, 0); -+ omap3beagle_zippy_spi_board_info[0].irq = OMAP_GPIO_IRQ(OMAP3BEAGLE_GPIO_ENC28J60_IRQ); -+ irq_set_irq_type(omap3beagle_zippy_spi_board_info[0].irq, IRQ_TYPE_EDGE_FALLING); -+ } else { -+ printk(KERN_ERR "could not obtain gpio for ENC28J60_IRQ\n"); -+ return; -+ } -+ -+ spi_register_board_info(omap3beagle_zippy_spi_board_info, -+ ARRAY_SIZE(omap3beagle_zippy_spi_board_info)); -+} -+ -+#else -+static inline void __init omap3beagle_enc28j60_init(void) { return; } -+#endif -+ - static struct mtd_partition omap3beagle_nand_partitions[] = { - /* All the partition sizes are listed in terms of NAND block size */ - { -@@ -567,6 +609,15 @@ static void __init omap3_beagle_init(void) - /* REVISIT leave DVI powered down until it's needed ... */ - gpio_request_one(170, GPIOF_OUT_INIT_HIGH, "DVI_nPD"); - -+ if(!strcmp(expansionboard_name, "zippy")) -+ { -+ printk(KERN_INFO "Beagle expansionboard: initializing enc28j60\n"); -+ omap3beagle_enc28j60_init(); -+ printk(KERN_INFO "Beagle expansionboard: assigning GPIO 141 and 162 to MMC1\n"); -+ mmc[1].gpio_wp = 141; -+ mmc[1].gpio_cd = 162; -+ } -+ - usb_musb_init(NULL); - usbhs_init(&usbhs_bdata); - omap_nand_flash_init(NAND_BUSWIDTH_16, omap3beagle_nand_partitions, --- -1.7.9.5 - diff --git a/patches/beagle/0009-meego-modedb-add-Toshiba-LTA070B220F-800x480-support.patch b/patches/beagle/0003-meego-modedb-add-Toshiba-LTA070B220F-800x480-support.patch similarity index 85% rename from patches/beagle/0009-meego-modedb-add-Toshiba-LTA070B220F-800x480-support.patch rename to patches/beagle/0003-meego-modedb-add-Toshiba-LTA070B220F-800x480-support.patch index 2b75b40f0..2936820ea 100644 --- a/patches/beagle/0009-meego-modedb-add-Toshiba-LTA070B220F-800x480-support.patch +++ b/patches/beagle/0003-meego-modedb-add-Toshiba-LTA070B220F-800x480-support.patch @@ -1,7 +1,7 @@ -From 5683bdf835b9bd99637d1905735574ebbd7fff9c Mon Sep 17 00:00:00 2001 +From 82eaec9e4ee67c9312ade069318d650c700baaf4 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Wed, 23 Mar 2011 08:37:54 -0500 -Subject: [PATCH 09/16] meego: modedb add Toshiba LTA070B220F 800x480 support +Subject: [PATCH 3/8] meego: modedb add Toshiba LTA070B220F 800x480 support from http://wiki.meego.com/ARM/Meego_on_Beagleboard_from_scratch @@ -26,5 +26,5 @@ index 5b686de..69ad1ec 100644 #ifdef CONFIG_FB_MODE_HELPERS -- -1.7.10 +1.7.10.4 diff --git a/patches/beagle/0011-default-to-fifo-mode-5-for-old-musb-beagles.patch b/patches/beagle/0004-default-to-fifo-mode-5-for-old-musb-beagles.patch similarity index 53% rename from patches/beagle/0011-default-to-fifo-mode-5-for-old-musb-beagles.patch rename to patches/beagle/0004-default-to-fifo-mode-5-for-old-musb-beagles.patch index 53afc5b3d..b81214972 100644 --- a/patches/beagle/0011-default-to-fifo-mode-5-for-old-musb-beagles.patch +++ b/patches/beagle/0004-default-to-fifo-mode-5-for-old-musb-beagles.patch @@ -1,7 +1,7 @@ -From b662dcac284e2e79bed794587dc0694ed944806e Mon Sep 17 00:00:00 2001 +From a78242228d7dd543f7619197f0c865349fb5ed75 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Sat, 8 Jan 2011 14:31:37 -0600 -Subject: [PATCH 11/16] default to fifo mode 5, for old musb beagles +Subject: [PATCH 4/8] default to fifo mode 5, for old musb beagles The fifo mode 4, 16kb can cause corruption on musb/omap35xx, use mode 5, 8kb... @@ -12,18 +12,18 @@ Signed-off-by: Robert Nelson 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c -index 920f04e..66ce5e0 100644 +index db3dff8..65fcf4c 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c -@@ -1015,7 +1015,7 @@ static void musb_shutdown(struct platform_device *pdev) - || defined(CONFIG_USB_MUSB_OMAP2PLUS_MODULE) \ - || defined(CONFIG_USB_MUSB_AM35X) \ - || defined(CONFIG_USB_MUSB_AM35X_MODULE) --static ushort __initdata fifo_mode = 4; -+static ushort __initdata fifo_mode = 5; +@@ -1037,7 +1037,7 @@ static void musb_shutdown(struct platform_device *pdev) + || defined(CONFIG_USB_MUSB_AM35X_MODULE) \ + || defined(CONFIG_USB_MUSB_DSPS) \ + || defined(CONFIG_USB_MUSB_DSPS_MODULE) +-static ushort __devinitdata fifo_mode = 4; ++static ushort __devinitdata fifo_mode = 5; #elif defined(CONFIG_USB_MUSB_UX500) \ || defined(CONFIG_USB_MUSB_UX500_MODULE) - static ushort __initdata fifo_mode = 5; + static ushort __devinitdata fifo_mode = 5; -- -1.7.10 +1.7.10.4 diff --git a/patches/beagle/0005-omap3_beagle-init-uart2-for-beagle-rev-AX-BX-only.patch b/patches/beagle/0005-omap3_beagle-init-uart2-for-beagle-rev-AX-BX-only.patch new file mode 100644 index 000000000..41df7952e --- /dev/null +++ b/patches/beagle/0005-omap3_beagle-init-uart2-for-beagle-rev-AX-BX-only.patch @@ -0,0 +1,133 @@ +From e29a33ac0aabb3b8ae45326fd941cb22585d6ac6 Mon Sep 17 00:00:00 2001 +From: "Govindraj.R" +Date: Tue, 6 Mar 2012 14:35:11 +0530 +Subject: [PATCH 5/8] omap3_beagle: init uart2 for beagle rev AX/BX only + +All beagle boards rev > AX/BX have external usb hubs connected to ehci +interface, external hub/peripheral uses a nreset sequence for which +uart2_rx.gpio_147 pin in mux mode4(USB2HS_nRST) is used on all beagle +boards expect rev Ax/BX. +(Reference to all beagle boards rev schematics: +http://beagleboard.org/hardware/design) + +Initialising uart2 will lead to serial init taking over uart2_rx pin +so init uart2_rx pin mux only for Beagle AX/BX rev boards. +Dont init uart2 for all other boards allowing usb_ehci functionality. + +To initialise individual uart port by id utilise and modify the existing +available func. omap_serial_board_init. + +Cc: Tony Lindgren +Cc: Kevin Hilman +Cc: Koen Kooi +Tested-by: Peter Ujfalusi +Tested-by: Robert Nelson +Signed-off-by: Govindraj.R +--- + arch/arm/mach-omap2/board-omap3beagle.c | 6 ++++- + arch/arm/mach-omap2/serial.c | 36 +++++++++++++++++------------- + arch/arm/plat-omap/include/plat/serial.h | 3 ++- + 3 files changed, 28 insertions(+), 17 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index a2527aa..2f2452a 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -135,6 +135,7 @@ static void __init omap3_beagle_init_rev(void) + beagle_config.mmc1_gpio_wp = 29; + beagle_config.dvi_pd_gpio = 170; + beagle_config.usr_button_gpio = 7; ++ omap_serial_board_init(NULL, 1); + break; + case 6: + printk(KERN_INFO "OMAP3 Beagle Rev: C1/C2/C3\n"); +@@ -1022,7 +1023,10 @@ static void __init omap3_beagle_init(void) + if (gpio_is_valid(beagle_config.dvi_pd_gpio)) + omap_mux_init_gpio(beagle_config.dvi_pd_gpio, OMAP_PIN_OUTPUT); + omap_display_init(&beagle_dss_data); +- omap_serial_init(); ++ omap_serial_board_init(NULL, 0); ++ omap_serial_board_init(NULL, 2); ++ omap_serial_board_init(NULL, 3); ++ + omap_sdrc_init(mt46h32m32lf6_sdrc_params, + mt46h32m32lf6_sdrc_params); + +diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c +index c1b93c7..7bcfcfd 100644 +--- a/arch/arm/mach-omap2/serial.c ++++ b/arch/arm/mach-omap2/serial.c +@@ -331,29 +331,32 @@ void __init omap_serial_init_port(struct omap_board_data *bdata, + /** + * omap_serial_board_init() - initialize all supported serial ports + * @info: platform specific data pointer ++ * @port_id: uart port number to be initialised + * +- * Initializes all available UARTs as serial ports. Platforms ++ * Initializes individual UARTs as serial ports. Platforms + * can call this function when they want to have default behaviour +- * for serial ports (e.g initialize them all as serial ports). ++ * for serial ports (e.g initialize individual serial ports based on port id). + */ +-void __init omap_serial_board_init(struct omap_uart_port_info *info) ++void __init omap_serial_board_init(struct omap_uart_port_info *info, u8 port_id) + { + struct omap_uart_state *uart; + struct omap_board_data bdata; + +- list_for_each_entry(uart, &uart_list, node) { +- bdata.id = uart->num; +- bdata.flags = 0; +- bdata.pads = NULL; +- bdata.pads_cnt = 0; ++ list_for_each_entry(uart, &uart_list, node) ++ if (uart->num == port_id) { ++ bdata.id = uart->num; ++ bdata.flags = 0; ++ bdata.pads = NULL; ++ bdata.pads_cnt = 0; ++ ++ omap_serial_check_wakeup(&bdata, uart); + +- omap_serial_check_wakeup(&bdata, uart); + +- if (!info) +- omap_serial_init_port(&bdata, NULL); +- else +- omap_serial_init_port(&bdata, &info[uart->num]); +- } ++ if (!info) ++ omap_serial_init_port(&bdata, NULL); ++ else ++ omap_serial_init_port(&bdata, info); ++ } + } + + /** +@@ -365,5 +368,8 @@ void __init omap_serial_board_init(struct omap_uart_port_info *info) + */ + void __init omap_serial_init(void) + { +- omap_serial_board_init(NULL); ++ struct omap_uart_state *uart; ++ ++ list_for_each_entry(uart, &uart_list, node) ++ omap_serial_board_init(NULL, uart->num); + } +diff --git a/arch/arm/plat-omap/include/plat/serial.h b/arch/arm/plat-omap/include/plat/serial.h +index b073e5f..fd14d28 100644 +--- a/arch/arm/plat-omap/include/plat/serial.h ++++ b/arch/arm/plat-omap/include/plat/serial.h +@@ -110,7 +110,8 @@ struct omap_board_data; + struct omap_uart_port_info; + + extern void omap_serial_init(void); +-extern void omap_serial_board_init(struct omap_uart_port_info *platform_data); ++extern void omap_serial_board_init(struct omap_uart_port_info *platform_data, ++ u8 port_id); + extern void omap_serial_init_port(struct omap_board_data *bdata, + struct omap_uart_port_info *platform_data); + #endif +-- +1.7.10.4 + diff --git a/patches/beagle/0012-backlight-Add-TLC59108-backlight-control-driver.patch b/patches/beagle/0006-backlight-Add-TLC59108-backlight-control-driver.patch similarity index 91% rename from patches/beagle/0012-backlight-Add-TLC59108-backlight-control-driver.patch rename to patches/beagle/0006-backlight-Add-TLC59108-backlight-control-driver.patch index e217f5dec..ab8ce9df2 100644 --- a/patches/beagle/0012-backlight-Add-TLC59108-backlight-control-driver.patch +++ b/patches/beagle/0006-backlight-Add-TLC59108-backlight-control-driver.patch @@ -1,7 +1,7 @@ -From 241f61b8739e30a1585e5535ddad1ac4df6a3b5b Mon Sep 17 00:00:00 2001 +From 0d8c1372e3de1b61855987ef349701377afe5803 Mon Sep 17 00:00:00 2001 From: "Manjunathappa, Prakash" Date: Mon, 1 Aug 2011 18:25:11 +0530 -Subject: [PATCH 12/16] backlight: Add TLC59108 backlight control driver +Subject: [PATCH 6/8] backlight: Add TLC59108 backlight control driver This patch adds support for I2C configurable TLC59108 backlight control driver. @@ -13,14 +13,14 @@ Signed-off-by: Vaibhav Hiremath drivers/video/backlight/Makefile | 1 + drivers/video/backlight/tlc59108.c | 160 ++++++++++++++++++++++++++++++++++++ 3 files changed, 169 insertions(+) - create mode 100755 drivers/video/backlight/tlc59108.c + create mode 100644 drivers/video/backlight/tlc59108.c diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig -index 278aeaa..df9dac7 100644 +index 2979292..3047e2d 100644 --- a/drivers/video/backlight/Kconfig +++ b/drivers/video/backlight/Kconfig -@@ -342,6 +342,14 @@ config BACKLIGHT_AAT2870 - If you have a AnalogicTech AAT2870 say Y to enable the +@@ -373,6 +373,14 @@ config BACKLIGHT_PANDORA + If you have a Pandora console, say Y to enable the backlight driver. +config BACKLIGHT_TLC59108 @@ -35,17 +35,17 @@ index 278aeaa..df9dac7 100644 endif # BACKLIGHT_LCD_SUPPORT diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile -index fdd1fc4..ba31474 100644 +index a2ac9cf..d845b96 100644 --- a/drivers/video/backlight/Makefile +++ b/drivers/video/backlight/Makefile -@@ -39,4 +39,5 @@ obj-$(CONFIG_BACKLIGHT_ADP8870) += adp8870_bl.o +@@ -42,4 +42,5 @@ obj-$(CONFIG_BACKLIGHT_ADP8870) += adp8870_bl.o obj-$(CONFIG_BACKLIGHT_88PM860X) += 88pm860x_bl.o obj-$(CONFIG_BACKLIGHT_PCF50633) += pcf50633-backlight.o obj-$(CONFIG_BACKLIGHT_AAT2870) += aat2870_bl.o +obj-$(CONFIG_BACKLIGHT_TLC59108) += tlc59108.o - + obj-$(CONFIG_BACKLIGHT_OT200) += ot200_bl.o diff --git a/drivers/video/backlight/tlc59108.c b/drivers/video/backlight/tlc59108.c -new file mode 100755 +new file mode 100644 index 0000000..4f4ea34 --- /dev/null +++ b/drivers/video/backlight/tlc59108.c @@ -211,5 +211,5 @@ index 0000000..4f4ea34 +MODULE_AUTHOR("Senthil Natarajan "); +MODULE_LICENSE("GPL v2"); -- -1.7.10 +1.7.10.4 diff --git a/patches/beagle/0013-tlc59108-adjust-for-beagleboard-uLCD7.patch b/patches/beagle/0007-tlc59108-adjust-for-beagleboard-uLCD7.patch similarity index 95% rename from patches/beagle/0013-tlc59108-adjust-for-beagleboard-uLCD7.patch rename to patches/beagle/0007-tlc59108-adjust-for-beagleboard-uLCD7.patch index 19006fbe5..47f066e33 100644 --- a/patches/beagle/0013-tlc59108-adjust-for-beagleboard-uLCD7.patch +++ b/patches/beagle/0007-tlc59108-adjust-for-beagleboard-uLCD7.patch @@ -1,7 +1,7 @@ -From c470f28a362e1b09db74d567283309e5ad8927b3 Mon Sep 17 00:00:00 2001 +From d1692e76987f33faa7ba3a5d56cb30c7feaddf51 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 27 Apr 2012 21:30:00 +0200 -Subject: [PATCH 13/16] tlc59108: adjust for beagleboard+uLCD7 +Subject: [PATCH 7/8] tlc59108: adjust for beagleboard+uLCD7 Signed-off-by: Koen Kooi --- @@ -9,7 +9,7 @@ Signed-off-by: Koen Kooi 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/drivers/video/backlight/tlc59108.c b/drivers/video/backlight/tlc59108.c -index 4f4ea34..40a21e7 100755 +index 4f4ea34..40a21e7 100644 --- a/drivers/video/backlight/tlc59108.c +++ b/drivers/video/backlight/tlc59108.c @@ -29,9 +29,16 @@ @@ -120,5 +120,5 @@ index 4f4ea34..40a21e7 100755 -MODULE_LICENSE("GPL v2"); +MODULE_LICENSE("GPL"); -- -1.7.10 +1.7.10.4 diff --git a/patches/beagle/0020-zeroMAP-Open-your-eyes.patch b/patches/beagle/0008-zeroMAP-Open-your-eyes.patch similarity index 84% rename from patches/beagle/0020-zeroMAP-Open-your-eyes.patch rename to patches/beagle/0008-zeroMAP-Open-your-eyes.patch index ff7a0db7e..bf3f313ed 100644 --- a/patches/beagle/0020-zeroMAP-Open-your-eyes.patch +++ b/patches/beagle/0008-zeroMAP-Open-your-eyes.patch @@ -1,4 +1,4 @@ -From 8c664f2e8832e28b34c3078e9fdf3688b5302a9b Mon Sep 17 00:00:00 2001 +From 31e0abfe1bc7bcbbe4df364fa784f77f6d3503a0 Mon Sep 17 00:00:00 2001 From: Alexander Holler Date: Wed, 4 Jul 2012 00:03:04 +0200 Subject: [PATCH 8/8] zeroMAP: Open your eyes! @@ -9,10 +9,10 @@ Signed-off-by: Alexander Holler 1 file changed, 7 insertions(+) diff --git a/kernel/printk.c b/kernel/printk.c -index dba1821..66a42be 100644 +index ac4bc9e..809b2a6 100644 --- a/kernel/printk.c +++ b/kernel/printk.c -@@ -1652,6 +1652,13 @@ static int __init console_setup(char *str) +@@ -1673,6 +1673,13 @@ static int __init console_setup(char *str) char *s, *options, *brl_options = NULL; int idx; diff --git a/patches/beagle/0009-OMAP3-USB-EHCI-fix.patch b/patches/beagle/0009-OMAP3-USB-EHCI-fix.patch new file mode 100644 index 000000000..5623ca883 --- /dev/null +++ b/patches/beagle/0009-OMAP3-USB-EHCI-fix.patch @@ -0,0 +1,44 @@ +From a0003b6b1a079bf732a17a28dbaefbcf36d1ced9 Mon Sep 17 00:00:00 2001 +From: Robert Nelson +Date: Fri, 3 Aug 2012 10:04:53 -0500 +Subject: [PATCH 9/9] OMAP3: USB: EHCI fix + +http://www.spinics.net/lists/linux-omap/msg74783.html + +Signed-off-by: Robert Nelson +--- + arch/arm/mach-omap2/clock3xxx_data.c | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c +index 1efdec2..aea6a93 100644 +--- a/arch/arm/mach-omap2/clock3xxx_data.c ++++ b/arch/arm/mach-omap2/clock3xxx_data.c +@@ -3391,15 +3391,15 @@ static struct omap_clk omap3xxx_clks[] = { + CLK(NULL, "usbhost_48m_fck", &usbhost_48m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX), + CLK(NULL, "usbhost_ick", &usbhost_ick, CK_3430ES2PLUS | CK_AM35XX | CK_36XX), + CLK("usbhs_omap", "usbhost_ick", &usbhost_ick, CK_3430ES2PLUS | CK_AM35XX | CK_36XX), +- CLK("usbhs_omap", "utmi_p1_gfclk", &dummy_ck, CK_3XXX), +- CLK("usbhs_omap", "utmi_p2_gfclk", &dummy_ck, CK_3XXX), +- CLK("usbhs_omap", "xclk60mhsp1_ck", &dummy_ck, CK_3XXX), +- CLK("usbhs_omap", "xclk60mhsp2_ck", &dummy_ck, CK_3XXX), +- CLK("usbhs_omap", "usb_host_hs_utmi_p1_clk", &dummy_ck, CK_3XXX), +- CLK("usbhs_omap", "usb_host_hs_utmi_p2_clk", &dummy_ck, CK_3XXX), +- CLK("usbhs_omap", "usb_tll_hs_usb_ch0_clk", &dummy_ck, CK_3XXX), +- CLK("usbhs_omap", "usb_tll_hs_usb_ch1_clk", &dummy_ck, CK_3XXX), +- CLK("usbhs_omap", "init_60m_fclk", &dummy_ck, CK_3XXX), ++ CLK(NULL, "utmi_p1_gfclk", &dummy_ck, CK_3XXX), ++ CLK(NULL, "utmi_p2_gfclk", &dummy_ck, CK_3XXX), ++ CLK(NULL, "xclk60mhsp1_ck", &dummy_ck, CK_3XXX), ++ CLK(NULL, "xclk60mhsp2_ck", &dummy_ck, CK_3XXX), ++ CLK(NULL, "usb_host_hs_utmi_p1_clk", &dummy_ck, CK_3XXX), ++ CLK(NULL, "usb_host_hs_utmi_p2_clk", &dummy_ck, CK_3XXX), ++ CLK(NULL, "usb_tll_hs_usb_ch0_clk", &dummy_ck, CK_3XXX), ++ CLK(NULL, "usb_tll_hs_usb_ch1_clk", &dummy_ck, CK_3XXX), ++ CLK(NULL, "init_60m_fclk", &dummy_ck, CK_3XXX), + CLK(NULL, "usim_fck", &usim_fck, CK_3430ES2PLUS | CK_36XX), + CLK(NULL, "gpt1_fck", &gpt1_fck, CK_3XXX), + CLK(NULL, "wkup_32k_fck", &wkup_32k_fck, CK_3XXX), +-- +1.7.10.4 + diff --git a/patches/beagle/0010-beagleboard-fix-uLCD7-support.patch b/patches/beagle/0010-beagleboard-fix-uLCD7-support.patch deleted file mode 100644 index 4805cec31..000000000 --- a/patches/beagle/0010-beagleboard-fix-uLCD7-support.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 7c9fb543aa8eb4956510d34a2d126f86dae4c924 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Fri, 27 Apr 2012 16:57:27 +0200 -Subject: [PATCH 10/16] beagleboard: fix uLCD7 support - -Signed-off-by: Koen Kooi ---- - arch/arm/mach-omap2/board-omap3beagle.c | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index 30cb2f0..0299d47 100644 ---- a/arch/arm/mach-omap2/board-omap3beagle.c -+++ b/arch/arm/mach-omap2/board-omap3beagle.c -@@ -44,6 +44,7 @@ - #include - #include - #include