KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ar71xx: fix a legacy image porting issue

Browse source 
Get rid of remaining IMAGE_PROFILE references and move template calls
the right place

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2016-07-13 13:50:03 +02:00
parent 2ea76bdf04
commit d6b3b44d97
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/ar71xx/image/Makefile
View file

@ -10,8 +10,6 @@ JFFS2_BLOCKSIZE = 64k 128k 256k
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk include $(INCLUDE_DIR)/image.mk
IMAGE_PROFILE:=$(if $(PROFILE),$(PROFILE),Default)
KERNEL_LOADADDR = 0x80060000 KERNEL_LOADADDR = 0x80060000
DEVICE_VARS += NETGEAR_KERNEL_MAGIC NETGEAR_BOARD_ID NETGEAR_HW_ID CMDLINE CONSOLE IMAGE_SIZE BOARDNAME LOADER_FLASH_OFFS LOADER_TYPE DEVICE_VARS += NETGEAR_KERNEL_MAGIC NETGEAR_BOARD_ID NETGEAR_HW_ID CMDLINE CONSOLE IMAGE_SIZE BOARDNAME LOADER_FLASH_OFFS LOADER_TYPE

7
target/linux/ar71xx/image/legacy.mk
View file

@ -322,7 +322,6 @@ define Image/BuildKernel
$(call MkuImage,lzma,,$(KDIR)/vmlinux.bin.lzma,$(UIMAGE)-lzma.bin) $(call MkuImage,lzma,,$(KDIR)/vmlinux.bin.lzma,$(UIMAGE)-lzma.bin)
cp $(KDIR)/loader-generic.elf $(VMLINUX)-lzma.elf cp $(KDIR)/loader-generic.elf $(VMLINUX)-lzma.elf
-mkdir -p $(KDIR_TMP) -mkdir -p $(KDIR_TMP)
$(call Image/Build/Profile/$(IMAGE_PROFILE),buildkernel)
endef endef
define Image/BuildKernel/Initramfs define Image/BuildKernel/Initramfs
@ -1140,10 +1139,6 @@ define Image/Build/jffs2
dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
endef endef
define Image/Build/Initramfs
$(call Image/Build/Profile/$(IMAGE_PROFILE),initramfs)
endef
define Image/Prepare define Image/Prepare
gzip -9n -c $(KDIR)/vmlinux > $(KDIR)/vmlinux.bin.gz gzip -9n -c $(KDIR)/vmlinux > $(KDIR)/vmlinux.bin.gz
$(call CompressLzma,$(KDIR)/vmlinux,$(KDIR)/vmlinux.bin.lzma) $(call CompressLzma,$(KDIR)/vmlinux,$(KDIR)/vmlinux.bin.lzma)
@ -1153,7 +1148,6 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
$(call Image/BuildLoader,generic,elf,,,-initramfs) $(call Image/BuildLoader,generic,elf,,,-initramfs)
endif endif
$(call Image/BuildLoader,generic,elf) $(call Image/BuildLoader,generic,elf)
$(call Image/Build/Profile/$(if $(CONFIG_IB),Default,$(IMAGE_PROFILE)),loader)
endef endef
define Image/Prepare/Profile define Image/Prepare/Profile
@ -1162,6 +1156,7 @@ endef
define Image/Build/Profile define Image/Build/Profile
$(call Image/Build/Profile/$(1),buildkernel) $(call Image/Build/Profile/$(1),buildkernel)
$(call Image/Build/Profile/$(1),initramfs)
$(call Image/Build/Profile/$(1),$(2)) $(call Image/Build/Profile/$(1),$(2))
endef endef