Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rtl838x: drop custom mkimage build function

Browse source 
UIMAGE_MAGIC is now supported by Build/uImage, in addition to
UIMAGE_NAME. This removes the need for a custom mkimage call, so let's
remove it.

Signed-off-by: Sander Vanheule <sander@svanheule.net>
This commit is contained in:
Sander Vanheule 2020-11-04 10:21:17 +01:00 committed by Adrian Schmutzler
parent ab1584a797
commit 8582e15616
1 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
target/linux/rtl838x/image/Makefile
View file

@ -7,16 +7,6 @@ include $(INCLUDE_DIR)/image.mk
KERNEL_LOADADDR = 0x80000000 KERNEL_LOADADDR = 0x80000000
KERNEL_ENTRY = 0x80000400 KERNEL_ENTRY = 0x80000400
define Build/custom-uimage
mkimage -A $(LINUX_KARCH) \
-O linux -T kernel \
-C gzip -a $(KERNEL_LOADADDR) $(if $(UIMAGE_MAGIC),-M $(UIMAGE_MAGIC),) \
-e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
-n '$(1)' -d $@ $@.new
mv $@.new $@
endef
define Device/Default define Device/Default
PROFILES = Default PROFILES = Default
KERNEL := kernel-bin | append-dtb | gzip | uImage gzip KERNEL := kernel-bin | append-dtb | gzip | uImage gzip
@ -35,8 +25,7 @@ define Device/allnet_all-sg8208m
DEVICE_VENDOR := ALLNET DEVICE_VENDOR := ALLNET
DEVICE_MODEL := ALL-SG8208M DEVICE_MODEL := ALL-SG8208M
UIMAGE_MAGIC := 0x00000006 UIMAGE_MAGIC := 0x00000006
KERNEL := kernel-bin | append-dtb | gzip | custom-uimage 2.2.2.0 UIMAGE_NAME := 2.2.2.0
KERNEL_INITRAMFS := kernel-bin | append-dtb | gzip | custom-uimage 2.2.2.0
DEVICE_PACKAGES := ip-full ip-bridge kmod-gpio-button-hotplug tc DEVICE_PACKAGES := ip-full ip-bridge kmod-gpio-button-hotplug tc
endef endef
TARGET_DEVICES += allnet_all-sg8208m TARGET_DEVICES += allnet_all-sg8208m