mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 23:42:43 +00:00
ar71xx: fix a legacy image porting issue
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:
parent
2ea76bdf04
commit
d6b3b44d97
@ -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
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user