X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=meta-agl-bsp%2Fmeta-rcar-gen3%2Frecipes-bsp%2Fu-boot%2Fu-boot_2015.04.bbappend;fp=meta-agl-bsp%2Fmeta-rcar-gen3%2Frecipes-bsp%2Fu-boot%2Fu-boot_2015.04.bbappend;h=f6271908f666ca28319b5cc795794ae32a0f33b8;hb=c2b2edbd68d2074a8c9010dd6270ebdeef763375;hp=6f30fa18e092d03850efc00bf6fa42b195261b2a;hpb=f6585ce144bee5cc847990408366104984c73826;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2015.04.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2015.04.bbappend
index 6f30fa18e..f6271908f 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2015.04.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2015.04.bbappend
@@ -4,6 +4,13 @@ SRC_URI_append = " \
     file://0001-fixup-build-with-gcc7.patch \
 "
 
+# Config names have changed in mainline u-boot since 2015.04,
+#  here we want to use the old ones.
+UBOOT_MACHINE = "${BOARD_NAME}_defconfig"
+
+# Also override the override
+UBOOT_MACHINE_sota = "${BOARD_NAME}_defconfig"
+
 do_deploy_prepend() {
     ln -sf ${B}/${UBOOT_SREC} ${S}/${UBOOT_SREC}
 }