Merge 2.0.0.6
authorJohn Dowdal <jdowdal@ti.com>
Thu, 15 Aug 2013 19:10:32 +0000 (15:10 -0400)
committerJohn Dowdal <jdowdal@ti.com>
Thu, 15 Aug 2013 19:10:32 +0000 (15:10 -0400)
Conflicts:
device/k2h/global-resource-list-arm-dsp.c
device/k2h/global-resource-list-arm-dsp.dtb
device/k2h/global-resource-list-arm-dsp.dts
device/k2h/global-resource-list.c
device/k2h/global-resource-list.dtb
device/k2h/global-resource-list.dts
device/k2h/policy_dsp-only.c
device/k2h/policy_dsp-only.dtb
device/k2h/policy_dsp-only.dts
device/k2h/policy_dsp_arm.c
device/k2h/policy_dsp_arm.dtb
device/k2h/policy_dsp_arm.dts
device/k2k/global-resource-list-arm-dsp.c
device/k2k/global-resource-list-arm-dsp.dtb
device/k2k/global-resource-list-arm-dsp.dts
device/k2k/global-resource-list.c
device/k2k/global-resource-list.dtb
device/k2k/global-resource-list.dts
device/k2k/policy_dsp-only.c
device/k2k/policy_dsp-only.dtb
device/k2k/policy_dsp-only.dts
device/k2k/policy_dsp_arm.c
device/k2k/policy_dsp_arm.dtb
device/k2k/policy_dsp_arm.dts
docs/ReleaseNotes_RM.doc
docs/ReleaseNotes_RM.pdf
package.xdc
setupenv.bat

29 files changed:
1  2 
device/k2h/global-resource-list-arm-dsp.c
device/k2h/global-resource-list-arm-dsp.dtb
device/k2h/global-resource-list-arm-dsp.dts
device/k2h/global-resource-list.c
device/k2h/global-resource-list.dtb
device/k2h/global-resource-list.dts
device/k2h/policy_dsp-only.c
device/k2h/policy_dsp-only.dtb
device/k2h/policy_dsp-only.dts
device/k2h/policy_dsp_arm.c
device/k2h/policy_dsp_arm.dtb
device/k2h/policy_dsp_arm.dts
device/k2k/global-resource-list-arm-dsp.c
device/k2k/global-resource-list-arm-dsp.dtb
device/k2k/global-resource-list-arm-dsp.dts
device/k2k/global-resource-list.c
device/k2k/global-resource-list.dtb
device/k2k/global-resource-list.dts
device/k2k/policy_dsp-only.c
device/k2k/policy_dsp-only.dtb
device/k2k/policy_dsp-only.dts
device/k2k/policy_dsp_arm.c
device/k2k/policy_dsp_arm.dtb
device/k2k/policy_dsp_arm.dts
docs/ReleaseNotes_RM.doc
docs/ReleaseNotes_RM.pdf
package.xdc
rmver.h
setupenv.bat

index da060b3edbbd545c3e69fada5f5469dc4f9cfda5,84ebb625eb0affa244b5f571256c465448247c78..84ebb625eb0affa244b5f571256c465448247c78
mode 100644,100755..100644
index c2cee29888e2ce8c7b99eb9dcb74262beb1f0929,8b58e291a42825e89e191daef1db8e4e87bbf724..8b58e291a42825e89e191daef1db8e4e87bbf724
mode 100644,100755..100644
Binary files differ
index ab037ab3fb07fdb6c3e2e577ba64d7200fa48b52,16ed182c9459b87dcc7617e4cf4435db711c87f0..16ed182c9459b87dcc7617e4cf4435db711c87f0
mode 100644,100755..100644
index 55e23d066a66d4c0c57bf218050cbd1fceec9801,ce1cfdaa6eebf19fb38cbc159bd1d55ce1a5c81c..ce1cfdaa6eebf19fb38cbc159bd1d55ce1a5c81c
mode 100644,100755..100644
index f42053557f0afb565cbe34837e3772686251ac31,fd638aacb5b9b4ee9ea445463d6d0efb35cb24fa..fd638aacb5b9b4ee9ea445463d6d0efb35cb24fa
mode 100644,100755..100644
Binary files differ
index e43ad16db1388310b79bdc4e98abfe031e5e86fd,3fcb287a5d2ded11e49e10b7ec2c31231f39dc96..3fcb287a5d2ded11e49e10b7ec2c31231f39dc96
mode 100644,100755..100644
index 072ed3c1e73a98b3b10a9ef35533c43828212c39,00387526e324a80ec4a6fe934428ff87c5926d3d..00387526e324a80ec4a6fe934428ff87c5926d3d
mode 100644,100755..100644
index 410c51dc2efa5582e25d40779683300125567731,73d1903edb422ad9123e66ad8af0dbd91d782687..73d1903edb422ad9123e66ad8af0dbd91d782687
mode 100644,100755..100644
Binary files differ
index 0cd85564e78fe588dfc1ffcf3bc94314205a7d6d,123ab63efefcac1a0eb7781d10cfce99537facfe..123ab63efefcac1a0eb7781d10cfce99537facfe
mode 100644,100755..100644
index 495af918dcd4fb1c1b92df364e761b2221f87e5b,c24cbfda92f1ed60070b664f9e93b5e5bf49b3ce..c24cbfda92f1ed60070b664f9e93b5e5bf49b3ce
mode 100644,100755..100644
index 34d957d6f13a08abad522f9ed94a75b704beacfb,a5a87225b1ae3b314e0d3291c901925f4a44563c..a5a87225b1ae3b314e0d3291c901925f4a44563c
mode 100644,100755..100644
Binary files differ
index dfa881aaf906be5cb34b527daf13545b5b5a248e,6d8d33b56a645cd58d54988f389551b0f6abc26b..6d8d33b56a645cd58d54988f389551b0f6abc26b
mode 100644,100755..100644
index da060b3edbbd545c3e69fada5f5469dc4f9cfda5,84ebb625eb0affa244b5f571256c465448247c78..84ebb625eb0affa244b5f571256c465448247c78
mode 100644,100755..100644
index c2cee29888e2ce8c7b99eb9dcb74262beb1f0929,8b58e291a42825e89e191daef1db8e4e87bbf724..8b58e291a42825e89e191daef1db8e4e87bbf724
mode 100644,100755..100644
Binary files differ
index ab037ab3fb07fdb6c3e2e577ba64d7200fa48b52,16ed182c9459b87dcc7617e4cf4435db711c87f0..16ed182c9459b87dcc7617e4cf4435db711c87f0
mode 100644,100755..100644
index 55e23d066a66d4c0c57bf218050cbd1fceec9801,ce1cfdaa6eebf19fb38cbc159bd1d55ce1a5c81c..ce1cfdaa6eebf19fb38cbc159bd1d55ce1a5c81c
mode 100644,100755..100644
index f42053557f0afb565cbe34837e3772686251ac31,fd638aacb5b9b4ee9ea445463d6d0efb35cb24fa..fd638aacb5b9b4ee9ea445463d6d0efb35cb24fa
mode 100644,100755..100644
Binary files differ
index e43ad16db1388310b79bdc4e98abfe031e5e86fd,3fcb287a5d2ded11e49e10b7ec2c31231f39dc96..3fcb287a5d2ded11e49e10b7ec2c31231f39dc96
mode 100644,100755..100644
index 072ed3c1e73a98b3b10a9ef35533c43828212c39,00387526e324a80ec4a6fe934428ff87c5926d3d..00387526e324a80ec4a6fe934428ff87c5926d3d
mode 100644,100755..100644
index 410c51dc2efa5582e25d40779683300125567731,73d1903edb422ad9123e66ad8af0dbd91d782687..73d1903edb422ad9123e66ad8af0dbd91d782687
mode 100644,100755..100644
Binary files differ
index 0cd85564e78fe588dfc1ffcf3bc94314205a7d6d,123ab63efefcac1a0eb7781d10cfce99537facfe..123ab63efefcac1a0eb7781d10cfce99537facfe
mode 100644,100755..100644
index 495af918dcd4fb1c1b92df364e761b2221f87e5b,c24cbfda92f1ed60070b664f9e93b5e5bf49b3ce..c24cbfda92f1ed60070b664f9e93b5e5bf49b3ce
mode 100644,100755..100644
index 34d957d6f13a08abad522f9ed94a75b704beacfb,a5a87225b1ae3b314e0d3291c901925f4a44563c..a5a87225b1ae3b314e0d3291c901925f4a44563c
mode 100644,100755..100644
Binary files differ
index dfa881aaf906be5cb34b527daf13545b5b5a248e,6d8d33b56a645cd58d54988f389551b0f6abc26b..6d8d33b56a645cd58d54988f389551b0f6abc26b
mode 100644,100755..100644
index f77353e5290f8bf89743281852c51b97118b9a2b,4697980b5a9799ae9dfa5bb8050562ed0935f260..e7a8155708bf2840bba8e1fd163d6448eb986f2f
Binary files differ
index ee061a015c83bd0cb46aea5f8864fc00616832c3,e6b21010c3999574def4d839dbf4a79347ce4374..9966943d41daea6a8cf666ddcb286ee16ec33fa5
Binary files differ
diff --cc package.xdc
index de8db53c8f87f30cdbd099309d9519ec40108844,5ab0df169fcda2ab5ddf96d1feb52bc858ee35c4..5ac022a01488df8f9f1b975a50686cb459f1af53
mode 100644,100755..100644
@@@ -9,6 -9,6 +9,6 @@@
   * Copyright (C) 2012-2013, Texas Instruments, Inc.\r
   *****************************************************************************/\r
  \r
- package ti.drv.rm[02, 01, 00, 01] {\r
 -package ti.drv.rm[02, 00, 00, 06] {\r
++package ti.drv.rm[02, 01, 00, 02] {\r
      module Settings;\r
  }\r
diff --cc rmver.h
index 0000000000000000000000000000000000000000,7dc2a4c21531487dd69cb03ac4fdd3ad81d35fe4..6d3c945cfb9d893da07bd299102a18b1b22ea3f0
mode 000000,100755..100755
--- /dev/null
+++ b/rmver.h
@@@ -1,0 -1,68 +1,68 @@@
 -#define RM_VERSION_ID                   (0x02000005)
+ #ifndef _RMVER_H
+ #define _RMVER_H
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ /* ============================================================= */
+ /**
+  *   @file  rmver.h
+  *
+  *   path  ti/drv/rm/rmver.h
+  *
+  *   @brief  Resource Manager Version Definitions
+  *
+  *  ============================================================
+  *  Copyright (c) Texas Instruments Incorporated 2012-2013
+  * 
+  *  Redistribution and use in source and binary forms, with or without 
+  *  modification, are permitted provided that the following conditions 
+  *  are met:
+  *
+  *    Redistributions of source code must retain the above copyright 
+  *    notice, this list of conditions and the following disclaimer.
+  *
+  *    Redistributions in binary form must reproduce the above copyright
+  *    notice, this list of conditions and the following disclaimer in the 
+  *    documentation and/or other materials provided with the   
+  *    distribution.
+  *
+  *    Neither the name of Texas Instruments Incorporated nor the names of
+  *    its contributors may be used to endorse or promote products derived
+  *    from this software without specific prior written permission.
+  *
+  *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+  *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+  *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+  *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+  *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+  *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+  *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  *
+ */
+ /**
+  * @brief   This is the RM Version. Versions numbers are encoded in the following 
+  * format:
+  *  0xAABBCCDD -> Arch (AA); API Changes (BB); Major (CC); Minor (DD)
+  */
 -#define RM_VERSION_STR                  "RM Revision: 02.00.00.05"
++#define RM_VERSION_ID                   (0x02010002)
+ /**
+  * @brief   This is the version string which describes the RM along with the
+  * date and build information.
+  */
++#define RM_VERSION_STR                  "RM Revision: 02.01.00.02"
+ #ifdef __cplusplus
+ }
+ #endif
+   
+ #endif  /* _RMVER_H */
diff --cc setupenv.bat
Simple merge