After merge master imx and U-Boot master. Pico imx7d build break.
common/built-in.o:/home/jun/u-boot/include/bmp_logo_data.h:46 : définitions multiples de « bmp_logo_bitmap » board/technexion/pico-imx7d/built-in.o:/home/jun/u-boot/include/bmp_logo_data.h:46 : défini pour la première fois ici common/built-in.o:/home/jun/u-boot/include/bmp_logo_data.h:12 : définitions multiples de « bmp_logo_palette » board/technexion/pico-imx7d/built-in.o:/home/jun/u-boot/include/bmp_logo_data.h:12 : défini pour la première fois ici Makefile:1610: recipe for target 'u-boot' failed make: *** [u-boot] Error 1
So fix with according Anatolij Gustschin U-Boot video merge.
See fix branch : https://github.com/jorisoffouga/u-boot/commits/fix/pico-imx7d
Joris Offouga (2): pico-imx7d: fix splash logo drawing pico-imx7d: Remove dead code for dm_video
arch/arm/dts/imx7d-pico-u-boot.dtsi | 31 ------------------------ board/technexion/pico-imx7d/pico-imx7d.c | 24 ------------------ configs/pico-dwarf-imx7d_defconfig | 2 ++ configs/pico-hobbit-imx7d_defconfig | 2 ++ configs/pico-imx7d_bl33_defconfig | 2 ++ configs/pico-imx7d_defconfig | 2 ++ configs/pico-nymph-imx7d_defconfig | 2 ++ configs/pico-pi-imx7d_defconfig | 2 ++ include/configs/pico-imx7d.h | 1 + 9 files changed, 13 insertions(+), 55 deletions(-)