Chiral expansion of baryon masses and $\sigma$-terms