Code Review
/
AGL
/
meta-agl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Prepare KK Milestone 2
[AGL/meta-agl.git]
/
meta-agl-bsp
/
conf
/
include
/
agl_nitrogen6x.inc
diff --git
a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
index
782e618
..
77eb973
100644
(file)
--- a/
meta-agl-bsp/conf/include/agl_nitrogen6x.inc
+++ b/
meta-agl-bsp/conf/include/agl_nitrogen6x.inc
@@
-4,6
+4,11
@@
DISTRO_FEATURES_append = " agl-medium-arm-compiler"
# etnaviv support.
MACHINEOVERRIDES .= ":use-mainline-bsp"
# etnaviv support.
MACHINEOVERRIDES .= ":use-mainline-bsp"
+# Disable meta-freescale package architecure mangling, as it causes
+# issues with AGL's explicit setting of DEFAULTTUNE.
+INHERIT_remove = "fsl-dynamic-packagearch"
+MACHINE_SOCARCH = "${TUNE_PKGARCH}"
+
# Disable the meta-freescale weston-init bbappend as it conflicts
# with AGL's.
BBMASK = "meta-freescale/recipes-graphics/wayland/weston-init"
# Disable the meta-freescale weston-init bbappend as it conflicts
# with AGL's.
BBMASK = "meta-freescale/recipes-graphics/wayland/weston-init"
@@
-11,7
+16,5
@@
BBMASK = "meta-freescale/recipes-graphics/wayland/weston-init"
# Set CMA size large enough to work with AGL
UBOOT_EXTLINUX_KERNEL_ARGS_append = " cma=512M"
# Set CMA size large enough to work with AGL
UBOOT_EXTLINUX_KERNEL_ARGS_append = " cma=512M"
-# Generate WIC image also
#WKS_FILE = "imx-uboot.wks"
#WKS_FILE = "imx-uboot.wks"
-AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
AGL_DEFAULT_INITRAMFS_FSTYPES := ""
AGL_DEFAULT_INITRAMFS_FSTYPES := ""