match up power/gnd numbers with pinmux

diff --git a/experiments9/coriolis2/ioring.py b/experiments9/coriolis2/ioring.py
index 42ff14b02b630f6dc813ec19860faf205762cf0e..ddebb712b9bfa777204d1f0204a589b9f508f2d8 100644 (file)
--- a/experiments9/coriolis2/ioring.py
+++ b/experiments9/coriolis2/ioring.py
@@ -38,7 +38,5 @@ chip.update({ 'pads.ioPadGauge' : 'pxlib',
           'core.size'       : ( l(13000), l(13000) ),
           'chip.size'       : ( l(14400), l(14400) ),
           'pads.useCoreSize': True,
-          'chip.n_extpower'  : 2,
-          'chip.n_intpower'  : 1,
           'chip.clockTree'  : True,
        })

diff --git a/experiments9/non_generated/ls180.vst b/experiments9/non_generated/ls180.vst
index d12d9419c9f0ca9afcfb50ca403ef565ce693fa4..d6c80cfb548ca02c6d34efe1095325dcc5eb0796 100644 (file)
--- a/experiments9/non_generated/ls180.vst
+++ b/experiments9/non_generated/ls180.vst
@@ -26,7 +26,7 @@ entity ls180 is
        ; sdcard_data_i   : in bit_vector(3 downto 0)
        ; gpio_i          : in bit_vector(15 downto 0)
        ; sdram_dq_i      : in bit_vector(15 downto 0)
-       ; nc              : in bit_vector(33 downto 0)
+       ; nc              : in bit_vector(23 downto 0)
        ; i2c_scl         : out bit
        ; i2c_sda_o       : out bit
        ; i2c_sda_oe      : out bit

diff --git a/pinmux b/pinmux
index 8c51389473777ca6a881735ee0cf73aaa5f99c4b..5055898bce9eae3da5bc94994a01d1deda9cf4ec 160000 (submodule)
--- a/pinmux
+++ b/pinmux
@@ -1 +1 @@
-Subproject commit 8c51389473777ca6a881735ee0cf73aaa5f99c4b
+Subproject commit 5055898bce9eae3da5bc94994a01d1deda9cf4ec