diff --git a/Makefile b/Makefile index 316d0abd..fb06de10 100755 --- a/Makefile +++ b/Makefile @@ -85,7 +85,8 @@ config.local: $(eval BOXMODEL=hd51) @echo " 11) AX/Mutant HD51" @echo " 12) AX/Mutant HD60" @echo " 13) AX/Mutant HD61" - @echo " 14) Maxytec Multibox SE 4K" + @echo " 14) Maxytec Multibox 4K" + @echo " 15) Maxytec Multibox SE 4K" @echo " 21) WWIO BRE2ZE4K" @echo " 31) Air Digital Zgemma H7" @echo " 41) VU+ Solo 4k" @@ -108,7 +109,8 @@ config.local: $(eval BOXMODEL=hd51) 11) boxmodel=hd51;; \ 12) boxmodel=hd60;; \ 13) boxmodel=hd61;; \ - 13) boxmodel=multiboxse;; \ + 14) boxmodel=multibox;; \ + 15) boxmodel=multiboxse;; \ 21) boxmodel=bre2ze4k;; \ 31) boxmodel=h7;; \ 41) boxmodel=vusolo4k;; \ diff --git a/make/environment-box.mk b/make/environment-box.mk index 7f17e11c..3e456838 100644 --- a/make/environment-box.mk +++ b/make/environment-box.mk @@ -15,13 +15,13 @@ # - Armbox -------------------------------------------------------------------- -# BOXTYPE armbox ----- + -# / | -# BOXSERIES hd5x hd6x -# | | -# BOXFAMILY bcm7251s hi3798mv200 -# / | \ | | | -# BOXMODEL hd51 bre2ze4k h7 hd60 hd61 multiboxse +# BOXTYPE armbox -------- + +# / \ +# BOXSERIES hd5x hd6x +# | | +# BOXFAMILY bcm7251s + hi3798mv200 + +# / | \ / | | \ +# BOXMODEL hd51 bre2ze4k h7 hd60 hd61 multibox multiboxse # BOXTYPE armbox + ------ + ---- + -------- + ------- + ---- + # / | \ \ \ \ \ @@ -165,7 +165,7 @@ else ifneq ($(BOXMODEL),) BOXTYPE = armbox BOXSERIES = hd5x BOXFAMILY = bcm7251s - else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd60 hd61 multiboxse)) + else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd60 hd61 multibox multiboxse)) BOXTYPE = armbox BOXSERIES = hd6x BOXFAMILY = hi3798mv200 @@ -239,6 +239,8 @@ else ifeq ($(BOXMODEL),hd60) BOXNAME = "AX/Mut@nt HD60" else ifeq ($(BOXMODEL),hd61) BOXNAME = "AX/Mut@nt HD61" +else ifeq ($(BOXMODEL),multibox) + BOXNAME = "Maxytec Multibox 4K" else ifeq ($(BOXMODEL),multiboxse) BOXNAME = "Maxytec Multibox SE 4K" else ifeq ($(BOXMODEL),vusolo4k) @@ -261,7 +263,7 @@ endif BOXMODELS = nevis apollo shiner kronos kronos_v2 BOXMODELS += hd51 bre2ze4k h7 -BOXMODELS += hd60 hd61 multiboxse +BOXMODELS += hd60 hd61 multibox multiboxse BOXMODELS += vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse BOXMODELS += vuduo diff --git a/make/environment-linux.mk b/make/environment-linux.mk index 440d80e1..eee9558a 100644 --- a/make/environment-linux.mk +++ b/make/environment-linux.mk @@ -65,7 +65,7 @@ else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd61)) BOOT_PARTITION = 4 -else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),multiboxse)) +else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),multibox multiboxse)) KERNEL_VERSION = 4.4.35 KERNEL_DATE = 20200219 KERNEL_DIR = linux-$(KERNEL_VERSION) @@ -230,7 +230,7 @@ KERNEL_VMLINUX = $(KERNEL_OBJ_DIR)/vmlinux ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vuduo)) KERNEL_IMAGE = vmlinux -else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd60 hd61 multiboxse)) +else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd60 hd61 multibox multiboxse)) KERNEL_IMAGE = uImage else KERNEL_IMAGE = zImage @@ -239,7 +239,7 @@ endif KERNEL_MAKE_TARGETS = $(KERNEL_IMAGE) # build also the kernel-dtb for arm-hd5x and arm-hd6x -ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7 hd60 hd61 multiboxse)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7 hd60 hd61 multibox multiboxse)) KERNEL_MAKE_TARGETS += $(notdir $(KERNEL_DTB)) endif diff --git a/make/flash-images.mk b/make/flash-images.mk index e1a6791c..66f8c2de 100644 --- a/make/flash-images.mk +++ b/make/flash-images.mk @@ -67,7 +67,7 @@ ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7)) make flash-image-hd5x make flash-image-hd5x-multi endif -ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd60 hd61 multiboxse)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd60 hd61 multibox multiboxse)) make flash-image-hd6x make flash-image-hd6x-single endif @@ -256,8 +256,11 @@ HD6X_RECOVERY_SOURCE = $(BOXMODEL)-recovery-$(HD6X_RECOVERY_DATE).zip HD6X_MULTI_RECOVERY_SITE = http://downloads.mutant-digital.net/$(BOXMODEL) +# avoid warning: overriding recipe +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd60 hd61)) $(DL_DIR)/$(HD6X_BOOTARGS_SOURCE): $(download) $(HD6X_MULTI_RECOVERY_SITE)/$(HD6X_BOOTARGS_SOURCE) +endif $(DL_DIR)/$(HD6X_PARTITONS_SOURCE): $(download) $(HD6X_MULTI_RECOVERY_SITE)/$(HD6X_PARTITONS_SOURCE) @@ -329,52 +332,67 @@ flash-image-hd6x-multi-recovery: | $(IMAGE_DIR) zip -r $(IMAGE_DIR)/$(IMAGE_NAME)_multi_recovery.zip * rm -rf $(IMAGE_BUILD_DIR) -# multiboxse -MULTIBOXSE_IMAGE_NAME = disk -MULTIBOXSE_BOOT_IMAGE = bootoptions.img -MULTIBOXSE_IMAGE_LINK = $(HD6X_IMAGE_NAME).ext4 +# multibox, multiboxse +MULTIBOX_IMAGE_NAME = disk +MULTIBOX_BOOT_IMAGE = bootoptions.img +MULTIBOX_IMAGE_LINK = $(HD6X_IMAGE_NAME).ext4 # partition offsets/sizes -MULTIBOXSE_BOOTOPTIONS_PARTITION_SIZE = 2048 -MULTIBOXSE_IMAGE_ROOTFS_SIZE = 1024M +MULTIBOX_BOOTOPTIONS_PARTITION_SIZE = 2048 +MULTIBOX_IMAGE_ROOTFS_SIZE = 1024M -MULTIBOXSE_BOOTARGS_DATE = 20201110 -MULTIBOXSE_BOOTARGS_SOURCE = multiboxse-bootargs-$(MULTIBOXSE_BOOTARGS_DATE).zip -MULTIBOXSE_FASTBOOT_DATE = 20201110 -MULTIBOXSE_FASTBOOT_SOURCE = multiboxse-fastboot-$(MULTIBOXSE_FASTBOOT_DATE).zip -MULTIBOXSE_PARAM_DATE = 20200630 -MULTIBOXSE_PARAM_SOURCE = 3798mv200-param-$(MULTIBOXSE_PARAM_DATE).zip -MULTIBOXSE_RECOVERY_DATE = 20201110 -MULTIBOXSE_RECOVERY_SOURCE = multiboxse-recovery-$(MULTIBOXSE_RECOVERY_DATE).zip +ifeq ($(BOXMODEL),multibox) +MULTIBOX_BOOTARGS_DATE = 20200504 +else ifeq ($(BOXMODEL),multiboxse) +MULTIBOX_BOOTARGS_DATE = 20201110 +endif +MULTIBOX_BOOTARGS_SOURCE = $(BOXMODEL)-bootargs-$(MULTIBOX_BOOTARGS_DATE).zip +ifeq ($(BOXMODEL),multibox) +MULTIBOX_FASTBOOT_DATE = 20200319 +else ifeq ($(BOXMODEL),multiboxse) +MULTIBOX_FASTBOOT_DATE = 20201110 +endif +MULTIBOX_FASTBOOT_SOURCE = $(BOXMODEL)-fastboot-$(MULTIBOX_FASTBOOT_DATE).zip +MULTIBOX_PARAM_DATE = 20200630 +MULTIBOX_PARAM_SOURCE = 3798mv200-param-$(MULTIBOX_PARAM_DATE).zip +ifeq ($(BOXMODEL),multibox) +MULTIBOX_RECOVERY_DATE = 20210118 +else ifeq ($(BOXMODEL),multiboxse) +MULTIBOX_RECOVERY_DATE = 20201110 +endif +MULTIBOX_RECOVERY_SOURCE = $(BOXMODEL)-recovery-$(MULTIBOX_RECOVERY_DATE).zip -MULTIBOXSE_MULTI_RECOVERY_SITE = http://source.mynonpublic.com/maxytec +MULTIBOX_MULTI_RECOVERY_SITE = http://source.mynonpublic.com/maxytec -$(DL_DIR)/$(MULTIBOXSE_BOOTARGS_SOURCE): - $(download) $(MULTIBOXSE_MULTI_RECOVERY_SITE)/$(MULTIBOXSE_BOOTARGS_SOURCE) +# avoid warning: overriding recipe +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),multibox multiboxse)) +$(DL_DIR)/$(MULTIBOX_BOOTARGS_SOURCE): + $(download) $(MULTIBOX_MULTI_RECOVERY_SITE)/$(MULTIBOX_BOOTARGS_SOURCE) +endif -$(DL_DIR)/$(MULTIBOXSE_FASTBOOT_SOURCE): - $(download) $(MULTIBOXSE_MULTI_RECOVERY_SITE)/$(MULTIBOXSE_FASTBOOT_SOURCE) +$(DL_DIR)/$(MULTIBOX_FASTBOOT_SOURCE): + $(download) $(MULTIBOX_MULTI_RECOVERY_SITE)/$(MULTIBOX_FASTBOOT_SOURCE) -$(DL_DIR)/$(MULTIBOXSE_PARAM_SOURCE): - $(download) $(MULTIBOXSE_MULTI_RECOVERY_SITE)/$(MULTIBOXSE_PARAM_SOURCE) +$(DL_DIR)/$(MULTIBOX_PARAM_SOURCE): + $(download) $(MULTIBOX_MULTI_RECOVERY_SITE)/$(MULTIBOX_PARAM_SOURCE) -$(DL_DIR)/$(MULTIBOXSE_RECOVERY_SOURCE): - $(download) $(MULTIBOXSE_MULTI_RECOVERY_SITE)/$(MULTIBOXSE_RECOVERY_SOURCE) +$(DL_DIR)/$(MULTIBOX_RECOVERY_SOURCE): + $(download) $(MULTIBOX_MULTI_RECOVERY_SITE)/$(MULTIBOX_RECOVERY_SOURCE) -flash-image-multiboxse-multi-recovery: $(DL_DIR)/$(MULTIBOXSE_BOOTARGS_SOURCE) -flash-image-multiboxse-multi-recovery: $(DL_DIR)/$(MULTIBOXSE_FASTBOOT_SOURCE) -flash-image-multiboxse-multi-recovery: $(DL_DIR)/$(MULTIBOXSE_PARAM_SOURCE) -flash-image-multiboxse-multi-recovery: $(DL_DIR)/$(MULTIBOXSE_RECOVERY_SOURCE) -flash-image-multiboxse-multi-recovery: | $(IMAGE_DIR) +flash-image-multibox-multi-recovery: $(DL_DIR)/$(MULTIBOX_BOOTARGS_SOURCE) +flash-image-multibox-multi-recovery: $(DL_DIR)/$(MULTIBOX_FASTBOOT_SOURCE) +flash-image-multibox-multi-recovery: $(DL_DIR)/$(MULTIBOX_PARAM_SOURCE) +flash-image-multibox-multi-recovery: $(DL_DIR)/$(MULTIBOX_RECOVERY_SOURCE) +flash-image-multibox-multi-recovery: | $(IMAGE_DIR) rm -rf $(IMAGE_BUILD_DIR) $(INSTALL) -d $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR) - unzip -o $(DL_DIR)/$(MULTIBOXSE_BOOTARGS_SOURCE) -d $(IMAGE_BUILD_DIR) - unzip -o $(DL_DIR)/$(MULTIBOXSE_FASTBOOT_SOURCE) -d $(IMAGE_BUILD_DIR) - unzip -o $(DL_DIR)/$(MULTIBOXSE_PARAM_SOURCE) -d $(IMAGE_BUILD_DIR) - unzip -o $(DL_DIR)/$(MULTIBOXSE_RECOVERY_SOURCE) -d $(IMAGE_BUILD_DIR) + unzip -o $(DL_DIR)/$(MULTIBOX_BOOTARGS_SOURCE) -d $(IMAGE_BUILD_DIR) + unzip -o $(DL_DIR)/$(MULTIBOX_FASTBOOT_SOURCE) -d $(IMAGE_BUILD_DIR) + unzip -o $(DL_DIR)/$(MULTIBOX_PARAM_SOURCE) -d $(IMAGE_BUILD_DIR) + unzip -o $(DL_DIR)/$(MULTIBOX_RECOVERY_SOURCE) -d $(IMAGE_BUILD_DIR) $(INSTALL_EXEC) $(IMAGE_BUILD_DIR)/update_bootargs_$(BOXMODEL).bin $(ROOTFS)$(datadir)/update_bootargs_$(BOXMODEL).bin - dd if=/dev/zero of=$(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(MULTIBOXSE_BOOT_IMAGE) bs=1024 count=$(MULTIBOXSE_BOOTOPTIONS_PARTITION_SIZE) - mkfs.msdos -S 512 $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(MULTIBOXSE_BOOT_IMAGE) + dd if=/dev/zero of=$(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(MULTIBOX_BOOT_IMAGE) bs=1024 count=$(MULTIBOX_BOOTOPTIONS_PARTITION_SIZE) + mkfs.msdos -S 512 $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(MULTIBOX_BOOT_IMAGE) echo "bootcmd=setenv bootargs \$$(bootargs) \$$(bootargs_common); mmc read 0 0x1000000 0x3BD000 0x8000; bootm 0x1000000; run bootcmd_fallback" > $(IMAGE_BUILD_DIR)/STARTUP echo "bootargs=root=/dev/mmcblk0p23 rootsubdir=linuxrootfs1 rootfstype=ext4 kernel=/dev/mmcblk0p19" >> $(IMAGE_BUILD_DIR)/STARTUP echo "bootcmd=setenv bootargs \$$(bootargs) \$$(bootargs_common); run bootcmd_android; run bootcmd_fallback" > $(IMAGE_BUILD_DIR)/STARTUP_ANDROID @@ -391,15 +409,15 @@ flash-image-multiboxse-multi-recovery: | $(IMAGE_DIR) echo "bootargs=root=/dev/mmcblk0p23 rootsubdir=linuxrootfs4 rootfstype=ext4 kernel=/dev/mmcblk0p22" >> $(IMAGE_BUILD_DIR)/STARTUP_LINUX_4 echo "bootcmd=setenv bootargs \$$(bootargs_common); mmc read 0 0x1000000 0x1000 0x9000; bootm 0x1000000" > $(IMAGE_BUILD_DIR)/STARTUP_RECOVERY $(INSTALL_DATA) -D $(PACKAGE_DIR)/bootmenu/files/$(BOXMODEL)/bootmenu.conf $(IMAGE_BUILD_DIR)/bootmenu.conf - mcopy -i $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(MULTIBOXSE_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP :: - mcopy -i $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(MULTIBOXSE_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_ANDROID :: - mcopy -i $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(MULTIBOXSE_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_ANDROID_DISABLE_LINUXSE :: - mcopy -i $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(MULTIBOXSE_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_LINUX_1 :: - mcopy -i $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(MULTIBOXSE_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_LINUX_2 :: - mcopy -i $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(MULTIBOXSE_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_LINUX_3 :: - mcopy -i $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(MULTIBOXSE_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_LINUX_4 :: - mcopy -i $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(MULTIBOXSE_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_RECOVERY :: - mcopy -i $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(MULTIBOXSE_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/bootmenu.conf :: + mcopy -i $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(MULTIBOX_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP :: + mcopy -i $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(MULTIBOX_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_ANDROID :: + mcopy -i $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(MULTIBOX_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_ANDROID_DISABLE_LINUXSE :: + mcopy -i $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(MULTIBOX_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_LINUX_1 :: + mcopy -i $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(MULTIBOX_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_LINUX_2 :: + mcopy -i $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(MULTIBOX_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_LINUX_3 :: + mcopy -i $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(MULTIBOX_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_LINUX_4 :: + mcopy -i $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(MULTIBOX_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_RECOVERY :: + mcopy -i $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(MULTIBOX_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/bootmenu.conf :: mv $(IMAGE_BUILD_DIR)/pq_param.bin $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR) mv $(IMAGE_BUILD_DIR)/baseparam.img $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR) echo boot-recovery > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/misc-boot.img @@ -407,7 +425,7 @@ flash-image-multiboxse-multi-recovery: | $(IMAGE_DIR) rm -rf $(IMAGE_BUILD_DIR)/*.conf rm -rf $(IMAGE_BUILD_DIR)/*.txt rm -rf $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/*.txt - rm -rf $(IMAGE_BUILD_DIR)/$(MULTIBOXSE_IMAGE_LINK) + rm -rf $(IMAGE_BUILD_DIR)/$(MULTIBOX_IMAGE_LINK) cp $(SUPPORT_DIR)/splash-images/ni-splash-$(BOXSERIES).img $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/logo.img echo $(IMAGE_NAME)_recovery > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/recoveryversion echo "***** ACHTUNG *****" >$(IMAGE_BUILD_DIR)/recovery_$(BOXMODEL)_lies.mich @@ -425,7 +443,7 @@ flash-image-multiboxse-multi-recovery: | $(IMAGE_DIR) rm -rf $(IMAGE_BUILD_DIR) flash-image-hd6x-single: $(if $(filter $(BOXMODEL),hd60 hd61),flash-image-hd6x-multi-recovery) -flash-image-hd6x-single: $(if $(filter $(BOXMODEL),multiboxse),flash-image-multiboxse-multi-recovery) +flash-image-hd6x-single: $(if $(filter $(BOXMODEL),multibox multiboxse),flash-image-multibox-multi-recovery) flash-image-hd6x-single: | $(IMAGE_DIR) rm -rf $(IMAGE_BUILD_DIR) $(INSTALL) -d $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR) diff --git a/make/linux-kernel.mk b/make/linux-kernel.mk index 00de8e59..f75a0b16 100644 --- a/make/linux-kernel.mk +++ b/make/linux-kernel.mk @@ -20,7 +20,7 @@ GFUTURES_4_10_PATCH = \ gfutures/4_10_reserve_dvb_adapter_0.patch \ gfutures/4_10_t230c2.patch -# arm hd60/hd61/multiboxse +# arm hd60/hd61/multibox/multiboxse GFUTURES_4_4_PATCH = \ gfutures/0001-remote.patch \ gfutures/0002-log2-give-up-on-gcc-constant-optimizations.patch \ @@ -172,6 +172,9 @@ HD60_PATCH = \ HD61_PATCH = \ $(GFUTURES_4_4_PATCH) +MULTIBOX_PATCH = \ + $(GFUTURES_4_4_PATCH) + MULTIBOXSE_PATCH = \ $(GFUTURES_4_4_PATCH) @@ -243,7 +246,7 @@ kernel.do_prepare: | $(DEPS_DIR) $(BUILD_DIR) $(MKDIR)/$(KERNEL_MODULES) $(INSTALL_DATA) $(KERNEL_CONFIG) $(KERNEL_OBJ_DIR)/.config $(MAKE) -C $(BUILD_DIR)/$(KERNEL_DIR) $(LINUX_KERNEL_MAKE_VARS) silentoldconfig -ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7 hd60 hd61 multiboxse)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7 hd60 hd61 multibox multiboxse)) $(INSTALL_DATA) $(PKG_FILES_DIR)/initramfs-subdirboot.cpio.gz $(KERNEL_OBJ_DIR) endif $(call TOUCH) diff --git a/make/target-blobs.mk b/make/target-blobs.mk index 15b2628d..28f5df9b 100644 --- a/make/target-blobs.mk +++ b/make/target-blobs.mk @@ -8,9 +8,9 @@ blobs: $(BLOBS_DEPENDENCIES) $(MAKE) firmware $(MAKE) $(BOXMODEL)-drivers -ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7 hd60 hd61 multiboxse vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7 hd60 hd61 multibox multiboxse vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) $(MAKE) $(BOXMODEL)-libgles - ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd60 hd61 multiboxse)) + ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd60 hd61 multibox multiboxse)) $(MAKE) $(BOXMODEL)-libs endif endif @@ -67,7 +67,11 @@ HD61_DRIVERS_VERSION = 20200731 HD61_DRIVERS_SOURCE = hd61-drivers-$(KERNEL_VERSION)-$(HD61_DRIVERS_VERSION).zip HD61_DRIVERS_SITE = http://source.mynonpublic.com/gfutures -MULTIBOXSE_DRIVERS_VERSION = 20201204 +MULTIBOX_DRIVERS_VERSION = 20201204 +MULTIBOX_DRIVERS_SOURCE = multibox-drivers-$(KERNEL_VERSION)-$(MULTIBOX_DRIVERS_VERSION).zip +MULTIBOX_DRIVERS_SITE = http://source.mynonpublic.com/maxytec + +MULTIBOXSE_DRIVERS_VERSION = 20211129 MULTIBOXSE_DRIVERS_SOURCE = multiboxse-drivers-$(KERNEL_VERSION)-$(MULTIBOXSE_DRIVERS_VERSION).zip MULTIBOXSE_DRIVERS_SITE = http://source.mynonpublic.com/maxytec @@ -175,6 +179,7 @@ h7-drivers: $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) | $(TARGET_DIR) hd60-drivers \ hd61-drivers \ +multibox-drivers \ multiboxse-drivers: $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) | $(TARGET_DIR) $(INSTALL) -d $(TARGET_modulesdir)/extra unzip -o $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) -d $(TARGET_modulesdir)/extra @@ -224,6 +229,11 @@ HD61_LIBGLES_DIR = $(empty) HD61_LIBGLES_SOURCE = hd61-mali-$(HD61_LIBGLES_VERSION).zip HD61_LIBGLES_SITE = http://downloads.mutant-digital.net/hd61 +MULTIBOX_LIBGLES_VERSION = 20190104 +MULTIBOX_LIBGLES_DIR = $(empty) +MULTIBOX_LIBGLES_SOURCE = maxytec-mali-3798mv200-$(MULTIBOXSE_LIBGLES_VERSION).zip +MULTIBOX_LIBGLES_SITE = http://source.mynonpublic.com/maxytec + MULTIBOXSE_LIBGLES_VERSION = 20190104 MULTIBOXSE_LIBGLES_DIR = $(empty) MULTIBOXSE_LIBGLES_SOURCE = maxytec-mali-3798mv200-$(MULTIBOXSE_LIBGLES_VERSION).zip @@ -296,6 +306,7 @@ hd6x-libgles-headers: $(DL_DIR)/$(HD6X_LIBGLES_HEADERS_SOURCE) | $(TARGET_DIR) hd60-libgles \ hd61-libgles \ +multibox-libgles \ multiboxse-libgles: $(DL_DIR)/$(BOXMODEL_LIBGLES_SOURCE) | $(TARGET_DIR) unzip -o $(DL_DIR)/$(BOXMODEL_LIBGLES_SOURCE) -d $(TARGET_libdir) $(CD) $(TARGET_libdir); \ @@ -335,6 +346,11 @@ HD61_LIBS_DIR = hiplay HD61_LIBS_SOURCE = gfutures-libs-3798mv200-$(HD61_LIBS_VERSION).zip HD61_LIBS_SITE = http://source.mynonpublic.com/gfutures +MULTIBOX_LIBS_VERSION = 20200622 +MULTIBOX_LIBS_DIR = hiplay +MULTIBOX_LIBS_SOURCE = maxytec-libs-3798mv200-$(MULTIBOXSE_LIBS_VERSION).zip +MULTIBOX_LIBS_SITE = http://source.mynonpublic.com/maxytec + MULTIBOXSE_LIBS_VERSION = 20200622 MULTIBOXSE_LIBS_DIR = hiplay MULTIBOXSE_LIBS_SOURCE = maxytec-libs-3798mv200-$(MULTIBOXSE_LIBS_VERSION).zip @@ -354,6 +370,7 @@ endif hd60-libs \ hd61-libs \ +multibox-libs \ multiboxse-libs: $(DL_DIR)/$(BOXMODEL_LIBS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(BOXMODEL_LIBS_DIR) unzip -o $(DL_DIR)/$(BOXMODEL_LIBS_SOURCE) -d $(BUILD_DIR)/$(BOXMODEL_LIBS_DIR) diff --git a/package/bootmenu/files/multibox/bootmenu.conf b/package/bootmenu/files/multibox/bootmenu.conf new file mode 100644 index 00000000..8b62320e --- /dev/null +++ b/package/bootmenu/files/multibox/bootmenu.conf @@ -0,0 +1,11 @@ +imageurl https://raw.githubusercontent.com/neutrino-images/ni-buildsystem/master/package/bootmenu/files/multibox/images +# +iface eth0 +dhcp yes +# +# for static config leave out 'dhcp yes' and add the following settings: +# +#ip 192.168.1.10 +#netmask 255.255.255.0 +#gateway 192.168.1.1 +#dns 192.168.1.1 diff --git a/package/bootmenu/files/multibox/images b/package/bootmenu/files/multibox/images new file mode 100644 index 00000000..989d2c16 --- /dev/null +++ b/package/bootmenu/files/multibox/images @@ -0,0 +1 @@ +Neutrino-Image_current https://www.neutrino-images.de/neutrino-images/get-image.php?boxmodel=multibox-mmc diff --git a/support/config.example b/support/config.example index 53746b51..702d3c7f 100644 --- a/support/config.example +++ b/support/config.example @@ -34,6 +34,9 @@ MAINTAINER = $(shell whoami) # Air Digital Zgemma H7 #BOXMODEL = h7 +# Maxytec Multibox 4K +#BOXMODEL = multibox + # Maxytec Multibox SE 4K #BOXMODEL = multiboxse diff --git a/support/online-update/get-image.php b/support/online-update/get-image.php index a2763277..2cc42401 100644 --- a/support/online-update/get-image.php +++ b/support/online-update/get-image.php @@ -13,7 +13,7 @@ $debug = false; $mmc = false; $recovery = false; -if ($boxmodel == "hd60-mmc" || $boxmodel == "hd61-mmc" || $boxmodel == "multiboxse-mmc") +if ($boxmodel == "hd60-mmc" || $boxmodel == "hd61-mmc" || $boxmodel == "multibox-mmc" || $boxmodel == "multiboxse-mmc") { $boxtype = "armbox"; @@ -21,6 +21,8 @@ if ($boxmodel == "hd60-mmc" || $boxmodel == "hd61-mmc" || $boxmodel == "multibox $boxmodel = "hd60"; elseif ($boxmodel == "hd61-mmc") $boxmodel = "hd61"; + elseif ($boxmodel == "multibox-mmc") + $boxmodel = "multibox"; elseif ($boxmodel == "multiboxse-mmc") $boxmodel = "multiboxse"; @@ -74,7 +76,7 @@ elseif ($boxtype == "armbox" || $boxtype == "arm") $boxtype_sc = "arm"; if ($mmc || $recovery) { - if ($boxmodel == "hd60" || $boxmodel == "hd61" || $boxmodel == "multiboxse") + if ($boxmodel == "hd60" || $boxmodel == "hd61" || $boxmodel == "multibox" || $boxmodel == "multiboxse") { if ($mmc) $add_str = "_single_mmc"; diff --git a/support/online-update/update.php b/support/online-update/update.php index 8d7a907e..0f06f315 100644 --- a/support/online-update/update.php +++ b/support/online-update/update.php @@ -59,6 +59,12 @@ if ($revision == 1) // libstb-hal $boxseries = "hd6x"; $boxmodel = "hd61"; } + elseif ($boxname == "multibox 4k") + { + $boxtype_sc = "arm"; + $boxseries = "hd6x"; + $boxmodel = "multibox"; + } elseif ($boxname == "multibox se 4k") { $boxtype_sc = "arm";