uboot-ti-staging: update to ti2017.00-rc6 tag

Signed-off-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>

conf/machine/am57xx-evm.conf

@@ -1,6 +1,6 @@
 #@TYPE: Machine
-#@NAME: DRA7xx EVM
-#@DESCRIPTION: Machine configuration for the TI DRA7xx EVM
+#@NAME: AM57xx EVM
+#@DESCRIPTION: Machine configuration for the TI AM57xx EVM
 
 require conf/machine/include/dra7xx.inc
 

conf/machine/beagle-x15.conf

@@ -0,0 +1,36 @@
+#@TYPE: Machine
+#@NAME: BeagleBoard X15
+#@DESCRIPTION: Machine configuration for the BeagleBoard X15
+
+require conf/machine/include/dra7xx.inc
+
+MACHINE_GUI_CLASS = "bigscreen"
+
+IMAGE_FSTYPES += "tar.xz"
+
+SERIAL_CONSOLE = "115200 ttyS2"
+
+KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb"
+
+UBOOT_MACHINE = "am57xx_evm_config"
+
+# UBI information.  Note that this is board and kernel specific.  Changes
+# in your kernel port may require changes in these variables.  For more
+# details about this board please see
+# http://processors.wiki.ti.com/index.php/UBIFS_Support
+
+# do ubiattach /dev/ubi_ctrl -m 7 -O 2048
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    126976 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 1988 LEBs
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 8192"
+
+# do ubiattach /dev/ubi_ctrl -m 7 -O 2048
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+# UBI: VID header offset:          2048 (aligned 2048)
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"

conf/machine/beaglebone.conf

@@ -10,8 +10,12 @@ KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb"
 # Only has DVI connector for external screen
 MACHINE_GUI_CLASS = "bigscreen"
 
-IMAGE_FSTYPES += "tar.gz"
+WKS_FILE = "sdimage-bootpart.wks"
+IMAGE_BOOT_FILES = "MLO u-boot.img"
+IMAGE_FSTYPES += "tar.xz wic.xz"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
 UBOOT_MACHINE = "am335x_boneblack_config"
+
+do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"

conf/machine/k2g-hs-evm.conf

@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: Keystone 2 K2G HS EVM
+#@DESCRIPTION: Machine configuration for the TI Keystone 2 K2G HS EVM
+
+require conf/machine/k2g-evm.conf
+
+UBOOT_MACHINE = "k2g_hs_evm_config"
+
+UBOOT_ENTRYPOINT = "0x82000000"
+UBOOT_LOADADDRESS = "0x82000000"
+UBOOT_RD_LOADADDRESS = "0x84000000"
+UBOOT_RD_ENTRYPOINT = "0x84000000"
+
+TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/k2g"

conf/machine/omapl138-lcdk.conf

@@ -1,11 +1,11 @@
 #@TYPE: Machine
-#@NAME: AM180x CPUs on an AM180x EVM board
-#@DESCRIPTION: Machine configuration for the TI AM180x EVM board
+#@NAME: OMAP-L138 LCDK
+#@DESCRIPTION: Machine configuration for the TI OMAP-L138 LCDK board
 
 require conf/machine/include/davinci.inc
 require conf/machine/include/omapl138.inc
 
-UBOOT_MACHINE = "da850_am18xxevm_config"
+UBOOT_MACHINE = "omapl138_lcdk_config"
 UBOOT_SUFFIX = "ais"
 
 UBOOT_ENTRYPOINT = "0xc0008000"

recipes-bsp/u-boot/u-boot-ti-staging_2017.01.bb

@@ -2,4 +2,4 @@ require u-boot-ti.inc
 
 BRANCH = "ti-u-boot-2017.01"
 
-SRCREV = "734f6d49ae509f72bbd97893f2a98dea20c7bdc0"
+SRCREV = "bc8176c3f14dfabd7ebb883b65b2b04b70f3cf0a"

recipes-graphics/libgles/ti-sgx-ddk-um_1.14.3699939.bb

@@ -31,7 +31,7 @@ INITSCRIPT_PARAMS = "defaults 8"
 
 inherit update-rc.d
 
-PR = "r23"
+PR = "r24"
 PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2 omap5-sgx-ddk-um-linux"
 
 DEPENDS += "libdrm udev libgbm wayland libffi"
@@ -73,5 +73,6 @@ INHIBIT_SYSROOT_STRIP = "1"
 
 INSANE_SKIP_${PN} += "dev-so ldflags useless-rpaths"
 INSANE_SKIP_${PN}-plugins = "dev-so"
+INSANE_SKIP_${PN} += "already-stripped"
 
 CLEANBROKEN = "1"

recipes-kernel/kselftests/kselftests_4.9.bb

@@ -59,6 +59,7 @@ do_configure () {
 	sed "s|^CC = .*||g" -i ${S}/tools/testing/selftests/memfd/Makefile
 	sed "s|^CC := .*||g" -i ${S}/tools/testing/selftests/powerpc/switch_endian/Makefile
 	sed "s|gcc|\$(CC)|g" -i ${S}/tools/testing/selftests/breakpoints/Makefile
+	sed "s|TARGETS|F_TARGETS|g" -i ${S}/tools/testing/selftests/futex/functional/Makefile
 	sed "s|^LDFLAGS += -lpthread|LDLIBS += -lpthread|g" -i ${S}/tools/testing/selftests/seccomp/Makefile
 	sed "s|^LDFLAGS += -lrt -lpthread|LDLIBS += -lrt -lpthread|g" -i ${S}/tools/testing/selftests/timers/Makefile
 	sed "s|BINARIES|TEST_PROGS|g" -i ${S}/tools/testing/selftests/sigaltstack/Makefile
@@ -71,6 +72,8 @@ do_compile () {
 do_install () {
 	oe_runmake install
 	chown -R root:root ${D}
+	# fixup run_kselftest.sh due to spurious lines starting by "make[1]:"
+	sed -i '/^make/d' ${D}${bindir}/kselftests/run_kselftest.sh
 }
 
 PACKAGE_BEFORE_PN = " \

recipes-kernel/linux/linux-ti-staging-4.9/omapl138/defconfig

@@ -0,0 +1 @@
+use-tisdk-config=ti_sdk_omapl138_release

recipes-kernel/linux/linux-ti-staging-rt_4.9.bb

@@ -6,4 +6,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.9:"
 
 BRANCH = "ti-rt-linux-4.9.y"
 
-SRCREV = "520e8f9cc5af10112715d011c1d83b3ee850d8ec"
+SRCREV = "c308253f1425277c704e238445e3e4f85a3dd3fb"

recipes-kernel/linux/linux-ti-staging-systest-4.9/omapl138/defconfig

@@ -0,0 +1 @@
+use-tisdk-config=ti_sdk_omapl138_debug

recipes-kernel/linux/linux-ti-staging_4.9.bb

@@ -55,7 +55,7 @@ S = "${WORKDIR}/git"
 
 BRANCH = "ti-lsk-linux-4.9.y"
 
-SRCREV = "102f61776e63e58bc75c13297a8fac34d99c8590"
+SRCREV = "a2b4f0ec61a340268c6f87e49adf55d1920e6e3d"
 PV = "4.9.13+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild

recipes-ti/ipc/ti-ipc-common.inc

@@ -1,5 +1,5 @@
 PV = "3.45.00.00"
-INC_PR = "r0"
+INC_PR = "r1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 

recipes-ti/ipc/ti-ipc-examples_git.bb

@@ -12,6 +12,11 @@ INSANE_SKIP_${PN} += "arch"
 
 ALLOW_EMPTY_${PN} = "1"
 
+PACKAGES =+ "${PN}-linux"
+
+INSANE_SKIP_${PN}-linux += "arch"
+ALLOW_EMPTY_${PN}-linux  = "1"
+
 IPC_INSTALL_DIR="${STAGING_DIR_TARGET}/usr/share/ti/ti-ipc-tree"
 
 do_compile() {
@@ -56,31 +61,35 @@ do_install() {
   cd ${S_ipc-examples}/src
   IPC_VERSION=`echo ${PV}${RELEASE_SUFFIX} | sed -e 's|\.|_|g'`
 
-  install -d ${D}/ipc_${IPC_VERSION}/examples
   if [  "${PLATFORM}" != "UNKNOWN" ]; then
+    # Install directory for bios examples
+    install -d ${D}/ipc_${IPC_VERSION}/examples/bios
+    # Install directory for linux examples
+    install -d ${D}${bindir}/ipc/examples
     oe_runmake -C examples install IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" \
-      HOSTOS="bios" EXEC_DIR="${D}/ipc_${IPC_VERSION}/examples"
+      HOSTOS="bios" EXEC_DIR="${D}/ipc_${IPC_VERSION}/examples/bios"
     oe_runmake -C examples install_rov IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" \
-      HOSTOS="bios" EXEC_DIR="${D}/ipc_${IPC_VERSION}/examples"
+      HOSTOS="bios" EXEC_DIR="${D}/ipc_${IPC_VERSION}/examples/bios"
 
     oe_runmake -C examples install IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" \
       LINUX_SYSROOT_DIR="${STAGING_INCDIR}" \
-      HOSTOS="linux" EXEC_DIR="${D}/ipc_${IPC_VERSION}/examples"
+      HOSTOS="linux" EXEC_DIR="${D}/${bindir}/ipc/examples"
 
     if [ ! -z ${ALT_PLATFORM} ]; then
-      oe_runmake -C examples install IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" \ 
-        HOSTOS="bios" EXEC_DIR="${D}/ipc_${IPC_VERSION}/examples" \
+      oe_runmake -C examples install IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" \
+        HOSTOS="bios" EXEC_DIR="${D}/ipc_${IPC_VERSION}/examples/bios" \
         PLATFORM="${ALT_PLATFORM}"
       oe_runmake -C examples install_rov IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" \
-        HOSTOS="bios" EXEC_DIR="${D}/ipc_${IPC_VERSION}/examples" \
+        HOSTOS="bios" EXEC_DIR="${D}/ipc_${IPC_VERSION}/examples/bios" \
         PLATFORM="${ALT_PLATFORM}"
 
       oe_runmake -C examples install IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" \
         LINUX_SYSROOT_DIR="${STAGING_INCDIR}" \
-        HOSTOS="linux" EXEC_DIR="${D}/ipc_${IPC_VERSION}/examples" \
+        HOSTOS="linux" EXEC_DIR="${D}/${bindir}/ipc/examples" \
         PLATFORM="${ALT_PLATFORM}"
     fi
   fi
 }
 
 FILES_${PN} += "ipc_*"
+FILES_${PN}-linux += "${bindir}/*"

recipes-ti/ipc/ti-ipc/omap_remoteproc.conf

@@ -0,0 +1 @@
+softdep omap_remoteproc pre: virtio_rpmsg_bus

recipes-ti/ipc/ti-ipc_git.bb

@@ -9,6 +9,7 @@ PR = "${INC_PR}.0"
 DEPENDS += "virtual/kernel"
 
 SRC_URI += "file://tiipclad-daemon.sh \
+            file://omap_remoteproc.conf \
             file://0001-Add-kernel-build-dir.patch \
            "
 
@@ -43,6 +44,11 @@ do_install_append() {
     install -c -m 755 ${WORKDIR}/tiipclad-daemon.sh ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
 }
 
+do_install_append_dra7xx() {
+    install -d ${D}${sysconfdir}/modprobe.d/
+    install -c -m 644 ${WORKDIR}/omap_remoteproc.conf ${D}${sysconfdir}/modprobe.d/
+}
+
 PACKAGES =+ "${PN}-test"
 RDEPENDS_${PN}-test += "${PN}"