rework build target skeleton

diff --git a/make/bootstrap.mk b/make/bootstrap.mk
index 75c1568f5530ebce67071079c1b2fd8ee9ea5229..a944901b7cecdf483f8c81e5c853a85571b81a14 100755 (executable)
--- a/make/bootstrap.mk
+++ b/make/bootstrap.mk
@@ -227,29 +227,22 @@ $(D)/cortex-strings: $(ARCHIVE)/cortex-strings-git-$(CORTEX_STRINGS_VER).tar.gz
 
 skeleton: | $(TARGETPREFIX)
        $(START_BUILD)
-       if [ $(PLATFORM) = "apollo" -o $(PLATFORM) = "kronos" ]; then \
-               if [ -n $(SKEL_ROOT_DIR) ]; then \
-                       [ ! -e $(BASE_DIR)/my-skel-root-hd2 ] && ln -s $(SKEL_ROOT_DIR) $(BASE_DIR)/my-skel-root-hd2; \
-                       cp --remove-destination -a my-skel-root-hd2/* $(TARGETPREFIX)/; \
-               else \
-                       cp --remove-destination -a skel-root-hd2/* $(TARGETPREFIX)/; \
-               fi \
-       elif [ $(PLATFORM) = "nevis" ]; then \
+       if [ $(BOXSERIES) = "hd1" ]; then \
                if [ -n $(SKEL_ROOT_DIR) ]; then \
                        [ ! -e $(BASE_DIR)/my-skel-root-hd1 ] && ln -s $(SKEL_ROOT_DIR) $(BASE_DIR)/my-skel-root-hd1; \
                        cp --remove-destination -a my-skel-root-hd1/* $(TARGETPREFIX)/; \
                else \
                        cp --remove-destination -a skel-root-hd1/* $(TARGETPREFIX)/; \
                fi \
-       elif [ $(BOXMODEL) = "h7" ]; then \
+       elif [ $(BOXSERIES) = "hd2" ]; then \
                if [ -n $(SKEL_ROOT_DIR) ]; then \
-                       [ ! -e $(BASE_DIR)/my-skel-root-h7 ] && ln -s $(SKEL_ROOT_DIR) $(BASE_DIR)/my-skel-root-h7; \
-                       cp --remove-destination -a my-skel-root-h7/* $(TARGETPREFIX)/; \
+                       [ ! -e $(BASE_DIR)/my-skel-root-hd2 ] && ln -s $(SKEL_ROOT_DIR) $(BASE_DIR)/my-skel-root-hd2; \
+                       cp --remove-destination -a my-skel-root-hd2/* $(TARGETPREFIX)/; \
                else \
-                       cp --remove-destination -a skel-root-h7/* $(TARGETPREFIX)/; \
+                       cp --remove-destination -a skel-root-hd2/* $(TARGETPREFIX)/; \
                fi \
        else \
-               if [ $(BOXMODEL) = "hd51" -o $(BOXMODEL) = "bre2ze4k"]; then \
+               if [ $(BOXTYPE) = "armbox" ]; then \
                        [ ! -e $(BASE_DIR)/my-skel-root-arm ] && ln -s $(SKEL_ROOT_DIR) $(BASE_DIR)/my-skel-root-arm; \
                        cp --remove-destination -a my-skel-root-arm/* $(TARGETPREFIX)/; \
                else \