Merge "bsp: add salvator-x H3 support"