Browse Source

Revert "- fix $(IMAGE_DIR) dependencies"

This reverts commit 721a812343.
master
vanhofen 5 years ago
parent
commit
0e23298be9
  1. 6
      make/images.mk
  2. 6
      make/linux-kernel.mk

6
make/images.mk

@ -78,7 +78,7 @@ flash-image-coolstream: IMAGE_NAME=$(IMAGE_PREFIX)-$(IMAGE_SUFFIX)
flash-image-coolstream: IMAGE_DESC="$(BOXNAME) [$(IMAGE_SUFFIX)][$(BOXSERIES)] $(shell echo $(IMAGE_TYPE_STRING) | sed 's/.*/\u&/')"
flash-image-coolstream: IMAGE_MD5FILE=$(IMAGE_TYPE_STRING)-$(IMAGE_SUFFIX).txt
flash-image-coolstream: IMAGE_DATE=$(shell cat $(ROOTFS)/.version | grep "^version=" | cut -d= -f2 | cut -c 5-)
flash-image-coolstream: | $(IMAGE_DIR)
flash-image-coolstream:
make devtable
mkfs.jffs2 -e $(ERASE_SIZE) $(MKFSFLAGS) -o $(IMAGE_DIR)/$(IMAGE_NAME).img
make devtable-remove
@ -119,7 +119,7 @@ flash-image-armbox: IMAGE_NAME=$(IMAGE_PREFIX)-$(IMAGE_SUFFIX)
flash-image-armbox: IMAGE_DESC="$(BOXNAME) [$(IMAGE_SUFFIX)] $(shell echo $(IMAGE_TYPE_STRING) | sed 's/.*/\u&/')"
flash-image-armbox: IMAGE_MD5FILE=$(IMAGE_TYPE_STRING)-$(IMAGE_SUFFIX).txt
flash-image-armbox: IMAGE_DATE=$(shell cat $(ROOTFS)/.version | grep "^version=" | cut -d= -f2 | cut -c 5-)
flash-image-armbox: | $(IMAGE_DIR)
flash-image-armbox:
mkdir -p $(IMAGE_BUILD_TMP)/$(BOXMODEL)
cp $(KERNEL_ZIMAGE_DTB) $(IMAGE_BUILD_TMP)/$(BOXMODEL)/kernel.bin
$(CD) $(ROOTFS); \
@ -170,7 +170,7 @@ STORAGE_PARTITION_OFFSET = "$(shell expr $(LINUX_SWAP_PARTITION_OFFSET) \+ $(LIN
#STORAGE_PARTITION_SIZE = 204800 # remaining flash memory
flash-image-armbox-multi: IMAGE_NAME=$(IMAGE_PREFIX)-$(IMAGE_SUFFIX)
flash-image-armbox-multi: | $(IMAGE_DIR)
flash-image-armbox-multi:
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)

6
make/linux-kernel.mk

@ -96,12 +96,12 @@ $(D)/kernel: $(D)/kernel-$(BOXTYPE) $(D)/kernel-modules-$(BOXTYPE)
$(D)/kernel-coolstream: $(D)/kernel-coolstream-$(BOXSERIES)
$(TOUCH)
$(D)/kernel-coolstream-hd1: $(D)/kernel.do_compile | $(IMAGE_DIR)
$(D)/kernel-coolstream-hd1: $(D)/kernel.do_compile
mkimage -A $(BOXARCH) -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(KERNEL_UIMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-uImage.img
mkimage -A $(BOXARCH) -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(KERNEL_ZIMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img
$(TOUCH)
$(D)/kernel-coolstream-hd2: $(D)/kernel.do_compile | $(IMAGE_DIR)
$(D)/kernel-coolstream-hd2: $(D)/kernel.do_compile
mkimage -A $(BOXARCH) -O linux -T kernel -C none -a 0x8000 -e 0x8000 -n "$(KERNEL_NAME)" -d $(KERNEL_ZIMAGE_DTB) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz
ifeq ($(BOXFAMILY), apollo)
ifeq ($(BOXMODEL), apollo)
@ -112,7 +112,7 @@ ifeq ($(BOXFAMILY), apollo)
endif
$(TOUCH)
$(D)/kernel-armbox: $(D)/kernel.do_compile | $(IMAGE_DIR)
$(D)/kernel-armbox: $(D)/kernel.do_compile
cp -a $(KERNEL_ZIMAGE_DTB) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL).bin
$(TOUCH)

Loading…
Cancel
Save