Introduce BSP_NAME

The current build system can't handle properly having more than one
board family and more than one BSP, so we make up a way to select what
to build and what to do based on the BSP_NAME variable which will
become useful later on.

This commit purposely breaks the Jenkins infrastructure as it exists
now, so that the pain is felt only once.

Co-Authored-By: Benjamin Dauphin <benjamin.dauphin@live.fr>
Co-Authored-By: Gilles Henaux <gill.henaux@gmail.com>

releasetools/arm_sdimage_omap.sh

@@ -19,13 +19,13 @@ then
 	. ${SETTINGS_MINIX}
 fi
 
+BSP_NAME=omap
 : ${ARCH=evbearm-el}
-: ${OBJ=../obj.${ARCH}}
 : ${TOOLCHAIN_TRIPLET=arm-elf32-minix-}
 : ${BUILDSH=build.sh}
 
 : ${SETS="minix-base minix-comp minix-games minix-man minix-tests tests"}
-: ${IMG=minix_arm_sd.img}
+: ${IMG=minix_arm_sd_omap.img}
 
 # ARM definitions:
 : ${BUILDVARS=-V MKGCCCMDS=yes -V MKLLVM=no}

releasetools/image.defaults

@@ -1,4 +1,4 @@
-: ${OBJ=../obj.${ARCH}}
+: ${OBJ=../obj.${ARCH}-${BSP_NAME}}
 : ${CROSS_TOOLS=${OBJ}/"tooldir.`uname -s`-`uname -r`-`uname -m`"/bin}
 : ${CROSS_PREFIX=${CROSS_TOOLS}/${TOOLCHAIN_TRIPLET}}
 : ${JOBS=1}
@@ -21,6 +21,9 @@
 : ${RC=../local/rc.${ARCH}}
 : ${ASR_HACK=0}
 
+# add BSP to buildvars
+BUILDVARS="-V BSP_NAME=${BSP_NAME} ${BUILDVARS}"
+
 # where the kernel & boot modules will be
 MODDIR=${DESTDIR}/boot/minix/.temp
 

releasetools/x86_cdimage.sh

@@ -6,8 +6,8 @@ set -e
 # be replaced by the proper NetBSD infrastructure.
 #
 
+BSP_NAME=generic-pc
 : ${ARCH=i386}
-: ${OBJ=../obj.${ARCH}}
 : ${TOOLCHAIN_TRIPLET=i586-elf32-minix-}
 : ${BUILDSH=build.sh}
 

releasetools/x86_hdimage.sh

@@ -6,8 +6,8 @@ set -e
 # be replaced by the proper NetBSD infrastructure.
 #
 
+BSP_NAME=generic-pc
 : ${ARCH=i386}
-: ${OBJ=../obj.${ARCH}}
 : ${TOOLCHAIN_TRIPLET=i586-elf32-minix-}
 : ${BUILDSH=build.sh}
 

releasetools/x86_ramimage.sh

@@ -6,8 +6,8 @@ set -e
 # be replaced by the proper NetBSD infrastructure.
 #
 
+BSP_NAME=generic-pc
 : ${ARCH=i386}
-: ${OBJ=../obj.${ARCH}}
 : ${TOOLCHAIN_TRIPLET=i586-elf32-minix-}
 : ${BUILDSH=build.sh}
 

releasetools/x86_usbimage.sh

@@ -6,8 +6,8 @@ set -e
 # be replaced by the proper NetBSD infrastructure.
 #
 
+BSP_NAME=generic-pc
 : ${ARCH=i386}
-: ${OBJ=../obj.${ARCH}}
 : ${TOOLCHAIN_TRIPLET=i586-elf32-minix-}
 : ${BUILDSH=build.sh}