realtek: Cleanup Makefiles

Our current Makefiles a little bit messy and can be improved somewhat,
both in whitespace and in style.

Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>

diff --git a/target/linux/realtek/Makefile b/target/linux/realtek/Makefile
index 797ae60274e0cf00460c8c53b61eafa9653f51ad..94280f43e56ec1302b329f2489724c97e1689f47 100644 (file)
--- a/target/linux/realtek/Makefile
+++ b/target/linux/realtek/Makefile
@@ -18,8 +18,17 @@ endef
 
 include $(INCLUDE_DIR)/target.mk
 
-DEFAULT_PACKAGES += uboot-envtools ethtool kmod-gpio-button-hotplug \
-       firewall4 nftables kmod-nft-offload odhcp6c \
-       ip-full ip-bridge tc-bpf
+DEFAULT_PACKAGES += \
+       ethtool \
+       firewall4 \
+       ip-bridge \
+       ip-full \
+       kmod-gpio-button-hotplug \
+       kmod-nft-offload \
+       nftables \
+       odhcp6c \
+       tc-bpf \
+       uboot-envtools \
+
 
 $(eval $(call BuildTarget))

diff --git a/target/linux/realtek/image/Makefile b/target/linux/realtek/image/Makefile
index 6c7be4aa90a644ccfc528e485156e8a791cf36bf..e4a3904aa83619cd39d000e7cd7bf25dedea2628 100644 (file)
--- a/target/linux/realtek/image/Makefile
+++ b/target/linux/realtek/image/Makefile
@@ -6,9 +6,15 @@ include $(INCLUDE_DIR)/image.mk
 KERNEL_LOADADDR = 0x80000000
 KERNEL_ENTRY = 0x80000400
 
-DEVICE_VARS += ZYXEL_VERS DLINK_KERNEL_PART_SIZE
-DEVICE_VARS += CAMEO_KERNEL_PART CAMEO_ROOTFS_PART CAMEO_CUSTOMER_SIGNATURE CAMEO_BOARD_VERSION
-DEVICE_VARS += H3C_PRODUCT_ID H3C_DEVICE_ID
+DEVICE_VARS += \
+        CAMEO_BOARD_VERSION \
+        CAMEO_CUSTOMER_SIGNATURE \
+        CAMEO_KERNEL_PART \
+        CAMEO_ROOTFS_PART \
+        DLINK_KERNEL_PART_SIZE \
+        H3C_DEVICE_ID \
+        H3C_PRODUCT_ID \
+        ZYXEL_VERS
 
 define Build/zyxel-vers
        ( echo VERS;\
@@ -81,13 +87,26 @@ endef
 
 define Device/Default
   PROFILES = Default
-  KERNEL := kernel-bin | append-dtb | gzip | uImage gzip
-  KERNEL_INITRAMFS := kernel-bin | append-dtb | gzip | uImage gzip
+  KERNEL := \
+       kernel-bin | \
+       append-dtb | \
+       gzip | \
+       uImage gzip
+  KERNEL_INITRAMFS := \
+       kernel-bin | \
+       append-dtb | \
+       gzip | \
+       uImage gzip
   DEVICE_DTS_DIR := ../dts-$(KERNEL_PATCHVER)
   DEVICE_DTS = $$(SOC)_$(1)
   IMAGES := sysupgrade.bin
-  IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | append-rootfs | pad-rootfs | \
-       check-size | append-metadata
+  IMAGE/sysupgrade.bin := \
+       append-kernel | \
+       append-metadata | \
+       append-rootfs | \
+       check-size | \
+       pad-rootfs | \
+       pad-to 64k
 endef
 
 include $(SUBTARGET).mk

diff --git a/target/linux/realtek/image/common.mk b/target/linux/realtek/image/common.mk
index 9d84ec08f526214dc5d41163d76a1b08340ea3ad..0c5152956967a75e43eda651c86bf10283a24fee 100644 (file)
--- a/target/linux/realtek/image/common.mk
+++ b/target/linux/realtek/image/common.mk
@@ -4,15 +4,26 @@ define Device/d-link_dgs-1210
   IMAGE_SIZE := 13824k
   DEVICE_VENDOR := D-Link
   DLINK_KERNEL_PART_SIZE := 1572864
-  KERNEL := kernel-bin | append-dtb | gzip | uImage gzip | dlink-cameo
+  KERNEL := \
+       kernel-bin | \
+       append-dtb | \
+       gzip | \
+       uImage gzip | \
+       dlink-cameo
   CAMEO_KERNEL_PART := 2
   CAMEO_ROOTFS_PART := 3
   CAMEO_CUSTOMER_SIGNATURE := 2
   CAMEO_BOARD_VERSION := 32
   IMAGES += factory_image1.bin
-  IMAGE/factory_image1.bin := append-kernel | pad-to 64k | \
-       append-rootfs | pad-rootfs | pad-to 16 | check-size | \
-       dlink-version | dlink-headers
+  IMAGE/factory_image1.bin := \
+       append-kernel | \
+       pad-to 64k | \
+       append-rootfs | \
+       pad-rootfs | \
+       pad-to 16 | \
+       check-size | \
+       dlink-version | \
+       dlink-headers
 endef
 
 define Device/hpe_1920
@@ -20,8 +31,24 @@ define Device/hpe_1920
   IMAGE_SIZE := 29632k
   BLOCKSIZE := 64k
   H3C_PRODUCT_ID := 0x3c010501
-  KERNEL := kernel-bin | append-dtb | relocate-kernel | 7z | h3c-image | h3c-vfs
-  KERNEL_INITRAMFS := kernel-bin | append-dtb | relocate-kernel | 7z | h3c-image
-  IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \
-       pad-rootfs | check-size | append-metadata
+  KERNEL := \
+       kernel-bin | \
+       append-dtb | \
+       relocate-kernel | \
+       7z | \
+       h3c-image | \
+       h3c-vfs
+  KERNEL_INITRAMFS := \
+       kernel-bin | \
+       append-dtb | \
+       relocate-kernel | \
+       7z | \
+       h3c-image
+  IMAGE/sysupgrade.bin := \
+       append-kernel | \
+       pad-to $$$$(BLOCKSIZE) | \
+       append-rootfs | \
+       pad-rootfs | \
+       check-size | \
+       append-metadata
 endef

diff --git a/target/linux/realtek/image/rtl838x.mk b/target/linux/realtek/image/rtl838x.mk
index eef66c89ce17c6bcd0406da621c9d5146b6085fe..6d6701154978849340e05c191578e9e649c03c6b 100644 (file)
--- a/target/linux/realtek/image/rtl838x.mk
+++ b/target/linux/realtek/image/rtl838x.mk
@@ -67,7 +67,10 @@ define Device/engenius_ews2910p
   DEVICE_VENDOR := EnGenius
   DEVICE_MODEL := EWP2910P
   UIMAGE_MAGIC := 0x03802910
-  KERNEL_INITRAMFS := kernel-bin | append-dtb | gzip | \
+  KERNEL_INITRAMFS := \
+       kernel-bin | \
+       append-dtb | \
+       gzip | \
        uImage gzip -n 'IMG-0.00.00-c0.0.00'
 endef
 TARGET_DEVICES += engenius_ews2910p
@@ -116,8 +119,16 @@ TARGET_DEVICES += iodata_bsh-g24mb
 
 # "NGE" refers to the uImage magic
 define Device/netgear_nge
-  KERNEL := kernel-bin | append-dtb | lzma | uImage lzma
-  KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | uImage lzma
+  KERNEL := \
+       kernel-bin | \
+       append-dtb | \
+       lzma | \
+       uImage lzma
+  KERNEL_INITRAMFS := \
+       kernel-bin | \
+       append-dtb | \
+       lzma | \
+       uImage lzma
   SOC := rtl8380
   IMAGE_SIZE := 14848k
   UIMAGE_MAGIC := 0x4e474520
@@ -212,7 +223,11 @@ define Device/zyxel_gs1900
   IMAGE_SIZE := 6976k
   DEVICE_VENDOR := ZyXEL
   UIMAGE_MAGIC := 0x83800000
-  KERNEL_INITRAMFS := kernel-bin | append-dtb | gzip | zyxel-vers | \
+  KERNEL_INITRAMFS := \
+       kernel-bin | \
+       append-dtb | \
+       gzip | \
+       zyxel-vers | \
        uImage gzip
 endef
 

diff --git a/target/linux/realtek/image/rtl839x.mk b/target/linux/realtek/image/rtl839x.mk
index 74ae95ccd78b4f403fb30782b6b9475d01148866..081c13ff9b225d4db3492d3cf7e7f8ef1a8f6781 100644 (file)
--- a/target/linux/realtek/image/rtl839x.mk
+++ b/target/linux/realtek/image/rtl839x.mk
@@ -15,7 +15,10 @@ define Device/panasonic_m48eg-pn28480k
   DEVICE_VENDOR := Panasonic
   DEVICE_MODEL := Switch-M48eG
   DEVICE_VARIANT := PN28480K
-  DEVICE_PACKAGES := kmod-hwmon-gpiofan kmod-hwmon-lm75 kmod-i2c-mux-pca954x \
+  DEVICE_PACKAGES := \
+       kmod-hwmon-gpiofan \
+       kmod-hwmon-lm75 \
+       kmod-i2c-mux-pca954x \
        kmod-thermal
 endef
 TARGET_DEVICES += panasonic_m48eg-pn28480k
@@ -27,7 +30,9 @@ define Device/tplink_sg2452p-v4
   DEVICE_VENDOR := TP-Link
   DEVICE_MODEL := SG2452P
   DEVICE_VARIANT := v4
-  DEVICE_PACKAGES := kmod-hwmon-gpiofan kmod-hwmon-tps23861
+  DEVICE_PACKAGES := \
+         kmod-hwmon-gpiofan \
+         kmod-hwmon-tps23861
 endef
 TARGET_DEVICES += tplink_sg2452p-v4
 
@@ -38,7 +43,11 @@ define Device/zyxel_gs1900-48
   UIMAGE_MAGIC := 0x83800000
   ZYXEL_VERS := AAHO
   DEVICE_MODEL := GS1900-48
-  KERNEL_INITRAMFS := kernel-bin | append-dtb | gzip | zyxel-vers $$$$(ZYXEL_VERS) | \
+  KERNEL_INITRAMFS := \
+       kernel-bin | \
+       append-dtb | \
+       gzip | \
+       zyxel-vers $$$$(ZYXEL_VERS) | \
        uImage gzip
 endef
 TARGET_DEVICES += zyxel_gs1900-48

diff --git a/target/linux/realtek/image/rtl930x.mk b/target/linux/realtek/image/rtl930x.mk
index 191ea5b20430e8850dd10bac3a30b592f2434a25..f55c5c002bf03d35943f7e50bc3ba466d9fdc75f 100644 (file)
--- a/target/linux/realtek/image/rtl930x.mk
+++ b/target/linux/realtek/image/rtl930x.mk
@@ -6,9 +6,12 @@ define Device/zyxel_xgs1250-12
   ZYXEL_VERS := ABWE
   DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := XGS1250-12
-    IMAGE_SIZE := 13312k
-  KERNEL_INITRAMFS := kernel-bin | append-dtb | gzip | zyxel-vers $$$$(ZYXEL_VERS) | \
+  IMAGE_SIZE := 13312k
+  KERNEL_INITRAMFS := \
+       kernel-bin | \
+       append-dtb | \
+       gzip | \
+       zyxel-vers $$$$(ZYXEL_VERS) | \
        uImage gzip
 endef
-
 TARGET_DEVICES += zyxel_xgs1250-12

diff --git a/target/linux/realtek/rtl838x/target.mk b/target/linux/realtek/rtl838x/target.mk
index ee658ea9862f204c3d0f5af3d6b2a30b9b1c80fb..d78b44b717ff24eb9c4a24d7473ead85a7813982 100644 (file)
--- a/target/linux/realtek/rtl838x/target.mk
+++ b/target/linux/realtek/rtl838x/target.mk
@@ -12,4 +12,3 @@ define Target/Description
 endef
 
 FEATURES := $(filter-out mips16,$(FEATURES))
-

diff --git a/target/linux/realtek/rtl839x/target.mk b/target/linux/realtek/rtl839x/target.mk
index 0bbd6a5d4a1ae51523271683f54f7d46fc2b1c2b..88993fad147dc835bcb2b8bdf294ef57f1ec0c21 100644 (file)
--- a/target/linux/realtek/rtl839x/target.mk
+++ b/target/linux/realtek/rtl839x/target.mk
@@ -10,4 +10,3 @@ KERNEL_PATCHVER:=5.10
 define Target/Description
        Build firmware images for Realtek RTL839x based boards.
 endef
-

diff --git a/target/linux/realtek/rtl930x/target.mk b/target/linux/realtek/rtl930x/target.mk
index f6f204d00638964faf2f2bf8876df48990dd5789..31b06219cab84fa642f74339d9e8e223d27ed477 100644 (file)
--- a/target/linux/realtek/rtl930x/target.mk
+++ b/target/linux/realtek/rtl930x/target.mk
@@ -10,4 +10,3 @@ KERNEL_PATCHVER:=5.10
 define Target/Description
        Build firmware images for Realtek RTL930x based boards.
 endef
-