Browse Source

- add vu+ uno4k and uno4kse

master
vanhofen 5 years ago
parent
commit
d0de30cd0b
  1. 4
      Makefile
  2. 2
      config.example
  3. 4038
      configs/kernel-vuuno4k.config
  4. 4248
      configs/kernel-vuuno4kse.config
  5. 4
      make/bootstrap.mk
  6. 4
      make/crosstool.mk
  7. 38
      make/environment-box.mk
  8. 4
      make/environment-build.mk
  9. 2
      make/environment-image.mk
  10. 38
      make/environment-linux.mk
  11. 2
      make/image-updates.mk
  12. 2
      make/images.mk
  13. 21
      make/linux-kernel.mk
  14. 6
      make/ni.mk
  15. 4
      make/target-libs-static.mk
  16. 2
      make/target-libs.mk
  17. 14
      make/target-scripts.mk
  18. 6
      make/target-tools.mk
  19. 13
      patches/kernel/vuplus/3_14_dmx_source_dvr.patch
  20. 81
      patches/kernel/vuplus/3_14_dvbs2x.patch
  21. 13
      patches/kernel/vuplus/4_1_dmx_source_dvr.patch
  22. 44
      skel-root/general/scripts/vuuno4k-platform-util.init
  23. 44
      skel-root/general/scripts/vuuno4kse-platform-util.init

4
Makefile

@ -42,6 +42,8 @@ config.local: $(eval BOXMODEL=hd51)
@echo " 32) VU+ Duo 4k"
@echo " 33) VU+ Ultimo 4k"
@echo " 34) VU+ Zero 4k"
@echo " 34) VU+ Uno 4k"
@echo " 34) VU+ Uno 4k SE"
@echo " 41) VU+ Duo"
@echo ""
@read -p "Select your boxmodel? [default: 11] " boxmodel; \
@ -58,6 +60,8 @@ config.local: $(eval BOXMODEL=hd51)
32) boxmodel=vuduo4k;; \
33) boxmodel=vuultimo4k;; \
34) boxmodel=vuzero4k;; \
35) boxmodel=vuuno4k;; \
36) boxmodel=vuuno4kse;; \
41) boxmodel=vuduo;; \
*) boxmodel=hd51;; \
esac; \

2
config.example

@ -28,6 +28,8 @@ MAINTAINER = $(shell whoami)
#BOXMODEL = vuduo4k
#BOXMODEL = vuultimo4k
#BOXMODEL = vuzero4k
#BOXMODEL = vuuno4k
#BOXMODEL = vuuno4kse
#BOXMODEL = vuduo
# -----------------------------------------------------------------------------

4038
configs/kernel-vuuno4k.config

File diff suppressed because it is too large

4248
configs/kernel-vuuno4kse.config

File diff suppressed because it is too large

4
make/bootstrap.mk

@ -40,7 +40,7 @@ endif
target-dir:
mkdir -p $(TARGET_DIR)
ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 vusolo4k vuduo4k vuultimo4k vuzero4k))
ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse))
mkdir -p $(TARGET_DIR)/boot
endif
mkdir -p $(TARGET_DIR)/dev
@ -144,7 +144,7 @@ ifeq ($(BOXSERIES), hd2)
ln -sf libuClibc-$(UCLIBC_VER).so libpthread.so.0; \
ln -sf libuClibc-$(UCLIBC_VER).so librt.so.0
endif
ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 vusolo4k vuduo4k vuultimo4k vuzero4k))
ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse))
$(CD) $(TARGET_LIB_DIR); \
ln -sf ld-2.23.so ld-linux.so.3
endif

4
make/crosstool.mk

@ -6,7 +6,7 @@
crosstool: $(CROSS_DIR)
crosstools:
for boxseries in hd1 hd2 hd51 vusolo4k vuduo4k vuultimo4k vuzero4k vuduo; do \
for boxseries in hd1 hd2 hd51 vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo; do \
echo "make crosstool-ng for $${boxseries}"; \
make BOXSERIES=$${boxseries} crosstool || exit; \
done;
@ -33,7 +33,7 @@ crosstool-restore: $(CROSSTOOL_BACKUP)
# -----------------------------------------------------------------------------
crosstools-renew:
for boxseries in hd1 hd2 hd51 vusolo4k vuduo4k vuultimo4k vuzero4k vuduo; do \
for boxseries in hd1 hd2 hd51 vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo; do \
make BOXSERIES=$${boxseries} ccache-clean || exit; \
done;
make host-clean

38
make/environment-box.mk

@ -15,13 +15,13 @@
# - Armbox --------------------------------------------------------------------
# BOXTYPE armbox ------ + ----- + -------- +
# / \ \ \ \
# BOXSERIES hd51 vusolo4k vuduo4k vuultimo4k vuzero4k
# | | | | |
# BOXFAMILY bcm7251s bcm7376 bcm7278 bcm7444s bcm72604
# | | | | | |
# BOXMODEL hd51 bre2ze4k vusolo4k vuduo4k vuultimo4k vuzero4k
# BOXTYPE armbox ------ + ----- + -------- + ------ + ----- +
# / \ \ \ \ \ \
# BOXSERIES hd51 vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse
# | | | | | | |
# BOXFAMILY bcm7251s bcm7376 bcm7278 bcm7444s bcm72604 bcm7252s
# | | | | | | | |
# BOXMODEL hd51 bre2ze4k vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse
# - Mipsbox --------------------------------------------------------------------
@ -65,6 +65,14 @@ ifneq ($(BOXSERIES),)
BOXTYPE = armbox
BOXFAMILY = bcm72604
BOXMODEL = vuzero4k
else ifeq ($(BOXSERIES), vuuno4k)
BOXTYPE = armbox
BOXFAMILY = bcm7252s
BOXMODEL = vuuno4k
else ifeq ($(BOXSERIES), vuuno4kse)
BOXTYPE = armbox
BOXFAMILY = bcm7252s
BOXMODEL = vuuno4kse
else ifeq ($(BOXSERIES), vuduo)
BOXTYPE = mipsbox
BOXFAMILY = bcm7335
@ -107,6 +115,10 @@ else ifneq ($(BOXFAMILY),)
BOXTYPE = armbox
BOXSERIES = vuzero4k
BOXMODEL = vuzero4k
else ifeq ($(BOXFAMILY), bcm7252s)
BOXTYPE = armbox
BOXSERIES = vuuno4kse
BOXMODEL = vuuno4kse
else ifeq ($(BOXFAMILY), bcm7335)
BOXTYPE = mipsbox
BOXSERIES = vuduo
@ -149,6 +161,14 @@ else ifneq ($(BOXMODEL),)
BOXTYPE = armbox
BOXSERIES = vuzero4k
BOXFAMILY = bcm72604
else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuuno4k))
BOXTYPE = armbox
BOXSERIES = vuuno4k
BOXFAMILY = bcm7252s
else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuuno4kse))
BOXTYPE = armbox
BOXSERIES = vuuno4k
BOXFAMILY = bcm7252s
else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuduo))
BOXTYPE = mipsbox
BOXSERIES = vuduo
@ -196,6 +216,10 @@ else ifeq ($(BOXMODEL), vuultimo4k)
BOXNAME="VU+ Ultimo 4K"
else ifeq ($(BOXMODEL), vuzero4k)
BOXNAME="VU+ Zero 4K"
else ifeq ($(BOXMODEL), vuuno4k)
BOXNAME="VU+ Uno 4K"
else ifeq ($(BOXMODEL), vuuno4kse)
BOXNAME="VU+ Uno 4K SE"
else ifeq ($(BOXMODEL), vuduo)
BOXNAME="VU+ Duo"
endif

4
make/environment-build.mk

@ -52,7 +52,7 @@ STATIC_DIR = $(STATIC_BASE)/$(BOXARCH)-linux-$(KERNEL_VER)
CONFIGS = $(BASE_DIR)/configs
PATCHES = $(BASE_DIR)/patches
SKEL-ROOT = $(BASE_DIR)/skel-root/$(BOXSERIES)
ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vusolo4k vuduo4k vuultimo4k vuzero4k))
ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse))
SKEL-ROOT = $(BASE_DIR)/skel-root/vuplus
endif
IMAGEFILES = $(BASE_DIR)/skel-root/general
@ -99,7 +99,7 @@ else ifeq ($(BOXSERIES), hd2)
endif
CXX11_ABI = -D_GLIBCXX_USE_CXX11_ABI=0
else ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 vusolo4k vuduo4k vuultimo4k vuzero4k))
else ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse))
DRIVERS_DIR = $(BOXMODEL)
CORTEX-STRINGS_LDFLAG = -lcortex-strings
TARGET = arm-cortex-linux-gnueabihf

2
make/environment-image.mk

@ -58,7 +58,7 @@ IMAGE_URL = $(NI-SERVER)/$(NI-SUBDIR)
IMAGE_BUILD_TMP = $(BUILD_TMP)/image-build
ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vusolo4k vuduo4k vuultimo4k vuzero4k vuduo))
ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo))
IMAGE_SUBDIR = $(subst vu,vuplus/,$(BOXMODEL))
else
IMAGE_SUBDIR = $(BOXMODEL)

38
make/environment-linux.mk

@ -116,6 +116,44 @@ else ifeq ($(BOXMODEL), vuzero4k)
BOOT_PARTITION = 4
# arm-vuuno4k
else ifeq ($(BOXMODEL), vuuno4k)
KERNEL_VER = 3.14.28-1.12
KERNEL_TMP = linux
KERNEL_SOURCE = stblinux-3.14-1.12.tar.bz2
KERNEL_URL = http://archive.vuplus.com/download/kernel
KERNEL_PATCH = $(VUUNO4K_PATCH)
KERNEL_BRANCH = $(EMPTY)
KERNEL_DTB = $(EMPTY)
VMLINUZ_INITRD_VER = 20191010
VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz
VMLINUZ_INITRD_URL = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
VMLINUZ_INITRD = vmlinuz-initrd-7439b0
BOOT_PARTITION = 4
# arm-vuuno4kse
else ifeq ($(BOXMODEL), vuuno4kse)
KERNEL_VER = 4.1.20-1.9
KERNEL_TMP = linux
KERNEL_SOURCE = stblinux-4.1-1.9.tar.bz2
KERNEL_URL = http://archive.vuplus.com/download/kernel
KERNEL_PATCH = $(VUUNO4KSE_PATCH)
KERNEL_BRANCH = $(EMPTY)
KERNEL_DTB = $(EMPTY)
VMLINUZ_INITRD_VER = 20191010
VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz
VMLINUZ_INITRD_URL = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
VMLINUZ_INITRD = vmlinuz-initrd-7439b0
BOOT_PARTITION = 4
# mips-vuduo
else ifeq ($(BOXMODEL), vuduo)
KERNEL_VER = 3.9.6

2
make/image-updates.mk

@ -3,7 +3,7 @@
#
# -----------------------------------------------------------------------------
BOXSERIES_UPDATE = hd2 hd51 vusolo4k vuduo4k vuultimo4k vuzero4k vuduo
BOXSERIES_UPDATE = hd2 hd51 vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo
ifneq ($(DEBUG), yes)
BOXSERIES_UPDATE += hd1
endif

2
make/images.mk

@ -61,7 +61,7 @@ ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k))
make flash-image-hd51
make flash-image-hd51-multi
endif
ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vusolo4k vuduo4k vuultimo4k vuzero4k))
ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse))
make flash-image-vuplus
make flash-image-vuplus-multi
endif

21
make/linux-kernel.mk

@ -41,10 +41,12 @@ VUPLUS_3_9_PATCH = \
vuplus/3_9_tda18271-advertise-supported-delsys.patch \
vuplus/3_9_test.patch
# arm-vusolo4k/arm-vuultimo4k
# arm-vusolo4k/arm-vuultimo4k/arm-vuuno4k
VUPLUS_3_14_PATCH = \
vuplus/3_14_bcm_genet_disable_warn.patch \
vuplus/3_14_linux_dvb-core.patch \
vuplus/3_14_dvbs2x.patch \
vuplus/3_14_dmx_source_dvr.patch \
vuplus/3_14_rt2800usb_fix_warn_tx_status_timeout_to_dbg.patch \
vuplus/3_14_usb_core_hub_msleep.patch \
vuplus/3_14_rtl8712_fix_build_error.patch \
@ -69,11 +71,12 @@ VUPLUS_3_14_PATCH = \
vuplus/3_14_0006-makefile-disable-warnings.patch \
vuplus/3_14_linux_dvb_adapter.patch
# arm-vuduo4k/arm-vuzero4k
# arm-vuduo4k/arm-vuzero4k/arm-vuuno4kse
VUPLUS_4_1_PATCH = \
vuplus/4_1_linux_dvb_adapter.patch \
vuplus/4_1_linux_dvb-core.patch \
vuplus/4_1_linux_4_1_45_dvbs2x.patch \
vuplus/4_1_dmx_source_dvr.patch \
vuplus/4_1_bcmsysport_4_1_45.patch \
vuplus/4_1_linux_usb_hub.patch \
vuplus/4_1_0001-regmap-add-regmap_write_bits.patch \
@ -121,8 +124,18 @@ VUULTIMO4K_PATCH = \
VUZERO4K_PATCH = \
$(VUPLUS_4_1_PATCH) \
vuplus/4_1_linux_rpmb_not_alloc.patch \
vuplus/4_1_bcmgenet-recovery-fix.patch
vuplus/4_1_bcmgenet-recovery-fix.patch \
vuplus/4_1_linux_rpmb_not_alloc.patch
VUUNO4K_PATCH = \
$(VUPLUS_3_14_PATCH) \
vuplus/3_14_bcmsysport_3.14.28-1.12.patch \
vuplus/3_14_linux_prevent_usb_dma_from_bmem.patch
VUUNO4KSE_PATCH = \
$(VUPLUS_4_1_PATCH) \
vuplus/4_1_bcmgenet-recovery-fix.patch \
vuplus/4_1_linux_rpmb_not_alloc.patch
VUDUO_PATCH = \
$(VUPLUS_3_9_PATCH)

6
make/ni.mk

@ -3,7 +3,7 @@
#
# -----------------------------------------------------------------------------
BOXMODEL_IMAGE = apollo kronos kronos_v2 hd51 bre2ze4k vusolo4k vuduo4k vuultimo4k vuzero4k # vuduo
BOXMODEL_IMAGE = apollo kronos kronos_v2 hd51 bre2ze4k vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse # vuduo
ifneq ($(DEBUG), yes)
BOXMODEL_IMAGE += nevis
endif
@ -53,7 +53,7 @@ ni-image:
$(MAKE) wget
$(MAKE) iconv
$(MAKE) streamripper
ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51 vusolo4k vuduo4k vuultimo4k vuzero4k vuduo))
ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51 vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo))
$(MAKE) less
$(MAKE) parted
$(MAKE) openvpn
@ -65,7 +65,7 @@ ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51 vusolo4k vuduo4k vuultimo4k
$(MAKE) minicom
$(MAKE) mc
endif
ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 vusolo4k vuduo4k vuultimo4k vuzero4k vuduo))
ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo))
$(MAKE) rsync
$(MAKE) ofgwrite
$(MAKE) aio-grab

4
make/target-libs-static.mk

@ -4,7 +4,7 @@
# -----------------------------------------------------------------------------
STATIC_LIBS =
ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51 vusolo4k vuduo4k vuultimo4k vuzero4k))
ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51 vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse))
STATIC_LIBS += cortex-strings
endif
@ -20,7 +20,7 @@ CORTEX-STRINGS_URL = http://git.linaro.org/git-ro/toolchain/cortex-strings.gi
$(ARCHIVE)/$(CORTEX-STRINGS_SOURCE):
$(GET-GIT-ARCHIVE) $(CORTEX-STRINGS_URL) $(CORTEX-STRINGS_VER) $(@F) $(ARCHIVE)
CORTEX-STRINGS_CONF = $(if $(filter $(BOXSERIES), hd51 vusolo4k vuduo4k vuultimo4k vuzero4k),--with-neon,--without-neon)
CORTEX-STRINGS_CONF = $(if $(filter $(BOXSERIES), hd51 vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse),--with-neon,--without-neon)
cortex-strings: $(STATIC_LIB_DIR)/libcortex-strings.la
$(STATIC_LIB_DIR)/libcortex-strings.la: $(ARCHIVE)/$(CORTEX-STRINGS_SOURCE) | $(TARGET_DIR)

2
make/target-libs.mk

@ -218,7 +218,7 @@ LIBPNG_PATCH = libpng-Disable-pngfix-and-png-fix-itxt.patch
LIBPNG_DEPS = zlib
LIBPNG_CONF = $(if $(filter $(BOXSERIES), hd51 vusolo4k vuduo4k vuultimo4k vuzero4k), --enable-arm-neon, --disable-arm-neon)
LIBPNG_CONF = $(if $(filter $(BOXSERIES), hd51 vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse),--enable-arm-neon,--disable-arm-neon)
libpng: $(LIBPNG_DEPS) $(ARCHIVE)/$(LIBPNG_SOURCE) | $(TARGET_DIR)
$(REMOVE)/$(LIBPNG_TMP)

14
make/target-scripts.mk

@ -37,7 +37,7 @@ $(TARGET_DIR)/etc/init.d/camd_datefix:
$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/camd_datefix.init $(@)
$(TARGET_DIR)/etc/init.d/coredump:
ifneq ($(BOXSERIES), hd1)
ifneq ($(BOXMODEL), nevis)
$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/coredump.init $(@)
endif
@ -69,17 +69,17 @@ $(TARGET_DIR)/etc/init.d/networking:
ln -sf networking $(TARGET_DIR)/etc/init.d/K99networking
$(TARGET_DIR)/etc/init.d/partitions-by-name:
ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51))
ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k))
$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/partitions-by-name.init $(@)
endif
$(TARGET_DIR)/etc/init.d/resizerootfs:
ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51))
ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k))
$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/resizerootfs.init $(@)
endif
$(TARGET_DIR)/etc/init.d/swap:
ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 vusolo4k vuduo4k vuultimo4k vuzero4k vuduo))
ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo))
$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/swap.init $(@)
ln -sf swap $(TARGET_DIR)/etc/init.d/K99swap
endif
@ -92,8 +92,8 @@ $(TARGET_DIR)/etc/init.d/syslogd:
ln -sf syslogd $(TARGET_DIR)/etc/init.d/K98syslogd
$(TARGET_DIR)/etc/init.d/vuplus-platform-util:
ifeq ($(BOXSERIES), $(filter $(BOXSERIES), vusolo4k vuduo4k vuultimo4k vuzero4k))
$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/$(BOXSERIES)-platform-util.init $(@)
ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse))
$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/$(BOXMODEL)-platform-util.init $(@)
endif
# -----------------------------------------------------------------------------
@ -105,7 +105,7 @@ scripts: \
$(TARGET_SHARE_DIR)/udhcpc/default.script
$(TARGET_DIR)/bin/bp3flash.sh:
ifeq ($(BOXSERIES), $(filter $(BOXSERIES), vuduo4k))
ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuduo4k))
$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/bp3flash.sh $(@)
endif

6
make/target-tools.mk

@ -46,7 +46,7 @@ define BUSYBOX_INSTALL_CONFIG
$(call KCONFIG_SET_OPT,CONFIG_PREFIX,"$(TARGET_DIR)",$(BUSYBOX_BUILD_CONFIG))
endef
ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51 vusolo4k vuduo4k vuultimo4k vuzero4k vuduo))
ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51 vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo))
define BUSYBOX_SET_BLKDISCARD
$(call KCONFIG_ENABLE_OPT,CONFIG_BLKDISCARD,$(BUSYBOX_BUILD_CONFIG))
@ -57,7 +57,7 @@ ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51 vusolo4k vuduo4k vuultimo4k
$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_IFUPDOWN_IPV6,$(BUSYBOX_BUILD_CONFIG))
endef
ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 vusolo4k vuduo4k vuultimo4k vuzero4k vuduo))
ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo))
define BUSYBOX_SET_SWAP
$(call KCONFIG_ENABLE_OPT,CONFIG_SWAPON,$(BUSYBOX_BUILD_CONFIG))
@ -72,7 +72,7 @@ ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51 vusolo4k vuduo4k vuultimo4k
$(call KCONFIG_ENABLE_OPT,CONFIG_PKILL,$(BUSYBOX_BUILD_CONFIG))
endef
ifeq ($(BOXSERIES), $(filter $(BOXSERIES), vusolo4k vuduo4k vuultimo4k vuzero4k vuduo))
ifeq ($(BOXSERIES), $(filter $(BOXSERIES), vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo))
define BUSYBOX_SET_START_STOP_DAEMON
$(call KCONFIG_ENABLE_OPT,CONFIG_START_STOP_DAEMON,$(BUSYBOX_BUILD_CONFIG))

13
patches/kernel/vuplus/3_14_dmx_source_dvr.patch

@ -0,0 +1,13 @@
diff --git a/include/uapi/linux/dvb/dmx.h b/include/uapi/linux/dvb/dmx.h
index b4fb650..1073007 100644
--- a/include/uapi/linux/dvb/dmx.h
+++ b/include/uapi/linux/dvb/dmx.h
@@ -127,7 +127,7 @@ typedef enum {
DMX_SOURCE_FRONT1,
DMX_SOURCE_FRONT2,
DMX_SOURCE_FRONT3,
- DMX_SOURCE_DVR0 = 16,
+ DMX_SOURCE_DVR0 = 32,
DMX_SOURCE_DVR1,
DMX_SOURCE_DVR2,
DMX_SOURCE_DVR3

81
patches/kernel/vuplus/3_14_dvbs2x.patch

@ -0,0 +1,81 @@
diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c
index 1f925e8..57ed889 100644
--- a/drivers/media/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb-core/dvb_frontend.c
@@ -170,6 +170,7 @@ static enum dvbv3_emulation_type dvbv3_type(u32 delivery_system)
return DVBV3_QAM;
case SYS_DVBS:
case SYS_DVBS2:
+ case SYS_DVBS2X:
case SYS_TURBO:
case SYS_ISDBS:
case SYS_DSS:
@@ -893,6 +894,7 @@ static int dvb_frontend_check_parameters(struct dvb_frontend *fe)
switch (c->delivery_system) {
case SYS_DVBS:
case SYS_DVBS2:
+ case SYS_DVBS2X:
case SYS_TURBO:
case SYS_DVBC_ANNEX_A:
case SYS_DVBC_ANNEX_C:
@@ -959,6 +961,7 @@ static int dvb_frontend_clear_cache(struct dvb_frontend *fe)
switch (c->delivery_system) {
case SYS_DVBS:
case SYS_DVBS2:
+ case SYS_DVBS2X:
case SYS_TURBO:
c->modulation = QPSK; /* implied for DVB-S in legacy API */
c->rolloff = ROLLOFF_35;/* implied for DVB-S */
@@ -2102,6 +2105,7 @@ static int dtv_set_frontend(struct dvb_frontend *fe)
switch (c->delivery_system) {
case SYS_DVBS:
case SYS_DVBS2:
+ case SYS_DVBS2X:
case SYS_ISDBS:
case SYS_TURBO:
case SYS_DVBC_ANNEX_A:
diff --git a/include/uapi/linux/dvb/frontend.h b/include/uapi/linux/dvb/frontend.h
index c56d77c..5aebaa9 100644
--- a/include/uapi/linux/dvb/frontend.h
+++ b/include/uapi/linux/dvb/frontend.h
@@ -165,6 +165,24 @@ typedef enum fe_code_rate {
FEC_3_5,
FEC_9_10,
FEC_2_5,
+ FEC_13_45=13,
+ FEC_9_20=14,
+ FEC_11_20=15,
+ FEC_23_36=16,
+ FEC_25_36=17,
+ FEC_13_18=18,
+ FEC_26_45=19,
+ FEC_28_45=20,
+ FEC_7_9=21,
+ FEC_77_90=22,
+ FEC_32_45=23,
+ FEC_11_15=24,
+ FEC_1_2_L=25,
+ FEC_8_15_L=26,
+ FEC_3_5_L=27,
+ FEC_2_3_L=28,
+ FEC_5_9_L=29,
+ FEC_26_45_L=30
} fe_code_rate_t;
@@ -183,6 +201,7 @@ typedef enum fe_modulation {
APSK_32,
DQPSK,
QAM_4_NR,
+ APSK_8,
} fe_modulation_t;
typedef enum fe_transmit_mode {
@@ -410,6 +429,7 @@ typedef enum fe_delivery_system {
SYS_DVBT2,
SYS_TURBO,
SYS_DVBC_ANNEX_C,
+ SYS_DVBS2X = 21,
} fe_delivery_system_t;
/* backward compatibility */

13
patches/kernel/vuplus/4_1_dmx_source_dvr.patch

@ -0,0 +1,13 @@
diff --git a/include/uapi/linux/dvb/dmx.h b/include/uapi/linux/dvb/dmx.h
index b4fb650..1073007 100644
--- a/include/uapi/linux/dvb/dmx.h
+++ b/include/uapi/linux/dvb/dmx.h
@@ -127,7 +127,7 @@ typedef enum {
DMX_SOURCE_FRONT1,
DMX_SOURCE_FRONT2,
DMX_SOURCE_FRONT3,
- DMX_SOURCE_DVR0 = 16,
+ DMX_SOURCE_DVR0 = 32,
DMX_SOURCE_DVR1,
DMX_SOURCE_DVR2,
DMX_SOURCE_DVR3

44
skel-root/general/scripts/vuuno4k-platform-util.init

@ -0,0 +1,44 @@
#!/bin/sh
if [ -e /sys/class/net/sys0 ]; then
ifconfig sys0 up
fi
case "$1" in
start)
# first boot?
[ -f /etc/dropbear/dropbear_rsa_host_key ]
echo -n "Starting vuplus-platform-util"
if [ ! -e /dev/brcm0 ]; then
DRV_PATH=/lib/modules/`uname -r`/extra
insmod $DRV_PATH/procmk.ko
insmod $DRV_PATH/bcm_event.ko
insmod $DRV_PATH/dvb_base.ko
start-stop-daemon --start --quiet --exec /usr/bin/dvb_server -- &
mknod -m a=rw /dev/brcm0 c 30 0
start-stop-daemon --start --quiet --exec /usr/bin/init_client $DRV_PATH/dvb-bcm7252s.ko $DRV_PATH/brcmfb.ko -- &
fi
while [ ! -c /dev/fb0 ]; do
usleep 100000
done
if [ -e /usr/bin/initfb ]; then
/usr/bin/initfb $(sed -n 's/osd_resolution=//p' /var/tuxbox/config/neutrino.conf)
fi
echo "."
;;
stop)
;;
restart)
;;
*)
echo "Usage: /etc/init.d/vuplus-platform-util {start|stop|restart}"
exit 1
esac
exit 0

44
skel-root/general/scripts/vuuno4kse-platform-util.init

@ -0,0 +1,44 @@
#!/bin/sh
if [ -e /sys/class/net/sys0 ]; then
ifconfig sys0 up
fi
case "$1" in
start)
# first boot?
[ -f /etc/dropbear/dropbear_rsa_host_key ]
echo -n "Starting vuplus-platform-util"
if [ ! -e /dev/brcm0 ]; then
DRV_PATH=/lib/modules/`uname -r`/extra
insmod $DRV_PATH/procmk.ko
insmod $DRV_PATH/bcm_event.ko
insmod $DRV_PATH/dvb_base.ko
start-stop-daemon --start --quiet --exec /usr/bin/dvb_server -- &
mknod -m a=rw /dev/brcm0 c 30 0
start-stop-daemon --start --quiet --exec /usr/bin/init_client $DRV_PATH/dvb-bcm7252sse.ko $DRV_PATH/brcmfb.ko -- &
fi
while [ ! -c /dev/fb0 ]; do
usleep 100000
done
if [ -e /usr/bin/initfb ]; then
/usr/bin/initfb $(sed -n 's/osd_resolution=//p' /var/tuxbox/config/neutrino.conf)
fi
echo "."
;;
stop)
;;
restart)
;;
*)
echo "Usage: /etc/init.d/vuplus-platform-util {start|stop|restart}"
exit 1
esac
exit 0
Loading…
Cancel
Save