[openwrt/openwrt] apm821xx: rename MerakiNAND -> meraki-header

LEDE Commits lede-commits at lists.infradead.org
Sat May 13 15:09:10 PDT 2023


chunkeey pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/8125729c7cf4e56b214d5ffa797040c47f451a87

commit 8125729c7cf4e56b214d5ffa797040c47f451a87
Author: Christian Lamparter <chunkeey at gmail.com>
AuthorDate: Sat May 13 21:09:56 2023 +0200

    apm821xx: rename MerakiNAND -> meraki-header
    
    specify that this functions adds a Cisco Meraki
    special-sauce header for their custom loader/uboot.
    
    Signed-off-by: Christian Lamparter <chunkeey at gmail.com>
---
 target/linux/apm821xx/image/nand.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/linux/apm821xx/image/nand.mk b/target/linux/apm821xx/image/nand.mk
index 1d28df98e5..2848b87719 100644
--- a/target/linux/apm821xx/image/nand.mk
+++ b/target/linux/apm821xx/image/nand.mk
@@ -15,7 +15,7 @@ define Build/MerakiAdd-dtb
 	@mv $@.new $@
 endef
 
-define Build/MerakiNAND
+define Build/meraki-header
 	-$(STAGING_DIR_HOST)/bin/mkmerakifw \
 		-B $(BOARD_NAME) -s \
 		-i $@ \
@@ -32,7 +32,7 @@ define Device/meraki_mr24
   IMAGES := sysupgrade.bin
   DTB_SIZE := 64512
   IMAGE_SIZE := 8191k
-  KERNEL := kernel-bin | lzma | uImage lzma | MerakiAdd-dtb | MerakiNAND
+  KERNEL := kernel-bin | lzma | uImage lzma | MerakiAdd-dtb | meraki-header
   KERNEL_INITRAMFS := kernel-bin | lzma | dtb | MuImage-initramfs lzma
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   UBINIZE_OPTS := -E 5




More information about the lede-commits mailing list