6 files changed, 12 insertions, 14 deletions

diff --git a/conf/machine/include/socfpga.inc b/conf/machine/include/socfpga.inc
index 60ba002..706c583 100644
--- a/conf/machine/include/socfpga.inc
+++ b/conf/machine/include/socfpga.inc
@@ -5,7 +5,7 @@ require conf/machine/include/tune-cortexa9.inc
 # this variable specifies the kernel to be built: linux-altera or linux-altera-ltsi
 # this affects the PREFERRED_PROVIDER of virtual/kernel
 # it can be overriden from the environment, using BB_ENV_EXTRAWHITE
-KERNEL_PROVIDER?="linux-altera-ltsi"
+KERNEL_PROVIDER ?= "linux-altera-ltsi"
 PREFERRED_PROVIDER_virtual/kernel = "${KERNEL_PROVIDER}"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-socfpga"
diff --git a/recipes-bsp/u-boot/u-boot-socfpga.inc b/recipes-bsp/u-boot/u-boot-socfpga.inc
index 5655c12..b673ca4 100755
--- a/recipes-bsp/u-boot/u-boot-socfpga.inc
+++ b/recipes-bsp/u-boot/u-boot-socfpga.inc
@@ -10,10 +10,10 @@ PACKAGES=""
 
 # the following variables can be passed from the env
 # using BB_ENV_WHITELIST to override the defaults
-UBOOT_REPO?="git://git.rocketboards.org/u-boot-socfpga.git"
-UBOOT_BRANCH?="socfpga_v${PV}"
-UBOOT_PROT?="http"
-UBOOT_TAG?="${AUTOREV}"
+UBOOT_REPO ?= "git://git.rocketboards.org/u-boot-socfpga.git"
+UBOOT_BRANCH ?= "socfpga_v${PV}"
+UBOOT_PROT ?= "http"
+UBOOT_TAG ?= "${AUTOREV}"
 
 SRC_URI = "${UBOOT_REPO};protocol=${UBOOT_PROT};branch=${UBOOT_BRANCH}"
 LIC_FILES_CHKSUM = "file://${S}/COPYING;startline=26;md5=1707d6db1d42237583f50183a5651ecb"
diff --git a/recipes-kernel/linux/linux-altera-latest.inc b/recipes-kernel/linux/linux-altera-latest.inc
index edf09b2..ae76d5e 100644
--- a/recipes-kernel/linux/linux-altera-latest.inc
+++ b/recipes-kernel/linux/linux-altera-latest.inc
@@ -1,4 +1,4 @@
-KERNEL_BRANCH?="socfpga-${PV}"
+KERNEL_BRANCH ?= "socfpga-${PV}"
 
 require recipes-kernel/linux/linux-altera.inc
 
diff --git a/recipes-kernel/linux/linux-altera-ltsi-rt_3.10.bb b/recipes-kernel/linux/linux-altera-ltsi-rt_3.10.bb
index 9946554..5d23758 100755
--- a/recipes-kernel/linux/linux-altera-ltsi-rt_3.10.bb
+++ b/recipes-kernel/linux/linux-altera-ltsi-rt_3.10.bb
@@ -1,6 +1,6 @@
 DTB_SUBDIR="dts/"
 
-KERNEL_BRANCH?="socfpga-${PV}-ltsi-rt"
+KERNEL_BRANCH ?= "socfpga-${PV}-ltsi-rt"
 
 require recipes-kernel/linux/linux-altera.inc
 
diff --git a/recipes-kernel/linux/linux-altera-ltsi.inc b/recipes-kernel/linux/linux-altera-ltsi.inc
index 8b058e5..196cc54 100644
--- a/recipes-kernel/linux/linux-altera-ltsi.inc
+++ b/recipes-kernel/linux/linux-altera-ltsi.inc
@@ -1,4 +1,4 @@
-KERNEL_BRANCH?="socfpga-${PV}-ltsi"
+KERNEL_BRANCH ?= "socfpga-${PV}-ltsi"
 
 require recipes-kernel/linux/linux-altera.inc
 
diff --git a/recipes-kernel/linux/linux-altera.inc b/recipes-kernel/linux/linux-altera.inc
index 3a8ac1d..aa801e9 100755
--- a/recipes-kernel/linux/linux-altera.inc
+++ b/recipes-kernel/linux/linux-altera.inc
@@ -1,9 +1,9 @@
 PR = "r1"
 
-KERNEL_REPO?="git://git.rocketboards.org/linux-socfpga.git"
-KERNEL_PROT?="http"
-KERNEL_DEFCONFIG?="socfpga_defconfig"
-KERNEL_TAG?="${AUTOREV}"
+KERNEL_REPO ?= "git://git.rocketboards.org/linux-socfpga.git"
+KERNEL_PROT ?= "http"
+KERNEL_DEFCONFIG ?= "socfpga_defconfig"
+KERNEL_TAG ?= "${AUTOREV}"
 
 SRC_URI = "${KERNEL_REPO};protocol=${KERNEL_PROT};branch=${KERNEL_BRANCH}"
 
@@ -14,8 +14,6 @@ SECTION = "kernel"
 DESCRIPTION = "Altera Linux kernel"
 LICENSE = "GPLv2"
 
-COMPATIBLE_MACHINE = "socfpga"
-
 LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
 S = "${WORKDIR}/git"