From patchwork Fri Dec 12 15:21:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 420516 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9DB7F1400E9 for ; Sat, 13 Dec 2014 02:26:43 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id B445D28C20E; Fri, 12 Dec 2014 16:23:48 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 07C3C28C1FA for ; Fri, 12 Dec 2014 16:23:20 +0100 (CET) X-policyd-weight: using cached result; rate:hard: -4.2 Received: from mail.free-electrons.com (down.free-electrons.com [37.187.137.238]) by arrakis.dune.hu (Postfix) with ESMTP for ; Fri, 12 Dec 2014 16:23:18 +0100 (CET) Received: by mail.free-electrons.com (Postfix, from userid 106) id 273A97FD; Fri, 12 Dec 2014 16:25:05 +0100 (CET) Received: from localhost (col31-4-88-188-83-94.fbx.proxad.net [88.188.83.94]) by mail.free-electrons.com (Postfix) with ESMTPSA id B1EC7717; Fri, 12 Dec 2014 16:25:04 +0100 (CET) From: Maxime Ripard To: Florian Fainelli , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Luka Perkov , Imre Kaloz Date: Fri, 12 Dec 2014 16:21:04 +0100 Message-Id: <1418397665-28828-5-git-send-email-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 2.2.0 In-Reply-To: <1418397665-28828-1-git-send-email-maxime.ripard@free-electrons.com> References: <1418397665-28828-1-git-send-email-maxime.ripard@free-electrons.com> Cc: Thomas Petazzoni , openwrt-devel@lists.openwrt.org Subject: [OpenWrt-Devel] [PATCH RFC 4/5] target: mvebu: Add a generic board X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Create a generic board relying on the board mechanism we just introduced. So far, the behaviour hasn't really changed, the same boards are supported, with the same options. Signed-off-by: Maxime Ripard --- target/linux/mvebu/boards/generic.mk | 18 ++++++++++++++++++ target/linux/mvebu/image/Makefile | 32 +++++++++++++++++++++----------- 2 files changed, 39 insertions(+), 11 deletions(-) create mode 100644 target/linux/mvebu/boards/generic.mk diff --git a/target/linux/mvebu/boards/generic.mk b/target/linux/mvebu/boards/generic.mk new file mode 100644 index 000000000000..e4ac20ecf473 --- /dev/null +++ b/target/linux/mvebu/boards/generic.mk @@ -0,0 +1,18 @@ +# +# Copyright (C) 2014 Maxime Ripard +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +GENERIC_UBI_OPTS = -m 2048 -p 128KiB -s 512 -O 2048 +GENERIC_DTB = \ + armada-370-db \ + armada-370-mirabox \ + armada-370-rd \ + armada-xp-db \ + armada-xp-gp \ + armada-xp-mamba \ + armada-xp-openblocks-ax3-4 + +$(eval $(call Board,GENERIC)) diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile index 0de7328515ca..d419d639cdf2 100644 --- a/target/linux/mvebu/image/Makefile +++ b/target/linux/mvebu/image/Makefile @@ -7,19 +7,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk -TARGET_DTBS := armada-xp-db armada-370-db armada-xp-openblocks-ax3-4 armada-370-mirabox \ - armada-370-rd armada-xp-gp armada-xp-mamba - LOADADDR:=0x00008000 JFFS2_BLOCKSIZE = 128k -UBIFS_OPTS = -F -m 2048 -e 124KiB -c 4096 -U -UBI_OPTS = -m 2048 -p 128KiB -s 512 -O 2048 - KDIR_TMP:=$(KDIR)/tmp - UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage define Image/Build/MkuImage @@ -35,7 +28,11 @@ define Image/Build/DTB endef define Image/BuildKernel - $(foreach dtb,$(TARGET_DTBS),$(call Image/Build/DTB,$(dtb))) + $(foreach board, \ + $(TARGET_BOARDS), \ + $(foreach dtb, \ + $($(board)_DTB), \ + $(call Image/Build/DTB,$(dtb)))) ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) $(call Image/Build/Initramfs) endif @@ -43,7 +40,12 @@ endef define Image/Build/squashfs $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) - $(foreach dtb,$(TARGET_DTBS),$(call Image/Build/UbinizeImage,$(dtb),,squashfs,$(UBI_OPTS));) + $(foreach board, \ + $(TARGET_BOARDS), \ + $(foreach dtb, \ + $($(board)_DTB), \ + $(call Image/Build/UbinizeImage,$(dtb),,squashfs, \ + $($(board)_UBI_OPTS));)) ( \ dd if=$(KDIR)/uImage-armada-xp-mamba bs=3072k conv=sync; \ dd if=$(BIN_DIR)/$(IMG_PREFIX)-armada-xp-mamba-squashfs-ubinized.bin \ @@ -52,7 +54,11 @@ define Image/Build/squashfs endef define Image/Build/Initramfs - $(foreach dtb,$(TARGET_DTBS),$(call Image/Build/DTB,$(dtb),-initramfs)) + $(foreach board, \ + $(TARGET_BOARDS), \ + $(foreach dtb, \ + $($(board)_DTB), \ + $(call Image/Build/DTB,$(dtb),-initramfs))) endef define BuildSysupgrade @@ -62,7 +68,11 @@ endef define Image/Build $(call Image/Build/$(1)) dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync - $(foreach dtb,$(TARGET_DTBS),$(call BuildSysupgrade,$(1),$(dtb));) + $(foreach board, \ + $(TARGET_BOARDS), \ + $(foreach dtb, \ + $($(board)_DTB), \ + $(call BuildSysupgrade,$(1),$(dtb));)) ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) $(call Image/Build/Initramfs) endif