diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/tcmode-external-xilinx.inc | 2 | ||||
| -rw-r--r-- | conf/machine/include/machine-xilinx-board.inc | 2 | ||||
| -rw-r--r-- | conf/machine/include/machine-xilinx-default.inc | 4 |
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 | ||
| 38 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_HOST}" | 38 | TOOLCHAIN_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. |
| 40 | TARGET_CC_ARCH_append += "${TARGET_LINK_HASH_STYLE}" | 40 | TARGET_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) |
| 43 | EXTERNAL_TOOLCHAIN_SYSROOT_armv7a ??= "${EXTERNAL_TOOLCHAIN}/${CSL_TARGET_SYS}/libc" | 43 | EXTERNAL_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 | ||
| 3 | EXTRA_IMAGEDEPENDS += "virtual/bootloader" | 3 | EXTRA_IMAGEDEPENDS += "virtual/bootloader" |
| 4 | 4 | ||
| 5 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_microblaze += "device-tree" | 5 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_microblaze = " device-tree" |
| 6 | 6 | ||
| 7 | IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} ${UBOOT_BINARY}" | 7 | IMAGE_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" | |||
| 28 | UBOOT_ELF_aarch64 ?= "u-boot.elf" | 28 | UBOOT_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 |
| 31 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_zynq += "device-tree" | 31 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_zynq = " device-tree" |
| 32 | 32 | ||
| 33 | # Common Device Tree Includes | 33 | # Common Device Tree Includes |
| 34 | MACHINE_DEVICETREE_append_zynq += " \ | 34 | MACHINE_DEVICETREE_append_zynq = " \ |
| 35 | common/zynq7-base.dtsi \ | 35 | common/zynq7-base.dtsi \ |
| 36 | " | 36 | " |
| 37 | 37 | ||
