diff mbox series

[5/5] rtl83xx: drop custom mkimage build function

Message ID 20201104092117.86343-6-sander@svanheule.net
State Accepted
Headers show
Series rtl838x: clean up build instructions | expand

Commit Message

Sander Vanheule Nov. 4, 2020, 9:21 a.m. UTC 
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>
---
 target/linux/rtl838x/image/Makefile | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)
diff mbox series

Patch

diff --git a/target/linux/rtl838x/image/Makefile b/target/linux/rtl838x/image/Makefile
index f490fa7ffe..6ec80218cf 100644
--- a/target/linux/rtl838x/image/Makefile
+++ b/target/linux/rtl838x/image/Makefile
@@ -7,16 +7,6 @@  include $(INCLUDE_DIR)/image.mk
 KERNEL_LOADADDR = 0x80000000
 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
   PROFILES = Default
   KERNEL := kernel-bin | append-dtb | gzip | uImage gzip
@@ -35,8 +25,7 @@  define Device/allnet_all-sg8208m
   DEVICE_VENDOR := ALLNET
   DEVICE_MODEL := ALL-SG8208M
   UIMAGE_MAGIC := 0x00000006
-  KERNEL := kernel-bin | append-dtb | gzip | custom-uimage 2.2.2.0
-  KERNEL_INITRAMFS := kernel-bin | append-dtb | gzip | custom-uimage 2.2.2.0
+  UIMAGE_NAME := 2.2.2.0
   DEVICE_PACKAGES := ip-full ip-bridge kmod-gpio-button-hotplug tc
 endef
 TARGET_DEVICES += allnet_all-sg8208m