diff --git a/configs/kernel-hd51.config b/configs/kernel-hd5x.config similarity index 100% rename from configs/kernel-hd51.config rename to configs/kernel-hd5x.config diff --git a/make/bootstrap.mk b/make/bootstrap.mk index d604e0e3..e649d739 100644 --- a/make/bootstrap.mk +++ b/make/bootstrap.mk @@ -46,7 +46,7 @@ target-dir: mkdir -p $(TARGET_BIN_DIR) mkdir -p $(TARGET_INCLUDE_DIR) mkdir -p $(TARGET_LIB_DIR) -ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) +ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) mkdir -p $(TARGET_DIR)/boot endif mkdir -p $(TARGET_DIR)/dev @@ -111,7 +111,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 hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) +ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) $(CD) $(TARGET_LIB_DIR); \ ln -sf ld-2.23.so ld-linux.so.3 endif diff --git a/make/crosstool.mk b/make/crosstool.mk index dbda3776..1ae533b2 100644 --- a/make/crosstool.mk +++ b/make/crosstool.mk @@ -6,7 +6,7 @@ crosstool: $(CROSS_DIR) crosstools: - for boxseries in hd1 hd2 hd51 hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo; do \ + for boxseries in hd1 hd2 hd5x hd6x vusolo4k vuduo4k vuduo4kse 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 hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo; do \ + for boxseries in hd1 hd2 hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo; do \ make BOXSERIES=$${boxseries} ccache-clean || exit; \ done; make host-clean diff --git a/make/environment-box.mk b/make/environment-box.mk index ae220ae2..f742c37b 100644 --- a/make/environment-box.mk +++ b/make/environment-box.mk @@ -17,7 +17,7 @@ # BOXTYPE armbox ---- + -- + ------ + ----- + ------- + -------- + ------ + ----- + # / | \ \ \ \ \ \ \ -# BOXSERIES hd51 hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse +# BOXSERIES hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse # | | | | | | | | | # BOXFAMILY bcm7251s hi3798m bcm7376 bcm7278 bcm7444s bcm72604 bcm7252s # / | \ | | | | | | | | | @@ -45,7 +45,7 @@ ifneq ($(BOXSERIES),) BOXTYPE = coolstream BOXFAMILY = apollo BOXMODEL = apollo - else ifeq ($(BOXSERIES), hd51) + else ifeq ($(BOXSERIES), hd5x) BOXTYPE = armbox BOXFAMILY = bcm7251s BOXMODEL = hd51 @@ -105,7 +105,7 @@ else ifneq ($(BOXFAMILY),) BOXMODEL = kronos else ifeq ($(BOXFAMILY), bcm7251s) BOXTYPE = armbox - BOXSERIES = hd51 + BOXSERIES = hd5x BOXMODEL = hd51 else ifeq ($(BOXFAMILY), hi3798m) BOXTYPE = armbox @@ -155,7 +155,7 @@ else ifneq ($(BOXMODEL),) BOXFAMILY = kronos else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7)) BOXTYPE = armbox - BOXSERIES = hd51 + BOXSERIES = hd5x BOXFAMILY = bcm7251s else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd60 hd61)) BOXTYPE = armbox diff --git a/make/environment-build.mk b/make/environment-build.mk index 0d81fd41..e0146c96 100644 --- a/make/environment-build.mk +++ b/make/environment-build.mk @@ -31,7 +31,7 @@ WHOAMI := $(shell id -un) ARCHIVE = $(BASE_DIR)/download BUILD_TMP = $(BASE_DIR)/build_tmp ROOTFS = $(BUILD_TMP)/rootfs -ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51)) +ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd5x)) ROOTFS = $(BUILD_TMP)/rootfs/linuxrootfs1 endif DEPS_DIR = $(BASE_DIR)/deps @@ -113,7 +113,7 @@ else ifeq ($(BOXSERIES), hd2) endif CXX11_ABI = -D_GLIBCXX_USE_CXX11_ABI=0 -else ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) +else ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) DRIVERS-BIN_DIR = $(BOXTYPE)/$(BOXMODEL) CORTEX-STRINGS_LDFLAG = -lcortex-strings TARGET = arm-cortex-linux-gnueabihf diff --git a/make/environment-linux.mk b/make/environment-linux.mk index 5e247874..d750313e 100644 --- a/make/environment-linux.mk +++ b/make/environment-linux.mk @@ -35,7 +35,7 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7)) KERNEL_BRANCH = $(EMPTY) KERNEL_DTB = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/dts/bcm7445-bcm97445svmb.dtb - KERNEL_CONFIG = $(CONFIGS)/kernel-hd51.config + KERNEL_CONFIG = $(CONFIGS)/kernel-hd5x.config BOOT_PARTITION = 1 @@ -214,7 +214,7 @@ endif KERNEL_MAKEOPTS = $(KERNEL_IMAGE) modules -# build also the kernel-dtb for arm-hd51 and arm-hd6x +# build also the kernel-dtb for arm-hd5x and arm-hd6x ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7 hd60 hd61)) KERNEL_MAKEOPTS += $(notdir $(KERNEL_DTB)) endif diff --git a/make/image-updates.mk b/make/image-updates.mk index 1bc758f9..dbe75f15 100644 --- a/make/image-updates.mk +++ b/make/image-updates.mk @@ -3,7 +3,7 @@ # # ----------------------------------------------------------------------------- -BOXSERIES_UPDATE = hd2 hd51 hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo +BOXSERIES_UPDATE = hd2 hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo ifneq ($(DEBUG), yes) BOXSERIES_UPDATE += hd1 endif diff --git a/make/images.mk b/make/images.mk index 5b387bc5..7a3edb42 100644 --- a/make/images.mk +++ b/make/images.mk @@ -58,8 +58,8 @@ ifeq ($(BOXMODEL), $(filter $(BOXMODEL), apollo shiner)) make flash-image-coolstream ERASE_SIZE=0x20000 IMAGE_SUFFIX=$(BOXTYPE_SC)-shiner endif ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7)) - make flash-image-hd51 - make flash-image-hd51-multi + make flash-image-hd5x + make flash-image-hd5x-multi endif ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd60 hd61)) make flash-image-hd6x @@ -113,8 +113,8 @@ endif # ----------------------------------------------------------------------------- -flash-image-hd51: IMAGE_DATE=$(shell cat $(ROOTFS)/.version | grep "^version=" | cut -d= -f2 | cut -c 5-) -flash-image-hd51: | $(IMAGE_DIR) +flash-image-hd5x: IMAGE_DATE=$(shell cat $(ROOTFS)/.version | grep "^version=" | cut -d= -f2 | cut -c 5-) +flash-image-hd5x: | $(IMAGE_DIR) rm -rf $(IMAGE_BUILD_TMP) mkdir -p $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR) cp $(KERNEL_ZIMAGE_DTB) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/kernel.bin @@ -130,13 +130,13 @@ flash-image-hd51: | $(IMAGE_DIR) # ----------------------------------------------------------------------------- # hd51, bre2ze4k, h7 -HD51_IMAGE_NAME = disk -HD51_BOOT_IMAGE = boot.img -HD51_IMAGE_LINK = $(HD51_IMAGE_NAME).ext4 +HD5x_IMAGE_NAME = disk +HD5x_BOOT_IMAGE = boot.img +HD5x_IMAGE_LINK = $(HD5x_IMAGE_NAME).ext4 # emmc image EMMC_IMAGE_SIZE = 3817472 -EMMC_IMAGE = $(IMAGE_BUILD_TMP)/$(HD51_IMAGE_NAME).img +EMMC_IMAGE = $(IMAGE_BUILD_TMP)/$(HD5x_IMAGE_NAME).img BLOCK_SIZE = 512 BLOCK_SECTOR = 2 @@ -165,14 +165,14 @@ LINUX_SWAP_PARTITION_SIZE = 204800 STORAGE_PARTITION_OFFSET = "$(shell expr $(LINUX_SWAP_PARTITION_OFFSET) \+ $(LINUX_SWAP_PARTITION_SIZE))" #STORAGE_PARTITION_SIZE = 204800 # remaining flash memory -flash-image-hd51-multi: | $(IMAGE_DIR) +flash-image-hd5x-multi: | $(IMAGE_DIR) rm -rf $(IMAGE_BUILD_TMP) mkdir -p $(IMAGE_BUILD_TMP) # Create a sparse image block - dd if=/dev/zero of=$(IMAGE_BUILD_TMP)/$(HD51_IMAGE_LINK) seek=$(shell expr $(ROOTFS_PARTITION_SIZE) \* $(BLOCK_SECTOR)) count=0 bs=$(BLOCK_SIZE) - mkfs.ext4 -v -F $(IMAGE_BUILD_TMP)/$(HD51_IMAGE_LINK) -d $(ROOTFS)/.. + dd if=/dev/zero of=$(IMAGE_BUILD_TMP)/$(HD5x_IMAGE_LINK) seek=$(shell expr $(ROOTFS_PARTITION_SIZE) \* $(BLOCK_SECTOR)) count=0 bs=$(BLOCK_SIZE) + mkfs.ext4 -v -F $(IMAGE_BUILD_TMP)/$(HD5x_IMAGE_LINK) -d $(ROOTFS)/.. # Error codes 0-3 indicate successfull operation of fsck (no errors or errors corrected) - fsck.ext4 -pvfD $(IMAGE_BUILD_TMP)/$(HD51_IMAGE_LINK) || [ $? -le 3 ] + fsck.ext4 -pvfD $(IMAGE_BUILD_TMP)/$(HD5x_IMAGE_LINK) || [ $? -le 3 ] dd if=/dev/zero of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) count=0 seek=$(shell expr $(EMMC_IMAGE_SIZE) \* $(BLOCK_SECTOR)) parted -s $(EMMC_IMAGE) mklabel gpt parted -s $(EMMC_IMAGE) unit KiB mkpart boot fat16 $(IMAGE_ROOTFS_ALIGNMENT) $(shell expr $(IMAGE_ROOTFS_ALIGNMENT) \+ $(BOOT_PARTITION_SIZE)) @@ -184,23 +184,23 @@ flash-image-hd51-multi: | $(IMAGE_DIR) parted -s $(EMMC_IMAGE) unit KiB mkpart userdata ext4 $(MULTI_ROOTFS_PARTITION_OFFSET) $(shell expr $(MULTI_ROOTFS_PARTITION_OFFSET) \+ $(MULTI_ROOTFS_PARTITION_SIZE)) parted -s $(EMMC_IMAGE) unit KiB mkpart swap linux-swap $(LINUX_SWAP_PARTITION_OFFSET) $(shell expr $(LINUX_SWAP_PARTITION_OFFSET) \+ $(LINUX_SWAP_PARTITION_SIZE)) parted -s $(EMMC_IMAGE) unit KiB mkpart storage ext4 $(STORAGE_PARTITION_OFFSET) 100% - dd if=/dev/zero of=$(IMAGE_BUILD_TMP)/$(HD51_BOOT_IMAGE) bs=$(BLOCK_SIZE) count=$(shell expr $(BOOT_PARTITION_SIZE) \* $(BLOCK_SECTOR)) - mkfs.msdos -S 512 $(IMAGE_BUILD_TMP)/$(HD51_BOOT_IMAGE) + dd if=/dev/zero of=$(IMAGE_BUILD_TMP)/$(HD5x_BOOT_IMAGE) bs=$(BLOCK_SIZE) count=$(shell expr $(BOOT_PARTITION_SIZE) \* $(BLOCK_SECTOR)) + mkfs.msdos -S 512 $(IMAGE_BUILD_TMP)/$(HD5x_BOOT_IMAGE) echo "boot emmcflash0.linuxkernel 'root=/dev/mmcblk0p3 rootsubdir=linuxrootfs1 kernel=/dev/mmcblk0p2 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP echo "boot emmcflash0.linuxkernel 'root=/dev/mmcblk0p3 rootsubdir=linuxrootfs1 kernel=/dev/mmcblk0p2 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_1 echo "boot emmcflash0.linuxkernel2 'root=/dev/mmcblk0p7 rootsubdir=linuxrootfs2 kernel=/dev/mmcblk0p4 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_2 echo "boot emmcflash0.linuxkernel3 'root=/dev/mmcblk0p7 rootsubdir=linuxrootfs3 kernel=/dev/mmcblk0p5 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_3 echo "boot emmcflash0.linuxkernel4 'root=/dev/mmcblk0p7 rootsubdir=linuxrootfs4 kernel=/dev/mmcblk0p6 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_4 - mcopy -i $(IMAGE_BUILD_TMP)/$(HD51_BOOT_IMAGE) -v $(IMAGE_BUILD_TMP)/STARTUP :: - mcopy -i $(IMAGE_BUILD_TMP)/$(HD51_BOOT_IMAGE) -v $(IMAGE_BUILD_TMP)/STARTUP_1 :: - mcopy -i $(IMAGE_BUILD_TMP)/$(HD51_BOOT_IMAGE) -v $(IMAGE_BUILD_TMP)/STARTUP_2 :: - mcopy -i $(IMAGE_BUILD_TMP)/$(HD51_BOOT_IMAGE) -v $(IMAGE_BUILD_TMP)/STARTUP_3 :: - mcopy -i $(IMAGE_BUILD_TMP)/$(HD51_BOOT_IMAGE) -v $(IMAGE_BUILD_TMP)/STARTUP_4 :: - dd conv=notrunc if=$(IMAGE_BUILD_TMP)/$(HD51_BOOT_IMAGE) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(IMAGE_ROOTFS_ALIGNMENT) \* $(BLOCK_SECTOR)) + mcopy -i $(IMAGE_BUILD_TMP)/$(HD5x_BOOT_IMAGE) -v $(IMAGE_BUILD_TMP)/STARTUP :: + mcopy -i $(IMAGE_BUILD_TMP)/$(HD5x_BOOT_IMAGE) -v $(IMAGE_BUILD_TMP)/STARTUP_1 :: + mcopy -i $(IMAGE_BUILD_TMP)/$(HD5x_BOOT_IMAGE) -v $(IMAGE_BUILD_TMP)/STARTUP_2 :: + mcopy -i $(IMAGE_BUILD_TMP)/$(HD5x_BOOT_IMAGE) -v $(IMAGE_BUILD_TMP)/STARTUP_3 :: + mcopy -i $(IMAGE_BUILD_TMP)/$(HD5x_BOOT_IMAGE) -v $(IMAGE_BUILD_TMP)/STARTUP_4 :: + dd conv=notrunc if=$(IMAGE_BUILD_TMP)/$(HD5x_BOOT_IMAGE) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(IMAGE_ROOTFS_ALIGNMENT) \* $(BLOCK_SECTOR)) dd conv=notrunc if=$(KERNEL_ZIMAGE_DTB) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(KERNEL_PARTITION_OFFSET) \* $(BLOCK_SECTOR)) - resize2fs $(IMAGE_BUILD_TMP)/$(HD51_IMAGE_LINK) $(ROOTFS_PARTITION_SIZE)k + resize2fs $(IMAGE_BUILD_TMP)/$(HD5x_IMAGE_LINK) $(ROOTFS_PARTITION_SIZE)k # Truncate on purpose - dd if=$(IMAGE_BUILD_TMP)/$(HD51_IMAGE_LINK) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(ROOTFS_PARTITION_OFFSET) \* $(BLOCK_SECTOR)) + dd if=$(IMAGE_BUILD_TMP)/$(HD5x_IMAGE_LINK) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(ROOTFS_PARTITION_OFFSET) \* $(BLOCK_SECTOR)) # Create final USB-image mkdir -p $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR) cp $(EMMC_IMAGE) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR) @@ -292,7 +292,9 @@ PHONY += devtable PHONY += devtable-remove PHONY += flash-image-coolstream PHONY += check-image-size -PHONY += flash-image-hd51 -PHONY += flash-image-hd51-multi +PHONY += flash-image-hd5x +PHONY += flash-image-hd5x-multi +PHONY += flash-image-hd6x +PHONY += flash-image-hd6x-multi PHONY += flash-image-vuplus PHONY += flash-image-vuplus-multi diff --git a/make/linux-kernel.mk b/make/linux-kernel.mk index db2c3098..45093781 100644 --- a/make/linux-kernel.mk +++ b/make/linux-kernel.mk @@ -321,7 +321,7 @@ kernel-modules-armbox: kernel-armbox $(INSTALL_DATA) $(KERNEL_MODULES_DIR)/modules.builtin $(TARGET_MODULES_DIR) $(INSTALL_DATA) $(KERNEL_MODULES_DIR)/modules.order $(TARGET_MODULES_DIR) make depmod -ifeq ($(BOXSERIES), hd51 hd6x) +ifeq ($(BOXSERIES), hd5x hd6x) make rtl8192eu endif ifeq ($(BOXSERIES), hd6x) diff --git a/make/ni.mk b/make/ni.mk index 69a7a07d..bfa7f51d 100644 --- a/make/ni.mk +++ b/make/ni.mk @@ -59,7 +59,7 @@ ni-image: $(MAKE) mtd-utils $(MAKE) wget $(MAKE) streamripper -ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51 hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) +ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) $(MAKE) less $(MAKE) parted $(MAKE) openvpn @@ -71,7 +71,7 @@ ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51 hd6x vusolo4k vuduo4k vuduo4 $(MAKE) minicom $(MAKE) mc endif - ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) + ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) $(MAKE) gptfdisk $(MAKE) rsync $(MAKE) ofgwrite diff --git a/make/target-libs-static.mk b/make/target-libs-static.mk index 902edcef..a3cca038 100644 --- a/make/target-libs-static.mk +++ b/make/target-libs-static.mk @@ -4,7 +4,7 @@ # ----------------------------------------------------------------------------- LIBS-STATIC = -ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51 hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) +ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) LIBS-STATIC += cortex-strings endif @@ -20,7 +20,7 @@ CORTEX-STRINGS_SITE = http://git.linaro.org/git-ro/toolchain/cortex-strings.gi $(ARCHIVE)/$(CORTEX-STRINGS_SOURCE): $(GET-GIT-ARCHIVE) $(CORTEX-STRINGS_SITE) $(CORTEX-STRINGS_VER) $(@F) $(ARCHIVE) -CORTEX-STRINGS_CONF = $(if $(filter $(BOXSERIES), hd51 hd6x vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse),--with-neon,--without-neon) +CORTEX-STRINGS_CONF = $(if $(filter $(BOXSERIES), hd5x hd6x 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) | $(STATIC_DIR) diff --git a/make/target-libs.mk b/make/target-libs.mk index 61b0b7d5..3d0d546c 100644 --- a/make/target-libs.mk +++ b/make/target-libs.mk @@ -208,7 +208,7 @@ LIBPNG_PATCH = libpng-Disable-pngfix-and-png-fix-itxt.patch LIBPNG_DEPS = zlib -LIBPNG_CONF = $(if $(filter $(BOXSERIES), hd51 hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse),--enable-arm-neon,--disable-arm-neon) +LIBPNG_CONF = $(if $(filter $(BOXSERIES), hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse),--enable-arm-neon,--disable-arm-neon) libpng: $(LIBPNG_DEPS) $(ARCHIVE)/$(LIBPNG_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBPNG_TMP) diff --git a/make/target-tools.mk b/make/target-tools.mk index ccf49802..80b77775 100644 --- a/make/target-tools.mk +++ b/make/target-tools.mk @@ -45,7 +45,7 @@ define BUSYBOX_INSTALL_CONFIG $(call KCONFIG_SET_OPT,CONFIG_PREFIX,"$(TARGET_DIR)",$(BUSYBOX_BUILD_CONFIG)) endef -ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51 hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) +ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) define BUSYBOX_SET_BLKDISCARD $(call KCONFIG_ENABLE_OPT,CONFIG_BLKDISCARD,$(BUSYBOX_BUILD_CONFIG)) @@ -56,7 +56,7 @@ ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51 hd6x vusolo4k vuduo4k vuduo4 $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_IFUPDOWN_IPV6,$(BUSYBOX_BUILD_CONFIG)) endef - ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) + ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) define BUSYBOX_SET_SWAP $(call KCONFIG_ENABLE_OPT,CONFIG_SWAPON,$(BUSYBOX_BUILD_CONFIG)) diff --git a/skel-root/hd51/etc/exports b/skel-root/hd5x/etc/exports similarity index 100% rename from skel-root/hd51/etc/exports rename to skel-root/hd5x/etc/exports diff --git a/skel-root/hd51/etc/filesystems b/skel-root/hd5x/etc/filesystems similarity index 100% rename from skel-root/hd51/etc/filesystems rename to skel-root/hd5x/etc/filesystems diff --git a/skel-root/hd51/etc/group b/skel-root/hd5x/etc/group similarity index 100% rename from skel-root/hd51/etc/group rename to skel-root/hd5x/etc/group diff --git a/skel-root/hd51/etc/hosts b/skel-root/hd5x/etc/hosts similarity index 100% rename from skel-root/hd51/etc/hosts rename to skel-root/hd5x/etc/hosts diff --git a/skel-root/hd51/etc/inetd.conf b/skel-root/hd5x/etc/inetd.conf similarity index 100% rename from skel-root/hd51/etc/inetd.conf rename to skel-root/hd5x/etc/inetd.conf diff --git a/skel-root/hd51/etc/init.d/rcS b/skel-root/hd5x/etc/init.d/rcS similarity index 100% rename from skel-root/hd51/etc/init.d/rcS rename to skel-root/hd5x/etc/init.d/rcS diff --git a/skel-root/hd51/etc/issue.net b/skel-root/hd5x/etc/issue.net similarity index 100% rename from skel-root/hd51/etc/issue.net rename to skel-root/hd5x/etc/issue.net diff --git a/skel-root/hd51/etc/mdev.conf b/skel-root/hd5x/etc/mdev.conf similarity index 100% rename from skel-root/hd51/etc/mdev.conf rename to skel-root/hd5x/etc/mdev.conf diff --git a/skel-root/hd51/etc/network/interfaces b/skel-root/hd5x/etc/network/interfaces similarity index 100% rename from skel-root/hd51/etc/network/interfaces rename to skel-root/hd5x/etc/network/interfaces diff --git a/skel-root/hd51/etc/nsswitch.conf b/skel-root/hd5x/etc/nsswitch.conf similarity index 100% rename from skel-root/hd51/etc/nsswitch.conf rename to skel-root/hd5x/etc/nsswitch.conf diff --git a/skel-root/hd51/etc/passwd b/skel-root/hd5x/etc/passwd similarity index 100% rename from skel-root/hd51/etc/passwd rename to skel-root/hd5x/etc/passwd diff --git a/skel-root/hd51/etc/profile b/skel-root/hd5x/etc/profile similarity index 100% rename from skel-root/hd51/etc/profile rename to skel-root/hd5x/etc/profile diff --git a/skel-root/hd51/etc/profile.local b/skel-root/hd5x/etc/profile.local similarity index 100% rename from skel-root/hd51/etc/profile.local rename to skel-root/hd5x/etc/profile.local diff --git a/skel-root/hd51/etc/protocols b/skel-root/hd5x/etc/protocols similarity index 100% rename from skel-root/hd51/etc/protocols rename to skel-root/hd5x/etc/protocols diff --git a/skel-root/hd51/etc/services b/skel-root/hd5x/etc/services similarity index 100% rename from skel-root/hd51/etc/services rename to skel-root/hd5x/etc/services diff --git a/skel-root/hd51/lib/mdev/common/mdev-log-only b/skel-root/hd5x/lib/mdev/common/mdev-log-only similarity index 100% rename from skel-root/hd51/lib/mdev/common/mdev-log-only rename to skel-root/hd5x/lib/mdev/common/mdev-log-only diff --git a/skel-root/hd51/lib/mdev/common/mdev-modprobe b/skel-root/hd5x/lib/mdev/common/mdev-modprobe similarity index 100% rename from skel-root/hd51/lib/mdev/common/mdev-modprobe rename to skel-root/hd5x/lib/mdev/common/mdev-modprobe diff --git a/skel-root/hd51/lib/mdev/common/mdev-module b/skel-root/hd5x/lib/mdev/common/mdev-module similarity index 100% rename from skel-root/hd51/lib/mdev/common/mdev-module rename to skel-root/hd5x/lib/mdev/common/mdev-module diff --git a/skel-root/hd51/lib/mdev/fs/mdev-mmcblk b/skel-root/hd5x/lib/mdev/fs/mdev-mmcblk similarity index 100% rename from skel-root/hd51/lib/mdev/fs/mdev-mmcblk rename to skel-root/hd5x/lib/mdev/fs/mdev-mmcblk diff --git a/skel-root/hd51/lib/mdev/fs/mdev-mount b/skel-root/hd5x/lib/mdev/fs/mdev-mount similarity index 100% rename from skel-root/hd51/lib/mdev/fs/mdev-mount rename to skel-root/hd5x/lib/mdev/fs/mdev-mount diff --git a/skel-root/hd51/lib/mdev/net/mdev-wlan b/skel-root/hd5x/lib/mdev/net/mdev-wlan similarity index 100% rename from skel-root/hd51/lib/mdev/net/mdev-wlan rename to skel-root/hd5x/lib/mdev/net/mdev-wlan diff --git a/skel-root/hd51/lib/mdev/usb/coldplug-setenv b/skel-root/hd5x/lib/mdev/usb/coldplug-setenv similarity index 100% rename from skel-root/hd51/lib/mdev/usb/coldplug-setenv rename to skel-root/hd5x/lib/mdev/usb/coldplug-setenv diff --git a/skel-root/hd51/lib/mdev/usb/mdev-usb b/skel-root/hd5x/lib/mdev/usb/mdev-usb similarity index 100% rename from skel-root/hd51/lib/mdev/usb/mdev-usb rename to skel-root/hd5x/lib/mdev/usb/mdev-usb