Merge branch 'master' into ksII-rm-dev
authorJustin Sobota <jsobota@ti.com>
Fri, 31 May 2013 19:14:50 +0000 (15:14 -0400)
committerJustin Sobota <jsobota@ti.com>
Fri, 31 May 2013 19:14:50 +0000 (15:14 -0400)
device/k2k/global-resource-list-arm-dsp.c
device/k2k/global-resource-list-arm-dsp.dtb
device/k2k/global-resource-list-arm-dsp.dts

index d64485ae19cc612f1a923f8535209296cf5061cb..134f7b4e9d309a3e2ab97568eb2cccd02f9e2c25 100644 (file)
@@ -7,8 +7,8 @@ const char rmGlobalResourceList[] = {
 0xed,
 0x00,
 0x00,
-0x0e,
-0x99,
+0x0f,
+0x15,
 0x00,
 0x00,
 0x00,
@@ -16,7 +16,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x0e,
-0x7c,
+0xf8,
 0x00,
 0x00,
 0x00,
@@ -40,7 +40,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x0e,
-0x44,
+0xc0,
 0x00,
 0x00,
 0x00,
@@ -3612,6 +3612,130 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
+0x01,
+0x78,
+0x67,
+0x65,
+0x2d,
+0x72,
+0x78,
+0x2d,
+0x63,
+0x68,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x0e,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x78,
+0x67,
+0x65,
+0x2d,
+0x74,
+0x78,
+0x2d,
+0x63,
+0x68,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x0e,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x78,
+0x67,
+0x65,
+0x2d,
+0x72,
+0x78,
+0x2d,
+0x66,
+0x6c,
+0x6f,
+0x77,
+0x2d,
+0x69,
+0x64,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x0e,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x20,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
 0x02,
 0x00,
 0x00,
@@ -3841,4 +3965,8 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x00,
+0x00,
+0x00,
 };
index db2b9140b777c42724dec2ad2de5026aabf7d117..72e5614061fae803c9185ae6bf869f73ea72a1ce 100644 (file)
Binary files a/device/k2k/global-resource-list-arm-dsp.dtb and b/device/k2k/global-resource-list-arm-dsp.dtb differ
index 00ae61018a8edcc6e3c55ef85a3431b5157c3b40..e6669a4313937f7987c3a0043c6ffbd5cbe6c3ac 100644 (file)
         bcp-rx-flow-id {
             resource-range = <0 64>;
         };           
+
+        xge-rx-ch {
+            resource-range = <0 16>;
+        };
+        xge-tx-ch {
+            resource-range = <0 8>;
+        };
+        xge-rx-flow-id {
+            resource-range = <0 32>;
+        };           
     }; /* cppi */
 
     pa {