main/u-boot: fix build with changes in SWIG
pick upstream commit a63456b9191fae2fe49f4b121e025792022e3950 from master to fix build with changes in SWIG
pick upstream commit a63456b9191fae2fe49f4b121e025792022e3950 from master to fix build with changes in SWIG