| Message ID | 20211215222507.762310-1-lothar.felten@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | configs/beaglebone_qt5_defconfig: bump to u-boot 2021.04 | expand |
On 15/12/2021 23:25, Lothar Felten wrote: > Fixes: > /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition... > scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here > > Tested on beaglebone black and beaglebone white (A6) > > Signed-off-by: Lothar Felten <lothar.felten@gmail.com> Applied to master, thanks. Regards, Arnout > --- > configs/beaglebone_qt5_defconfig | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig > index 5f084b77df..03b46e91a7 100644 > --- a/configs/beaglebone_qt5_defconfig > +++ b/configs/beaglebone_qt5_defconfig > @@ -32,13 +32,11 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="250M" > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.04" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" > BR2_TARGET_UBOOT_NEEDS_DTC=y > # BR2_TARGET_UBOOT_FORMAT_BIN is not set > BR2_TARGET_UBOOT_FORMAT_IMG=y > -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="spl/u-boot-spl.bin" > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="MLO" > BR2_PACKAGE_HOST_DOSFSTOOLS=y >
>>>>> "Lothar" == Lothar Felten <lothar.felten@gmail.com> writes: > Fixes: > /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition... > scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here > Tested on beaglebone black and beaglebone white (A6) > Signed-off-by: Lothar Felten <lothar.felten@gmail.com> Committed to 2021.11.x, thanks.
diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig index 5f084b77df..03b46e91a7 100644 --- a/configs/beaglebone_qt5_defconfig +++ b/configs/beaglebone_qt5_defconfig @@ -32,13 +32,11 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="250M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="spl/u-boot-spl.bin" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="MLO" BR2_PACKAGE_HOST_DOSFSTOOLS=y
Fixes: /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition... scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here Tested on beaglebone black and beaglebone white (A6) Signed-off-by: Lothar Felten <lothar.felten@gmail.com> --- configs/beaglebone_qt5_defconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)