- drop cst-bootloader target

make/environment.mk

@@ -321,8 +321,6 @@ TUXBOX_NEUTRINO_BRANCH	?= master
 
 TUXBOX_LIBSTB-HAL	= library-stb-hal
 
-TUXBOX_BOOTLOADER	= bootloader-uboot-cst
-
 TUXBOX_REMOTE_REPO	= tuxbox
 
 # various

make/kernel-cst.mk

@@ -68,7 +68,7 @@ endif
 kernel-cst-install-hd2: $(D)/kernel-cst-hd2
 	cp -af $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz $(KDESTDIR)/vmlinux.ub.gz
 
-$(D)/kernel-cst-hd1: $(D)/uboot-cst-hd1 $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGETPREFIX)
+$(D)/kernel-cst-hd1: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGETPREFIX)
 	cd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && \
 		git checkout $(KBRANCH) && \
 	tar -C $(SOURCE_DIR) -cp $(NI_LINUX-KERNEL) --exclude-vcs | tar -C $(BUILD_TMP) -x
@@ -90,15 +90,6 @@ $(D)/kernel-cst-hd1: $(D)/uboot-cst-hd1 $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TAR
 kernel-cst-install-hd1: $(D)/kernel-cst-hd1
 	cp -af $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img $(KDESTDIR)/zImage
 
-$(D)/uboot-cst-hd1: $(SOURCE_DIR)/$(TUXBOX_BOOTLOADER) | $(TARGETPREFIX)
-	cd $(SOURCE_DIR)/$(TUXBOX_BOOTLOADER) && git checkout coolstream_hdx
-	tar -C $(SOURCE_DIR) -cp $(TUXBOX_BOOTLOADER) --exclude-vcs | tar -C $(BUILD_TMP) -x
-	cd $(BUILD_TMP)/$(TUXBOX_BOOTLOADER) && \
-		make coolstream_hdx_config && \
-		$(MAKE)
-	cp $(BUILD_TMP)/$(TUXBOX_BOOTLOADER)/u-boot.bin $(BUILD_TMP)/u-boot.bin
-	touch $@
-
 kernel-cst-modules: kernel-cst-modules-$(BOXSERIES)
 
 kernel-cst-modules-hd1: kernel-cst

make/prerequisites.mk

@@ -6,7 +6,7 @@ TOOLCHECK += find-yacc find-flex find-tic find-pkg-config find-help2man
 TOOLCHECK += find-cmake find-ccache find-autopoint find-python find-curl
 TOOLCHECK += find-lzma find-gperf find-gettext find-bc
 
-preqs: download neutrino-hd-source ni-git tuxbox-git
+preqs: download neutrino-hd-source ni-git
 
 $(CCACHE):
 	@echo
@@ -40,12 +40,6 @@ $(N_HD_SOURCE):
 $(BUILD-GENERIC-PC):
 	git clone $(NI_GIT)/$(NI_BUILD-GENERIC-PC).git $(BUILD-GENERIC-PC)
 
-$(SOURCE_DIR)/$(TUXBOX_BOOTLOADER):
-	cd $(SOURCE_DIR) && \
-		git clone $(TUXBOX_GIT)/$(notdir $@).git
-	cd $@ && \
-		git checkout coolstream_hdx
-
 $(SOURCE_DIR)/$(NI_LIBSTB-HAL):
 	cd $(SOURCE_DIR) && \
 		git clone $(NI_GIT)/$(notdir $@).git
@@ -181,9 +175,6 @@ toolcheck: $(TOOLCHECK)
 
 neutrino-hd-source: $(N_HD_SOURCE)
 
-tuxbox-git: \
-	$(SOURCE_DIR)/$(TUXBOX_BOOTLOADER)
-
 ni-git: \
 	$(BUILD-GENERIC-PC) \
 	$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) \

make/update.mk

@@ -33,9 +33,6 @@ ifeq ($(NI_ADMIN), true)
 		make update-tuxbox-remotes
 endif
 
-update-tuxbox-git:
-	cd $(SOURCE_DIR)/$(TUXBOX_BOOTLOADER) && git pull
-
 # rebase of ffmpeg/kernel repos forces us to force push into git repo
 # use this target once if such force push was done
 update-ni-force: