3 files changed, 7 insertions, 48 deletions

diff --git a/recipes-bsp/am33x-cm3/am33x-cm3/init-am33x-cm3 b/recipes-bsp/am33x-cm3/am33x-cm3/init-am33x-cm3
deleted file mode 100644
index 56c17b33..00000000
--- a/recipes-bsp/am33x-cm3/am33x-cm3/init-am33x-cm3
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# Load the PM CM3 firmware
-echo 1 > /sys/devices/ocp.2/44d00000.wkup_m3/firmware/am335x-pm-firmware.bin/loading
-cat /lib/firmware/am335x-pm-firmware.bin > /sys/devices/ocp.2/44d00000.wkup_m3/firmware/am335x-pm-firmware.bin/data
-echo 0 > /sys/devices/ocp.2/44d00000.wkup_m3/firmware/am335x-pm-firmware.bin/loading
diff --git a/recipes-bsp/am33x-cm3/am33x-cm3/init-am43x-cm3 b/recipes-bsp/am33x-cm3/am33x-cm3/init-am43x-cm3
deleted file mode 100644
index 0a75c1fd..00000000
--- a/recipes-bsp/am33x-cm3/am33x-cm3/init-am43x-cm3
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# Load the PM CM3 firmware
-echo 1 > /sys/devices/44000000.ocp/44d00000.wkup_m3/firmware/am335x-pm-firmware.bin/loading
-cat /lib/firmware/am335x-pm-firmware.bin > /sys/devices/44000000.ocp/44d00000.wkup_m3/firmware/am335x-pm-firmware.bin/data
-echo 0 > /sys/devices/44000000.ocp/44d00000.wkup_m3/firmware/am335x-pm-firmware.bin/loading
diff --git a/recipes-bsp/am33x-cm3/am33x-cm3_git.bb b/recipes-bsp/am33x-cm3/am33x-cm3_git.bb
index 42f20da4..51ec9bdd 100644
--- a/recipes-bsp/am33x-cm3/am33x-cm3_git.bb
+++ b/recipes-bsp/am33x-cm3/am33x-cm3_git.bb
@@ -3,35 +3,14 @@ DESCRIPTION = "Cortex-M3 binary blob for suspend-resume"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://License.txt;md5=7bdc54a749ab7a7dea999d25d99a41b8"
 
-PV = "05.00.00.03"
-PR = "r1"
+PV = "1.8.7"
+PR = "r0"
+PE = "1"
 
-# Make package machine specific due to different init scripts
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+SRCREV = "fb0117edd5810a8d3bd9b1cd8abe34e12ff2d0ba"
+BRANCH ?= "next"
 
-# SRCREV corresponds to tag v05.00.00.03
-SRCREV = "a0ddffb63147e2079a08944c0e399c75538201a9"
-BRANCH ?= "master"
-
-# This init script is only used for older kernels that do not support
-# hotplug of the firmware.  Newer kernels do not require the initscript
-# package.
-INITSCRIPT_NAME = "am335x-pm-firmware-load"
-INITSCRIPT_PARAMS = "defaults 96"
-
-inherit update-rc.d
-
-UPDATERCPN = "${PN}-initscript"
-
-RDEPENDS_${PN}-initscript = "am33x-cm3"
-
-SRC_URI = "git://arago-project.org/git/projects/am33x-cm3.git;protocol=git;branch=${BRANCH} \
-           file://init-am33x-cm3 \
-           file://init-am43x-cm3 \
-          "
-
-SCRIPT_ti33x = "init-am33x-cm3"
-SCRIPT_ti43x = "init-am43x-cm3"
+SRC_URI = "git://git.ti.com/ti-cm3-pm-firmware/amx3-cm3.git;protocol=git;branch=${BRANCH}"
 
 S = "${WORKDIR}/git"
 
@@ -41,15 +20,7 @@ do_compile() {
 
 do_install() {
         install -d ${D}${base_libdir}/firmware
-        install -m 0644 bin/am335x-pm-firmware.bin ${D}${base_libdir}/firmware/
-
-        # Install the init script to load the PM firmware at boot
-        install -d ${D}${sysconfdir}/init.d
-        install -m 0755 ${WORKDIR}/${SCRIPT} ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
+        install -m 0644 bin/am335x-pm-firmware.elf ${D}${base_libdir}/firmware/
 }
 
-PACKAGES =+ "${PN}-initscript"
-
 FILES_${PN} += "${base_libdir}/firmware"
-
-FILES_${PN}-initscript = "${sysconfdir}/*"