diff --git a/Makefile b/Makefile
index 9f40f37..1028233 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@
 
 help: targets
 targets::
-	@echo "Tagets available for building in this Makefile:"
+	@echo "Targets available for building in this Makefile:"
 	@echo
 
 include $(ROOTDIR)/build/boot.mk
diff --git a/rootfs.mk b/rootfs.mk
index 632f1bf..845afad 100644
--- a/rootfs.mk
+++ b/rootfs.mk
@@ -32,9 +32,7 @@
 	bluetooth \
 	bluez \
 	libbluetooth3 \
-	linux-image-4.9.51-aiy \
-	mendel-distro-info-data \
-	uboot-imx
+	mendel-distro-info-data
 
 GUI_PACKAGES := \
 	gstreamer1.0-alsa \
diff --git a/setup.sh b/setup.sh
index 0920e18..06fc0e1 100755
--- a/setup.sh
+++ b/setup.sh
@@ -43,8 +43,9 @@
 }
 
 export ROOTDIR="$(getrootdir)"
+source ${ROOTDIR}/board/project.sh
 export OUT="${ROOTDIR}/out"
-export PRODUCT_OUT="${OUT}/target/product/imx8m_phanbell"
+export PRODUCT_OUT="${OUT}/target/product/${PROJECT_NAME}"
 export HOST_OUT="${OUT}/host/linux-x86"
 export ROOT_OUT="${OUT}/root"
 export BUILDTAB="${OUT}/buildtab"
@@ -150,8 +151,8 @@
     JUMP_TARGETS[host]="${HOST_OUT}"
     JUMP_TARGETS[root]="${ROOT_OUT}"
     JUMP_TARGETS[build]="${ROOTDIR}/build"
-    JUMP_TARGETS[kernel]="${ROOTDIR}/linux-imx/"
-    JUMP_TARGETS[uboot]="${ROOTDIR}/uboot-imx/"
+    JUMP_TARGETS[kernel]="${ROOTDIR}/linux-${PLATFORM}/"
+    JUMP_TARGETS[uboot]="${ROOTDIR}/uboot-${PLATFORM}/"
 
     function j
     {