Merge pull request #3275 from YosysHQ/micko/clk2fflogic_fix