16 files changed, 1 insertions, 1260 deletions
diff --git a/recipes-bsp/alsa-state/alsa-state.bbappend b/recipes-bsp/alsa-state/alsa-state.bbappend
index 3689c43ad..dbfed385d 100644
--- a/recipes-bsp/alsa-state/alsa-state.bbappend
+++ b/recipes-bsp/alsa-state/alsa-state.bbappend
@@ -3,5 +3,3 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 PACKAGE_ARCH_mx7 = "${MACHINE_ARCH}"
 PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
-PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}"
-PACKAGE_ARCH_mxs = "${MACHINE_ARCH}"
diff --git a/recipes-bsp/alsa-state/alsa-state/mx5/asound.conf b/recipes-bsp/alsa-state/alsa-state/mx5/asound.conf
deleted file mode 100755
index 0cbe59b25..000000000
--- a/recipes-bsp/alsa-state/alsa-state/mx5/asound.conf
+++ /dev/null
@@ -1,275 +0,0 @@
-defaults.pcm.rate_converter "linear"
-pcm.dmix_48000{
-type dmix
-ipc_key 5678293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 48000
-}
-}
-pcm.dmix_44100{
-type dmix
-ipc_key 5678293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 44100
-}
-}
-pcm.dmix_32000{
-type dmix
-ipc_key 5678293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 32000
-}
-}
-pcm.dmix_24000{
-type dmix
-ipc_key 5678293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 24000
-}
-}
-pcm.dmix_22050{
-type dmix
-ipc_key 5678293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 22050
-}
-}
-pcm.dmix_16000{
-type dmix
-ipc_key 5678293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 16000
-}
-}
-pcm.dmix_12000{
-type dmix
-ipc_key 5678293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 12000
-}
-}
-pcm.dmix_11025{
-type dmix
-ipc_key 5678293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 11025
-}
-}
-pcm.dmix_8000{
-type dmix
-ipc_key 5678293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 8000
-}
-}
-pcm.!dsnoop_48000{
-type dsnoop
-ipc_key 5778293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 48000
-}
-}
-pcm.!dsnoop_44100{
-type dsnoop
-ipc_key 5778293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 44100
-}
-}
-pcm.!dsnoop_32000{
-type dsnoop
-ipc_key 5778293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 32000
-}
-}
-pcm.!dsnoop_24000{
-type dsnoop
-ipc_key 5778293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 24000
-}
-}
-pcm.!dsnoop_22050{
-type dsnoop
-ipc_key 5778293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 22050
-}
-}
-pcm.!dsnoop_16000{
-type dsnoop
-ipc_key 5778293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 16000
-}
-}
-pcm.!dsnoop_12000{
-type dsnoop
-ipc_key 5778293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 12000
-}
-}
-pcm.!dsnoop_11025{
-type dsnoop
-ipc_key 5778293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 11025
-}
-}
-pcm.!dsnoop_8000{
-type dsnoop
-ipc_key 5778293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 8000
-}
-}
-pcm.asymed{
-type asym
-playback.pcm "dmix_44100"
-capture.pcm "dsnoop_44100"
-}
-pcm.dsp0{
-type plug
-slave.pcm "asymed"
-}
-pcm.!default{
-type plug
-route_policy "average"
-slave.pcm "asymed"
-}
-ctl.mixer0{
-type hw
-card 0
-}
diff --git a/recipes-bsp/alsa-state/alsa-state/mx5/asound.state b/recipes-bsp/alsa-state/alsa-state/mx5/asound.state
deleted file mode 100644
index 7c13a88a0..000000000
--- a/recipes-bsp/alsa-state/alsa-state/mx5/asound.state
+++ /dev/null
@@ -1,139 +0,0 @@
-state.imx3stack {
-        control.1 {
-                iface MIXER
-                name 'MIC GAIN'
-                value '0dB'
-                comment {
-                        access 'read write'
-                        type ENUMERATED
-                        count 1
-                        item.0 '0dB'
-                        item.1 '20dB'
-                        item.2 '30dB'
-                        item.3 '40dB'
-                }
-        }
-        control.2 {
-                iface MIXER
-                name 'Capture Volume'
-                value.0 12
-                value.1 12
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 15'
-                }
-        }
-        control.3 {
-                iface MIXER
-                name 'Capture Vol Reduction'
-                value 'No Change'
-                comment {
-                        access 'read write'
-                        type ENUMERATED
-                        count 1
-                        item.0 'No Change'
-                        item.1 'Reduced by 6dB'
-                }
-        }
-        control.4 {
-                iface MIXER
-                name 'Playback Volume'
-                value.0 192
-                value.1 192
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 192'
-                }
-        }
-        control.5 {
-                iface MIXER
-                name 'Headphone Volume'
-                value.0 127
-                value.1 127
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 127'
-                }
-        }
-        control.6 {
-                iface MIXER
-                name 'DAC Mux'
-                value DAC
-                comment {
-                        access 'read write'
-                        type ENUMERATED
-                        count 1
-                        item.0 DAC
-                        item.1 LINE_IN
-                }
-        }
-        control.7 {
-                iface MIXER
-                name 'ADC Mux'
-                value LINE_IN
-                comment {
-                        access 'read write'
-                        type ENUMERATED
-                        count 1
-                        item.0 MIC_IN
-                        item.1 LINE_IN
-                }
-        }
-        control.8 {
-                iface MIXER
-                name ASRC
-                value disable
-                comment {
-                        access 'read write'
-                        type ENUMERATED
-                        count 1
-                        item.0 disable
-                        item.1 '32KHz'
-                        item.2 '44.1KHz'
-                        item.3 '48KHz'
-                        item.4 '96KHz'
-                }
-        }
-        control.9 {
-                iface MIXER
-                name 'Jack Function'
-                value on
-                comment {
-                        access 'read write'
-                        type ENUMERATED
-                        count 1
-                        item.0 off
-                        item.1 on
-                }
-        }
-        control.10 {
-                iface MIXER
-                name 'Speaker Function'
-                value on
-                comment {
-                        access 'read write'
-                        type ENUMERATED
-                        count 1
-                        item.0 off
-                        item.1 on
-                }
-        }
-        control.11 {
-                iface MIXER
-                name 'Line In Function'
-                value off
-                comment {
-                        access 'read write'
-                        type ENUMERATED
-                        count 1
-                        item.0 off
-                        item.1 on
-                }
-        }
-}
diff --git a/recipes-bsp/alsa-state/alsa-state/mxs/asound.conf b/recipes-bsp/alsa-state/alsa-state/mxs/asound.conf
deleted file mode 100644
index 39cb39611..000000000
--- a/recipes-bsp/alsa-state/alsa-state/mxs/asound.conf
+++ /dev/null
@@ -1,299 +0,0 @@
-defaults.pcm.rate_converter "linear"
-pcm.dmix_48000{
-type plug
-slave.pcm{
-type dmix
-ipc_key 5678293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 48000
-}
-}
-}
-pcm.dmix_44100{
-type dmix
-ipc_key 5678293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 44100
-}
-}
-pcm.dmix_32000{
-type plug
-slave.pcm{
-type dmix
-ipc_key 5678293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 32000
-}
-}
-}
-pcm.dmix_24000{
-type plug
-slave.pcm{
-type dmix
-ipc_key 5678293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 24000
-}
-}
-}
-pcm.dmix_22050{
-type plug
-slave.pcm{
-type dmix
-ipc_key 5678293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 22050
-}
-}
-}
-pcm.dmix_16000{
-type plug
-slave.pcm{
-type dmix
-ipc_key 5678293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 16000
-}
-}
-}
-pcm.dmix_12000{
-type plug
-slave.pcm{
-type dmix
-ipc_key 5678293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 12000
-}
-}
-}
-pcm.dmix_11025{
-type plug
-slave.pcm{
-type dmix
-ipc_key 5678293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 11025
-}
-}
-}
-pcm.dmix_8000{
-type plug
-slave.pcm{
-type dmix
-ipc_key 5678293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 8000
-}
-}
-}
-pcm.!dsnoop_48000{
-type dsnoop
-ipc_key 5778293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 48000
-}
-}
-pcm.!dsnoop_44100{
-type dsnoop
-ipc_key 5778293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 44100
-}
-}
-pcm.!dsnoop_32000{
-type dsnoop
-ipc_key 5778293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 32000
-}
-}
-pcm.!dsnoop_24000{
-type dsnoop
-ipc_key 5778293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 24000
-}
-}
-pcm.!dsnoop_22050{
-type dsnoop
-ipc_key 5778293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 22050
-}
-}
-pcm.!dsnoop_16000{
-type dsnoop
-ipc_key 5778293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 16000
-}
-}
-pcm.!dsnoop_12000{
-type dsnoop
-ipc_key 5778293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 12000
-}
-}
-pcm.!dsnoop_11025{
-type dsnoop
-ipc_key 5778293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 11025
-}
-}
-pcm.!dsnoop_8000{
-type dsnoop
-ipc_key 5778293
-ipc_key_add_uid yes
-slave{
-pcm "hw:0,0"
-period_time 0
-period_size 2048
-buffer_size 24576
-format S16_LE
-rate 8000
-}
-}
-pcm.asymed{
-type asym
-playback.pcm "dmix_44100"
-capture.pcm "dsnoop_44100"
-}
-pcm.dsp0{
-type plug
-slave.pcm "asymed"
-}
-pcm.!default{
-type plug
-route_policy "average"
-slave.pcm "asymed"
-}
-ctl.mixer0{
-type hw
-card 0
-}
diff --git a/recipes-bsp/alsa-state/alsa-state/mxs/asound.state b/recipes-bsp/alsa-state/alsa-state/mxs/asound.state
deleted file mode 100644
index d508cc363..000000000
--- a/recipes-bsp/alsa-state/alsa-state/mxs/asound.state
+++ /dev/null
@@ -1,191 +0,0 @@
-state.mxsevk {
-        control.1 {
-                iface MIXER
-                name 'MIC GAIN'
-                value '0dB'
-                comment {
-                        access 'read write'
-                        type ENUMERATED
-                        count 1
-                        item.0 '0dB'
-                        item.1 '20dB'
-                        item.2 '30dB'
-                        item.3 '40dB'
-                }
-        }
-        control.2 {
-                iface MIXER
-                name 'Capture Volume'
-                value.0 12
-                value.1 12
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 15'
-                }
-        }
-        control.3 {
-                iface MIXER
-                name 'Capture Vol Reduction'
-                value 'No Change'
-                comment {
-                        access 'read write'
-                        type ENUMERATED
-                        count 1
-                        item.0 'No Change'
-                        item.1 'Reduced by 6dB'
-                }
-        }
-        control.4 {
-                iface MIXER
-                name 'Playback Volume'
-                value.0 156
-                value.1 156
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 192'
-                }
-        }
-        control.5 {
-                iface MIXER
-                name 'Headphone Volume'
-                value.0 127
-                value.1 127
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 127'
-                }
-        }
-        control.6 {
-                iface MIXER
-                name 'DAC Mux'
-                value DAC
-                comment {
-                        access 'read write'
-                        type ENUMERATED
-                        count 1
-                        item.0 DAC
-                        item.1 LINE_IN
-                }
-        }
-        control.7 {
-                iface MIXER
-                name 'ADC Mux'
-                value MIC_IN
-                comment {
-                        access 'read write'
-                        type ENUMERATED
-                        count 1
-                        item.0 MIC_IN
-                        item.1 LINE_IN
-                }
-        }
-}
-state.mxsevk_1 {
-        control.1 {
-                iface MIXER
-                name PRO
-                value false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 1
-                }
-        }
-        control.2 {
-                iface MIXER
-                name AUDIO
-                value false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 1
-                }
-        }
-        control.3 {
-                iface MIXER
-                name COPY
-                value false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 1
-                }
-        }
-        control.4 {
-                iface MIXER
-                name PRE
-                value false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 1
-                }
-        }
-        control.5 {
-                iface MIXER
-                name CC
-                value 0
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 1
-                        range '0 - 127'
-                }
-        }
-        control.6 {
-                iface MIXER
-                name L
-                value false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 1
-                }
-        }
-        control.7 {
-                iface MIXER
-                name V
-                value false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 1
-                }
-        }
-        control.8 {
-                iface MIXER
-                name 'USER DATA'
-                value false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 1
-                }
-        }
-        control.9 {
-                iface MIXER
-                name 'AUTO MUTE'
-                value false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 1
-                }
-        }
-        control.10 {
-                iface MIXER
-                name 'V CONFIG'
-                value false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 1
-                }
-        }
-}
diff --git a/recipes-bsp/imx-lib/imx-lib-11.09.02/obey-variables.patch b/recipes-bsp/imx-lib/imx-lib-11.09.02/obey-variables.patch
deleted file mode 100644
index 901345acc..000000000
--- a/recipes-bsp/imx-lib/imx-lib-11.09.02/obey-variables.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-Obey CFLAGS, LDFLAGS
-Signed-off-by: Christopher Larson <chris_larson@mentor.com>
-Upstream-status: Pending
--- imx-lib-11.09.02.orig/hdmi-cec/Makefile     2014-09-02 13:04:37.114250749 -0700
-+++ imx-lib-11.09.02/hdmi-cec/Makefile  2014-09-02 13:04:37.086250568 -0700
-@@ -1,5 +1,6 @@
- CC ?=$(CROSS_COMPILE)gcc
- AR ?=$(CROSS_COMPILE)ar
-+CFLAGS ?=-O2
- 
- # list of platforms which want this test case
- INCLUDE_LIST:= IMX6Q
-@@ -32,10 +33,10 @@
- endif
- 
- %.o: %.c
-       $(CC) -D$(PLATFORM) -Wall -O2 -fPIC -c $^ -o $@
-+       $(CC) -D$(PLATFORM) -Wall -fPIC $(CFLAGS) -c $^ -o $@
- 
- $(LIBNAME).so.$(SONAMEVERSION): $(OBJ)
-       $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@
-+       $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@ $(LDFLAGS)
- 
- $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
-        ln -s $< $@
--- imx-lib-11.09.02.orig/ipu/Makefile  2014-09-02 13:04:37.114250749 -0700
-+++ imx-lib-11.09.02/ipu/Makefile       2014-09-02 13:05:11.062458117 -0700
-@@ -1,5 +1,6 @@
- CC ?=$(CROSS_COMPILE)gcc
- AR ?=$(CROSS_COMPILE)ar
-+CFLAGS ?=-O2
- 
- ifeq ($(PLATFORM), IMX6Q)
- OBJS = mxc_ipu_hl_lib_dummy.o
-@@ -28,7 +29,7 @@
- endif
- 
- $(LIBNAME).so.$(SONAMEVERSION): $(OBJS)
-       $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -lpthread
-+       $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -lpthread $(LDFLAGS)
- 
- $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
-        ln -s $< $@
-@@ -37,7 +38,7 @@
- ifeq "$(PLATFORM)" ""
-        $(error "Unspecified PLATFORM variable")
- endif
-       $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -O2 -fPIC -c $^ -o $@
-+       $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -fPIC $(CFLAGS) -c $^ -o $@
- 
- .PHONY: clean
- clean:
--- imx-lib-11.09.02.orig/pxp/Makefile  2014-09-02 13:04:37.114250749 -0700
-+++ imx-lib-11.09.02/pxp/Makefile       2014-09-02 13:05:53.354716651 -0700
-@@ -1,5 +1,6 @@
- CC ?=$(CROSS_COMPILE)gcc
- AR ?=$(CROSS_COMPILE)ar
-+CFLAGS ?=-O2
- 
- # list of platforms which want this test case
- INCLUDE_LIST:=IMX50 IMX51 IMX5 IMX6Q IMX6S
-@@ -25,10 +26,10 @@
- endif
- 
- %.o: %.c
-       $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -O2 -fPIC -c $^ -o $@
-+       $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -fPIC $(CFLAGS) -c $^ -o $@
- 
- $(LIBNAME).so.$(SONAMEVERSION): $(OBJ)
-       $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@
-+       $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@ $(LDFLAGS)
- 
- $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
-        ln -s $< $@
--- imx-lib-11.09.02.orig/rng/Makefile  2014-09-02 13:04:37.114250749 -0700
-+++ imx-lib-11.09.02/rng/Makefile       2014-09-02 13:04:37.086250568 -0700
-@@ -4,16 +4,17 @@
- AR = ar -crv
- RM = rm -f
- CC ?=$(CROSS_COMPILE)gcc
-LD=$(CROSS_COMPILE)ld
-+LD ?=$(CROSS_COMPILE)ld
-+CFLAGS ?=-g
- 
- INC := $(INCLUDE)
- 
- # Add compilation checks
-CFLAGS += -g -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wdeclaration-after-statement -fPIC
-+override CFLAGS += -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wdeclaration-after-statement -fPIC
- 
- # In absence of kernel CONFIG flags, set API library to build on
- # 'unknown' platform.
-CFLAGS += -DFSL_PLATFORM_OTHER -DFSL_HAVE_RNGC $(INC)
-+override CFLAGS += -DFSL_PLATFORM_OTHER -DFSL_HAVE_RNGC $(INC)
- 
- OBJS= fsl_shw_rand.o  fsl_shw_hash.o  fsl_shw_sym.o  fsl_shw_user.o         \
-                fsl_shw_keystore.o fsl_shw_auth.o  fsl_shw_hmac.o  fsl_shw_wrap.o
-@@ -34,7 +35,7 @@
-        $(AR) $@ $^
- 
- $(LIBNAME).so.$(SONAMEVERSION): $(OBJS)
-       $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^
-+       $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ $(LDFLAGS)
- 
- $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
-        ln -s $< $@
--- imx-lib-11.09.02.orig/sahara2/Makefile      2014-09-02 13:04:37.114250749 -0700
-+++ imx-lib-11.09.02/sahara2/Makefile   2014-09-02 13:04:37.086250568 -0700
-@@ -4,7 +4,8 @@
- AR = ar -crv
- RM = rm -f
- CC ?=$(CROSS_COMPILE)gcc
-LD=$(CROSS_COMPILE)ld
-+LD ?=$(CROSS_COMPILE)ld
-+CFLAGS ?=-g
- 
- INC := $(INCLUDE)
- 
-@@ -18,19 +19,19 @@
- endif
- 
- # Add compilation checks
-CFLAGS += -g -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wdeclaration-after-statement -fPIC
-+override CFLAGS += -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wdeclaration-after-statement -fPIC
- 
- OBJS= fsl_shw_rand.o  fsl_shw_hash.o  fsl_shw_sym.o  fsl_shw_user.o         \
-       fsl_shw_auth.o  fsl_shw_hmac.o  fsl_shw_wrap.o  fsl_shw_keystore.o um_adaptor.o  sf_util.o
- 
- 
- #CFLAGS += -DSAHARA -DLINUX -I$(APIINCDIR)
-CFLAGS += -DSAHARA -DLINUX $(INC)
-CFLAGS += $(TARGET_ARCH)
-+override CFLAGS += -DSAHARA -DLINUX $(INC)
-+override CFLAGS += $(TARGET_ARCH)
- # Uncomment to debug Library's creation of structures for driver
-#CFLAGS +=  -DDIAG_SECURITY_FUNC
-+#override CFLAGS +=  -DDIAG_SECURITY_FUNC
- # Uncomment to simulate memory allocation errors
-#CFLAGS += -DDIAG_MEM_ERRORS -DDIAG_MEM_CONST=5
-+#override CFLAGS += -DDIAG_MEM_ERRORS -DDIAG_MEM_CONST=5
- 
- LIBNAME=libsahara
- SONAMEVERSION=0
-@@ -53,7 +54,7 @@
-        $(AR) $@ $^
- 
- $(LIBNAME).so.$(SONAMEVERSION): $(OBJS)
-       $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^
-+       $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ $(LDFLAGS)
- 
- $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
-        ln -s $< $@
--- imx-lib-11.09.02.orig/screenlayer/Makefile  2014-09-02 13:04:37.114250749 -0700
-+++ imx-lib-11.09.02/screenlayer/Makefile       2014-09-02 13:04:37.086250568 -0700
-@@ -1,5 +1,6 @@
- CC ?=$(CROSS_COMPILE)gcc
- AR ?=$(CROSS_COMPILE)ar
-+CFLAGS ?=-O2
- INC = $(INCLUDE) -I../ipu
- 
- OBJS = ScreenLayer.o
-@@ -24,13 +25,13 @@
- endif
- 
- $(LIBNAME).so.$(SONAMEVERSION): $(OBJS)
-       $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -L../ipu -lipu
-+       $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -L../ipu -lipu $(LDFLAGS)
- 
- $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
-        ln -s $< $@
- 
- %.o: %.c
-       $(CC) $(INC) -Wall -O2 -fPIC -c $^ -o $@
-+       $(CC) $(INC) -Wall -fPIC $(CFLAGS) -c $^ -o $@
- 
- .PHONY: clean
- clean:
--- imx-lib-11.09.02.orig/sim/Makefile  2014-09-02 13:04:37.114250749 -0700
-+++ imx-lib-11.09.02/sim/Makefile       2014-09-02 13:04:37.086250568 -0700
-@@ -1,9 +1,10 @@
- CC ?=$(CROSS_COMPILE)gcc
- AR ?=$(CROSS_COMPILE)ar
-+CFLAGS ?=-O2
- 
- OBJS = iso7816-3.o
- 
-CFLAGS += $(INCLUDE)
-+override CFLAGS += $(INCLUDE)
- 
- LIBNAME=libsim
- SONAMEVERSION=0
-@@ -21,13 +22,13 @@
-        cp iso7816-3.h $(DEST_DIR)/usr/include
- 
- $(LIBNAME).so.$(SONAMEVERSION): $(OBJS)
-       $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -lpthread
-+       $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -lpthread $(LDFLAGS)
- 
- $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
-        ln -s $< $@
- 
- %.o: %.c
-       $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -O2 -fPIC -c $^ -o $@
-+       $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -fPIC $(CFLAGS) -c $^ -o $@
- 
- else
- all install :
diff --git a/recipes-bsp/imx-lib/imx-lib.inc b/recipes-bsp/imx-lib/imx-lib.inc
index 2e3162655..ff4271302 100644
--- a/recipes-bsp/imx-lib/imx-lib.inc
+++ b/recipes-bsp/imx-lib/imx-lib.inc
@@ -8,7 +8,6 @@ DEPENDS = "virtual/kernel"
 LIC_FILES_CHKSUM = "file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24"
 PLATFORM_mx6 = "IMX6Q"
-PLATFORM_mx5 = "IMX51"
 PLATFORM_mx6sl = "IMX6S"
 PLATFORM_mx6sx = "IMX6S"
 PLATFORM_mx7   = "IMX7"
diff --git a/recipes-bsp/imx-lib/imx-lib_11.09.02.bb b/recipes-bsp/imx-lib/imx-lib_11.09.02.bb
deleted file mode 100644
index f8e0e3a66..000000000
--- a/recipes-bsp/imx-lib/imx-lib_11.09.02.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (C) 2013 Freescale Semiconductor
-require imx-lib.inc
-LIC_FILES_CHKSUM = "file://ipu/mxc_ipu_hl_lib.h;endline=13;md5=6c7486b21a8524b1879fa159578da31e"
-SRC_URI = "${FSL_MIRROR}/imx-lib-${PV}.tar.gz \
-           file://obey-variables.patch"
-SRC_URI[md5sum] = "a4e7447e35cfac0b966a51f001390d6e"
-SRC_URI[sha256sum] = "3ed082005789db0c9c41e14073417319f4e23f5646a7d21f34840470f4328bd5"
-COMPATIBLE_MACHINE = "(mx5)"
diff --git a/recipes-bsp/imx-test/imx-test.inc b/recipes-bsp/imx-test/imx-test.inc
index a459ea91d..7174b0525 100644
--- a/recipes-bsp/imx-test/imx-test.inc
+++ b/recipes-bsp/imx-test/imx-test.inc
@@ -3,12 +3,10 @@
 SUMMARY = "Test programs for IMX BSP"
 DESCRIPTION = "Unit tests for the IMX BSP"
 SECTION = "base"
-DEPENDS_mx5   = "virtual/kernel imx-lib imx-vpu"
 DEPENDS_mx6q  = "virtual/kernel imx-lib imx-vpu"
 DEPENDS_mx6dl = "virtual/kernel imx-lib imx-vpu"
 DEPENDS_mx6sl = "virtual/kernel imx-lib"
 DEPENDS_mx6sx = "virtual/kernel imx-lib"
-DEPENDS_mxs   = "virtual/kernel"
 DEPENDS_mx6ul = "virtual/kernel imx-lib"
 DEPENDS_mx7   = "virtual/kernel imx-lib"
@@ -28,8 +26,6 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 PLATFORM_mx6 = "IMX6Q"
 PLATFORM_mx6sl = "IMX6SL"
 PLATFORM_mx6sx = "IMX6SX"
-PLATFORM_mx53 = "IMX53"
-PLATFORM_mx51 = "IMX51"
 PLATFORM_mx7 = "IMX7D"
 PLATFORM_mx6ul = "IMX6UL"
diff --git a/recipes-bsp/imx-test/imx-test/Fix-build-in-OpenEmbedded-Core-environment.patch b/recipes-bsp/imx-test/imx-test/Fix-build-in-OpenEmbedded-Core-environment.patch
deleted file mode 100644
index 7497e91da..000000000
--- a/recipes-bsp/imx-test/imx-test/Fix-build-in-OpenEmbedded-Core-environment.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From fd826140db0f2a867ef588cccf2e5322cc77126a Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio@ossystems.com.br>
-Date: Mon, 19 Jan 2015 16:56:29 -0200
-Subject: [PATCH] Fix build in OpenEmbedded-Core environment
-Organization: O.S. Systems Software LTDA.
-Some of the unit-tests were not being built due to differences on how
-the build system behaves when running inside of the OE-Core. This
-fixes those minor issues and increases the number of tests available.
-Upstream-Status: Pending
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-diff --git a/test/ar3k_bt/Makefile b/test/ar3k_bt/Makefile
-index 92e2901..75d3e78 100755
--- a/test/ar3k_bt/Makefile
-+++ b/test/ar3k_bt/Makefile
-@@ -21,7 +21,7 @@ all: $(OBJS)
- CFLAGS +=  -lbluetooth
- 
- $(OBJDIR)/hciattach-ar3k.bin :
-       $(CC)  ${INC} -Wall -lbluetooth -g hciattach_ath3k.c  hciattach.c  hciattach_qualcomm.c  hciattach_st.c  hciattach_tialt.c  hciattach_ti.c -o hciattach-ar3k.bin
-+       $(CC)  ${INC} -Wall -lbluetooth -g hciattach_ath3k.c  hciattach.c  hciattach_qualcomm.c  hciattach_st.c  hciattach_tialt.c  hciattach_ti.c -o $(OBJDIR)/hciattach-ar3k.bin
- 
- clean:
-        rm -f *.o hciattach-ar3k.bin
-- 
-2.1.4
diff --git a/recipes-bsp/imx-test/imx-test/clocks.sh b/recipes-bsp/imx-test/imx-test/clocks.sh
deleted file mode 100755
index 2121bef6b..000000000
--- a/recipes-bsp/imx-test/imx-test/clocks.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-# This script is taken directly from the section 5.10 of the Freescale Application Note
-# AN4509 and it simple prints the CPU clocks in a nice format
-saved_path=$PWD
-if ! mount|grep -sq '/sys/kernel/debug'; then
-  mount -t debugfs none /sys/kernel/debug
-fi
-printf "%-24s %-20s %3s %9s\n" "clock" "parent" "use" "flags" "rate"
-for foo in $(find /sys/kernel/debug/clock -type d); do
-  if [ "$foo" = '/sys/kernel/debug/clock' ]; then
-    continue
-  fi
-  cd $foo
-  ec="$(cat usecount)"
-  rate="$(cat rate)"
-  flag="$(cat flags)"
-  clk="$(basename $foo)"
-  cd ..
-  parent="$(basename $PWD)"
-  if [ "$parent" = 'clock' ]; then
-    parent=" ---"
-  fi
-  printf "%-24s %-24s %2d %2d %10d\n" "$clk" "$parent" "$ec" "$flag" "$rate"
-  cd $saved_path
-done
diff --git a/recipes-bsp/imx-test/imx-test/revert_epdc_hdr_change.patch b/recipes-bsp/imx-test/imx-test/revert_epdc_hdr_change.patch
deleted file mode 100644
index 4fb0564af..000000000
--- a/recipes-bsp/imx-test/imx-test/revert_epdc_hdr_change.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From e559eb0a9573b9011c03efaf42364dce67af893a Mon Sep 17 00:00:00 2001
-From: Lauren Post <lauren.post@freescale.com>
-Date: Tue, 10 Sep 2013 10:58:28 -0500
-Subject: [PATCH] ENGR00279068-2 epdc_test_driver: Update header name change
- of mxc_epdc.h
-Upstream-Status: Pending
-Signed-off-by: Lauren Post <lauren.post@freescale.com>
-Signed-off-by: Frank Li <Frank.li@freescale.com>
---
- module_test/epdc_test_driver.c |    4 ++--
- 1 file changed, 1 insertions(+), 1 deletions(-)
-diff --git a/module_test/epdc_test_driver.c b/module_test/epdc_test_driver.c
-index fb15aec..447246f 100644
--- a/module_test/epdc_test_driver.c
-+++ b/module_test/epdc_test_driver.c
-@@ -36,7 +36,7 @@
- 
- #include <linux/device.h>
- #include <linux/mxcfb.h>
-#include <linux/mxcfb_epdc.h>
-+#include <linux/mxcfb_epdc_kernel.h>
- 
- /* major number of device */
- static int gMajor;
-- 
-1.7.9.5
diff --git a/recipes-bsp/imx-test/imx-test_5.1.bb b/recipes-bsp/imx-test/imx-test_5.1.bb
index ff42c7fe5..82df7652a 100644
--- a/recipes-bsp/imx-test/imx-test_5.1.bb
+++ b/recipes-bsp/imx-test/imx-test_5.1.bb
@@ -2,10 +2,7 @@
 include imx-test.inc
-SRC_URI_append_mx5 = " file://clocks.sh"
-SRC_URI_append_mxs = " file://clocks.sh"
 SRC_URI[md5sum] = "5991439d4b20abac1095688164d26f40"
 SRC_URI[sha256sum] = "042d0b03d7838395a6b35d0ca7159f1f4b6cf3055dcc4a12a1b66488fca987b1"
-COMPATIBLE_MACHINE = "(mxs|mx5|mx6|mx7)"
+COMPATIBLE_MACHINE = "(mx6|mx7)"
diff --git a/recipes-bsp/imx-vpu/imx-vpu-11.09.02/obey-variables.patch b/recipes-bsp/imx-vpu/imx-vpu-11.09.02/obey-variables.patch
deleted file mode 100644
index 13f61b271..000000000
--- a/recipes-bsp/imx-vpu/imx-vpu-11.09.02/obey-variables.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Obey CFLAGS, LDFLAGS
-Signed-off-by: Christopher Larson <chris_larson@mentor.com>
-Upstream-status: Pending
--- imx-vpu-11.09.02.orig/vpu/Makefile  2014-09-02 13:14:50.862005896 -0700
-+++ imx-vpu-11.09.02/vpu/Makefile       2014-09-02 13:15:15.018153222 -0700
-@@ -1,5 +1,6 @@
- CC ?=$(CROSS_COMPILE)gcc
- AR ?=$(CROSS_COMPILE)ar
-+CFLAGS ?= -O2
- 
- # list of platforms which want this test case
- INCLUDE_LIST:= IMX27ADS IMX51 IMX53 IMX6Q
-@@ -33,10 +34,10 @@
- endif
- 
- %.o: %.c
-       $(CC) -D$(PLATFORM) -Wall -O2 -fPIC -c $^ -o $@
-+       $(CC) -D$(PLATFORM) -Wall -fPIC $(CFLAGS) -c $^ -o $@
- 
- $(LIBNAME).so.$(SONAMEVERSION): $(OBJ)
-       $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@
-+       $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@ $(LDFLAGS)
- 
- $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
-        ln -s $< $@
diff --git a/recipes-bsp/imx-vpu/imx-vpu.inc b/recipes-bsp/imx-vpu/imx-vpu.inc
index fd59770ad..c84bf955b 100644
--- a/recipes-bsp/imx-vpu/imx-vpu.inc
+++ b/recipes-bsp/imx-vpu/imx-vpu.inc
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://vpu/EULA.txt;md5=b063366b066c9f10037c59756a9ced54"
 DEPENDS = "virtual/kernel"
 inherit fsl-eula-unpack
-PLATFORM_mx5 = "IMX51"
 PLATFORM_mx6 = "IMX6Q"
 SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
diff --git a/recipes-bsp/imx-vpu/imx-vpu_11.09.02.bb b/recipes-bsp/imx-vpu/imx-vpu_11.09.02.bb
deleted file mode 100644
index c5dd9bd59..000000000
--- a/recipes-bsp/imx-vpu/imx-vpu_11.09.02.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (C) 2013 Freescale Semiconductor
-require imx-vpu.inc
-SRC_URI += "file://obey-variables.patch"
-SRC_URI[md5sum] = "1988a08687a09ef8590e66ff17ac6ed3"
-SRC_URI[sha256sum] = "783f136aa9b9257d4bffbdaf05bdcb85d177c544c3f8a4674421ba7b065ed5c0"
-COMPATIBLE_MACHINE = "(mx5)"