[source] kirkwood: clean up redundant variables in the image building code
LEDE Commits
lede-commits at lists.infradead.org
Wed Jul 20 01:18:21 PDT 2016
nbd pushed a commit to source.git, branch master:
https://git.lede-project.org/?p=source.git;a=commitdiff;h=5d4b04495502b326592c94a364bcd2cde65439ba
commit 5d4b04495502b326592c94a364bcd2cde65439ba
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Tue Jul 19 16:38:25 2016 +0200
kirkwood: clean up redundant variables in the image building code
Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
target/linux/kirkwood/image/Makefile | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile
index 5776c2e..a532b48 100644
--- a/target/linux/kirkwood/image/Makefile
+++ b/target/linux/kirkwood/image/Makefile
@@ -23,18 +23,20 @@ define Device/Default
KERNEL_NAME := zImage
KERNEL_SUFFIX := -uImage
KERNEL_INSTALL := 1
-endef
-define Device/dockstar
- DEVICE_DTS := kirkwood-dockstar
PAGESIZE := 2048
SUBPAGESIZE := 512
BLOCKSIZE := 128KiB
+ IMAGES := sysupgrade.tar
+ IMAGE/sysupgrade.tar := sysupgrade-nand
+endef
+
+define Device/dockstar
+ DEVICE_DTS := kirkwood-dockstar
FILESYSTEMS := squashfs
PROFILES := Generic DOCKSTAR
- IMAGES := factory.bin sysupgrade.tar
+ IMAGES += factory.bin
IMAGE/factory.bin := append-ubi
- IMAGE/sysupgrade.tar := sysupgrade-nand
KERNEL_IN_UBI := 1
KERNEL := kernel-bin | append-dtb
endef
@@ -53,28 +55,20 @@ endef
define Device/linksys-audi
DEVICE_DTS := kirkwood-linksys-audi
- PAGESIZE := 512
- SUBPAGESIZE := 256
- BLOCKSIZE := 16KiB
KERNEL_SIZE := 2624k
FILESYSTEMS := squashfs
PROFILES := Generic AUDI
- IMAGES := factory.bin sysupgrade.tar
+ IMAGES += factory.bin
IMAGE/factory.bin := append-kernel $$$$(KERNEL_SIZE) | append-ubi
- IMAGE/sysupgrade.tar := sysupgrade-nand
endef
define Device/linksys-viper
DEVICE_DTS := kirkwood-linksys-viper
- PAGESIZE := 2048
- SUBPAGESIZE := 512
- BLOCKSIZE := 128KiB
KERNEL_SIZE := 2688k
FILESYSTEMS := squashfs
PROFILES := Generic VIPER
- IMAGES := factory.bin sysupgrade.tar
+ IMAGES += factory.bin
IMAGE/factory.bin := append-kernel $$$$(KERNEL_SIZE) | append-ubi
- IMAGE/sysupgrade.tar := sysupgrade-nand
endef
define Image/BuildKernel/Template
More information about the lede-commits
mailing list