hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mvebu: switch to the new image build code

Browse Source 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
master
Felix Fietkau 8 years ago
parent 60d2620253
commit 32727c409e
6 changed files with 127 additions and 405 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 356
      target/linux/mvebu/image/Makefile
  2. 17
      target/linux/mvebu/profiles/globalscale.mk
  3. 53
      target/linux/mvebu/profiles/linksys.mk
  4. 72
      target/linux/mvebu/profiles/marvell.mk
  5. 17
      target/linux/mvebu/profiles/plathome.mk
  6. 17
      target/linux/mvebu/profiles/solidrun.mk

356
target/linux/mvebu/image/Makefile
Unescape View File

@ -10,238 +10,136 @@ JFFS2_BLOCKSIZE = 128k
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk include $(INCLUDE_DIR)/image.mk
LOADADDR:=0x00008000 KERNEL_LOADADDR := 0x00008000
define Image/Build/DTB
cp $(KDIR)/zImage$(2) $(KDIR)/zImage$(2)-$(1);
cat $(DTS_DIR)/$(1).dtb >> $(KDIR)/zImage$(2)-$(1);
$(call Image/BuildKernel/MkuImage, \
none, $(LOADADDR), $(LOADADDR), \
$(KDIR)/zImage$(2)-$(1), $(KDIR)/uImage$(2)-$(1))
endef
# $(1): Profile Name
# $(2): DTB Name
# $(3): Erase Block Size
# $(4): Page Size
# $(5): Sub-Page Size (optional)
# $(6): VID offset (optional)
define NANDProfile
define Image/BuildKernel/Profile/$(1)
$(call Image/Build/DTB,$(2))
ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
$(call Image/Build/Profile,$(1)/Initramfs)
endif
endef
define Image/Build/Profile/$(1)/BuildSysupgrade
$(call Image/Build/SysupgradeNAND,$(2),$$(1),$(KDIR)/uImage-$(2))
endef
define Image/Build/Profile/$(1)/Initramfs
$(call Image/Build/DTB,$(2),-initramfs)
cp $(KDIR)/uImage-initramfs-$(2) $(BIN_DIR)/$(IMG_PREFIX)-$(2)-initramfs
endef
define Image/Build/Profile/$(1)/squashfs
$(call Image/Build/UbinizeImage,$(2),,squashfs, -p $(3) -m $(4) $(if $(5),-s $(5)) $(if $(6),-O $(6)))
endef
PROFILES_LIST += $(1)
endef
# $(1): Profile Name
# $(2): DTB Name
# $(3): Erase Block Size
define UBINORProfile
define Image/BuildKernel/Profile/$(1)
$(call Image/Build/DTB,$(2))
ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
$(call Image/Build/Profile,$(1)/Initramfs)
endif
endef
define Image/Build/Profile/$(1)/Initramfs
$(call Image/Build/DTB,$(2),-initramfs)
endef
define Image/Build/Profile/$(1)/squashfs
$(call Image/Build/UbinizeImage,$(2),,squashfs, -p $(3) -m 1)
endef
PROFILES_LIST += $(1)
endef
# $(1): Profile Name
# $(2): DTB Name
# $(3): Erase Block Size
define NORProfile
define Image/BuildKernel/Profile/$(1)
$(call Image/Build/DTB,$(2))
ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
$(call Image/Build/Profile,$(1)/Initramfs)
endif
endef
define Image/Build/Profile/$(1)/Initramfs
$(call Image/Build/DTB,$(2),-initramfs)
endef
define Image/Build/Profile/$(1)/squashfs
( \
dd if=$(KDIR)/uImage-$(2) bs=$(patsubst %KiB,%k,$(3)) conv=sync; \
dd if=$(KDIR)/root.squashfs bs=$(patsubst %KiB,%k,$(3)) conv=sync; \
) > $$(BIN_DIR)/$$(IMG_PREFIX)-$(2)-squashfs-firmware.bin
endef
PROFILES_LIST += $(1)
endef
# $(1): Profile Name
# $(2): DTB Name
define MMCProfile
define Image/BuildKernel/Profile/$(1)
$(call Image/Build/DTB,$(2))
cp $(KDIR)/zImage-$(2) $(BIN_DIR)/zImage-$(1);
cp $(DTS_DIR)/$(2).dtb $(BIN_DIR)/$(1).dtb;
ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
$(call Image/Build/Profile,$(1)/Initramfs)
endif
endef
define Image/Build/Profile/$(1)/Initramfs
$(call Image/Build/DTB,$(2),-initramfs)
cp $(KDIR)/uImage-initramfs-$(2) $(BIN_DIR)/$(IMG_PREFIX)-$(2)-initramfs
endef
PROFILES_LIST += $(1)
endef
# $(1): Profile Name
# $(2): Sub Profiles list
define MultiProfile
define Image/BuildKernel/Profile/$(1)
$(foreach profile, $(2),
$(call Image/BuildKernel/Profile/$(profile)))
endef
define Image/Build/Profile/$(1)/BuildSysupgrade
$(foreach profile, $(2),
$(call Image/Build/Profile/$(profile)/BuildSysupgrade,$$(1)))
endef
define Image/Build/Profile/$(1)/Initramfs
$(foreach profile, $(2),
$(call Image/Build/Profile/$(profile)/Initramfs))
endef
define Image/Build/Profile/$(1)/squashfs
$(foreach profile, $(2),
$(call Image/Build/Profile/$(profile)/squashfs))
endef
endef
# Boards with NAND, without subpages
$(eval $(call NANDProfile,370-DB,armada-370-db,512KiB,4096))
$(eval $(call NANDProfile,370-RD,armada-370-rd,512KiB,4096))
$(eval $(call NANDProfile,385-DB-AP,armada-385-db-ap,256KiB,4096))
$(eval $(call NANDProfile,Mirabox,armada-370-mirabox,512KiB,4096))
$(eval $(call NANDProfile,XP-DB,armada-xp-db,512KiB,4096))
$(eval $(call NANDProfile,XP-GP,armada-xp-gp,512KiB,4096))
# Boards with NAND, with subpages
$(eval $(call NANDProfile,Mamba,armada-xp-linksys-mamba,128KiB,2048,512,2048))
$(eval $(call NANDProfile,Caiman,armada-385-linksys-caiman,128KiB,2048,512,2048))
$(eval $(call NANDProfile,Cobra,armada-385-linksys-cobra,128KiB,2048,512,2048))
$(eval $(call NANDProfile,Shelby,armada-385-linksys-shelby,128KiB,2048,512,2048))
# Boards with large NOR, where we want to use UBI
$(eval $(call UBINORProfile,OpenBlocks-AX-3-4,armada-xp-openblocks-ax3-4,128KiB))
# Boards with small NOR, where UBI doesn't make sense
$(eval $(call NORProfile,388-RD,armada-388-rd,256KiB))
$(eval $(call MMCProfile,Solidrun-Clearfog-A1,armada-388-clearfog))
###
### Linksys
###
# Caiman: Linksys WRT1200AC
define Image/Build/Profile/Caiman/squashfs
$(call Image/Build/UbinizeImage,armada-385-linksys-caiman,,squashfs, -p 128KiB -m 2048 -s 512 -O 2048)
( \
dd if=$(KDIR)/uImage-armada-385-linksys-caiman bs=6144k conv=sync; \
dd if=$(KDIR)/$(IMG_PREFIX)-armada-385-linksys-caiman-squashfs-ubinized.bin \
bs=2048 conv=sync; \
) > $(BIN_DIR)/$(IMG_PREFIX)-armada-385-linksys-caiman-squashfs-factory.img
endef
# Cobra: Linksys WRT1900ACv2
define Image/Build/Profile/Cobra/squashfs
$(call Image/Build/UbinizeImage,armada-385-linksys-cobra,,squashfs, -p 128KiB -m 2048 -s 512 -O 2048)
( \
dd if=$(KDIR)/uImage-armada-385-linksys-cobra bs=6144k conv=sync; \
dd if=$(KDIR)/$(IMG_PREFIX)-armada-385-linksys-cobra-squashfs-ubinized.bin \
bs=2048 conv=sync; \
) > $(BIN_DIR)/$(IMG_PREFIX)-armada-385-linksys-cobra-squashfs-factory.img
endef
# Mamba: Linksys WRT1900AC
define Image/Build/Profile/Mamba/squashfs
$(call Image/Build/UbinizeImage,armada-xp-linksys-mamba,,squashfs, -p 128KiB -m 2048 -s 512 -O 2048)
( \
dd if=$(KDIR)/uImage-armada-xp-linksys-mamba bs=3072k conv=sync; \
dd if=$(KDIR)/$(IMG_PREFIX)-armada-xp-linksys-mamba-squashfs-ubinized.bin \
bs=2048 conv=sync; \
) > $(BIN_DIR)/$(IMG_PREFIX)-armada-xp-linksys-mamba-squashfs-factory.img
endef
# Shelby: Linksys WRT1900ACS
define Image/Build/Profile/Shelby/squashfs
$(call Image/Build/UbinizeImage,armada-385-linksys-shelby,,squashfs, -p 128KiB -m 2048 -s 512 -O 2048)
( \
dd if=$(KDIR)/uImage-armada-385-linksys-shelby bs=6144k conv=sync; \
dd if=$(KDIR)/$(IMG_PREFIX)-armada-385-linksys-shelby-squashfs-ubinized.bin \
bs=2048 conv=sync; \
) > $(BIN_DIR)/$(IMG_PREFIX)-armada-385-linksys-shelby-squashfs-factory.img
endef
###
### Marvell
###
# Marvell Armada 385 Access Point Development board (DB-88F6820-AP)
define Image/Build/Profile/385-DB-AP/squashfs
$(call Image/Build/UbinizeImage,armada-385-db-ap,,squashfs, -p 256KiB -m 4096)
( \
dd if=$(KDIR)/uImage-armada-385-db-ap bs=8M conv=sync; \
dd if=$(KDIR)/$(IMG_PREFIX)-armada-385-db-ap-squashfs-ubinized.bin \
bs=4096 conv=sync; \
) > $(BIN_DIR)/$(IMG_PREFIX)-armada-385-db-ap-squashfs-factory.img
endef
# The Default profile should build everything
$(eval $(call MultiProfile,Default,$(PROFILES_LIST)))
define Image/BuildKernel DEVICE_VARS += KERNEL_SIZE
$(call Image/BuildKernel/Profile/$(PROFILE))
endef
define Image/Build/squashfs define Device/Default
# Align the squashfs image size before calling the profiles, DEVICE_DTS := $(1)
# otherwise the size would keep growing BOARD_NAME = $$(DEVICE_DTS)
$(call prepare_generic_squashfs,$(KDIR)/root.squashfs) KERNEL_NAME := zImage
$(call Image/Build/Profile/$(PROFILE)/squashfs) KERNEL := kernel-bin | append-dtb | uImage none
endef endef
define Image/Build define Device/UBI
$(call Image/Build/$(1)) IMAGES := sysupgrade.bin
$(call Image/Build/Profile/$(PROFILE)/BuildSysupgrade,$(1)) IMAGE/sysupgrade.bin := sysupgrade-nand
ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) endef
$(call Image/Build/Profile/$(PROFILE)/Initramfs)
endif define Device/UBI-factory
$(Device/UBI)
IMAGES += factory.img
IMAGE/factory.img := append-kernel $$$$(KERNEL_SIZE) | append-ubi | pad-to $$$$(PAGESIZE)
endef
define Device/NAND-128K
$(Device/UBI)
BLOCKSIZE := 128KiB
PAGESIZE := 2048
SUBPAGESIZE := 512
VID_HDR_OFFSET := 2048
endef
define Device/NAND-256K
$(Device/UBI)
BLOCKSIZE := 256KiB
PAGESIZE := 4096
endef
define Device/NAND-512K
$(Device/UBI)
BLOCKSIZE := 512KiB
PAGESIZE := 4096
endef
define Device/linksys
DEVICE_TITLE := Linksys $(1)
DEVICE_PACKAGES := kmod-mwlwifi wpad-mini swconfig
endef
define Device/armada-385-linksys
$(Device/NAND-128K)
$(Device/UBI-factory)
KERNEL_SIZE := 6144k
endef
define Device/linksys-wrt1200ac
$(call Device/linksys,WRT1200AC (Caiman))
$(Device/armada-385-linksys)
DEVICE_DTS := armada-385-linksys-caiman
endef
TARGET_DEVICES += linksys-wrt1200ac
define Device/linksys-wrt1900acv2
$(call Device/linksys,WRT1900ACv2 (Cobra))
$(Device/armada-385-linksys)
DEVICE_DTS := armada-385-linksys-cobra
endef
TARGET_DEVICES += linksys-wrt1900acv2
define Device/linksys-wrt1900acs
$(call Device/linksys,WRT1900ACS (Shelby))
$(Device/armada-385-linksys)
DEVICE_DTS := armada-385-linksys-shelby
endef
TARGET_DEVICES += linksys-wrt1900acs
define Device/linksys-wrt1900ac
$(call Device/linksys,WRT1900AC (Mamba))
DEVICE_DTS := armada-xp-linksys-mamba
$(Device/NAND-128K)
$(Device/UBI-factory)
KERNEL_SIZE := 3072k
endef
TARGET_DEVICES += linksys-wrt1900ac
define Device/openblocks-ax3
$(Device/UBI-factory)
DEVICE_DTS := armada-xp-openblocks-ax3-4
BLOCKSIZE := 128KiB
PAGESIZE := 1
IMAGE/factory.img := append-kernel $$$$(KERNEL_SIZE) | append-ubi
DEVICE_TITLE := Plat'Home OpenBlocks AX3
endef
TARGET_DEVICES += openblocks-ax3
define Device/armada-385-db-ap
$(Device/NAND-256K)
$(Device/UBI-factory)
KERNEL_SIZE := 8192k
DEVICE_TITLE := Marvell Armada 385 DB AP (DB-88F6820-AP)
endef
TARGET_DEVICES += armada-385-db-ap
define Device/marvell-nand
$(Device/NAND-512K)
DEVICE_TITLE := Marvell Armada $(1)
endef
Device/armada-370-db = $(call Device/marvell-nand,370 DB (DB-88F6710-BP-DDR3))
Device/armada-370-rd = $(call Device/marvell-nand,370 RD (RD-88F6710-A1))
Device/armada-xp-db = $(call Device/marvell-nand,XP DB (DB-78460-BP))
Device/armada-xp-gp = $(call Device/marvell-nand,XP GP (DB-MV784MP-GP))
TARGET_DEVICES += armada-370-db armada-370-rd armada-xp-db armada-xp-gp
define Device/armada-388-rd
DEVICE_TITLE := Marvell Armada 388 RD (RD-88F6820-AP)
IMAGES := firmware.bin
IMAGE/firmware.bin := append-kernel 256k | append-rootfs | pad-rootfs
endef
TARGET_DEVICES += armada-388-rd
define Device/armada-388-clearfog
KERNEL_INSTALL := 1
DEVICE_TITLE := SolidRun ClearFog
endef
TARGET_DEVICES += armada-388-clearfog
define Device/globalscale-mirabox
$(Device/NAND-512K)
DEVICE_DTS := armada-370-mirabox
DEVICE_TITLE := Globalscale Mirabox
endef endef
TARGET_DEVICES += globalscale-mirabox
$(eval $(call BuildImage)) $(eval $(call BuildImage))

17
target/linux/mvebu/profiles/globalscale.mk
Unescape View File

@ -1,17 +0,0 @@
#
# Copyright (C) 2015 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
define Profile/Mirabox
NAME:=Globalscale Mirabox
PACKAGES:=
endef
define Profile/Mirabox/Description
Package set compatible with the Globalscale Mirabox.
endef
$(eval $(call Profile,Mirabox))

53
target/linux/mvebu/profiles/linksys.mk
Unescape View File

@ -1,53 +0,0 @@
#
# Copyright (C) 2013-2015 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
define Profile/Caiman
NAME:=Linksys WRT1200AC (Caiman)
PACKAGES:= kmod-mwlwifi wpad-mini swconfig
endef
define Profile/Caiman/Description
Package set compatible with the Linksys WRT1200AC (Caiman).
endef
$(eval $(call Profile,Caiman))
define Profile/Cobra
NAME:=Linksys WRT1900ACv2 (Cobra)
PACKAGES:= kmod-mwlwifi wpad-mini swconfig
endef
define Profile/Cobra/Description
Package set compatible with the Linksys WRT1900AC (Cobra).
endef
$(eval $(call Profile,Cobra))
define Profile/Mamba
NAME:=Linksys WRT1900AC (Mamba)
PACKAGES:= kmod-mwlwifi wpad-mini swconfig
endef
define Profile/Mamba/Description
Package set compatible with the Linksys WRT1900AC (Mamba).
endef
$(eval $(call Profile,Mamba))
define Profile/Shelby
NAME:=Linksys WRT1900ACS (Shelby)
PACKAGES:= kmod-mwlwifi wpad-mini swconfig
endef
define Profile/Shelby/Description
Package set compatible with the Linksys WRT1900ACS (Shelby).
endef
$(eval $(call Profile,Shelby))

72
target/linux/mvebu/profiles/marvell.mk
Unescape View File

@ -1,72 +0,0 @@
#
# Copyright (C) 2013-2015 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
define Profile/370-DB
NAME:=Marvell Armada 370 DB (DB-88F6710-BP-DDR3)
PACKAGES:=
endef
define Profile/370-DB/Description
Package set compatible with the Armada 370 evaluation board (DB-88F6710-BP-DDR3).
endef
$(eval $(call Profile,370-DB))
define Profile/370-RD
NAME:=Marvell Armada 370 RD (RD-88F6710-A1)
PACKAGES:=
endef
define Profile/370-RD/Description
Package set compatible with the Armada 370 reference design board (RD-88F6710-A1).
endef
$(eval $(call Profile,370-RD))
define Profile/385-RD
NAME:=Marvell Armada 385 RD (RD-88F6820-AP)
PACKAGES:=
endef
define Profile/385-RD/Description
Package set compatible with the Armada 385 reference design board (RD-88F6820-AP).
endef
$(eval $(call Profile,385-RD))
define Profile/385-DB-AP
NAME:=Marvell Armada 385 DB AP (DB-88F6820-AP)
PACKAGES:=
endef
define Profile/385-DB-AP/Description
Package set compatible with the Armada 385 access point development board (DB-88F6820-AP).
endef
$(eval $(call Profile,385-DB-AP))
define Profile/XP-DB
NAME:=Marvell Armada XP DB (DB-78460-BP)
PACKAGES:=
endef
define Profile/XP-DB/Description
Package set compatible with the Marvell Armada XP evaluation board (DB-78460-BP).
endef
$(eval $(call Profile,XP-DB))
define Profile/XP-GP
NAME:=Marvell Armada XP GP (DB-MV784MP-GP)
PACKAGES:=
endef
define Profile/XP-GP/Description
Package set compatible with the Armada XP development board (DB-MV784MP-GP).
endef
$(eval $(call Profile,XP-GP))

17
target/linux/mvebu/profiles/plathome.mk
Unescape View File

@ -1,17 +0,0 @@
#
# Copyright (C) 2015 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
define Profile/OpenBlocks-AX-3-4
NAME:=Plat'Home OpenBlocks AX3
PACKAGES:=
endef
define Profile/OpenBlocks-AX-3-4/Description
Package set compatible with the Plat'Home OpenBlocks AX3.
endef
$(eval $(call Profile,OpenBlocks-AX-3-4))

17
target/linux/mvebu/profiles/solidrun.mk
Unescape View File

@ -1,17 +0,0 @@
#
# Copyright (C) 2016 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
define Profile/Solidrun-Clearfog-A1
NAME:=SolidRun ClearFog A1 board
PACKAGES:=
endef
define Profile/Solidrun-Clearfog-A1/Description
Package set compatible with the SolidRun ClearFog A1 board
endef
$(eval $(call Profile,Solidrun-Clearfog-A1))
Write Preview
Loading…
Cancel
Save