Move archiecture/target variables to TOOLCHAIN file

Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>

board/alix/OPENSSL

@@ -1 +0,0 @@
-OPENSSL_TARGET="linux-generic32 386"

board/alix/TOOLCHAIN

@@ -5,3 +5,6 @@ MUSL_CPU="i386"
 GCC_EXTRACFG="--disable-libmpx --disable-libssp"
 
 LINUXPKG="linux"
+LINUX_CPU="x86"
+LINUX_TGT="bzImage"
+OPENSSL_TARGET="linux-generic32 386"

board/alix/bbstatic.config

@@ -1,4 +1,3 @@
-# x86
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.27.2

board/alix/linux.config

@@ -1,5 +1,3 @@
-# x86
-# bzImage
 #
 # Automatically generated file; DO NOT EDIT.
 # Linux/x86 4.14.1 Kernel Configuration

board/rpi3/OPENSSL

@@ -1 +0,0 @@
-OPENSSL_TARGET="linux-generic32"

board/rpi3/TOOLCHAIN

@@ -5,3 +5,6 @@ MUSL_CPU="arm"
 GCC_EXTRACFG="--with-float=hard --with-fpu=neon-vfpv3"
 
 LINUXPKG="linux-rpi3"
+LINUX_CPU="arm"
+LINUX_TGT="zImage"
+OPENSSL_TARGET="linux-generic32"

board/rpi3/linux.config

@@ -1,5 +1,3 @@
-# arm
-# zImage
 #
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm 4.9.24 Kernel Configuration

pkg/bbstatic/build

@@ -14,18 +14,17 @@ build() {
 	local OUTPUT="$2"
 
 	local CFGFILE="$SCRIPTDIR/board/$BOARD/bbstatic.config"
-	local BB_CPU=$(head -1 "$CFGFILE" | cut -b 3-)
 	local SYSROOT="$TCDIR/$TARGET"
 
 	cp "$CFGFILE" "$OUTPUT/.config"
 
 	export KBUILD_OUTPUT="$OUTPUT"
 
-	make -C "$INPUT" O="$OUTPUT" ARCH="$BB_CPU" CROSS_COMPILE="${TARGET}-" oldconfig
+	make -C "$INPUT" O="$OUTPUT" CROSS_COMPILE="${TARGET}-" oldconfig
 	sed -i "$OUTPUT/.config" -e 's,^CONFIG_CROSS_COMPILE=.*,CONFIG_CROSS_COMPILE="'$TARGET'-",'
 	sed -i "$OUTPUT/.config" -e 's,^CONFIG_SYSROOT=.*,CONFIG_SYSROOT="'$SYSROOT'",'
 
-	make -C "$INPUT" O="$OUTPUT" ARCH="$BB_CPU" CROSS_COMPILE="${TARGET}-" -j $NUMJOBS
+	make -C "$INPUT" O="$OUTPUT" CROSS_COMPILE="${TARGET}-" -j $NUMJOBS
 }
 
 deploy() {

pkg/linux/build

@@ -18,8 +18,6 @@ build() {
 	local OUTPUT="$2"
 
 	local CFGFILE="$SCRIPTDIR/board/$BOARD/linux.config"
-	local LINUX_CPU=$(head -1 "$CFGFILE" | cut -b 3-)
-	local LINUX_TGT=$(head -2 "$CFGFILE" | tail -1 | cut -b 3-)
 	local INITRDLIST="$PKGDEPLOYDIR/initrd/initrd.list"
 
 	export KBUILD_OUTPUT="$OUTPUT"
@@ -38,10 +36,6 @@ deploy() {
 	local BUILD="$2"
 	local DEPLOY="$3"
 
-	local CFGFILE="$SCRIPTDIR/board/$BOARD/linux.config"
-	local LINUX_CPU=$(head -1 "$CFGFILE" | cut -b 3-)
-	local LINUX_TGT=$(head -2 "$CFGFILE" | tail -1 | cut -b 3-)
-
 	pushd $BUILD
 	install -m 755 "arch/$LINUX_CPU/boot/$LINUX_TGT" "$DEPLOY/vmlinuz-$VERSION"
 	popd

pkg/linux_modules/build

@@ -7,7 +7,6 @@ build() {
 	local OUTPUT="$2"
 
 	local CFGFILE="$SCRIPTDIR/board/$BOARD/linux.config"
-	local LINUX_CPU=$(head -1 "$CFGFILE" | cut -b 3-)
 
 	export KBUILD_OUTPUT="$OUTPUT"
 	make -C "$INPUT" O="$OUTPUT" ARCH="$LINUX_CPU" CROSS_COMPILE="${TARGET}-" mrproper
@@ -24,7 +23,6 @@ deploy() {
 	local DEPLOY="$3"
 
 	local CFGFILE="$SCRIPTDIR/board/$BOARD/linux.config"
-	local LINUX_CPU=$(head -1 "$CFGFILE" | cut -b 3-)
 
 	mkdir -p "$DEPLOY/lib/modules"
 

pkg/openssl/build

@@ -13,15 +13,11 @@ build() {
 	local SOURCE="$1"
 	local BUILD="$2"
 
-	source "$SCRIPTDIR/board/$BOARD/OPENSSL"
-
 	$SOURCE/Configure --prefix=/ --cross-compile-prefix="${TARGET}-" \
 			  --openssldir=/etc/ssl --libdir=/lib \
 			  -DOPENSSL_NO_HEARTBEATS \
 			  threads shared zlib-dynamic no-async $OPENSSL_TARGET
 
-	unset -v OPENSSL_TARGET
-
 	make -j 1
 }
 

tcpkg/linux_hdr/build

@@ -6,9 +6,6 @@ build() {
 	local INPUT="$1"
 	local OUTPUT="$2"
 
-	local CFGFILE="$SCRIPTDIR/board/$BOARD/linux.config"
-	local LINUX_CPU=$(head -1 "$CFGFILE" | cut -b 3-)
-
 	make -C "$INPUT" O="$OUTPUT" ARCH="$LINUX_CPU" mrproper
 	make -C "$INPUT" O="$OUTPUT" ARCH="$LINUX_CPU" headers_check
 }
@@ -17,9 +14,6 @@ deploy() {
 	local INPUT="$1"
 	local OUTPUT="$2"
 
-	local CFGFILE="$SCRIPTDIR/board/$BOARD/linux.config"
-	local LINUX_CPU=$(head -1 "$CFGFILE" | cut -b 3-)
-
 	export KBUILD_OUTPUT="$OUTPUT"
 	make -C "$INPUT" O="$OUTPUT" ARCH="$LINUX_CPU" INSTALL_HDR_PATH="$TCDIR/$TARGET" headers_install
 }