From 8df38d4e0fc230faeac006e37f2a7fbb4bde6d37 Mon Sep 17 00:00:00 2001 From: Dalon Westergreen Date: Thu, 12 Nov 2015 07:29:38 -0800 Subject: Conditionally set kernel preferred provider and uboot preferred version --- conf/machine/arria10.conf | 2 +- conf/machine/arria5.conf | 2 +- conf/machine/cyclone5.conf | 2 +- conf/machine/include/socfpga.inc | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/machine/arria10.conf b/conf/machine/arria10.conf index 78f8159..3bfcfe8 100644 --- a/conf/machine/arria10.conf +++ b/conf/machine/arria10.conf @@ -4,7 +4,7 @@ require conf/machine/include/socfpga.inc -PREFERRED_VERSION_u-boot-socfpga = "2014.10" +PREFERRED_VERSION_u-boot-socfpga ?= "2014.10" UBOOT_MACHINE = "socfpga_arria10_defconfig" KMACHINE = "arria10" diff --git a/conf/machine/arria5.conf b/conf/machine/arria5.conf index e94d3df..8589f94 100644 --- a/conf/machine/arria5.conf +++ b/conf/machine/arria5.conf @@ -4,7 +4,7 @@ require conf/machine/include/socfpga.inc -PREFERRED_VERSION_u-boot-socfpga = "2013.01.01" +PREFERRED_VERSION_u-boot-socfpga ?= "2013.01.01" UBOOT_MACHINE = "socfpga_arria5" KMACHINE = "arria5" diff --git a/conf/machine/cyclone5.conf b/conf/machine/cyclone5.conf index b993095..fd74005 100644 --- a/conf/machine/cyclone5.conf +++ b/conf/machine/cyclone5.conf @@ -4,7 +4,7 @@ require conf/machine/include/socfpga.inc -PREFERRED_VERSION_u-boot-socfpga = "2013.01.01" +PREFERRED_VERSION_u-boot-socfpga ?= "2013.01.01" UBOOT_MACHINE = "socfpga_cyclone5" KMACHINE = "cyclone5" diff --git a/conf/machine/include/socfpga.inc b/conf/machine/include/socfpga.inc index 706c583..6932620 100644 --- a/conf/machine/include/socfpga.inc +++ b/conf/machine/include/socfpga.inc @@ -6,9 +6,9 @@ require conf/machine/include/tune-cortexa9.inc # this affects the PREFERRED_PROVIDER of virtual/kernel # it can be overriden from the environment, using BB_ENV_EXTRAWHITE KERNEL_PROVIDER ?= "linux-altera-ltsi" -PREFERRED_PROVIDER_virtual/kernel = "${KERNEL_PROVIDER}" +PREFERRED_PROVIDER_virtual/kernel ?= "${KERNEL_PROVIDER}" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-socfpga" +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-socfpga" # Increase this everytime you change something in the kernel MACHINE_KERNEL_PR = "r1" -- cgit v1.2.3-54-g00ecf