Merge commit 'remotes/korg/cupcake' into cupcake_to_master

Conflicts:
	core/prelink-linux-arm.map

diff --cc core/combo/linux-arm.mk
Simple merge

diff --cc core/prelink-linux-arm.map
index 38d3a50,429ae1a..2d1da06
--- 1/core/prelink-linux-arm.map
--- 2/core/prelink-linux-arm.map
+++ b/core/prelink-linux-arm.map
@@@ -84,12 -90,29 +90,20 @@@ libgps.so               0xA970000
  libcamera.so            0xA9680000
  libqcamera.so           0xA9400000
  
 -# pv libraries
 -libopencorenet_support.so     0xA7D20000
 -libpvasf.so                   0xA7BC0000
 -libpvasfreg.so                0xA7B70000
 -libopencoredownload.so        0xA7B40000
 -libopencoredownloadreg.so     0xA7B00000
 -libopencorenet_support.so     0xA7A00000
 -libopencorertsp.so            0xA7900000
 -libopencorertspreg.so         0xA7800000
 -libopencoreauthor.so          0xA7600000
 -libopencorecommon.so          0xA7500000
 -libopencoremp4.so             0xA7400000
 -libopencoremp4reg.so          0xA7300000
 -libopencoreplayer.so          0xA7000000
 +# pv opencore libraries
 +libopencore_author.so   0xA7B00000
 +libopencore_player.so   0xA7800000
 +libopencore_common.so   0xA7300000
 +libopencore_2way.so     0xA7000000
  
+ # opencore hardware support
+ libmm-adspsvc.so              0xA6FFD000
+ libOmxCore.so                 0xA6FF0000
+ libOmxMpeg4Dec.so             0xA6FC0000
+ libOmxH264Dec.so              0xA6F90000
+ libOmxVidEnc.so               0xA6F60000
+ libopencorehw.so              0xA6F50000
+ 
  # libraries for specific apps or temporary libraries
  libcam_ipl.so           0x9F000000
  libwbxml.so             0x9E800000

diff --cc envsetup.sh
Simple merge