Merge pull request #224 from daveshah1/nextpnr0299

up5k: Fix TOPADDSUB_CARRYSELECT_0 override where it swaps with osc tr…