From patchwork Mon Jun 19 11:31:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 1796512 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=PUj/B3YY; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=I7xCNGyL; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Ql71N1sfQz20XQ for ; Mon, 19 Jun 2023 21:33:12 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=VNDShEi9rm6UZu8N6tQy+VdtipgZcSiK6wGTo8fcYpA=; b=PUj/B3YYI8dPLv p+aK3k/Y9+qR3w6CdZxCX702dGpKtj/wEYOllUf5VMrn5Wrk2w7H0b7IKCr8DgKySVpITNzXsWKye SFfNY6HBpy2BkABin8xMY25WaGc2Xjz8Rbk6pUKK2ZApVRWD6YIbVfH8z9riAemaAsvwRQIooe8b7 zWSONhAjDYqL/zeBeQg4R3f1HZm6khkwEoDqI/b1UOdBq2jINIRjh+Traajdw/dxRmlVQj0nowcPI qglvlPpuo4S7OhaUbG9AnqVcLOrTOiII8rmhRNyLaa0k1arBUUf1EyG9IGjuaMBFWUXSxASkH871F DdmrRJ4uW6sqVnHcnwcA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qBD6Y-008MOo-1D; Mon, 19 Jun 2023 11:31:30 +0000 Received: from mail-lf1-x131.google.com ([2a00:1450:4864:20::131]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qBD6U-008MN2-0q for openwrt-devel@lists.openwrt.org; Mon, 19 Jun 2023 11:31:27 +0000 Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-4f63006b4e3so4352421e87.1 for ; Mon, 19 Jun 2023 04:31:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687174284; x=1689766284; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TlU3JDoRqbUBjU/CQviWSUlIsB1BtpzeAP2GPGDnkYc=; b=I7xCNGyLLxB1yZLtOrWQmu5ZVA3W8wXg3Ckgbg8jr/e7toCdSpCa9wteXzyzmb43J/ FU9ZP0uJODzpQitevrEVE4bSEtpvEyW54dY8Obizwih4KUMIwGhYqxfD1Bkdh9li7pkb rKHV1pcV+US4bT+DLGirX+TcgcMSETPJMlUOjnIvVeeJL2t+rVn/tPwk0irBRUd4e768 R4XGC7fgi1QIZFrkpou/X3ApTaTNucud7IjVkBOjKS4NbNW5Vl4asyoOTX5IzUXP3RBq tvuMotEV6DdVxn2e5jdK3xHn4cxQLjhtw8/7UotBzjw5mw0byUqQdccgqqEOi8oBzJdB ljlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687174284; x=1689766284; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TlU3JDoRqbUBjU/CQviWSUlIsB1BtpzeAP2GPGDnkYc=; b=akUfTnD1kONQFR25FHUBGiGHycCk1wMpv5MLPoJdUEmj9IjywchNdBshmja5rthCdk tfcC9XKOSSea8T10nvyxw8x+dSz2j+jF5cQbrXLe5zHFuMkHH/B2bX2CAxb0FuHWwPSf ZKPZ04mKimTpGQopGMVugl3OseVfQCLm88yDOF+nidDIB5gGpVIYXi6Exn1MwTc33FBC Lwb/+sRnvLBbFhJBNC2nAxYMvrc+/q0CjaUF0dPvRS/zAgJognO/fn2FdV1RL2h9b50T ltTeJMQm3+34KpwalCkPzV/5BCemjFqxl6XHBotuWStOlPAZ39+dsSFR9zHzEtNLy1b9 /Hsw== X-Gm-Message-State: AC+VfDzD0XBbzXvVamYsA1civit+s9G0xapa3n4Uy0XGThq+VqvoRA5z NoKGbxfKxNA5r36mndigZt0GVQ== X-Google-Smtp-Source: ACHHUZ7mzFyS/yhcxaHLGMI4Hr8jpxmJgW99/VBLO4p1Crxq0MD+gMEhRviF2V7CCqXBUPJgcQC08g== X-Received: by 2002:a19:9211:0:b0:4f8:5b23:5287 with SMTP id u17-20020a199211000000b004f85b235287mr4383913lfd.62.1687174283891; Mon, 19 Jun 2023 04:31:23 -0700 (PDT) Received: from Fecusia.lan (c-05d8225c.014-348-6c756e10.bbcust.telenor.se. [92.34.216.5]) by smtp.gmail.com with ESMTPSA id i25-20020ac25239000000b004f8571275a4sm1416273lfl.96.2023.06.19.04.31.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 04:31:23 -0700 (PDT) From: Linus Walleij To: Imre Kaloz , Krzysztof Halasa Cc: openwrt-devel@lists.openwrt.org, Linus Walleij Subject: [PATCH 1/5] boot/apex: Restore the APEX boot loader Date: Mon, 19 Jun 2023 13:31:02 +0200 Message-Id: <20230619113106.2653595-2-linus.walleij@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230619113106.2653595-1-linus.walleij@linaro.org> References: <20230619113106.2653595-1-linus.walleij@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230619_043126_298168_F3AA87A7 X-CRM114-Status: GOOD ( 15.19 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: This is a partial revert of the deletion of the IXP4xx target: we restore the APEX boot loader so we can use it for the NSLU2 and related targets. The APEX upstream is as dead as it gets so I have applied OpenWrts old patches on top of the never released v1.6.10 version and forked it into an OpenWrt variant on GitHub. If the upstream comes back [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:131 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's 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_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List 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 is a partial revert of the deletion of the IXP4xx target: we restore the APEX boot loader so we can use it for the NSLU2 and related targets. The APEX upstream is as dead as it gets so I have applied OpenWrts old patches on top of the never released v1.6.10 version and forked it into an OpenWrt variant on GitHub. If the upstream comes back alive I will happily switch over to it. The file refers to the external GitHub, I suppose when integrating this patch the file should be copied to OpenWrts file repository and the file link changed. Signed-off-by: Linus Walleij --- package/boot/apex/Makefile | 61 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 package/boot/apex/Makefile diff --git a/package/boot/apex/Makefile b/package/boot/apex/Makefile new file mode 100644 index 000000000000..f4ce5811b024 --- /dev/null +++ b/package/boot/apex/Makefile @@ -0,0 +1,61 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Copyright (C) 2006-2023 OpenWrt.org + +include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/kernel.mk + +PKG_NAME:=apex +# This version was created from the stalled and unreleased v1.6.10 +# with some patches on top. +PKG_VERSION:=1.6.10-openwrt +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://github.com/linusw/apex/releases/download/v1.6.10-openwrt/ +PKG_HASH:=034baa99574014f4bcb8d36baf830fa942bef816b22e228eabd7c5663612c640 +PKG_TARGETS:=bin + +include $(INCLUDE_DIR)/package.mk + +export GCC_HONOUR_COPTS=s + +define Package/apex + SECTION:=boot + CATEGORY:=Boot Loaders + DEPENDS:=@TARGET_ixp4xx + DEFAULT:=y + TITLE:=Boot loader for NSLU2, FSG3, NAS100D and others +endef + +define build_apex + $(MAKE) -C $(PKG_BUILD_DIR) \ + ARCH=arm \ + $(1)_config + $(MAKE) -C $(PKG_BUILD_DIR) \ + $(TARGET_CONFIGURE_OPTS) \ + KBUILD_HAVE_NLS=no \ + ARCH=arm \ + clean all + $(INSTALL_BIN) $(PKG_BUILD_DIR)/apex.bin $(PKG_BUILD_DIR)/out/apex-$(2).bin +endef + +define Build/Compile + $(INSTALL_DIR) $(PKG_BUILD_DIR)/out + $(call build_apex,openwrt-nslu2-armeb,nslu2-armeb) + $(call build_apex,openwrt-nslu2-16mb-armeb,nslu2-16mb-armeb) + $(call build_apex,openwrt-fsg3-armeb,fsg3-armeb) + $(call build_apex,openwrt-nas100d-armeb,nas100d-armeb) +endef + +define Package/apex/install + $(INSTALL_DIR) $(STAGING_DIR)/apex + $(CP) $(PKG_BUILD_DIR)/out/*.bin $(1)/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(STAGING_DIR_IMAGE) + $(CP) $(PKG_BUILD_DIR)/out/*.bin $(STAGING_DIR_IMAGE)/ +endef + +$(eval $(call BuildPackage,apex))