k2g merge

diff --cc build/buildlib.xs
index f9aadb7029242370052982081621557b0c825848,e9732bceecab36483c442b02d9404ffdbb69e2d5..f9aadb7029242370052982081621557b0c825848
mode 100644,100644..100755
--- 1/build/buildlib.xs
--- 2/build/buildlib.xs
+++ b/build/buildlib.xs

diff --cc config.bld
index 05f7e2b5d833d9aa61bbc105eb272fc60b6ee517,dc67655c93a2252d6fdd42f8b3f03e2bfe96ac6b..fbce179df86cd2c46b546a242f655cbbe950a71e
mode 100644,100644..100755
--- 1/config.bld
--- 2/config.bld
+++ b/config.bld
@@@ -146,167 -94,5 +146,180 @@@ if (miniBuild == "ON"
  \r
  }\r
  \r
 -/* List all the build targets here. */\r
 -Build.targets = [ C66LE, C66BE ];\r
 +/* Create the SoC List  */\r
 +var socs = { \r
 +    /* device independent libraries */\r
 +    all :\r
 +    {\r
 +        /* Build this library */\r
 +        build: "true",\r
 +        /* SoC lib enabled */\r
 +        socDevLib: "false",\r
 +        /* dma lib enabled */\r
 +        dmaDevLib: "false",     \r
 +       /* Library options */\r
 +        copts: "",\r
 +        /* target lists, kept blank now, would be updated based on argument lists */\r
 +        targets: []\r
 +    },\r
++   k2g :\r
++    {\r
++        /* this variable would be reinitialized to true, if XDCARGS contains k2g */\r
++        build: "false", \r
++        /* SoC lib enabled */\r
++        socDevLib: "false",\r
++        /* dma lib enabled */\r
++        dmaDevLib: "false",     \r
++       /* Library options */\r
++       copts: " -DSOC_K2G",\r
++       /* target list */\r
++       targets: [ C66LE, C66BE, A15LE]\r
++    },\r
 +   k2h :\r
 +    {\r
 +        /* this variable would be reinitialized to true, if XDCARGS contains k2h */\r
 +        build: "false", \r
 +        /* SoC lib enabled */\r
 +        socDevLib: "false",\r
 +        /* dma lib enabled */\r
 +        dmaDevLib: "false",     \r
 +       /* Library options */\r
 +       copts: " -DSOC_K2H",\r
 +       /* target list */\r
 +       targets: [ C66LE, C66BE, A15LE]\r
 +    },\r
 +   k2k :\r
 +    {\r
 +        /* this variable would be reinitialized to true, if XDCARGS contains k2k */\r
 +        build: "false", \r
 +        /* SoC lib enabled */\r
 +        socDevLib: "false",\r
 +        /* dma lib enabled */\r
 +        dmaDevLib: "false",     \r
 +       /* Library options */\r
 +       copts: " -DSOC_K2K",\r
 +       /* target list */\r
 +       targets: [ C66LE, C66BE, A15LE]\r
 +    },\r
 +   k2e :\r
 +    {\r
 +        /* this variable would be reinitialized to true, if XDCARGS contains k2e */\r
 +        build: "false", \r
 +        /* SoC lib enabled */\r
 +        socDevLib: "false",\r
 +        /* dma lib enabled */\r
 +        dmaDevLib: "false",     \r
 +      /* Library options */\r
 +       copts: " -DSOC_K2E",\r
 +       /* target list */\r
 +       targets: [ C66LE, C66BE, A15LE]\r
 +    },\r
 +   k2l :\r
 +    {\r
 +        /* this variable would be reinitialized to true, if XDCARGS contains k2l */\r
 +        build: "false", \r
 +         /* SoC lib enabled */\r
 +        socDevLib: "false",\r
 +        /* dma lib enabled */\r
 +        dmaDevLib: "false",     \r
 +      /* Library options */\r
 +       copts: " -DSOC_K2L",\r
 +       /* target list */\r
 +       targets: [ C66LE, C66BE, A15LE]\r
 +    },\r
 +\r
 +   c6678 :\r
 +    {\r
 +        /* this variable would be reinitialized to true, if XDCARGS contains k2k */\r
 +        build: "false", \r
 +        /* SoC lib enabled */\r
 +        socDevLib: "false",\r
 +        /* dma lib enabled */\r
 +        dmaDevLib: "false",     \r
 +       /* Library options */\r
 +       copts: " -DSOC_C6678",\r
 +       /* target list */\r
 +       targets: [ C66LE, C66BE]\r
 +    },\r
 +\r
 +   c6657 :\r
 +    {\r
 +        /* this variable would be reinitialized to true, if XDCARGS contains k2k */\r
 +        build: "false", \r
 +        /* SoC lib enabled */\r
 +        socDevLib: "false",\r
 +        /* dma lib enabled */\r
 +        dmaDevLib: "false",     \r
 +       /* Library options */\r
 +       copts: " -DSOC_C6657",\r
 +       /* target list */\r
 +       targets: [ C66LE, C66BE]\r
 +    }\r
 +};\r
 +\r
 +/**************************************************************************\r
 + * FUNCTION NAME : merge\r
 + **************************************************************************\r
 + * DESCRIPTION   :\r
 + *  The function is used to merge two arrarys\r
 + **************************************************************************/\r
 +function merge() {\r
 +    var args = arguments;\r
 +    var hash = {};\r
 +    var arr = [];\r
 +    for (var i = 0; i < args.length; i++) {\r
 +       for (var j = 0; j < args[i].length; j++) {\r
 +         if (hash[args[i][j]] !== true) {\r
 +           arr[arr.length] = args[i][j];\r
 +           hash[args[i][j]] = true;\r
 +         }\r
 +       }\r
 +     }\r
 +    return arr;\r
 +}\r
 +\r
 +/* Grab input from XDCARGS */\r
 +var buildArguments  = [];\r
 +\r
 +/* Construct the build arguments */\r
 +for (var tmp=0; arguments[tmp] != undefined; tmp++)\r
 +{\r
 +\r
 +    /* If no arguments are provided, override for building all */\r
 +    if ( ( arguments.length == 1) && (arguments[tmp].equals("./config.bld")) )\r
 +        buildArguments[buildArguments.length++] = "all";\r
 +    else\r
 +        buildArguments[buildArguments.length++] = arguments[tmp];\r
 +}\r
 +\r
 +/* Build targets on this build */\r
 +var build_targets = [];\r
 +var soc_names = Object.keys(socs);\r
 +\r
 +for (var i=0; i < buildArguments.length; i++ ) {\r
 +    /* Build it for all targets */\r
 +    if (buildArguments[i] == "all") {\r
 +        for (var j = 0; j < soc_names.length; j++)  {\r
 +            build_targets = merge (build_targets.slice(0), socs[soc_names[j]].targets.slice(0));\r
 +            /* Set build to "true" for that SoC */\r
 +            socs[soc_names[j]].build = "true";\r
 +        }\r
 +    }\r
 +    else {\r
 +        /* Skip the first argument, which is ./config.bld to get to next SoCs */\r
 +        if (i == 0) continue;          \r
 +        /* Set that build to true if it is found in supported build socs */\r
 +        for (j = 0; j < soc_names.length; j++) {\r
 +            if (buildArguments[i] == soc_names[j]) {\r
 +                socs[buildArguments[i]].build = "true";\r
 +                build_targets = merge (build_targets.slice(0), socs[buildArguments[i]].targets.slice(0));\r
 +                break;\r
 +            }\r
 +        }\r
 +    }   \r
 +}\r
 +\r
 +/* Update the Build target generated list */\r
 +socs["all"].targets = build_targets; \r
 +Build.targets   = build_targets;\r
 +\r

diff --cc package.xdc
index c54ff8a91be8a4229abb61b81d8a9d10134676fd,44846598036b0d5c5749beb1c59fb62233a3526c..c54ff8a91be8a4229abb61b81d8a9d10134676fd
mode 100644,100644..100755
--- 1/package.xdc
--- 2/package.xdc
+++ b/package.xdc

diff --cc test/k2e/c66/bios/rmK2EC66DspMtBiosTestProject.txt
index 6da3a578499a196ddaa289ac8d9ec960a2e369f6,dfbf6387b562252c0b9cc18829a282e245392276..6da3a578499a196ddaa289ac8d9ec960a2e369f6
mode 100644,100644..100755
--- 1/test/k2e/c66/bios/rmK2EC66DspMtBiosTestProject.txt
--- 2/test/k2e/c66/bios/rmK2EC66DspMtBiosTestProject.txt
+++ b/test/k2e/c66/bios/rmK2EC66DspMtBiosTestProject.txt

diff --cc test/k2g/c66/bios/rmK2GC66A15LinuxDspClientTestProject.txt
index 0000000000000000000000000000000000000000,a4642c91b5f766b065741299fd4885c22fc8a5c6..a4642c91b5f766b065741299fd4885c22fc8a5c6
mode 000000,100644..100644
--- /dev/null
--- 2/test/k2g/c66/bios/rmK2GArmv7LinuxDspClientTestProject.txt
+++ b/test/k2g/c66/bios/rmK2GC66A15LinuxDspClientTestProject.txt

diff --cc test/k2h/c66/bios/rmK2HC66DspMtBiosTestProject.txt
index a1e4305892d4bcdcff8ab508d2d7b1c70be40eb7,40001221cda0da7fd2de312c8413346c4f6720eb..a1e4305892d4bcdcff8ab508d2d7b1c70be40eb7
mode 100644,100644..100755
--- 1/test/k2h/c66/bios/rmK2HC66DspMtBiosTestProject.txt
--- 2/test/k2h/c66/bios/rmK2HC66DspMtBiosTestProject.txt
+++ b/test/k2h/c66/bios/rmK2HC66DspMtBiosTestProject.txt

diff --cc test/k2k/c66/bios/rmK2KC66DspMtBiosTestProject.txt
index 3dd1dc7436bdb7dd735bf8c011b968659bf7c606,be2bf9f1eaa71acb9d8f18bd8c6246ebaaeb776b..3dd1dc7436bdb7dd735bf8c011b968659bf7c606
mode 100644,100644..100755
--- 1/test/k2k/c66/bios/rmK2KC66DspMtBiosTestProject.txt
--- 2/test/k2k/c66/bios/rmK2KC66DspMtBiosTestProject.txt
+++ b/test/k2k/c66/bios/rmK2KC66DspMtBiosTestProject.txt

diff --cc test/k2k/c66/bios/rm_test_sc.cfg
index ead91682db8dfe5d921da5fc8544cddc45ca24d0,cb0e94de5db4d88aee6243e149fa43257efb8007..ead91682db8dfe5d921da5fc8544cddc45ca24d0
mode 100644,100644..100755
--- 1/test/k2k/c66/bios/rm_test_sc.cfg
--- 2/test/k2k/c66/bios/rm_test_sc.cfg
+++ b/test/k2k/c66/bios/rm_test_sc.cfg

diff --cc test/k2l/c66/bios/rmK2LC66DspMtBiosTestProject.txt
index bb51317e468b0ddd2b50526b08a8e6c4ecf964f7,6c13611af320309d600e43366b3f24d7f3734466..bb51317e468b0ddd2b50526b08a8e6c4ecf964f7
mode 100644,100644..100755
--- 1/test/k2l/c66/bios/rmK2LC66DspMtBiosTestProject.txt
--- 2/test/k2l/c66/bios/rmK2LC66DspMtBiosTestProject.txt
+++ b/test/k2l/c66/bios/rmK2LC66DspMtBiosTestProject.txt