Skip to contentSkip to conversation

recipes: Limit ti specific recipes under ti-soc override

PATCH New Denys Dmytriyenko 1 participant 3 messages Oct 17, 2018

lore
Share & tools
lore

Denys Dmytriyenko

author
#0 lore raw

PATCH 1/3 recipes: Limit ti specific recipes under ti-soc override

From: Khem Raj <[email protected]>

This helps in multi-BSP scenario, where other BSP layers are also present in the layermix

Signed-off-by Khem Raj <[email protected]>
Signed-off-by Denys Dmytriyenko <[email protected]>
---
 recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb            | 2 ++
 recipes-bsp/cmem/cmem.inc                              | 2 ++
 recipes-bsp/cuia/cuia_1.0.0.13.bb                      | 3 +++
 recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb | 3 +++
 recipes-bsp/x-load/x-load_git.bb                       | 3 +++
 recipes-graphics/gbm/libgbm_10.0.0.bb                  | 3 +++
 recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb     | 3 +++
 recipes-graphics/omapfbplay/omapfbplay.inc             | 2 ++
 recipes-multimedia/libdce/libdce_3.00.14.00.bb         | 3 +++
 recipes-ti/bios/ti-biosutils_1.02.02.bb                | 3 +++
 recipes-ti/devtools/ti-xdctools-common.inc             | 5 +++++
 recipes-ti/dmai/ti-dmai_svn.bb                         | 3 +++
 recipes-ti/dsplib/dsplib.inc                           | 2 ++
 recipes-ti/hdvpss/ti-hdvpss_01.00.01.27.bb             | 3 ++-
 recipes-ti/includes/ti-unpack.inc                      | 4 ++++
 recipes-ti/ipc/ti-ipc-common.inc                       | 2 ++
 recipes-ti/linuxutils/ti-linuxutils_2.26.01.02.bb      | 3 +++
 recipes-ti/mathlib/mathlib.inc                         | 2 ++
 recipes-ti/ndk/ti-ndk_3.40.01.01.bb                    | 3 +++
 recipes-ti/osal/ti-osal.inc                            | 3 +++
 recipes-ti/swtools/swtools_git.bb                      | 2 ++
 21 files changed, 58 insertions(+), 1 deletion(-)
recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb +2 -0
index 93cebd71..b9a3b0fa 100644
@@ -24,3 +24,5 @@ do_install() {
 }
 
 FILES_${PN} += "${base_libdir}/firmware"
+COMPATIBLE_HOST ?= "null"
+COMPATIBLE_HOST_ti-soc = "(.*)"
recipes-bsp/cmem/cmem.inc +2 -0
index 11cebe8d..abbf2492 100644
@@ -12,3 +12,5 @@ PV = "4.15.00.02+git${SRCPV}"
 SRC_URI = "git://git.ti.com/ipc/ludev.git;protocol=git;branch=${BRANCH}"
 
 S = "${WORKDIR}/git"
+COMPATIBLE_HOST ?= "null"
+COMPATIBLE_HOST_ti-soc = "(.*)"
recipes-bsp/cuia/cuia_1.0.0.13.bb +3 -0
index e048f6aa..a7caf504 100644
@@ -23,3 +23,6 @@ do_install() {
 	cd ${S}
 	oe_runmake DESTDIR=${D} libdir=${libdir} includedir=${includedir} install
 }
+
+COMPATIBLE_HOST ?= "null"
+COMPATIBLE_HOST_ti-soc = "(.*)"
recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb +3 -0
index 94485b6a..d29b6496 100644
@@ -22,3 +22,6 @@ do_install() {
     install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/extra
     install -m 644 ${S}/galcore.ko ${D}/${base_libdir}/modules/${KERNEL_VERSION}/extra
 }
+
+COMPATIBLE_HOST ?= "null"
+COMPATIBLE_HOST_ti-soc = "(.*)"
recipes-bsp/x-load/x-load_git.bb +3 -0
index dd8bce2d..1ce1b0f0 100644
@@ -17,3 +17,6 @@ CONFIG_HEADER_beagleboard = "1"
 XLOAD_MACHINE_omap3-touchbook = "omap3530beagle_config"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+COMPATIBLE_HOST ?= "null"
+COMPATIBLE_HOST_ti-soc = "(.*)"
recipes-graphics/gbm/libgbm_10.0.0.bb +3 -0
index 38715ccf..9e3c7ed0 100644
@@ -16,3 +16,6 @@ SRC_URI = "git://git.ti.com/glsdk/libgbm.git;protocol=git;branch=${BRANCH} \
             file://0001-gbm.c-include-sys-sysmacros.h-for-minor-major-in-new.patch"
 
 S = "${WORKDIR}/git"
+
+COMPATIBLE_HOST ?= "null"
+COMPATIBLE_HOST_ti-soc = "(.*)"
recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb +3 -0
index dafaac1e..a2f8f192 100644
@@ -37,3 +37,6 @@ do_install() {
 }
 
 INSANE_SKIP_${PN} += "ldflags"
+
+COMPATIBLE_HOST ?= "null"
+COMPATIBLE_HOST_ti-soc = "(.*)"
recipes-graphics/omapfbplay/omapfbplay.inc +2 -0
index df166dd3..744eb8f7 100644
@@ -14,6 +14,8 @@ SRC_URI = "git://git.mansr.com/omapfbplay;protocol=git \
 S = "${WORKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_HOST ?= "null"
+COMPATIBLE_HOST_ti-soc = "(.*)"
 
 # We want a kernel header for armv7a, but we don't want to make mplayer machine specific for that
 STAGING_KERNEL_DIR = "${STAGING_DIR}/${MACHINE_ARCH}${TARGET_VENDOR}-${TARGET_OS}/kernel"
recipes-multimedia/libdce/libdce_3.00.14.00.bb +3 -0
index 04c0b718..4d032422 100644
@@ -13,3 +13,6 @@ PR = "r1"
 
 S = "${WORKDIR}/git"
 EXTRA_OECONF += "IPC_HEADERS=${STAGING_INCDIR}/ti/ipc/mm"
+
+COMPATIBLE_HOST ?= "null"
+COMPATIBLE_HOST_ti-soc = "(.*)"
recipes-ti/bios/ti-biosutils_1.02.02.bb +3 -0
index 5b6b4f43..01c070d7 100644
@@ -7,3 +7,6 @@ SRC_URI[biosutilstarball.md5sum] = "0654e9e72b0a6fc7a6575829c0cd90c9"
 SRC_URI[biosutilstarball.sha256sum] = "df486500bdc8dbe3800fc7efe4241e6fa5b1827ba7c0dc17a71b41d42ef921e1"
 
 INSANE_SKIP_${PN} = "installed-vs-shipped"
+
+COMPATIBLE_HOST ?= "null"
+COMPATIBLE_HOST_ti-soc = "(.*)"
recipes-ti/devtools/ti-xdctools-common.inc +5 -0
index a3949cad..27f8f908 100644
@@ -61,3 +61,8 @@ libhpi.so \
 lib.so \
 libcairo.so.2 \
 "
+
+COMPATIBLE_HOST ?= "null"
+COMPATIBLE_HOST_ti-soc = "(.*)"
+COMPATIBLE_HOST_class-native = "(.*)"
+COMPATIBLE_HOST_class-nativesdk = "(.*)"
recipes-ti/dmai/ti-dmai_svn.bb +3 -0
index 4a91b9b9..3cc54b91 100644
@@ -38,3 +38,6 @@ SRC_URI_append = " file://omap3530-r642-remove-include-videodev.diff;striplevel=
                  "
 
 INSANE_SKIP_${PN} = "installed-vs-shipped"
+
+COMPATIBLE_HOST ?= "null"
+COMPATIBLE_HOST_ti-soc = "(.*)"
recipes-ti/dsplib/dsplib.inc +2 -0
index f3696795..a3953105 100644
@@ -69,3 +69,5 @@ ALLOW_EMPTY_${PN} = "1"
 FILES_${PN}-dev += "${DSPLIB_INSTALL_DIR_RECIPE}"
 
 INSANE_SKIP_${PN}-dev = "arch"
+COMPATIBLE_HOST ?= "null"
+COMPATIBLE_HOST_ti-soc = "(.*)"
recipes-ti/hdvpss/ti-hdvpss_01.00.01.27.bb +2 -1
index e3b1c56f..88b08442 100644
@@ -3,4 +3,5 @@ require ti-hdvpss.inc
 SRC_URI[md5sum] = "6db908bef3b933dc8cea666564d5d4d8"
 SRC_URI[sha256sum] = "2caa9c859cfe348197e860f07d174a8ab7048d38d6d3a12ec576802122c9e91e"
 
-
+COMPATIBLE_HOST ?= "null"
+COMPATIBLE_HOST_ti-soc = "(.*)"
recipes-ti/includes/ti-unpack.inc +4 -0
index a571fd5d..9da11ede 100644
@@ -79,3 +79,7 @@ python ti_bin_do_unpack() {
     # Return to the previous directory
     os.chdir(save_cwd)
 }
+
+COMPATIBLE_HOST ?= "null"
+COMPATIBLE_HOST_ti-soc = "(.*)"
+COMPATIBLE_HOST_class-native = "(.*)"
recipes-ti/ipc/ti-ipc-common.inc +2 -0
index dddb7344..aea9d278 100644
@@ -2,6 +2,8 @@ PV = "3.50.02.02"
 INC_PR = "r0"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_HOST ?= "null"
+COMPATIBLE_HOST_ti-soc = "(.*)"
 
 PLATFORM = "UNKNOWN"
 PLATFORM_omap5-evm = "OMAP54XX"
recipes-ti/linuxutils/ti-linuxutils_2.26.01.02.bb +3 -0
index 1a56d1da..113e6a69 100644
@@ -12,3 +12,6 @@ SRC_URI[md5sum] = "70b4918bc35c1bcfef34d6ba3fbce0c8"
 SRC_URI[sha256sum] = "51266dd928f8d629cd417c869789a6c0d596612120f165619119cbaadfd66ee2"
 
 INSANE_SKIP_${PN} = "installed-vs-shipped"
+
+COMPATIBLE_HOST ?= "null"
+COMPATIBLE_HOST_ti-soc = "(.*)"
recipes-ti/mathlib/mathlib.inc +2 -0
index 6aea085a..61f198bc 100644
@@ -68,3 +68,5 @@ ALLOW_EMPTY_${PN} = "1"
 FILES_${PN}-dev += "${MATHLIB_INSTALL_DIR_RECIPE}"
 
 INSANE_SKIP_${PN}-dev = "arch"
+COMPATIBLE_HOST ?= "null"
+COMPATIBLE_HOST_ti-soc = "(.*)"
recipes-ti/ndk/ti-ndk_3.40.01.01.bb +3 -0
index 4a494b19..c6c18733 100644
@@ -11,3 +11,6 @@ SRC_URI[ndkzip.sha256sum] = "e2e5c683c70dfad6f4372c5eeebaf0209b27abb0f77304f14f0
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 INHIBIT_SYSROOT_STRIP = "1"
+
+COMPATIBLE_HOST ?= "null"
+COMPATIBLE_HOST_ti-soc = "(.*)"
recipes-ti/osal/ti-osal.inc +3 -0
index cb8da354..0a966d40 100644
@@ -19,3 +19,6 @@ INSANE_SKIP_${PN}-dev = "staticdev"
 
 ALLOW_EMPTY_${PN} = "1"
 FILES_${PN}-dev += "${OSAL_INSTALL_DIR_RECIPE}"
+
+COMPATIBLE_HOST ?= "null"
+COMPATIBLE_HOST_ti-soc = "(.*)"
recipes-ti/swtools/swtools_git.bb +2 -0
index 425a0690..168fe211 100644
@@ -42,3 +42,5 @@ FILES_${PN}-dev += "${SWTOOLS_INSTALL_DIR_RECIPE}"
 
 INSANE_SKIP_${PN}-dev = "arch staticdev"
 ALLOW_EMPTY_${PN} = "1"
+COMPATIBLE_HOST ?= "null"
+COMPATIBLE_HOST_ti-soc = "(.*)"
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/3 beaglebone.conf: SERIAL_CONSOLE has been deprecated

From: Khem Raj <[email protected]>

Signed-off-by Khem Raj <[email protected]>
Signed-off-by Denys Dmytriyenko <[email protected]>
---
 conf/machine/beaglebone.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
conf/machine/beaglebone.conf +1 -1
index 25147926..9aeb2992 100644
@@ -11,7 +11,7 @@ KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblue.dtb \
 # Only has DVI connector for external screen
 MACHINE_GUI_CLASS = "bigscreen"
 
-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLES = "115200;ttyS0"
 
 # fall back on generic am335x_evm_config for now
 #UBOOT_MACHINE = "am335x_boneblack_config"
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH 3/3 beaglebone.conf: Package kernel and devicetree

In reply to Denys Dmytriyenko

From: Khem Raj <[email protected]>

Use variables from u-boot recipe, makes it easy to switch between TI staging and mainline u-boot from oe-core if someone wants to.

Use SPL_BINARY and UBOOT_SUFFIX to define IMAGE_BOOT_FILES

Signed-off-by Khem Raj <[email protected]>
Signed-off-by Denys Dmytriyenko <[email protected]>
---
 conf/machine/beaglebone.conf | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
conf/machine/beaglebone.conf +9 -3
index 9aeb2992..5e7348a4 100644
@@ -1,6 +1,6 @@
 #@TYPE: Machine
 #@NAME: BeagleBone machine
-#@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board 
+#@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board
 
 require conf/machine/include/ti33x.inc
 

@@ -16,11 +16,17 @@ SERIAL_CONSOLES = "115200;ttyS0"
 # fall back on generic am335x_evm_config for now
 #UBOOT_MACHINE = "am335x_boneblack_config"
 
+SPL_BINARY = "MLO"
+UBOOT_SUFFIX = "img"
+
 WKS_FILE = "sdimage-bootpart.wks"
-IMAGE_BOOT_FILES = "MLO u-boot.img"
-IMAGE_FSTYPES += "tar.xz wic.xz"
 
 do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
+IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} ${SPL_BINARY}"
+
+IMAGE_FSTYPES += "tar.xz wic.xz"
+
+IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage"
 
 # Refine the list of device targets for ti-pdk class recipes
 TI_PDK_LIMIT_BOARDS = "bbbAM335x"
Signature · 1 line
2.17.1