Add Software alignment trap as config option
Update TopHat defconfig