Hi Quentin,
I have submitted the updated v2 patch here:
https://lists.openembedded.org/g/openembedded-core/topic/120907196
The mapping is now placed in u-boot-common.inc so both u-boot and u-boot-tools inherit it.
 
Regards,
Devansh