Staging: w35und: Merge wbhal_f.h to wbhal_s.h