From patchwork Wed Oct 4 23:14:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sandeep Sheriker X-Patchwork-Id: 821504 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="B5i3sI6g"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3y6sJP0wscz9s2G for ; Thu, 5 Oct 2017 10:17:57 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-ID:Date:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=UQt8Uqiw3HJgyDc0ghp/ehGnoKq15MO2I0vK4pXrRyM=; b=B5i3sI6g1i0mKkO+L8E7smGXZ2 r2AE7/kAEiz4Md9cgr3dxDmMfPW/8afKxneAgbGEriiJFwp4el4texd8+G6PQHUyfOnCRO+iIHqRk 6MSiTbNvunda7cLZsJ64MhEuIX/jmU7W9rvmaVY5+ohvx6MGrUUVf3BSbMNpju6qi9SjzCmJeYfzn ekZi1Wf8Q7FXlcj3JkbnisXfQy1JzlgYrQpLbijiiGW7DleSPLS35fuc4lH4u2bmolgEbp7C9xZmJ e3sQ7xNagvrD//sgJ6c2bMJDaV4P/vB48omMIKIs5aCVHd6BhwxdcYToM9dfKAaY1TYdWx+B6s8b9 f5TaaIKg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dzsvE-0004Yi-CS; Wed, 04 Oct 2017 23:17:48 +0000 Received: from esa3.microchip.iphmx.com ([68.232.153.233]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dzssd-00017c-PP for lede-dev@lists.infradead.org; Wed, 04 Oct 2017 23:15:18 +0000 X-IronPort-AV: E=Sophos;i="5.42,478,1500966000"; d="scan'208";a="7625649" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa3.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 04 Oct 2017 16:14:29 -0700 Received: from sandeep-office.microchip.com (10.10.76.4) by chn-sv-exch07.mchp-main.com (10.10.76.108) with Microsoft SMTP Server id 14.3.352.0; Wed, 4 Oct 2017 16:14:29 -0700 From: Sandeep Sheriker Mallikarjun To: Date: Wed, 4 Oct 2017 16:14:56 -0700 Message-ID: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171004_161509_500720_EB5EAEF4 X-CRM114-Status: UNSURE ( 5.70 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [68.232.153.233 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Subject: [LEDE-DEV] [PATCH 3/3] at91: creating sdcard image for sama5 X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org creating sdcard image using gen_at91_sdcard_img.sh for sama5 platform and sdcard image partition layout is: P0: Boot (fat32) - Contains(at91bootstrap,u-boot,zImage & dtb) p1: Rootfs (ext4) Signed-off-by: Sandeep Sheriker Mallikarjun --- target/linux/at91/image/Makefile | 45 ++++++++++++++++++++++ .../image/gen_at91_sdcard_img.sh} | 9 +++-- target/linux/at91/image/sama5.mk | 3 ++ 3 files changed, 54 insertions(+), 3 deletions(-) copy target/linux/{omap/image/gen_omap_sdcard_img.sh => at91/image/gen_at91_sdcard_img.sh} (68%) diff --git a/target/linux/at91/image/Makefile b/target/linux/at91/image/Makefile index 9333709..628d3d8 100644 --- a/target/linux/at91/image/Makefile +++ b/target/linux/at91/image/Makefile @@ -9,6 +9,11 @@ include $(INCLUDE_DIR)/image.mk KERNEL_LOADADDR := 0x20008000 +AT91_SD_BOOT_PARTSIZE:= 64 +FAT32_BLOCK_SIZE:=1024 +FAT32_BLOCKS:=$(shell echo \ + $$(($(AT91_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE)))) + ifeq ($(SUBTARGET),legacy) include ./legacy.mk UBIFS_OPTS := -m 2048 -e 126KiB -c 2048 @@ -48,6 +53,46 @@ define Device/evaluation IMAGE/root.ubi := append-ubi endef +# $(CP) $(KDIR)/zImage \ +# $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE_SANITIZED)-zImage +define Build/at91-sdcard + rm -f $@.boot + mkfs.fat -C $@.boot $(FAT32_BLOCKS) + + mcopy -i $@.boot $(KDIR)/zImage ::zImage + + $(foreach dts,$(DEVICE_DTS), \ + mcopy -i $@.boot $(DTS_DIR)/$(dts).dtb \ + ::$(dts).dtb; \ + mcopy -i $@.boot \ + $(BIN_DIR)/u-boot-$(dts:at91-%=%)_mmc/u-boot.bin \ + ::u-boot.bin; \ + $(CP) $(BIN_DIR)/at91bootstrap-$(dts:at91-%=%)sd_uboot*/*.bin \ + $(BIN_DIR)/BOOT.bin; \ + mcopy -i $@.boot $(BIN_DIR)/BOOT.bin ::BOOT.bin;) + + ./gen_at91_sdcard_img.sh \ + $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img \ + $@.boot \ + $(KDIR)/root.ext4 \ + $(AT91_SD_BOOT_PARTSIZE) \ + $(CONFIG_TARGET_ROOTFS_PARTSIZE) + + gzip -nc9 $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img \ + > $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img.gz + + $(CP) $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img.gz \ + $(BIN_DIR)/ + + rm -f $(BIN_DIR)/BOOT.bin + rm -f $@.boot +endef + +define Device/evaluation-sdimage + IMAGES += sdcard.img.gz + IMAGE/sdcard.img.gz := at91-sdcard +endef + define Device/evaluation-zImage IMAGES += zImage IMAGE/zImage := install-zImage diff --git a/target/linux/omap/image/gen_omap_sdcard_img.sh b/target/linux/at91/image/gen_at91_sdcard_img.sh similarity index 68% copy from target/linux/omap/image/gen_omap_sdcard_img.sh copy to target/linux/at91/image/gen_at91_sdcard_img.sh index c2f2aad..16c76f0 100755 --- a/target/linux/omap/image/gen_omap_sdcard_img.sh +++ b/target/linux/at91/image/gen_at91_sdcard_img.sh @@ -9,7 +9,9 @@ set -x [ $# -eq 5 ] || { - echo "SYNTAX: $0 " + echo "SYNTAX: $0 \ + \ + " exit 1 } @@ -20,9 +22,10 @@ BOOTFSSIZE="$4" ROOTFSSIZE="$5" head=4 -sect=63 +sect=2048 -set `ptgen -o $OUTPUT -h $head -s $sect -l 1024 -t c -p ${BOOTFSSIZE}M -t 83 -p ${ROOTFSSIZE}M` +set `ptgen -o $OUTPUT -h $head -s $sect -l 1024 -t c -p \ + ${BOOTFSSIZE}M -t 83 -p ${ROOTFSSIZE}M` BOOTOFFSET="$(($1 / 512))" BOOTSIZE="$(($2 / 512))" diff --git a/target/linux/at91/image/sama5.mk b/target/linux/at91/image/sama5.mk index 1610815..7d32875 100644 --- a/target/linux/at91/image/sama5.mk +++ b/target/linux/at91/image/sama5.mk @@ -8,6 +8,7 @@ define Device/at91-sama5d3_xplained at91bootstrap-sama5d3_xplainedsd_uboot \ u-boot-sama5d3_xplained_mmc \ u-boot-sama5d3_xplained_nandflash + $(Device/evaluation-sdimage) endef TARGET_DEVICES += at91-sama5d3_xplained @@ -22,6 +23,7 @@ define Device/at91-sama5d2_xplained at91bootstrap-sama5d2_xplainedsd_uboot \ u-boot-sama5d2_xplained_mmc \ u-boot-sama5d2_xplained_spiflash + $(Device/evaluation-sdimage) endef TARGET_DEVICES += at91-sama5d2_xplained @@ -37,5 +39,6 @@ define Device/at91-sama5d4_xplained u-boot-sama5d4_xplained_mmc \ u-boot-sama5d4_xplained_nandflash \ u-boot-sama5d4_xplained_spiflash + $(Device/evaluation-sdimage) endef TARGET_DEVICES += at91-sama5d4_xplained