From patchwork Tue Jan 1 17:09:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 1019780 X-Patchwork-Delegate: chunkeey@googlemail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Pdfmb7Kp"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="p4I/tymd"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::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 43Tgf91SSCz9s7T for ; Wed, 2 Jan 2019 04:09:53 +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: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:In-Reply-To:References: List-Owner; bh=X1zcorluY6OWwpmFmGqpR8aw5IG0AAO3Vh/SuQ3JtZg=; b=Pdfmb7KpFVZ8aS 3GpPFJ0LtnFeFkMT6hnqXy2wbYlr+ofR1vX8iEnj9CtLX0FPa83v51Tf75bwg47BMUPQPmjUpBdDr byKd/pkB8+UJSh5Bv1Fq+lQQp4dSFj70krmqjwh2MrDKFpxzGJ9lCemnQ7KjOBQHS+N1LbouWgwxn BqqTNOw6e6oX7qnQ+MeaLfNzR2iBK+tI7JWUzYO6UFMF5OwC+Au+O8DGWVAztQMaEiNSvIhNXGh02 qV4OcOTwwy3QbB15C4hX8z7yFBimnhvzaZ65c0DN5mgr/cpjRr2G4r/NY2iCCvQR4QgIjosNWJbwj 3rwnjlegTNioW/VR5bIw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1geNY4-0007BH-Mo; Tue, 01 Jan 2019 17:09:48 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1geNXs-0006zm-5v for openwrt-devel@lists.openwrt.org; Tue, 01 Jan 2019 17:09:37 +0000 Received: by mail-wr1-x442.google.com with SMTP id 96so28546039wrb.2 for ; Tue, 01 Jan 2019 09:09:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=GmGdo28FiYKk7HbWnwQYtFXIFgFmjdbKZI30beatmPA=; b=p4I/tymdnRnYhZkfDL0JoyfTDk0K8rgD8p7BdnT3m6Qp/iftWG1OBu1Qo7+LXWl/q7 8HFu85rCgSf/Cy4xNS37ym7mFLFWLtnJJEclpetFBy9A5ks4ev/NlYPnC8N2OMzGkAVU +Lv8AhZE0pl/jBvxjGLl8ljhoBy67xQmn1Wb9/lh1cpMd0E9ItM7iSZAj8sD/fBPhpem 2f07GguG/pMUZZRx4UEp4OoArW9zjfaojpZiVu/whnq2qVpEzXzT7lJS5aVyTKz/POH4 RFMq3+/VZjKRYVVnilG3j5kU/As4XBV4d+IfqebEK3auvWXGgtU6vk0T4NX/BtRPJOMb C8TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=GmGdo28FiYKk7HbWnwQYtFXIFgFmjdbKZI30beatmPA=; b=XwDAgYw8r2ZoNf73DC/yM4OWBsSrcp5aKLv73jqYZ6Go4uYHXnqB6swV6zR95VfVac S/yfxMF2fCbotyzWl2uTAL5dyk7fjrv8SbaY9Trl70RfxP0XiWb/KJ+UDQiHvWEnbQsV kdFLanajL+8kY7YTCz3+1/UYy+NwqKmWCjOZA0omRHqIdBzfx6zTocWRW5IwzS9ell5N 2ZPDRq4DzMPnMlnlef5ioEkt6IKh/P7c1kOrMoiQPN+23DOcKrwQINZ5o9qjjSTcFP/X Sc9EDMyiq0G/JXNF8Cj1S3e9bfKT5bL8oB+S/ckJg4EAJ5hsrlLWlV6ezqAoBUlYazrV 1vwg== X-Gm-Message-State: AJcUukdy76/5lQyx6qoMYLqZuZMEwlCQ6n9gtfiQpB+tmh/R5f0JpvwP QpYCO8v9zoesgALh9JXfg5RY2hq9 X-Google-Smtp-Source: ALg8bN5gNL/z0CneX/aAKpxMbmkqc14W78+XJhRFRMR+FmY0jNjeBx50hNKuwi+0kRTAWuGmp5Jotg== X-Received: by 2002:adf:c888:: with SMTP id k8mr38646052wrh.6.1546362573646; Tue, 01 Jan 2019 09:09:33 -0800 (PST) Received: from debian64.daheim (p5B0D75FC.dip0.t-ipconnect.de. [91.13.117.252]) by smtp.gmail.com with ESMTPSA id j8sm94204671wmd.0.2019.01.01.09.09.32 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 Jan 2019 09:09:33 -0800 (PST) Received: from chuck by debian64.daheim with local (Exim 4.92-RC3) (envelope-from ) id 1geNXo-00006l-Fq for openwrt-devel@lists.openwrt.org; Tue, 01 Jan 2019 18:09:32 +0100 From: Christian Lamparter To: openwrt-devel@lists.openwrt.org Date: Tue, 1 Jan 2019 18:09:31 +0100 Message-Id: <20190101170932.373-1-chunkeey@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190101_090936_246423_614C7F90 X-CRM114-Status: GOOD ( 12.67 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:442 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (chunkeey[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [OpenWrt-Devel] [PATCH 1/2] brcm2708: boot-part feature integration X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This patch adds the boot-part feature which enables the brcm2708 target move from the custom boot partition size config option to the generic CONFIG_TARGET_KERNEL_PARTSIZE. Note: For people using custom images: Just like with CONFIG_TARGET_ROOTFS_PARTSIZE changing the value can cause sysupgrade to repartition the device! Make sure to have a backup in this case. Signed-off-by: Christian Lamparter --- config/Config-images.in | 1 + target/linux/brcm2708/Makefile | 2 +- target/linux/brcm2708/image/Config.in | 5 ----- target/linux/brcm2708/image/Makefile | 4 ++-- 4 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 target/linux/brcm2708/image/Config.in diff --git a/config/Config-images.in b/config/Config-images.in index 245aed098b..a0c7b7a94d 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -270,6 +270,7 @@ menu "Target Images" int "Kernel partition size (in MB)" depends on GRUB_IMAGES || USES_BOOT_PART default 8 if TARGET_apm821xx_sata + default 20 if TARGET_brcm2708 default 16 config TARGET_ROOTFS_PARTSIZE diff --git a/target/linux/brcm2708/Makefile b/target/linux/brcm2708/Makefile index f4dd86767c..11908f5c2f 100644 --- a/target/linux/brcm2708/Makefile +++ b/target/linux/brcm2708/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk ARCH:=arm BOARD:=brcm2708 BOARDNAME:=Broadcom BCM27xx -FEATURES:=ext4 audio usb usbgadget display gpio fpu squashfs rootfs-part +FEATURES:=ext4 audio usb usbgadget display gpio fpu squashfs rootfs-part boot-part MAINTAINER:=Álvaro Fernández Rojas SUBTARGETS:=bcm2708 bcm2709 bcm2710 diff --git a/target/linux/brcm2708/image/Config.in b/target/linux/brcm2708/image/Config.in deleted file mode 100644 index f7abd9d39d..0000000000 --- a/target/linux/brcm2708/image/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BRCM2708_SD_BOOT_PARTSIZE - int "Boot (SD Card) filesystem partition size (in MB)" - depends on TARGET_brcm2708 - default 20 - diff --git a/target/linux/brcm2708/image/Makefile b/target/linux/brcm2708/image/Makefile index f2d8cec326..cd00d7f394 100644 --- a/target/linux/brcm2708/image/Makefile +++ b/target/linux/brcm2708/image/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk FAT32_BLOCK_SIZE=1024 -FAT32_BLOCKS=$(shell echo $$(($(CONFIG_BRCM2708_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE)))) +FAT32_BLOCKS=$(shell echo $$(($(CONFIG_TARGET_KERNEL_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE)))) define Build/Compile $(CP) $(LINUX_DIR)/COPYING $(KDIR)/COPYING.linux @@ -44,7 +44,7 @@ endef define Build/sdcard-img ./gen_rpi_sdcard_img.sh $@ $@.boot $(IMAGE_ROOTFS) \ - $(CONFIG_BRCM2708_SD_BOOT_PARTSIZE) $(CONFIG_TARGET_ROOTFS_PARTSIZE) + $(CONFIG_TARGET_KERNEL_PARTSIZE) $(CONFIG_TARGET_ROOTFS_PARTSIZE) endef ### Devices ###