mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-05-31 00:39:57 +00:00
Code Issues Projects Releases Wiki Activity

Use += where ever possible instead of append

Browse Source 
Exceptions will be cases involving overrides, machine specific
varible expansion and cases where variable modification needed to be
done after all += operations.

Change-Id: I7c76a77949d0a012238d488d5a75c489c54abf68
Signed-off-by: Vineeth Raveendran <vineeth.raveendran@arm.com>
This commit is contained in:
Vineeth Raveendran
2019-12-09 12:01:47 +00:00
committed by Bertrand Marquis
parent c601acec48
commit aab12c535e
9 changed files with 24 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm-bsp/conf/machine/fvp-common/fvp.inc
-5
View File
@@ -39,8 +39,3 @@ UBOOT_MACHINE = "vexpress_aemv8a_dram_defconfig"
# Xen configuration # Xen configuration
XEN_CONFIG_EARLY_PRINTK = "fastmodel" XEN_CONFIG_EARLY_PRINTK = "fastmodel"
# parameters for xen dtb generation in meta-auto
XEN_DOM0_BOOTARGS_append = " root=/dev/vda2"
XEN_XEN_BOOTARGS_append = " console=dtuart dtuart=serial0 bootscrub=0"
meta-arm-bsp/conf/machine/juno.conf
+1 -6
View File
@@ -25,12 +25,7 @@ EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"
# Juno u-boot configuration # Juno u-boot configuration
UBOOT_MACHINE = "vexpress_aemv8a_juno_defconfig" UBOOT_MACHINE = "vexpress_aemv8a_juno_defconfig"
DISTRO_FEATURES_append = " usbhost usbgadget" DISTRO_FEATURES += "usbhost usbgadget"
# Xen configuration # Xen configuration
XEN_CONFIG_EARLY_PRINTK = "juno" XEN_CONFIG_EARLY_PRINTK = "juno"
# parameters for xen dtb generation in meta-auto
XEN_DOM0_BOOTARGS_append = " root=/dev/sda1 rootwait"
XEN_XEN_BOOTARGS_append = " console=dtuart dtuart=serial0 bootscrub=0 iommu=no"
meta-arm-bsp/recipes-bsp/boot-wrapper-aaarch64/boot-wrapper-aarch64.inc
+12 -12
View File
@@ -37,28 +37,28 @@ BOOT_WRAPPER_AARCH64_IMAGE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'xen', \
DEPENDS += "virtual/kernel dtc-native" DEPENDS += "virtual/kernel dtc-native"
EXTRA_OECONF_append = " --with-kernel-dir=${WORKDIR}/kernel" EXTRA_OECONF += "--with-kernel-dir=${WORKDIR}/kernel"
EXTRA_OECONF_append = " --with-dtb=${WORKDIR}/kernel/dummy.dtb" EXTRA_OECONF += "--with-dtb=${WORKDIR}/kernel/dummy.dtb"
EXTRA_OECONF_append = " --with-cmdline=\"\"" EXTRA_OECONF += "--with-cmdline=\"\""
EXTRA_OECONF_append = " --enable-psci --enable-gicv3" EXTRA_OECONF += "--enable-psci --enable-gicv3"
EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'xen', \ EXTRA_OECONF += " ${@bb.utils.contains('DISTRO_FEATURES', 'xen', \
'--with-xen=${WORKDIR}/kernel/arch/arm64/boot/Image', '', d)}" '--with-xen=${WORKDIR}/kernel/arch/arm64/boot/Image', '', d)}"
EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'xen', \ EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'xen', \
'--with-xen-cmdline=\"\"', '', d)}" '--with-xen-cmdline=\"\"', '', d)}"
# unset LDFLAGS solves this error when compiling kernel modules: # unset LDFLAGS solves this error when compiling kernel modules:
# aarch64-poky-linux-ld: unrecognized option '-Wl,-O1' # aarch64-poky-linux-ld: unrecognized option '-Wl,-O1'
EXTRA_OEMAKE_append = " 'LDFLAGS= --gc-sections '" EXTRA_OEMAKE += "'LDFLAGS= --gc-sections '"
# Strip prefix if any # Strip prefix if any
REAL_DTB = "${@os.path.basename(d.getVar('BOOT_WRAPPER_AARCH64_DEVICETREE'))}" REAL_DTB = "${@os.path.basename(d.getVar('BOOT_WRAPPER_AARCH64_DEVICETREE'))}"
EXTRA_OEMAKE_append = " 'KERNEL_DTB=${DEPLOY_DIR_IMAGE}/${REAL_DTB}'" EXTRA_OEMAKE += "'KERNEL_DTB=${DEPLOY_DIR_IMAGE}/${REAL_DTB}'"
EXTRA_OEMAKE_append = " 'KERNEL_IMAGE=${DEPLOY_DIR_IMAGE}/${BOOT_WRAPPER_AARCH64_KERNEL}'" EXTRA_OEMAKE += "'KERNEL_IMAGE=${DEPLOY_DIR_IMAGE}/${BOOT_WRAPPER_AARCH64_KERNEL}'"
EXTRA_OEMAKE_append = " 'CMDLINE=${BOOT_WRAPPER_AARCH64_CMDLINE}'" EXTRA_OEMAKE += "'CMDLINE=${BOOT_WRAPPER_AARCH64_CMDLINE}'"
EXTRA_OEMAKE_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'xen', \ EXTRA_OEMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'xen', \
'XEN_IMAGE=${DEPLOY_DIR_IMAGE}/${BOOT_WRAPPER_AARCH64_XEN}', '', d)}" 'XEN_IMAGE=${DEPLOY_DIR_IMAGE}/${BOOT_WRAPPER_AARCH64_XEN}', '', d)}"
EXTRA_OEMAKE_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'xen', \ EXTRA_OEMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'xen', \
'XEN_CMDLINE=\"${BOOT_WRAPPER_AARCH64_XEN_CMDLINE}\"', '', d)}" 'XEN_CMDLINE=\"${BOOT_WRAPPER_AARCH64_XEN_CMDLINE}\"', '', d)}"
meta-arm-bsp/recipes-devtools/fvp-common/fvp-native.inc
+1 -1
View File
@@ -20,7 +20,7 @@ do_install() {
install -d ${D}${bindir} install -d ${D}${bindir}
} }
FILES_${PN} = "${datadir}/fvp/* ${bindir}/*" FILES_${PN} = "${datadir}/fvp/* ${bindir}/*"
INSANE_SKIP_${PN}_append = "already-stripped" INSANE_SKIP_${PN} += "already-stripped"
# This is required so that our binaries are in the sysroot. We need this # This is required so that our binaries are in the sysroot. We need this
# to have both fvp required libraries and fvp in the same sysroot. # to have both fvp required libraries and fvp in the same sysroot.
meta-arm-bsp/recipes-devtools/gem5/gem5-native.inc
+2 -3
View File
@@ -24,9 +24,8 @@ inherit native pythonnative
# google protobuf # google protobuf
# pkgconfig # pkgconfig
# hdf5 # hdf5
DEPENDS_append = " python-native python-scons-native python-six-native \ DEPENDS += "python-native python-scons-native python-six-native \
protobuf-native hdf5-native pkgconfig-native boost-native \ protobuf-native hdf5-native pkgconfig-native boost-native libpng-native"
libpng-native"
do_configure[noexec] = "1" do_configure[noexec] = "1"
meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc
+1 -1
View File
@@ -8,7 +8,7 @@
FILESEXTRAPATHS_prepend := "${THISDIR}:${THISDIR}/files:" FILESEXTRAPATHS_prepend := "${THISDIR}:${THISDIR}/files:"
# Arm platforms kmeta # Arm platforms kmeta
SRC_URI_append = " file://arm-platforms-kmeta;type=kmeta;name=arm-platforms-kmeta;destsuffix=arm-platforms-kmeta" SRC_URI += "file://arm-platforms-kmeta;type=kmeta;name=arm-platforms-kmeta;destsuffix=arm-platforms-kmeta"
# #
# FVP FOUNDATION KMACHINE # FVP FOUNDATION KMACHINE