Merge remote-tracking branch 'origin/master' into xc7srl

diff --cc techlibs/xilinx/cells_xtra.sh
index 46ababdea1635a00b1b2d98a543ac084cc102879,56520ea1065ea72a0d4d89ee408b12db9b670073..3f8efeebd77d395ef408116d5ef97c88ca29c62c
--- 1/techlibs/xilinx/cells_xtra.sh
--- 2/techlibs/xilinx/cells_xtra.sh
+++ b/techlibs/xilinx/cells_xtra.sh
@@@ -134,9 -135,9 +135,10 @@@ function xtract_cell_decl(
        xtract_cell_decl ROM256X1
        xtract_cell_decl ROM32X1
        xtract_cell_decl ROM64X1
 -      xtract_cell_decl SRL16E
 -      xtract_cell_decl SRLC32E
 +      #xtract_cell_decl SRL16E
 +      #xtract_cell_decl SRLC32E
 +      xtract_cell_decl STARTUPE2
+       xtract_cell_decl STARTUPE2 "(* keep *)"
        xtract_cell_decl USR_ACCESSE2
        xtract_cell_decl XADC
  } > cells_xtra.new

diff --cc techlibs/xilinx/cells_xtra.v
index 6adad35aef395114cab3f73b47a4d72043f3ba4a,497518d35033e313138ef3708fb47522542cca47..06c868080b4592f8f45f99eba6c1cdc1325cb669
--- 1/techlibs/xilinx/cells_xtra.v
--- 2/techlibs/xilinx/cells_xtra.v
+++ b/techlibs/xilinx/cells_xtra.v
@@@ -3843,6 -3847,23 +3847,7 @@@ module ROM64X1 (...)
      input A0, A1, A2, A3, A4, A5;
  endmodule
  
 -module SRL16E (...);
 -    parameter [15:0] INIT = 16'h0000;
 -    parameter [0:0] IS_CLK_INVERTED = 1'b0;
 -    output Q;
 -    input A0, A1, A2, A3, CE, CLK, D;
 -endmodule
 -
 -module SRLC32E (...);
 -    parameter [31:0] INIT = 32'h00000000;
 -    parameter [0:0] IS_CLK_INVERTED = 1'b0;
 -    output Q;
 -    output Q31;
 -    input [4:0] A;
 -    input CE, CLK, D;
 -endmodule
 -
+ (* keep *)
  module STARTUPE2 (...);
      parameter PROG_USR = "FALSE";
      parameter real SIM_CCLK_FREQ = 0.0;