Merge pull request #1 from zandrey/fido_1.8

Fido 1.8 Altera Linux Kernel and U-Boot recipes fixes

2 files changed, 5 insertions, 5 deletions

diff --git a/recipes-bsp/u-boot/u-boot-socfpga.inc b/recipes-bsp/u-boot/u-boot-socfpga.inc
index b673ca4..a8e5728 100755
--- a/recipes-bsp/u-boot/u-boot-socfpga.inc
+++ b/recipes-bsp/u-boot/u-boot-socfpga.inc
@@ -22,7 +22,7 @@ SRCREV_pn-${PN} = "${UBOOT_TAG}"
 S = "${WORKDIR}/git"
 
 # GCC 4.5.1 builds unusable binaries using -Os, remove it from OPTFLAGS
-EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
+EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" V=1'
 
 python () {
         if not d.getVar("UBOOT_MACHINE", True):
diff --git a/recipes-kernel/linux/linux-altera.inc b/recipes-kernel/linux/linux-altera.inc
index 356ce3e..3e0a5a4 100644
--- a/recipes-kernel/linux/linux-altera.inc
+++ b/recipes-kernel/linux/linux-altera.inc
@@ -14,9 +14,9 @@ SECTION = "kernel"
 DESCRIPTION = "Altera Linux kernel"
 LICENSE = "GPLv2"
 
-LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+LIC_FILES_CHKSUM = "file://${B}/COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
-S = "${WORKDIR}/git"
+B = "${WORKDIR}/git"
 
 MACHINE_DEFCONFIG = "${KERNEL_DEFCONFIG}"
 
@@ -84,7 +84,7 @@ do_deploy_dtb() {
     if test -n "${KERNEL_DEVICETREE}"; then
         for DTB_FILE in ${KERNEL_DEVICETREE}; do
             DTB_SYMLINK_NAME="${DTB_FILE}.dtb"
-            DEVICE_TREE_OUTPUT="${S}/arch/${ARCH}/boot/${DTB_SUBDIR}${DTB_FILE}.dtb"
+            DEVICE_TREE_OUTPUT="${B}/arch/${ARCH}/boot/${DTB_SUBDIR}${DTB_FILE}.dtb"
             DTB_NAME="${DTB_FILE}-${DATETIME}.dtb"
             if [ ! -f ${DEVICE_TREE_OUTPUT} ]; then
                 echo "Warning: ${DEVICE_TREE_OUTPUT} is not available!"
@@ -102,7 +102,7 @@ addtask deploy_dtb after do_compile_dtb before do_build
 VMLINUX_NAME ?= "vmlinux-${PV}-${PR}-${MACHINE}-${DATETIME}"
 
 kernel_do_deploy_append() {
-        install -m 0644 ${S}/vmlinux ${DEPLOYDIR}/${VMLINUX_NAME}
+        install -m 0644 ${B}/vmlinux ${DEPLOYDIR}/${VMLINUX_NAME}
         cd ${DEPLOYDIR} &&
                 rm -f vmlinux &&
                 ln -sf ${VMLINUX_NAME} vmlinux