imx-boot: Fixed compile error on i.MX8MP

Added missing variable to machine config.
Fixed wrong override and small clean-ups in u-boot-imx.

conf/machine/imx8mpguf.conf

@@ -22,6 +22,7 @@ UBOOT_DTB_NAME = "kuk-trizeps8plus.dtb"
 
 # Set imx-mkimage boot target
 IMXBOOT_TARGETS = "flash_trizeps8plus"
+IMX_BOOT_SOC_TARGET = "iMX8MP"
 
 # The i.MX8MM needs a seek of 32 (used for WIC images only)
 IMX_BOOT_SEEK = "32"

dynamic-layers/freescale-layer/recipes-bsp/u-boot/u-boot-imx_%.bbappend

@@ -9,17 +9,18 @@ SRCBRANCH = "guf_imx_v2020.04-trizeps8plus_2021_12_07"
 PV = "2020.04"
 DEPENDS += "u-boot-tools-native"
 
-SRC_URI = "git://git@git.seco.com:4444/seco-ne/3rd-party/kuk/uboot-imx-kuk.git;protocol=ssh;branch=${SRCBRANCH};nobranch=1 \
-           file://add-u-boot-initial-env-target-to-Makefile.patch \
+SRC_URI = " \
+    git://git@git.seco.com:4444/seco-ne/3rd-party/kuk/uboot-imx-kuk.git;protocol=ssh;branch=${SRCBRANCH};nobranch=1 \
+    file://add-u-boot-initial-env-target-to-Makefile.patch \
 "
 SRCREV = "${AUTOREV}"
 
 ## Keith und Koep u-boot for imx8
 
 # imx8mp
-SRC_URI:remove_imx8mpguf = " \
-           file://add-u-boot-initial-env-target-to-Makefile.patch \
-           "
+SRC_URI:remove:imx8mpguf = " \
+    file://add-u-boot-initial-env-target-to-Makefile.patch \
+"
 
 # This is set in poky u-boot.inc to ${PN}-initial-env, which
 # names the file u-boot-imx-initial-env,
@@ -32,7 +33,6 @@ FILES:${PN}-fw-env = "/etc/fw_env*config"
 # Create an uboot-initial-env.bin that can be dd'd to the env offset
 # and then correctly read by u-boot and the libuboot-tools
 do_compile:append () {
-
     if [ -n "${UBOOT_CONFIG}" -o -n "${UBOOT_DELTA_CONFIG}" ]
     then
         unset i j k