summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDalon Westergreen <dalon.westergreen@intel.com>2017-01-20 08:24:08 -0800
committerDalon Westergreen <dalon.westergreen@intel.com>2017-01-20 08:24:08 -0800
commitf43c2def652f91f584ec6acfc3ee99d54d5f19ab (patch)
tree819fcb4c1be5b115105c6af0e080d50966d3c1fb
parente24b0ec9d6d62ae69ee4614fb1d6f03d2b9df35c (diff)
downloadmeta-altera-f43c2def652f91f584ec6acfc3ee99d54d5f19ab.tar.gz
Only conditionally set SOCFPGA_SDIMG_PARTITION_COMMAND
Since the machine conf allows you to change uboot versions you need to be able to change the sdcard creation setup
-rw-r--r--conf/machine/arria5.conf2
-rw-r--r--conf/machine/cyclone5.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/arria5.conf b/conf/machine/arria5.conf
index a04f2d5..6eedabf 100644
--- a/conf/machine/arria5.conf
+++ b/conf/machine/arria5.conf
@@ -19,4 +19,4 @@ KERNEL_DEVICETREE_arria5 ?= " \
19 19
20# Add support for SDCARD creation 20# Add support for SDCARD creation
21IMAGE_CLASSES += "sdcard_image-socfpga" 21IMAGE_CLASSES += "sdcard_image-socfpga"
22SOCFPGA_SDIMG_PARTITION_COMMAND = "generate_sdcard_partitions_v2016_11_and_newer" 22SOCFPGA_SDIMG_PARTITION_COMMAND ?= "generate_sdcard_partitions_v2016_11_and_newer"
diff --git a/conf/machine/cyclone5.conf b/conf/machine/cyclone5.conf
index 1c4586e..a2d743b 100644
--- a/conf/machine/cyclone5.conf
+++ b/conf/machine/cyclone5.conf
@@ -27,5 +27,5 @@ KERNEL_DEVICETREE ?= "\
27 27
28# Add support for SDCARD creation 28# Add support for SDCARD creation
29IMAGE_CLASSES += "sdcard_image-socfpga" 29IMAGE_CLASSES += "sdcard_image-socfpga"
30SOCFPGA_SDIMG_PARTITION_COMMAND = "generate_sdcard_partitions_v2016_11_and_newer" 30SOCFPGA_SDIMG_PARTITION_COMMAND ?= "generate_sdcard_partitions_v2016_11_and_newer"
31 31