updated scripts toolchain file

Author: robamu

RPiToolchain.cmake

@@ -16,12 +16,12 @@ endif()
 
 # CROSS_COMPILE also needs to be set accordingly or passed to the CMake command
 
-if(NOT DEFINED ENV{RASPBIAN_ROOTFS})
+if(NOT DEFINED ENV{LINUX_ROOTFS})
 	message(FATAL_ERROR 
-		"Define the RASPBIAN_ROOTFS variable to point to the Raspberry Pi rootfs."
+		"Define the LINUX_ROOTFS variable to point to the Raspberry Pi rootfs."
 	)
 else()
-	set(SYSROOT_PATH "$ENV{RASPBIAN_ROOTFS}")
+	set(SYSROOT_PATH "$ENV{LINUX_ROOTFS}")
 	message(STATUS "Raspberry Pi sysroot: ${SYSROOT_PATH}")
 endif()
 
@@ -70,26 +70,6 @@ endif()
 set(CMAKE_C_COMPILER ${CROSS_COMPILE_CC})
 set(CMAKE_CXX_COMPILER ${CROSS_COMPILE_CXX})
 
-# List of library dirs where LD has to look. Pass them directly through gcc. 
-# LD_LIBRARY_PATH is not evaluated by arm-*-ld
-set(LIB_DIRS 
-	"/opt/cross-pi-gcc/arm-linux-gnueabihf/lib"
-	"/opt/cross-pi-gcc/lib"
-	"${SYSROOT_PATH}/opt/vc/lib"
-	"${SYSROOT_PATH}/lib/${CROSS_COMPILE}"
-	"${SYSROOT_PATH}/usr/local/lib"
-	"${SYSROOT_PATH}/usr/lib/${CROSS_COMPILE}"
-	"${SYSROOT_PATH}/usr/lib"
-	"${SYSROOT_PATH}/usr/lib/${CROSS_COMPILE}/blas"
-	"${SYSROOT_PATH}/usr/lib/${CROSS_COMPILE}/lapack"
-)
-# You can additionally check the linker paths if you add the 
-# flags ' -Xlinker --verbose'
-set(COMMON_FLAGS "-I${SYSROOT_PATH}/usr/include")
-foreach(LIB ${LIB_DIRS})
-	set(COMMON_FLAGS "${COMMON_FLAGS} -L${LIB} -Wl,-rpath-link,${LIB}")
-endforeach()
-
 set(CMAKE_PREFIX_PATH 
 	"${CMAKE_PREFIX_PATH}"
 	"${SYSROOT_PATH}/usr/lib/${CROSS_COMPILE}"

rpi3-env-set.sh

@@ -0,0 +1,9 @@
+#!/bin/bash -i
+echo "Entering Raspberry Pi 3 environment"
+export PATH=$PATH:"$HOME/x-tools/armv8-rpi3-linux-gnueabihf/bin"
+export CROSS_COMPILE="armv8-rpi3-linux-gnueabihf"
+export RASPBERRY_VERSION="3"
+export LINUX_ROOTFS="${HOME}/rpi3/rootfs"
+
+export CONSOLE_PREFIX="[Raspberry Pi 3]"
+exec /bin/bash

rpi4-env-set.sh

@@ -0,0 +1,9 @@
+#!/bin/bash -i
+echo "Entering Raspberry Pi 4 environment"
+export PATH=$PATH:"$HOME/x-tools/armv8-rpi4-linux-gnueabihf/bin"
+export CROSS_COMPILE="armv8-rpi4-linux-gnueabihf"
+export RASPBERRY_VERSION="4"
+export LINUX_ROOTFS="${HOME}/rpi4/rootfs"
+
+export CONSOLE_PREFIX="[Raspberry Pi 4]"
+exec /bin/bash