Dorna Sports and Yamaha have agreed on a deal to continue supplying the MotoGP paddock with NMAX scooters for 2021 and beyond.