cross_origen 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f7582c611769181fb35ca1c63a9de7d0b91fb55
-  data.tar.gz: 12b85146240f75f5135419ef20420a9cc5f1ca20
+  metadata.gz: 7a8a97d56c4be0c17d49a9486ec425b34eab92fc
+  data.tar.gz: 19f08b7708edb0fd9b1b1da7bd2b7a0e59b98766
 SHA512:
-  metadata.gz: fd24d373d4d19d60f230db4d84feddf85eae354c2699a2f8405c0188e98d4cf0c926f1f8cb51f92bfe00d82a3eb3df9a9a94b6471f6e7584e86469aaee925017
-  data.tar.gz: 4a4143ef8cfef70ea40eed6a13859b329687b47cf19eee009416f480afa4eaebb552610c03372b7af6ca7dd5fc3bf0602f55f23dff07bed145902b0d0c115dd6
+  metadata.gz: de17ae91904278a13727d3ae7d2e1d3f48e1e45a29177e31155a6281a0d3623b17eaf33e7aabb9d13f553f337a37a205d9c00a02c4c12e2bae378f26a0ce9025
+  data.tar.gz: e20b7196527a69f0bedacbe778843beb1dde1da11495405d820cb9a89d106c3f787f3e1e61d184106dc05e9bfbc54ee1aa293269a6a62a87d45307b359a30515

data/bin/fix_my_workspace

@@ -0,0 +1,92 @@
+#!/usr/bin/env ruby
+$VERBOSE = nil  # Don't care about world writable dir warnings and the like
+
+if $_fix_my_workspace_version_check
+  $_fix_my_workspace_version = '0.6.0'
+else
+  require 'origen'
+
+  if !Origen.site_config.gem_manage_bundler
+    puts 'Sorry but you have opted to manage Bundler yourself via your Origen site config, and this means'
+    puts 'that I cannot make certain assumptions about how your workspace is configured.'
+    puts 'You will need to either resolve this problem yourself, or else change the value of'
+    puts 'gem_mange_bundler to true.'
+    puts 'See here for more details on how to do that: http://origen-sdk.org/origen/guides/starting/company/'
+
+  else
+    ENV['BUNDLE_GEMFILE'] = File.join(Origen.root, 'Gemfile')
+    ENV['BUNDLE_PATH'] = File.expand_path(Origen.site_config.gem_install_dir)
+    ENV['BUNDLE_BIN'] = File.join(Origen.root, 'lbin')
+
+    # Force copy system gems to local gems
+    if Origen.site_config.gem_use_from_system
+      local_gem_dir = "#{ENV['BUNDLE_PATH']}/ruby/#{Pathname.new(Gem.dir).basename}"
+      gem_dir = Pathname.new(Gem.dir)
+
+      Origen.site_config.gem_use_from_system.each do |gem, version|
+        begin
+          # This will raise an error if the system doesn't have this gem installed, that
+          # will be rescued below
+          spec = Gem::Specification.find_by_name(gem, version)
+
+          local_dir = File.join(local_gem_dir, Pathname.new(spec.gem_dir).relative_path_from(gem_dir))
+          FileUtils.mkdir_p local_dir
+          FileUtils.cp_r("#{spec.gem_dir}/.", local_dir)
+
+          local_file = Pathname.new(File.join(local_gem_dir, Pathname.new(spec.cache_file).relative_path_from(gem_dir)))
+          FileUtils.mkdir_p local_file.dirname
+          FileUtils.cp(spec.cache_file, local_file)
+
+          if spec.extension_dir && File.exist?(spec.extension_dir)
+            local_dir = File.join(local_gem_dir, Pathname.new(spec.extension_dir).relative_path_from(gem_dir))
+            FileUtils.mkdir_p local_dir
+            FileUtils.cp_r("#{spec.extension_dir}/.", local_dir)
+          end
+
+          local_file = Pathname.new(File.join(local_gem_dir, Pathname.new(spec.spec_file).relative_path_from(gem_dir)))
+          FileUtils.mkdir_p local_file.dirname
+          FileUtils.cp(spec.spec_file, local_file)
+
+        rescue Gem::LoadError
+          # This just means that one of the gems that should be copied from the system
+          # was not actually installed in the system, so nothing we can do about that here
+        end
+      end
+    end
+
+    # Delete lbin
+    FileUtils.rm_rf(ENV['BUNDLE_BIN']) if File.exist?(ENV['BUNDLE_BIN'])
+
+    # Run bundler with correct switches
+    cmd = "bundle install --gemfile #{ENV['BUNDLE_GEMFILE']} --binstubs #{ENV['BUNDLE_BIN']} --path #{ENV['BUNDLE_PATH']}"
+    `chmod o-w #{Origen.root}` # Stops some annoying world writable warnings during install
+    `chmod o-w #{Origen.root}/bin` if File.exist?("#{Origen.root}/bin")
+    `chmod o-w #{Origen.root}/.bin` if File.exist?("#{Origen.root}/.bin")
+
+    # Try again, this time updating the bundle
+    if system(cmd)
+      fixed = true
+    elsif system 'bundle update'
+      fixed = true
+    end
+
+    if File.exist?(ENV['BUNDLE_BIN'])
+      `chmod o-w #{ENV['BUNDLE_BIN']}`
+
+      # Make .bat versions of all executables, Bundler should really be doing this when running
+      # on windows
+      if Origen.os.windows?
+        Dir.glob("#{ENV['BUNDLE_BIN']}/*").each do |bin|
+          unless bin =~ /.bat$/
+            bat = "#{bin}.bat"
+            unless File.exist?(bat)
+              File.open(bat, 'w') { |f| f.write('@"ruby.exe" "%~dpn0" %*') }
+            end
+          end
+        end
+      end
+    end
+
+    system 'origen -v' if fixed
+  end
+end

data/config/application.rb

@@ -14,6 +14,13 @@ class CrossOrigenApplication < Origen::Application
     #:files => ["lib", "config/application.rb"],
   }
 
+  config.shared = {
+  #  :patterns => "pattern/shared",
+  #  :templates => "templates",
+  #  :programs => "program",
+    :command_launcher => "config/shared_commands.rb"
+  }
+
   # Prevent these from showing up in 'origen rc unman'
   config.unmanaged_dirs = %w()
   config.unmanaged_files = %w()

data/config/environment.rb

@@ -31,5 +31,6 @@ module CrossOrigen
   autoload :IpXact,       "cross_origen/ip_xact"
   autoload :DesignSync,   "cross_origen/design_sync"
   autoload :OrigenFormat, "cross_origen/origen_format"
+  autoload :CMSISSVD,     "cross_origen/cmsis_svd"
 end
 require "cross_origen"

data/config/shared_commands.rb

@@ -0,0 +1,18 @@
+# The requested command is passed in here as @command
+case @command
+
+when "cr:import"
+  require "cross_origen/commands/import"
+  # Important to exit when a command has been fulfilled or else Origen core will try and execute it
+  exit 0
+
+# Always leave an else clause to allow control to fall back through to the Origen command handler.
+# You probably want to also add the command details to the help shown via 'origen -h',
+# you can do this bb adding the required text to @plugin_commands before handing control back to
+# Origen.
+else
+  @plugin_commands << <<-EOT
+ cr:import       Import peripheral and register data from 3rd party formats
+  EOT
+
+end

data/config/version.rb

@@ -1,7 +1,7 @@
 module CrossOrigen
   MAJOR = 0
-  MINOR = 6
-  BUGFIX = 1
+  MINOR = 7
+  BUGFIX = 0
   DEV = nil
 
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')

data/lib/cross_origen/cmsis_svd.rb

@@ -0,0 +1,143 @@
+module CrossOrigen
+  class CMSISSVD < XMLDoc
+    def import(file, options = {}) # rubocop:disable CyclomaticComplexity
+      with_output_file(options) do |f|
+        doc(file, options) do |doc|
+          f.puts '# This file was automatically generated from a CMSIS-SVD input file'
+          f.puts '# Name:    ' + (fetch(doc.xpath('device/name'), get_text: true) || '')
+          f.puts '# Version: ' + (fetch(doc.xpath('device/version'), get_text: true) || '')
+          f.puts "# Created at #{Time.now.strftime('%e %b %Y %H:%M%p')} by #{User.current.name}"
+          f.puts '# rubocop:disable all'
+          f.puts 'module ImportedCMSISSVD'
+          f.puts '  def initialize(*args)'
+          f.puts '    instantiate_imported_cmsis_svd_data'
+          f.puts '  end'
+          f.puts ''
+          f.puts '  def instantiate_imported_cmsis_svd_data'
+
+          # Create sub-blocks
+          indexes = {}
+          doc.xpath('device/peripherals/peripheral').each do |p|
+            name = fetch(p.xpath('groupName'), get_text: true)
+            name = name.to_s.downcase.symbolize
+            ba = extract(p, 'baseAddress', format: :integer, hex: true)
+            if j = peripheral_groups(doc)[name] > 1
+              indexes[name] ||= 0
+              f.puts "    sub_block :#{name}#{indexes[name]}, base_address: #{ba.to_hex}"
+              indexes[name] += 1
+            else
+              f.puts "    sub_block :#{name}, base_address: #{ba.to_hex}"
+            end
+          end
+          f.puts ''
+
+          # Add registers to each sub-block
+          indexes = {}
+          doc.xpath('device/peripherals/peripheral').each do |p|
+            sb = fetch(p.xpath('groupName'), get_text: true)
+            sb = sb.to_s.downcase.symbolize
+            if j = peripheral_groups(doc)[sb] > 1
+              indexes[sb] ||= 0
+              ix = indexes[sb]
+              indexes[sb] += 1
+              sb = "#{sb}#{ix}"
+            end
+
+            p.xpath('registers/register').each do |r|
+              name = extract(r, 'name')
+              di = extract(r, 'dim', format: :integer)
+              dim = !!di
+              if dim
+                dinc = extract(r, 'dimIncrement', format: :integer)
+                dvals = extract(r, 'dimIndex').split(',')
+              else
+                di = 1
+              end
+              offset = extract(r, 'addressOffset', format: :integer, hex: true)
+              size = extract(r, 'size', format: :integer)
+              reset = extract(r, 'resetValue', format: :integer, hex: true)
+              desc = (extract(r, 'description') || '').gsub("'", %q(\\\'))
+
+              di.times do |i|
+                if dim
+                  n = name.sub('[%s]', dvals[i])
+                  addr = offset + (i * dinc)
+                else
+                  n = name
+                  addr = offset
+                end
+                f.puts "    #{sb}.add_reg :#{n.downcase.symbolize}, #{addr.to_hex}, size: #{size}#{reset ? ', reset: ' + reset.to_hex : ''}, description: '#{desc}' do |reg|"
+                r.xpath('fields/field').each do |b|
+                  bn = extract(b, 'name')
+                  unless bn == 'RESERVED'
+                    bn = bn.to_s.downcase.symbolize
+                    lsb = extract(b, 'lsb', format: :integer)
+                    msb = extract(b, 'msb', format: :integer)
+                    access = extract(b, 'access')
+                    desc = (extract(r, 'description') || '').gsub("'", %q(\\\'))
+                    case access
+                    when 'read-only'
+                      ac = :ro
+                    else
+                      ac = :rw
+                    end
+                    if lsb == msb
+                      f.puts "      reg.bit #{lsb}, :#{bn}, access: :#{ac}, description: '#{desc}'"
+                    else
+                      f.puts "      reg.bit #{msb}..#{lsb}, :#{bn}, access: :#{ac}, description: '#{desc}'"
+                    end
+                  end
+                end
+                f.puts '    end'
+              end
+            end
+          end
+
+          f.puts '  end'
+
+          # Create accessor methods to return an array of peripherals in the case
+          # where there are many in a group
+          peripheral_groups(doc).each do |name, size|
+            name = name.to_s.downcase.symbolize
+            if size > 1
+              f.puts ''
+              f.puts "  def #{name}"
+              f.print '    ['
+              size.times do |i|
+                if i == 0
+                  f.print "#{name}0"
+                else
+                  f.print ", #{name}#{i}"
+                end
+              end
+              f.puts ']'
+              f.puts '  end'
+            end
+          end
+
+          f.puts 'end'
+          f.puts '# rubocop:enable all'
+        end
+      end
+    end
+
+    def peripheral_groups(doc)
+      @peripheral_groups ||= begin
+        g = {}
+        doc.xpath('device/peripherals/peripheral').each do |p|
+          group = fetch(p.xpath('groupName'), get_text: true)
+          group = group.to_s.downcase.symbolize
+          g[group] ||= 0
+          g[group] += 1
+        end
+        g
+      end
+    end
+
+    def with_output_file(options = {})
+      path = options[:output] || 'imported_cmsis_svd.rb'
+      File.open(path, 'w') { |f| yield f }
+      puts "Successfully imported to #{path}"
+    end
+  end
+end

data/lib/cross_origen/commands/import.rb

@@ -0,0 +1,32 @@
+options = {}
+opt_parser = OptionParser.new do |opts|
+  opts.banner = <<-END
+Usage: origen cr:import FILE [options]
+
+Import the given file into Origen format.
+This will output a Ruby module that can then be included in an Origen model
+to add the contained registers, sub-blocks, etc.
+
+END
+  opts.on('-o', '--output PATH', String, 'Override the default output file') { |t| options[:output] = t }
+end
+opt_parser.parse! ARGV
+
+file = ARGV[0]
+unless file
+  puts 'You must supply a file to import!'
+  exit
+end
+
+unless File.exist?(file)
+  puts 'That file does not exist!'
+  exit
+end
+
+snippet = IO.read(file, 2000)  # Read first 2000 characters
+case snippet
+when /CMSIS-SVD.xsd/
+  CrossOrigen::CMSISSVD.new(nil).import(file, options)
+else
+  puts 'Unknown file format!'
+end

data/lib/cross_origen/origen_format.rb

@@ -21,15 +21,18 @@ module CrossOrigen
       incl:  "\# This file is created by Origen via CrossOrigen::OrigenFormat#export, and is read-only"
     }
 
-    attr_reader :obj, :top_level_class, :top_level_hierarchy, :output_dir, :top_level_path, :incl_path, :incl_dir, :file_content
+    attr_reader :obj, :top_level_class, :top_level_hierarchy, :output_dir, :top_level_path, :incl_path, :incl_dir, :file_content, :inst_level
 
     def initialize(options = {})
       options = {
-        obj:  $dut,
-        path: "#{Origen.root!}/output"
+        obj:               $dut,
+        path:              "#{Origen.root!}/output",
+        instantiate_level: :top
       }.update(options)
       @obj = options[:obj]
       @output_dir = options[:path]
+      @inst_level = options[:instantiate_level]
+      fail "@instantiate_level must be either set to ':top' or ':sub_block'" unless [:top, :sub_block].include?(@inst_level)
       @top_level_path = "#{output_dir}/top_level.rb"
       @incl_path = "#{output_dir}/sub_blocks.rb"
       @incl_dir = "#{output_dir}/import"
@@ -72,12 +75,22 @@ module CrossOrigen
         bom_file.puts(FILE_COMMENTS[:incl])
         bom_file.puts("require_relative 'sub_blocks'")
         @top_level_hierarchy.each do |name, obj|
+          if @inst_level == :sub_block && @top_level_hierarchy.keys.last == name
+            obj = 'module'
+            name = 'SubBlocks'
+          end
           bom_file.puts("#{indent}#{obj} #{name.split('::').last}")
           indent += '  '
         end
         bom_file.puts("#{indent}include Origen::Model")
         bom_file.puts('')
-        bom_file.puts("#{indent}def initialize(options = {})")
+        if @inst_level == :sub_block
+          bom_file.puts("#{indent}def instantiate_sub_blocks(options = {})")
+        elsif @inst_level == :top
+          bom_file.puts("#{indent}def initialize(options = {})")
+        else
+          fail '@instantiate_level not set to an acceptable value [:top, :sub_block]'
+        end
         indent += '  '
         # This method is recursive (indirectly) so file_content should find all BoM and include file strings
         create_file_content(@obj, indent)

data/lib/cross_origen.rb

@@ -64,8 +64,9 @@ module CrossOrigen
   # The Ruby files are created at options[:path] (app output directory by default)
   def cr_to_origen(options = {})
     options = {
-      obj:  $dut,
-      path: Origen.app.config.output_directory
+      obj:               $dut,
+      path:              Origen.app.config.output_directory,
+      instantiate_level: :top
     }.update(options)
     # This method assumes and checks for $self to contain Origen::Model
     error "ERROR: #{options[:obj].class} does not contain Origen::Model as required" unless options[:obj].class < Origen::Model

data/templates/web/examples/origen_export.md.erb

@@ -1,96 +1,151 @@
-% render "layouts/basic.html", tab: :examples do
-
-## Origen Export
-
-This page shows how to create static read-only Ruby files from
-models created by importing 3rd party data (e.g. IP-XACT). The Ruby files can then be
-used for day-day running of your application and this will significantly improve
-the boot up speed vs. re-importing the data every time.
-
-The Ruby files can be periodically refreshed as new versions of the master
-data are released.
-
-The user only need provide the output path where they want the
-Ruby files to be written.
-
-### Implementation
-
-Here is an example of how to create the static Ruby files.
-
-~~~ruby
-$dut.to_origen(path: "#{Origen.root}/output/exported")
-~~~
-
-### Output
-
-At the output path the following files are created:
-
-* top_level.rb: The top-level object, this is the one that should be instantiated
-
-~~~ruby
-# This file is created by Origen, CrossOrigen::OrigenFormat#export, and is read-only
-require_relative 'sub_blocks'
-module CrossOrigen
-  module Test
-    class DUT
-      include Origen::Model
-
-      def initialize(options = {})
-        sub_block :atx, base_address: 0xDEADBEEF, class_name: 'ATX'
-        sub_block # ...
-      end
-    end
-  end
-end
-~~~
-
-* sub_blocks.rb: include file for the sub_block class files
-
-~~~ruby
-# This file is created by Origen, CrossOrigen::OrigenFormat#export, and is read-only
-require_relative 'import/atx.rb'
-require_relative # ...
-~~~
-
-* import/\<sub_block\>.rb: models the individual sub_block object
-
-~~~ruby
-# -*- encoding : utf-8 -*-
-# This file is created by Origen, CrossOrigen::OrigenFormat#export, and is read-only.
-# If you need to make changes, re-open the class
-module CrossOrigen
-  module Test
-    class DUT
-      class ATX # rubocop:disable ClassLength
-        include Origen::Model
-
-        def initialize(options = {})
-          instantiate_registers(options)
-        end
-
-        # rubocop:disable LineLength
-        # rubocop:disable StringLiterals
-        def instantiate_registers(options = {}) # rubocop:disable MethodLength
-          # ** MGATE Clock Divider Register **
-          # The MCLKDIV register is used to divide down the frequency of the HBOSCCLK input. If the MCLKDIV
-          # register is set to value "N", then the output (beat) frequency of the clock divider is OSCCLK / (N+1). The
-          # resulting beats are, in turn, counted by the PTIMER module to control the duration of Flash high-voltage
-          # operations.
-          reg :mclkdiv, 0x0, size: 16 do |reg|
-            # **Oscillator (Hi)** - Firmware FMU clk source selection. (Note that in addition to this firmware-controlled bit, the
-            # FMU clock source is also dependent on test and power control discretes).
-            # 
-            # 0 | FMU clock is the externally supplied bus clock ipg_clk
-            # 1 | FMU clock is the internal oscillator from the TFS hardblock
-            reg.bit 15, :osch, reset: 0b1, access: :rw
-            # ...
-          end
-          # ...
-        end
-      end
-    end
-  end
-end
-~~~
-
-% end
+% render "layouts/basic.html", tab: :examples do
+
+## Origen Export
+
+This page shows how to create static read-only Ruby files from
+models created by importing 3rd party data (e.g. IP-XACT). The Ruby files can then be
+used for day-day running of your application and this will significantly improve
+the boot up speed vs. re-importing the data every time.
+
+The Ruby files can be periodically refreshed as new versions of the master
+data are released.
+
+The user only need provide the output path where they want the
+Ruby files to be written.
+
+### Implementation
+
+There are two methods for instantiating device models:
+
+1. As a named Origen TopLevel class with a method #instantiate_sub_blocks to model the device
+2. As a generic SubBlocks module to model the device
+
+Option #1 is the default behavior and is handled in this manner:
+
+~~~ruby
+$dut.to_origen(path: "#{Origen.root}/output/exported")
+~~~
+
+### Output
+
+At the output path the following files are created:
+
+* top_level.rb: The top-level object, this is the one that should be instantiated
+
+~~~ruby
+# This file is created by Origen, CrossOrigen::OrigenFormat#export, and is read-only
+require_relative 'sub_blocks'
+module CrossOrigen
+  module Test
+    class DUT
+      include Origen::Model
+
+      def initialize(options = {})
+        sub_block :atx, base_address: 0xDEADBEEF, class_name: 'ATX'
+        sub_block # ...
+      end
+    end
+  end
+end
+~~~
+
+* sub_blocks.rb: include file for the sub_block class files
+
+~~~ruby
+# This file is created by Origen, CrossOrigen::OrigenFormat#export, and is read-only
+require_relative 'import/atx.rb'
+require_relative # ...
+~~~
+
+* import/\<sub_block\>.rb: models the individual sub_block object
+
+~~~ruby
+# -*- encoding : utf-8 -*-
+# This file is created by Origen, CrossOrigen::OrigenFormat#export, and is read-only.
+# If you need to make changes, re-open the class
+module CrossOrigen
+  module Test
+    class DUT
+      class ATX # rubocop:disable ClassLength
+        include Origen::Model
+
+        def initialize(options = {})
+          instantiate_registers(options)
+        end
+
+        # rubocop:disable LineLength
+        # rubocop:disable StringLiterals
+        def instantiate_registers(options = {}) # rubocop:disable MethodLength
+          # ** MGATE Clock Divider Register **
+          # The MCLKDIV register is used to divide down the frequency of the HBOSCCLK input. If the MCLKDIV
+          # register is set to value "N", then the output (beat) frequency of the clock divider is OSCCLK / (N+1). The
+          # resulting beats are, in turn, counted by the PTIMER module to control the duration of Flash high-voltage
+          # operations.
+          reg :mclkdiv, 0x0, size: 16 do |reg|
+            # **Oscillator (Hi)** - Firmware FMU clk source selection. (Note that in addition to this firmware-controlled bit, the
+            # FMU clock source is also dependent on test and power control discretes).
+            # 
+            # 0 | FMU clock is the externally supplied bus clock ipg_clk
+            # 1 | FMU clock is the internal oscillator from the TFS hardblock
+            reg.bit 15, :osch, reset: 0b1, access: :rw
+            # ...
+          end
+          # ...
+        end
+      end
+    end
+  end
+end
+~~~
+
+Why option #2?  Some Origen applications may serve multiple products and want the ability to swap the current
+TopLevel model using target instantitation.  
+
+~~~ruby
+origen i -t my_product
+~~~
+
+Here is a generic example of how an application may use option #2 in
+combination with the CrossOrigen import feature.  By passing the 'instantiate_level: :sub_block' to the #to_origen
+method, the device model is changed to a SubBlocks module implementation.  Notice that the #to_origen method is called
+inside the #on_load_target callback.  This is necessary as the #to_origen method accesses Origen.app.output_directory,
+which is not available until the target is instantiated.
+
+~~~ruby
+
+module MyOrigenApp
+  class Product
+    include Origen::TopLevel
+    include CrossOrigen
+    
+    attr_accessor :curr_prod, :curr_prod_xml, :top_origen_path
+	
+    def initialize(options = {})
+      options = {
+        curr_product: nil
+      }.update(options)
+      @curr_prod = options [:curr_product]
+      @curr_prod_xml = Pathname.new("#{Origen.root}/vendor/mycompany/products/#{curr_prod}/product_ipxact.xml")
+      @top_origen_path = Pathname.new("#{Origen.root}/vendor/mycompany/products/#{curr_prod}/top_level.rb")
+      # Import or instantiate registers
+      if @top_origen_path.exist?
+        Origen.log.info("Instantiating registers from Origen source for product #{curr_prod}...")
+        require @top_origen_path.to_s.chomp(".rb")
+        extend SubBlocks
+        instantiate_sub_blocks()
+      else
+        Origen.log.info("Importing IP-XACT registers for #{curr_prod}...")
+        cr_import(path: @curr_prod_xml)
+      end
+    end
+    
+    def on_load_target
+      to_origen(path: @top_origen_path, instantiate_level: :sub_block)
+    end
+    
+  end
+end  
+
+~~~
+
+% end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: cross_origen
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: origen_doc_helpers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
 description: 
 email:
 - stephen.f.mcginty@gmail.com
@@ -59,13 +45,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/fix_my_workspace
 - config/application.rb
 - config/commands.rb
 - config/development.rb
 - config/environment.rb
+- config/shared_commands.rb
 - config/users.rb
 - config/version.rb
 - lib/cross_origen.rb
+- lib/cross_origen/cmsis_svd.rb
+- lib/cross_origen/commands/import.rb
 - lib/cross_origen/design_sync.rb
 - lib/cross_origen/headers.rb
 - lib/cross_origen/ip_xact.rb
@@ -109,9 +99,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Translators for importing and exporting Origen data to/from 3rd party formats
 test_files: []
-has_rdoc: