From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Sat, 23 Jan 2021 12:24:28 +0000 (+0100)
Subject: bcm4908: sort and wrap build recipes
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=30651e6834972d97c164d5ea2d0b3061e1bb9aa5;p=openwrt%2Fstaging%2Fthess.git

bcm4908: sort and wrap build recipes

This sorts the Build recipes alphabetically, wraps some long lines
and moves the DEVICE_VARS to the top like common on several other
targets.

Cc: Rafał Miłecki <rafal@milecki.pl>

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---

diff --git a/target/linux/bcm4908/image/Makefile b/target/linux/bcm4908/image/Makefile
index b744839e5b..8a40a1e6a9 100644
--- a/target/linux/bcm4908/image/Makefile
+++ b/target/linux/bcm4908/image/Makefile
@@ -3,14 +3,12 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-define Build/bcm4908lzma
-	$(STAGING_DIR_HOST)/bin/lzma e -lc1 -lp2 -pb2 -d22 $@ $@.new
-	mv $@.new $@
-endef
+DEVICE_VARS += ASUS_PRODUCTID ASUS_BUILD_NO ASUS_FW_REV ASUS_EXT_NO
 
-define Build/bcm4908kernel
-	$(STAGING_DIR_HOST)/bin/bcm4908kernel -i $@ -o $@.new
-	mv $@.new $@
+define Build/bcm4908asus
+	$(STAGING_DIR_HOST)/bin/bcm4908asus create -i $@ \
+		-p $(ASUS_PRODUCTID) -b $(ASUS_BUILD_NO) -f $(ASUS_FW_REV) \
+		-e $(ASUS_EXT_NO)
 endef
 
 define Build/bcm4908img
@@ -22,16 +20,22 @@ define Build/bcm4908img
 	cp $(KDIR)/bcm63xx-cfe/$(subst _,$(comma),$(DEVICE_NAME))/cferam.000 $@-bootfs/
 	cp $(IMAGE_KERNEL) $@-bootfs/vmlinux.lz
 
-	$(STAGING_DIR_HOST)/bin/mkfs.jffs2 --pad --little-endian --squash-uids -v -e 128KiB -o $@-bootfs.jffs2 -d $@-bootfs -m none -n
-	$(STAGING_DIR_HOST)/bin/bcm4908img create $@.new -f $@-bootfs.jffs2 -a 0x20000 -f $@
+	$(STAGING_DIR_HOST)/bin/mkfs.jffs2 --pad --little-endian --squash-uids \
+		-v -e 128KiB -o $@-bootfs.jffs2 -d $@-bootfs -m none -n
+	$(STAGING_DIR_HOST)/bin/bcm4908img create $@.new -f $@-bootfs.jffs2 \
+		-a 0x20000 -f $@
 	mv $@.new $@
 endef
 
-define Build/bcm4908asus
-	$(STAGING_DIR_HOST)/bin/bcm4908asus create -i $@ -p $(ASUS_PRODUCTID) -b $(ASUS_BUILD_NO) -f $(ASUS_FW_REV) -e $(ASUS_EXT_NO)
+define Build/bcm4908kernel
+	$(STAGING_DIR_HOST)/bin/bcm4908kernel -i $@ -o $@.new
+	mv $@.new $@
 endef
 
-DEVICE_VARS += ASUS_PRODUCTID ASUS_BUILD_NO ASUS_FW_REV ASUS_EXT_NO
+define Build/bcm4908lzma
+	$(STAGING_DIR_HOST)/bin/lzma e -lc1 -lp2 -pb2 -d22 $@ $@.new
+	mv $@.new $@
+endef
 
 define Device/Default
   KERNEL := kernel-bin | bcm4908lzma | bcm4908kernel