RPi: remove platform

18 files changed, 27 insertions, 240 deletions

diff --git a/tools/buildsteps/defaultenv b/tools/buildsteps/defaultenv
index becf6ae8f8..66f0777fb0 100644
--- a/tools/buildsteps/defaultenv
+++ b/tools/buildsteps/defaultenv
@@ -50,12 +50,6 @@ case $XBMC_PLATFORM_DIR in
     DEFAULT_CONFIGURATION="Debug"
   ;;
 
-  rbpi)
-    JENKINS_RBPI_DEVENV=${JENKINS_RBPI_DEVENV:-"/home/jenkins/rbpi-dev"}
-    DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends
-    DEFAULT_CONFIGURATION="Debug"
-  ;;
-
   freebsd)
     DEFAULT_CONFIGURATION="Debug"
   ;;
diff --git a/tools/buildsteps/rbpi/configure-depends b/tools/buildsteps/rbpi/configure-depends
deleted file mode 100755
index 13d5ca27cb..0000000000
--- a/tools/buildsteps/rbpi/configure-depends
+++ /dev/null
@@ -1,12 +0,0 @@
-WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
-XBMC_PLATFORM_DIR=rbpi
-. $WORKSPACE/tools/buildsteps/defaultenv
-
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
-then
-  cd $WORKSPACE/tools/depends;
-
-  ./configure --with-platform=raspberry-pi2 --host=arm-linux-gnueabihf --prefix=$XBMC_DEPENDS_ROOT --with-tarballs=$TARBALLS \
-    --with-firmware=$JENKINS_RBPI_DEVENV/firmware --build=i686-linux $DEBUG_SWITCH \
-    --with-toolchain=$JENKINS_RBPI_DEVENV/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf
-fi
diff --git a/tools/buildsteps/rbpi/configure-xbmc b/tools/buildsteps/rbpi/configure-xbmc
deleted file mode 100755
index 6dd54bf845..0000000000
--- a/tools/buildsteps/rbpi/configure-xbmc
+++ /dev/null
@@ -1,5 +0,0 @@
-WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
-XBMC_PLATFORM_DIR=rbpi
-. $WORKSPACE/tools/buildsteps/defaultenv
-
-make -C $WORKSPACE/tools/depends/target/cmakebuildsys
diff --git a/tools/buildsteps/rbpi/make-binary-addons b/tools/buildsteps/rbpi/make-binary-addons
deleted file mode 100755
index 862e7d79e9..0000000000
--- a/tools/buildsteps/rbpi/make-binary-addons
+++ /dev/null
@@ -1,28 +0,0 @@
-WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
-XBMC_PLATFORM_DIR=rbpi
-. $WORKSPACE/tools/buildsteps/defaultenv
-
-. $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
-
-#clear the build failed file
-rm -f $WORKSPACE/cmake/$FAILED_BUILD_FILENAME
-
-ALL_BINARY_ADDONS_BUILT="1"
-#only build binary addons when requested by env/jenkins
-if [ "$BUILD_BINARY_ADDONS" == "true" ]
-then
-  for addon in $BINARY_ADDONS
-  do
-    echo "building $addon"
-    git clean -xffd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon
-    cd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon;make -j $BUILDTHREADS V=99 VERBOSE=1  || ALL_BINARY_ADDONS_BUILT="0"
-  done
-fi
-
-if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
-then
-  tagSuccessFulBuild $WORKSPACE/cmake
-else
-  #mark the build failure in the filesystem but leave jenkins running
-  tagFailedBuild $WORKSPACE/cmake
-fi
diff --git a/tools/buildsteps/rbpi/make-depends b/tools/buildsteps/rbpi/make-depends
deleted file mode 100755
index ceeee09234..0000000000
--- a/tools/buildsteps/rbpi/make-depends
+++ /dev/null
@@ -1,9 +0,0 @@
-WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
-XBMC_PLATFORM_DIR=rbpi
-. $WORKSPACE/tools/buildsteps/defaultenv
-
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
-then
-  cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS || make && tagSuccessFulBuild $WORKSPACE/tools/depends
-fi
-
diff --git a/tools/buildsteps/rbpi/make-native-depends b/tools/buildsteps/rbpi/make-native-depends
deleted file mode 100755
index d4d9e7dbe1..0000000000
--- a/tools/buildsteps/rbpi/make-native-depends
+++ /dev/null
@@ -1,9 +0,0 @@
-WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
-XBMC_PLATFORM_DIR=rbpi
-. $WORKSPACE/tools/buildsteps/defaultenv
-
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] && [ "$BINARY_ADDONS_CLEAN_NATIVETOOLS" != "0" ]
-then
-  git clean -xffd $WORKSPACE/tools/depends/native
-  cd $WORKSPACE/tools/depends/native;make -j $BUILDTHREADS && tagSuccessFulBuild $WORKSPACE/tools/depends
-fi
\ No newline at end of file
diff --git a/tools/buildsteps/rbpi/make-xbmc b/tools/buildsteps/rbpi/make-xbmc
deleted file mode 100755
index 07cfae21c7..0000000000
--- a/tools/buildsteps/rbpi/make-xbmc
+++ /dev/null
@@ -1,5 +0,0 @@
-WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
-XBMC_PLATFORM_DIR=rbpi
-. $WORKSPACE/tools/buildsteps/defaultenv
-
-cd $WORKSPACE/build;make -j$BUILDTHREADS || make
diff --git a/tools/buildsteps/rbpi/package b/tools/buildsteps/rbpi/package
deleted file mode 100755
index f3c41a5c96..0000000000
--- a/tools/buildsteps/rbpi/package
+++ /dev/null
@@ -1,5 +0,0 @@
-WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
-XBMC_PLATFORM_DIR=rbpi
-. $WORKSPACE/tools/buildsteps/defaultenv
-
-#nothing for rbpi atm
diff --git a/tools/buildsteps/rbpi/prepare-depends b/tools/buildsteps/rbpi/prepare-depends
deleted file mode 100755
index c38eb77901..0000000000
--- a/tools/buildsteps/rbpi/prepare-depends
+++ /dev/null
@@ -1,24 +0,0 @@
-WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
-XBMC_PLATFORM_DIR=rbpi
-. $WORKSPACE/tools/buildsteps/defaultenv
-
-#clean without depends for skipping depends build if possible
-#also skip binary addons (pvr, audioencoder) as long as they are deployed in tree
-cd $WORKSPACE;git clean -xfd -e "cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
-
-if [ -d $JENKINS_RBPI_DEVENV/firmware ]
-then
-  cd $JENKINS_RBPI_DEVENV/firmware;git pull origin master
-else
-  cd $JENKINS_RBPI_DEVENV;git clone git://github.com/raspberrypi/firmware.git --depth=1 -b master
-fi
-
-cd $WORKSPACE
-
-# if depends path has changed - cleanout everything and do a full rebuild
-if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
-then
-  #clean up the rest too
-  cd $WORKSPACE;git clean -xffd
-  cd $WORKSPACE/tools/depends/;./bootstrap
-fi
diff --git a/tools/buildsteps/rbpi/prepare-xbmc b/tools/buildsteps/rbpi/prepare-xbmc
deleted file mode 100755
index 3957f5aab7..0000000000
--- a/tools/buildsteps/rbpi/prepare-xbmc
+++ /dev/null
@@ -1,11 +0,0 @@
-WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
-XBMC_PLATFORM_DIR=rbpi
-. $WORKSPACE/tools/buildsteps/defaultenv
-
-cd $WORKSPACE
-
-#build binary addons before building xbmc...
-#make sure that binary_addons don't clean the native tools
-#here
-BINARY_ADDONS_CLEAN_NATIVETOOLS="0"
-. $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-binary-addons
diff --git a/tools/depends/README.md b/tools/depends/README.md
index b4bc0587dd..2e5db17886 100644
--- a/tools/depends/README.md
+++ b/tools/depends/README.md
@@ -20,25 +20,25 @@ Paths below are examples. If you want to build Kodi, follow our **[build guides]
 ### All platforms
 `./bootstrap`
 ### Darwin
-**macOS (x86_64)**  
+**macOS (x86_64)**
 `./configure --host=x86_64-apple-darwin`
 
-**iOS (arm64)**  
+**iOS (arm64)**
 `./configure --host=aarch64-apple-darwin`
 
-**tvOS**  
+**tvOS**
 `./configure --host=aarch64-apple-darwin --with-platform=tvos`
 
 **NOTE:** You can target the same `--prefix=` path. Each setup will be done in an isolated directory. The last configure/make you do is the one used for Kodi/Xcode.
- 
+
 ### Android
-**arm**  
+**arm**
 `./configure --with-tarballs=$HOME/android-tools/xbmc-tarballs --host=arm-linux-androideabi --with-sdk-path=$HOME/android-tools/android-sdk-linux --with-ndk-path=$HOME/android-tools/android-ndk-r20 --prefix=$HOME/android-tools/xbmc-depends`
 
-**aarch64**  
+**aarch64**
 `./configure --with-tarballs=$HOME/android-tools/xbmc-tarballs --host=aarch64-linux-android --with-sdk-path=$HOME/android-tools/android-sdk-linux --with-ndk-path=$HOME/android-tools/android-ndk-r20 --prefix=$HOME/android-tools/xbmc-depends`
 
-**x86**  
+**x86**
 `./configure --with-tarballs=$HOME/android-tools/xbmc-tarballs --host=i686-linux-android --with-sdk-path=$HOME/android-tools/android-sdk-linux --with-ndk-path=$HOME/android-tools/android-ndk-r20 --prefix=$HOME/android-tools/xbmc-depends`
 
 **x86_64**
@@ -47,13 +47,10 @@ Paths below are examples. If you want to build Kodi, follow our **[build guides]
 > **Note:** Android x86 and x86_64 are not maintained and are not 100% sure that everything works correctly!
 
 ### Linux
-**ARM (codesourcery/lenaro/etc)**  
+**ARM (codesourcery/lenaro/etc)**
 `./configure --with-toolchain=/opt/toolchains/my-example-toolchain/ --prefix=/opt/xbmc-deps --host=arm-linux-gnueabi`
 
-**Raspberry Pi**  
-`./configure --with-platform=raspberry-pi --host=arm-linux-gnueabihf --prefix=/opt/xbmc-deps --with-tarballs=/opt/xbmc-tarballs --with-toolchain=/opt/rbp-dev/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf --with-firmware=/opt/rbp-dev/firmware --build=i686-linux`
-
-**Native**  
+**Native**
 `./configure --with-toolchain=/usr --prefix=/opt/xbmc-deps --host=x86_64-linux-gnu`
 
 Cross compiling is a PITA.
diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac
index 3ab992a34e..700681e7b3 100644
--- a/tools/depends/configure.ac
+++ b/tools/depends/configure.ac
@@ -431,30 +431,6 @@ case $use_platform in
     fi
     target_platform=$use_platform
     ;;
-  raspberry-pi)
-     target_platform=raspberry-pi
-     use_cpu=arm1176jzf-s
-     ffmpeg_options_default="--cpu=arm1176jzf-s"
-     platform_cflags="-mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp"
-     platform_cxxflags="-mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp"
-     platform_ldflags=""
-     ;;
-  raspberry-pi2)
-     target_platform=raspberry-pi
-     use_cpu=cortex-a7
-     ffmpeg_options_default="--cpu=cortex-a7"
-     platform_cflags="-fPIC -mcpu=cortex-a7 -mfloat-abi=hard -mfpu=neon-vfpv4 -mvectorize-with-neon-quad"
-     platform_cxxflags="-fPIC -mcpu=cortex-a7 -mfloat-abi=hard -mfpu=neon-vfpv4 -mvectorize-with-neon-quad"
-     platform_ldflags="-lpthread"
-     ;;
-  raspberry-pi3)
-     target_platform=raspberry-pi
-     use_cpu=cortex-a53
-     ffmpeg_options_default="--cpu=cortex-a53"
-     platform_cflags="-fPIC -mcpu=cortex-a53 -mfloat-abi=hard -mfpu=neon-fp-armv8 -mvectorize-with-neon-quad"
-     platform_cxxflags="-fPIC -mcpu=cortex-a53 -mfloat-abi=hard -mfpu=neon-fp-armv8 -mvectorize-with-neon-quad"
-     platform_ldflags="-lpthread"
-     ;;
   tvos)
     platform_cflags+=" -fembed-bitcode"
     platform_cxxflags+=" -fembed-bitcode"
@@ -468,32 +444,6 @@ case $use_platform in
     AC_MSG_ERROR(unsupported platform ($use_platform))
 esac
 
-if test "$target_platform" = "raspberry-pi" ; then
-  if test -d "${use_firmware}/opt/vc/include"; then
-    :
-  else
-    AC_MSG_ERROR([Raspberry Pi firmware not found])
-  fi
-  use_arch="arm"
-  use_hardcoded_tables="yes"
-  ARCH="arm"
-  cross_compiling="yes"
-  use_host="arm-linux-gnueabihf"
-  deps_dir="$use_platform-$build_type"
-  platform_cflags+=" -pipe -mabi=aapcs-linux -Wno-psabi \
-   -Wa,-mno-warn-deprecated -Wno-deprecated-declarations \
-   -isystem${use_firmware}/opt/vc/include \
-   -isystem${use_firmware}/opt/vc/include/interface/vcos/pthreads \
-   -isystem${use_firmware}/opt/vc/include/interface/vmcs_host/linux"
-  platform_cxxflags+=" -pipe -mabi=aapcs-linux -Wno-psabi \
-   -Wa,-mno-warn-deprecated -Wno-deprecated-declarations \
-   -isystem${use_firmware}/opt/vc/include \
-   -isystem${use_firmware}/opt/vc/include/interface/vcos/pthreads \
-   -isystem${use_firmware}/opt/vc/include/interface/vmcs_host/linux"
-  platform_ldflags+=" -L${use_firmware}/opt/vc/lib -lEGL -lGLESv2 -lbcm_host -lvcos \
-   -lvchiq_arm"
-fi
-
 XBMC_SETUP_ARCH_DEFINES()
 
 
diff --git a/tools/depends/m4/xbmc_arch.m4 b/tools/depends/m4/xbmc_arch.m4
index b4beef8f77..83e42552c7 100644
--- a/tools/depends/m4/xbmc_arch.m4
+++ b/tools/depends/m4/xbmc_arch.m4
@@ -74,7 +74,4 @@ if test "$target_platform" = "target_android" ; then
   AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -DTARGET_ANDROID")
 fi
 
-if test "$target_platform" = "target_raspberry_pi" ; then
-  AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_ARMEL -DTARGET_RASPBERRY_PI")
-fi
 ])
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile
index 405690ceab..afda288e3b 100644
--- a/tools/depends/target/Makefile
+++ b/tools/depends/target/Makefile
@@ -61,24 +61,19 @@ endif
 WAYLANDPP_DEPS=
 ALSA_LIB=
 ifeq ($(OS),linux)
-  DEPENDS += dbus libuuid
-  # not for raspberry pi or gbm
-  ifeq (,$(filter $(TARGET_PLATFORM),raspberry-pi gbm))
-    DEPENDS += linux-system-libs
-    WAYLANDPP_DEPS += linux-system-libs
-  endif
-  DEPENDS += alsa-lib
+  DEPENDS += dbus libuuid alsa-lib
   ALSA_LIB = alsa-lib
   LIBUUID = libuuid
-  ifeq ($(TARGET_PLATFORM),$(filter $(TARGET_PLATFORM),raspberry-pi gbm))
-    DEPENDS += libxkbcommon libinput libudev libevdev mtdev
-  endif
+
   ifeq ($(TARGET_PLATFORM),gbm)
-    DEPENDS += libdrm mesa
+    DEPENDS += libxkbcommon libinput libudev libevdev mtdev libdrm mesa
     ifeq ($(CPU),x86_64)
       DEPENDS += libva
       LIBVA = libva
     endif
+  else
+    DEPENDS += linux-system-libs
+    WAYLANDPP_DEPS += linux-system-libs
   endif
 endif
 
diff --git a/tools/depends/target/Toolchain.cmake.in b/tools/depends/target/Toolchain.cmake.in
index 7b5ea6ab0e..8786f52f7e 100644
--- a/tools/depends/target/Toolchain.cmake.in
+++ b/tools/depends/target/Toolchain.cmake.in
@@ -10,14 +10,7 @@ set(PLATFORM "@target_platform@")
 if(OS STREQUAL linux)
   set(CMAKE_SYSTEM_NAME Linux)
   set(CORE_SYSTEM_NAME linux)
-  if(PLATFORM STREQUAL raspberry-pi)
-    set(CORE_PLATFORM_NAME rbpi)
-    # wrapping libdvd fails with gold on rbpi
-    # todo: revisit after toolchain bump
-    set(ENABLE_LDGOLD OFF CACHE BOOL "Disabling Gnu Gold Linker" FORCE)
-  elseif(NOT "@target_platform@" STREQUAL "")
-    set(CORE_PLATFORM_NAME @target_platform@)
-  endif()
+  set(CORE_PLATFORM_NAME @target_platform@)
   if(NOT "@app_rendersystem@" STREQUAL "")
     set(X11_RENDER_SYSTEM @app_rendersystem@ CACHE STRING "Render system to use with X11: \"gl\" or \"gles\"")
     set(WAYLAND_RENDER_SYSTEM @app_rendersystem@ CACHE STRING "Render system to use with Wayland: \"gl\" or \"gles\"")
@@ -100,13 +93,6 @@ if(NOT "@use_sdk_path@" STREQUAL "")
   list(APPEND CMAKE_FIND_ROOT_PATH @use_sdk_path@ @use_sdk_path@/usr)
 endif()
 
-# add RBPI's firmware directories
-if(CORE_PLATFORM_NAME STREQUAL rbpi)
-  list(APPEND CMAKE_FIND_ROOT_PATH @use_firmware@/opt/vc)
-  list(APPEND CMAKE_LIBRARY_PATH @use_firmware@/opt/vc/lib)
-  list(APPEND CMAKE_INCLUDE_PATH @use_firmware@/opt/vc/include)
-endif()
-
 # add Android directories and tools
 if(CORE_SYSTEM_NAME STREQUAL android)
   set(NDKROOT @use_ndk_path@)
diff --git a/tools/depends/target/Toolchain_binaddons.cmake.in b/tools/depends/target/Toolchain_binaddons.cmake.in
index 30059d1c6d..27a6dbd3aa 100644
--- a/tools/depends/target/Toolchain_binaddons.cmake.in
+++ b/tools/depends/target/Toolchain_binaddons.cmake.in
@@ -10,15 +10,7 @@ set(CMAKE_FIND_ROOT_PATH @CMAKE_FIND_ROOT_PATH@)
 if(OS STREQUAL linux)
   set(CMAKE_SYSTEM_NAME Linux)
   set(CORE_SYSTEM_NAME linux)
-  if(PLATFORM STREQUAL raspberry-pi)
-    set(CORE_PLATFORM_NAME rbpi)
-    set(ENABLE_LDGOLD OFF CACHE BOOL "Disabling Gnu Gold Linker" FORCE)
-    if(NOT APP_RENDER_SYSTEM)
-      set(APP_RENDER_SYSTEM gles)
-    endif()
-  elseif(NOT "@target_platform@" STREQUAL "")
-    set(CORE_PLATFORM_NAME @target_platform@)
-  endif()
+  set(CORE_PLATFORM_NAME @target_platform@)
   if(NOT APP_RENDER_SYSTEM)
     set(APP_RENDER_SYSTEM gl)
   endif()
@@ -73,13 +65,6 @@ if(NOT "@use_toolchain@" STREQUAL "")
   list(APPEND CMAKE_FIND_ROOT_PATH @use_toolchain@/sysroot/usr)
 endif()
 
-# add RBPI's firmware directories
-if(CORE_PLATFORM_NAME STREQUAL rbpi)
-  list(APPEND CMAKE_FIND_ROOT_PATH @use_firmware@/opt/vc)
-  list(APPEND CMAKE_LIBRARY_PATH @CMAKE_FIND_ROOT_PATH@/lib:@use_firmware@/opt/vc/lib)
-  list(APPEND CMAKE_INCLUDE_PATH @CMAKE_FIND_ROOT_PATH@/include:@use_firmware@/opt/vc/include)
-endif()
-
 # add Android directories and tools
 if(CORE_SYSTEM_NAME STREQUAL android)
   set(NDKROOT @use_ndk_path@)
diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt
index 3ebd65cf13..a0f4ed269b 100644
--- a/tools/depends/target/ffmpeg/CMakeLists.txt
+++ b/tools/depends/target/ffmpeg/CMakeLists.txt
@@ -39,20 +39,16 @@ if(CMAKE_BUILD_TYPE STREQUAL Release)
 endif()
 
 if(CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL freebsd)
-  if(CORE_PLATFORM_NAME STREQUAL rbpi)
-    list(APPEND ffmpeg_conf --cpu=${CPU} --disable-vaapi --disable-vdpau)
+  list(APPEND ffmpeg_conf --enable-pic)
+  if(ENABLE_VAAPI)
+    list(APPEND ffmpeg_conf --enable-vaapi)
   else()
-    list(APPEND ffmpeg_conf --enable-pic)
-    if(ENABLE_VAAPI)
-      list(APPEND ffmpeg_conf --enable-vaapi)
-    else()
-      list(APPEND ffmpeg_conf --disable-vaapi)
-    endif()
-    if(ENABLE_VDPAU)
-      list(APPEND ffmpeg_conf --enable-vdpau)
-    else()
-      list(APPEND ffmpeg_conf --disable-vdpau)
-    endif()
+    list(APPEND ffmpeg_conf --disable-vaapi)
+  endif()
+  if(ENABLE_VDPAU)
+    list(APPEND ffmpeg_conf --enable-vdpau)
+  else()
+    list(APPEND ffmpeg_conf --disable-vdpau)
   endif()
 elseif(CORE_SYSTEM_NAME STREQUAL android)
   if(CPU MATCHES arm64)
@@ -75,7 +71,7 @@ elseif(CORE_SYSTEM_NAME STREQUAL osx)
                           --disable-securetransport)
 endif()
 
-if(CPU MATCHES arm OR CORE_PLATFORM_NAME STREQUAL rbpi)
+if(CPU MATCHES arm)
   list(APPEND ffmpeg_conf --enable-pic --disable-armv5te --disable-armv6t2)
 elseif(CPU MATCHES mips)
   list(APPEND ffmpeg_conf --disable-mips32r2 --disable-mipsdsp --disable-mipsdspr2)
diff --git a/tools/depends/xbmc-addons.include b/tools/depends/xbmc-addons.include
index 35399f0e2f..79d7c069b4 100644
--- a/tools/depends/xbmc-addons.include
+++ b/tools/depends/xbmc-addons.include
@@ -6,11 +6,6 @@ export PKG_CONFIG_LIBDIR = $(ADDON_DEPS_DIR)/lib/pkgconfig
 ifeq ($(CROSS_COMPILING),yes)
   DEPS = $(TOOLCHAIN_FILE) $(abs_top_srcdir)/target/config-binaddons.site $(abs_top_srcdir)/target/Toolchain_binaddons.cmake $(CONFIG_SUB) $(CONFIG_GUESS)
   TOOLCHAIN = -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN_FILE)
-  ifeq ($(OS),linux)
-    ifneq ($(TARGET_PLATFORM),raspberry-pi)
-      DEPS += linux-system-libs
-    endif
-  endif
 endif
 
 ifeq ($(PLATFORM),)