summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/tcmode-external-xilinx.inc2
-rw-r--r--conf/machine/include/machine-xilinx-board.inc2
-rw-r--r--conf/machine/include/machine-xilinx-default.inc4
3 files changed, 4 insertions, 4 deletions
diff --git a/conf/distro/include/tcmode-external-xilinx.inc b/conf/distro/include/tcmode-external-xilinx.inc
index 6949810b..b2824acb 100644
--- a/conf/distro/include/tcmode-external-xilinx.inc
+++ b/conf/distro/include/tcmode-external-xilinx.inc
@@ -37,7 +37,7 @@ ENABLE_BINARY_LOCALE_GENERATION = ""
37 37
38TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_HOST}" 38TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_HOST}"
39# Fix up default hash, enforce it in for CC_ARCH for packages that ignore LDFLAGS. 39# Fix up default hash, enforce it in for CC_ARCH for packages that ignore LDFLAGS.
40TARGET_CC_ARCH_append += "${TARGET_LINK_HASH_STYLE}" 40TARGET_CC_ARCH_append = " ${TARGET_LINK_HASH_STYLE}"
41 41
42# Default sysroot is inside the Xilinx ARM v7-A toolchain in the '<CSL_TARGET_SYS>/libc' (no debug-root) 42# Default sysroot is inside the Xilinx ARM v7-A toolchain in the '<CSL_TARGET_SYS>/libc' (no debug-root)
43EXTERNAL_TOOLCHAIN_SYSROOT_armv7a ??= "${EXTERNAL_TOOLCHAIN}/${CSL_TARGET_SYS}/libc" 43EXTERNAL_TOOLCHAIN_SYSROOT_armv7a ??= "${EXTERNAL_TOOLCHAIN}/${CSL_TARGET_SYS}/libc"
diff --git a/conf/machine/include/machine-xilinx-board.inc b/conf/machine/include/machine-xilinx-board.inc
index 654e3ebb..3447731e 100644
--- a/conf/machine/include/machine-xilinx-board.inc
+++ b/conf/machine/include/machine-xilinx-board.inc
@@ -2,7 +2,7 @@
2 2
3EXTRA_IMAGEDEPENDS += "virtual/bootloader" 3EXTRA_IMAGEDEPENDS += "virtual/bootloader"
4 4
5MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_microblaze += "device-tree" 5MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_microblaze = " device-tree"
6 6
7IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} ${UBOOT_BINARY}" 7IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} ${UBOOT_BINARY}"
8 8
diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc
index 8a23f07e..054a2e18 100644
--- a/conf/machine/include/machine-xilinx-default.inc
+++ b/conf/machine/include/machine-xilinx-default.inc
@@ -28,10 +28,10 @@ UBOOT_ELF ?= "u-boot"
28UBOOT_ELF_aarch64 ?= "u-boot.elf" 28UBOOT_ELF_aarch64 ?= "u-boot.elf"
29 29
30# By default use the device-tree recipe to generate device trees for Zynq machines 30# By default use the device-tree recipe to generate device trees for Zynq machines
31MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_zynq += "device-tree" 31MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_zynq = " device-tree"
32 32
33# Common Device Tree Includes 33# Common Device Tree Includes
34MACHINE_DEVICETREE_append_zynq += " \ 34MACHINE_DEVICETREE_append_zynq = " \
35 common/zynq7-base.dtsi \ 35 common/zynq7-base.dtsi \
36 " 36 "
37 37