u-boot-socfpga: cleanup u-boot binary suffix definition

UBOOT_BINARY and UBOOT_SUFFIX are defined on a machine
basis, and therefore are moved from u-boot-socfpga
recipe to the machine configuration.

Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>

2 files changed, 6 insertions, 8 deletions

diff --git a/conf/machine/cyclone5.conf b/conf/machine/cyclone5.conf
index 164c108..7210566 100644
--- a/conf/machine/cyclone5.conf
+++ b/conf/machine/cyclone5.conf
@@ -15,6 +15,12 @@ UBOOT_CONFIG[sockit] = "socfpga_sockit_defconfig"
 UBOOT_CONFIG[socrates] = "socfpga_socrates_defconfig"
 UBOOT_CONFIG[sr1500] = "socfpga_sr1500_defconfig"
 
+# Some versions of u-boot use .bin and others use .img.
+# By default we use .sfp as this is what is generated
+# for Cyclone V by the U-Boot.
+UBOOT_SUFFIX = "sfp"
+UBOOT_BINARY = "u-boot-with-spl.${UBOOT_SUFFIX}"
+
 KMACHINE = "cyclone5"
 
 # Default kernel devicetrees
diff --git a/recipes-bsp/u-boot/u-boot-socfpga_v2018.05.bb b/recipes-bsp/u-boot/u-boot-socfpga_v2018.05.bb
index 9f0e176..81492cb 100644
--- a/recipes-bsp/u-boot/u-boot-socfpga_v2018.05.bb
+++ b/recipes-bsp/u-boot/u-boot-socfpga_v2018.05.bb
@@ -8,12 +8,4 @@ SRCREV = "890e79f2b1c26c5ba1a86d179706348aec7feef7"
 SRC_URI_append = "\
     "
 
-# Some versions of u-boot use .bin and others use .img.
-# By default we use .sfp as this is what is generated
-# for Cyclone V by the U-Boot.
-UBOOT_SUFFIX = "sfp"
-UBOOT_BINARY = "u-boot-with-spl.${UBOOT_SUFFIX}"
-
-UBOOT_MAKE_TARGET ?= "all"
-
 DEPENDS += "dtc-native bc-native u-boot-mkimage-native"