Commit 839ebeb1ac814271d8bda892360f9c2b3ec206a7

Authored by Eric Lee
1 parent 50449683a3

Fall back weston to the GL backend

Showing 2 changed files with 46 additions and 1 deletions Inline Diff

recipes-bsp/u-boot/u-boot-smarcimx8mm_2019.04.bb
1 # Copyright (C) 2013-2016 Freescale Semiconductor 1 # Copyright (C) 2013-2016 Freescale Semiconductor
2 # Copyright 2017-2019 NXP 2 # Copyright 2017-2019 NXP
3 3
4 DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards." 4 DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards."
5 require recipes-bsp/u-boot/u-boot-common.inc 5 require recipes-bsp/u-boot/u-boot-common.inc
6 require recipes-bsp/u-boot/u-boot.inc 6 require recipes-bsp/u-boot/u-boot.inc
7 inherit pythonnative 7 inherit pythonnative
8 8
9 PROVIDES += "u-boot" 9 PROVIDES += "u-boot"
10 DEPENDS_append = " python dtc-native" 10 DEPENDS_append = " python dtc-native"
11 11
12 LICENSE = "GPLv2+" 12 LICENSE = "GPLv2+"
13 LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" 13 LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
14 14
15 UBOOT_SRC ?= "${EMB_UBOOT_MIRROR};protocol=ssh" 15 UBOOT_SRC ?= "${EMB_UBOOT_MIRROR};protocol=ssh"
16 SRCBRANCH = "smarc_8mm-imx_v2019.04_4.19.35_1.1.0" 16 SRCBRANCH = "smarc_8mm-imx_v2019.04_4.19.35_1.1.0"
17 SRC_URI = "${UBOOT_SRC};branch=${SRCBRANCH}" 17 SRC_URI = "${UBOOT_SRC};branch=${SRCBRANCH}"
18 SRCREV = "5999439f6bef2790462bb0ec936f3a783e3ce4b7" 18 SRCREV = "731c0fd70c338cf30512557588398efc6362f560"
19 19
20 S = "${WORKDIR}/git" 20 S = "${WORKDIR}/git"
21 21
22 inherit fsl-u-boot-localversion 22 inherit fsl-u-boot-localversion
23 23
24 LOCALVERSION ?= "-${SRCBRANCH}" 24 LOCALVERSION ?= "-${SRCBRANCH}"
25 25
26 BOOT_TOOLS = "imx-boot-tools" 26 BOOT_TOOLS = "imx-boot-tools"
27 27
28 do_deploy_append_mx8m () { 28 do_deploy_append_mx8m () {
29 # Deploy the mkimage, u-boot-nodtb.bin and fsl-imx8mm-XX.dtb for mkimage to generate boot binary 29 # Deploy the mkimage, u-boot-nodtb.bin and fsl-imx8mm-XX.dtb for mkimage to generate boot binary
30 if [ -n "${UBOOT_CONFIG}" ] 30 if [ -n "${UBOOT_CONFIG}" ]
31 then 31 then
32 for config in ${UBOOT_MACHINE}; do 32 for config in ${UBOOT_MACHINE}; do
33 i=$(expr $i + 1); 33 i=$(expr $i + 1);
34 for type in ${UBOOT_CONFIG}; do 34 for type in ${UBOOT_CONFIG}; do
35 j=$(expr $j + 1); 35 j=$(expr $j + 1);
36 if [ $j -eq $i ] 36 if [ $j -eq $i ]
37 then 37 then
38 install -d ${DEPLOYDIR}/${BOOT_TOOLS} 38 install -d ${DEPLOYDIR}/${BOOT_TOOLS}
39 install -m 0777 ${B}/${config}/arch/arm/dts/${UBOOT_DTB_NAME} ${DEPLOYDIR}/${BOOT_TOOLS} 39 install -m 0777 ${B}/${config}/arch/arm/dts/${UBOOT_DTB_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}
40 install -m 0777 ${B}/${config}/tools/mkimage ${DEPLOYDIR}/${BOOT_TOOLS}/mkimage_uboot 40 install -m 0777 ${B}/${config}/tools/mkimage ${DEPLOYDIR}/${BOOT_TOOLS}/mkimage_uboot
41 install -m 0777 ${B}/${config}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG} 41 install -m 0777 ${B}/${config}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG}
42 fi 42 fi
43 done 43 done
44 unset j 44 unset j
45 done 45 done
46 unset i 46 unset i
47 fi 47 fi
48 48
49 } 49 }
50 50
51 PACKAGE_ARCH = "${MACHINE_ARCH}" 51 PACKAGE_ARCH = "${MACHINE_ARCH}"
52 COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" 52 COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
53 53
54 UBOOT_NAME_mx6 = "u-boot-${MACHINE}.bin-${UBOOT_CONFIG}" 54 UBOOT_NAME_mx6 = "u-boot-${MACHINE}.bin-${UBOOT_CONFIG}"
55 UBOOT_NAME_mx7 = "u-boot-${MACHINE}.bin-${UBOOT_CONFIG}" 55 UBOOT_NAME_mx7 = "u-boot-${MACHINE}.bin-${UBOOT_CONFIG}"
56 UBOOT_NAME_mx8 = "u-boot-${MACHINE}.bin-${UBOOT_CONFIG}" 56 UBOOT_NAME_mx8 = "u-boot-${MACHINE}.bin-${UBOOT_CONFIG}"
57 57
recipes-graphics/wayland/weston_6.0.1.imx.bbappend
File was created 1 /*Weston falls back to use the GL backend*/
2 do_install_append() {
3 # Weston doesn't need the .la files to load modules, so wipe them
4 rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la
5
6 # If X11, ship a desktop file to launch it
7 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
8 install -d ${D}${datadir}/applications
9 install ${WORKDIR}/weston.desktop ${D}${datadir}/applications
10
11 install -d ${D}${datadir}/icons/hicolor/48x48/apps
12 install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
13 fi
14
15 if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then
16 install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
17 fi
18
19 if [ -z "${@bb.utils.filter('BBFILE_COLLECTIONS', 'aglprofilegraphical', d)}" ]; then
20 if [ "${@bb.utils.filter('BBFILE_COLLECTIONS', 'ivi', d)}" ]; then
21 WESTON_INI_SRC=${B}/ivi-shell/weston.ini
22 else
23 WESTON_INI_SRC=${B}/weston.ini
24 fi
25 WESTON_INI_DEST_DIR=${D}${sysconfdir}/xdg/weston
26 install -d ${WESTON_INI_DEST_DIR}
27 install -m 0644 ${WESTON_INI_SRC} ${WESTON_INI_DEST_DIR}
28 cd ${WESTON_INI_DEST_DIR}
29 case ${SOCNAME} in
30 8mq)
31 uncomment "gbm-format=argb8888" weston.ini
32 uncomment "\\[shell\\]" weston.ini
33 uncomment "size=1920x1080" weston.ini
34 ;;
35 esac
36 if "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'true', 'false', d)}"; then
37 uncomment "xwayland=true" weston.ini
38 fi
39 cd -
40 fi
41
42 if [ -f ${WORKDIR}/weston.config ]; then
43 install -Dm0755 ${WORKDIR}/weston.config ${D}${sysconfdir}/default/weston
44 fi
45 }
46