From patchwork Tue Oct 29 15:46:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Maciej Nowak X-Patchwork-Id: 2003841 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=o1sSNfP4; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256 header.s=desiato.20200630 header.b=Uo/3A24+; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=terefe.re header.i=@terefe.re header.a=rsa-sha256 header.s=default header.b=t/G1Hoa/; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XdHZ53kPqz1xxc for ; Wed, 30 Oct 2024 04:39:25 +1100 (AEDT) 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=3BwOwjmRlxEBo9kmjY5IbiHhqEb9LVgcP+wVK06Mj68=; b=o1sSNfP4UD/NFY M/5d8YkMbvJujCM28Wpc6FlDUBm6GKCRHXBixtJ0BpU8t07uwnf49c4DCP42YKcm9Zy3uFA2ddCll ty1fG5EMP9Aeh60lDosAPm/dqUCQCa7AE4CXecwL50m+N14zZM7kevwurHWAMHNuvPjgcu6wsfnQ8 wsbyhcy8xwA0ZjNzEGaM40ZMtB+1dfZR0YEoW1wZzp3gt/xIvrtaw6rmBrw+t1T6C++kyJtvCbtvY ZyQqj5nkTeyz/ZZXzOn7LJ8V/eCuEzNWAs/rXx0kzYyc7bp2X4vdSUzlH63Qobjx2MTDYgbOGNGOW VT3FCyjB+oARZf24tH8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t5qAP-0000000FJWf-27ex; Tue, 29 Oct 2024 17:38:05 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t5oov-0000000F4mQ-3zra for openwrt-devel@bombadil.infradead.org; Tue, 29 Oct 2024 16:11:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=iBSP7cr8C1TNVz+SsAySw/57t5okVnGrmJkOlhs4CcU=; b=Uo/3A24+6vJ8fp9e1cv1ZcfopN yMdLk/+zAycDhLUBXBehGCwfEMroMbFHx+9Kny0UQP8pIZUUcjce8YbIqB80dYUvzn9nVgd3h/Ei+ OtmXG2uOYCkNTLg4zka4y47BTVdrGhPdD3GlY5gMoX8uLxrqd/79z+iRFJ/LQmrW+V386oJ4rNWeI 6RsHzjhcbfBvlfbpewqtKFL/0nbvZAoS6zrSeqBZIy7Bdp/hAqSWkuLRYmTATX7CPti3yXCUe1L8h N8pZlOnyoEAiQR7YDjFok82irLNLZD8rkKGYZdDolSPQfYQwIgC6nXuwAhDz64T1ycpo5GZjCi1bV pKVX8k2w==; Received: from terefe.re ([2a04:52c0:101:a4a:0:ffff:5ff:60c8]) by desiato.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t5oor-00000009wku-1kId for openwrt-devel@lists.openwrt.org; Tue, 29 Oct 2024 16:11:48 +0000 Received: from localhost.localdomain (unknown [212.106.161.104]) by terefe.re (Postfix) with ESMTPSA id DFC9120302; Tue, 29 Oct 2024 17:11:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=terefe.re; s=default; t=1730218302; bh=y4t9XgsPo65FswA0D74XABnl1SIqz5AvKYQddKvC0fo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t/G1Hoa/4VDquFYjlm+m2gUqplOsmjojNmxixxJ1ltpp8H4ngLpkrAssPTIRA4V2l aXsjvdZKVw1ft9ME6OWm+k4JjF5FSkVKdRTCdhNNihk5oUg6Gr+n3GQeJhJ+vW6OqE DBetYE4YYLlBjwEggCAnVtIvLr3Vn2Fu6UZmwvlNUVCn+FljUo41iGJvyzfdW9lT/K kfaRexZX+vZvu5SdPs92MTMQZasCNCiArvvPJ7dUx5O519sKlSuCAPKuPL+62WfcSP aBinTcdV9BNGzZX8l1Vjno4e3b5syQjjUOvNN3n6Fn4QCvyDwOeyDXYG8JvfPUkVGS MxIDGprC2tAvw== From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Cc: Raylynn Knight , Koen Vandeputte , Tomasz Maciej Nowak Subject: [PATCH 02/14] tegra: rename generic subtarget to armv7 Date: Tue, 29 Oct 2024 16:46:55 +0100 Message-ID: <20241029161046.110403-3-tmn505@terefe.re> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241029161046.110403-1-tmn505@terefe.re> References: <20241029161046.110403-1-tmn505@terefe.re> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241029_161145_682355_BAC52A29 X-CRM114-Status: GOOD ( 11.60 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "desiato.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: From: Tomasz Maciej Nowak Preparation for new subtarget addition. Additionally drop BOOT_SCRIPT variable, since there's only single bootscript. Signed-off-by: Tomasz Maciej Nowak --- package/boot/uboot-tegra/Makefile | 2 +- target/linux/tegra/Makefile | 9 ++------- target/linux/tegra/armv7/target.mk | 9 +++++++++ target/lin [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -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 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 From: Tomasz Maciej Nowak Preparation for new subtarget addition. Additionally drop BOOT_SCRIPT variable, since there's only single bootscript. Signed-off-by: Tomasz Maciej Nowak --- package/boot/uboot-tegra/Makefile | 2 +- target/linux/tegra/Makefile | 9 ++------- target/linux/tegra/armv7/target.mk | 9 +++++++++ target/linux/tegra/generic/target.mk | 1 - target/linux/tegra/image/Makefile | 17 ++++------------- target/linux/tegra/image/armv7.mk | 9 +++++++++ .../{generic-bootscript => bootscript.txt} | 0 7 files changed, 25 insertions(+), 22 deletions(-) create mode 100644 target/linux/tegra/armv7/target.mk delete mode 100644 target/linux/tegra/generic/target.mk create mode 100644 target/linux/tegra/image/armv7.mk rename target/linux/tegra/image/{generic-bootscript => bootscript.txt} (100%) diff --git a/package/boot/uboot-tegra/Makefile b/package/boot/uboot-tegra/Makefile index a90008bbd1d3..11104920ffe4 100644 --- a/package/boot/uboot-tegra/Makefile +++ b/package/boot/uboot-tegra/Makefile @@ -20,7 +20,7 @@ include $(INCLUDE_DIR)/package.mk define U-Boot/Default BUILD_TARGET := tegra - BUILD_SUBTARGET := generic + BUILD_SUBTARGET := armv7 HIDDEN := y endef diff --git a/target/linux/tegra/Makefile b/target/linux/tegra/Makefile index b917ea909d66..433510e23d6a 100644 --- a/target/linux/tegra/Makefile +++ b/target/linux/tegra/Makefile @@ -1,23 +1,18 @@ # SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2017-2019 Tomasz Maciej Nowak +# Copyright (C) 2017-2024 Tomasz Maciej Nowak include $(TOPDIR)/rules.mk -ARCH := arm BOARD := tegra BOARDNAME := NVIDIA Tegra FEATURES := audio boot-part display ext4 fpu gpio pci pcie rootfs-part rtc squashfs usb -CPU_TYPE := cortex-a9 -CPU_SUBTYPE := vfpv3-d16 -SUBTARGETS := generic +SUBTARGETS := armv7 KERNEL_PATCHVER := 6.6 include $(INCLUDE_DIR)/target.mk -KERNELNAME := zImage dtbs - DEFAULT_PACKAGES += e2fsprogs mkf2fs partx-utils define Target/Description diff --git a/target/linux/tegra/armv7/target.mk b/target/linux/tegra/armv7/target.mk new file mode 100644 index 000000000000..ab7572f6eb15 --- /dev/null +++ b/target/linux/tegra/armv7/target.mk @@ -0,0 +1,9 @@ +ARCH := arm +BOARDNAME := NVIDIA Tegra ARMv7 +CPU_TYPE := cortex-a9 +CPU_SUBTYPE := vfpv3-d16 +KERNELNAME := zImage dtbs + +define Target/Description + Build firmware image for NVIDIA Tegra ARMv7 SoC devices. +endef diff --git a/target/linux/tegra/generic/target.mk b/target/linux/tegra/generic/target.mk deleted file mode 100644 index f5cb1fb19b94..000000000000 --- a/target/linux/tegra/generic/target.mk +++ /dev/null @@ -1 +0,0 @@ -BOARDNAME:=Generic diff --git a/target/linux/tegra/image/Makefile b/target/linux/tegra/image/Makefile index 96b095e64929..3b38fcdde684 100644 --- a/target/linux/tegra/image/Makefile +++ b/target/linux/tegra/image/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2017-2019 Tomasz Maciej Nowak +# Copyright (C) 2017-2024 Tomasz Maciej Nowak include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk @@ -14,7 +14,7 @@ define Build/tegra-sdcard $(CP) $(DEVICE_DTS_DIR)/*.dtb $@.boot) mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ -n '$(DEVICE_TITLE) OpenWrt bootscript' \ - -d $(BOOT_SCRIPT) \ + -d bootscript.txt \ $@.boot/boot.scr $(CP) $@ $@.rootfs @@ -28,10 +28,9 @@ define Build/tegra-sdcard $(if $(UBOOT),dd if=$(STAGING_DIR_IMAGE)/$(UBOOT).img of=$@ bs=512 skip=1 seek=1 conv=notrunc) endef -DEVICE_VARS += BOOT_SCRIPT UBOOT +DEVICE_VARS += UBOOT define Device/Default - BOOT_SCRIPT := generic-bootscript DEVICE_DTS_DIR := $$(DTS_DIR)/nvidia IMAGES := sdcard.img.gz IMAGE/sdcard.img.gz := append-rootfs | pad-extra 128k | tegra-sdcard | gzip | append-metadata @@ -40,14 +39,6 @@ define Device/Default PROFILES := Default endef -define Device/compulab_trimslice - DEVICE_VENDOR := CompuLab - DEVICE_MODEL := TrimSlice - DEVICE_DTS := tegra20-trimslice - DEVICE_PACKAGES := kmod-leds-gpio kmod-r8169 kmod-rt2800-usb \ - kmod-rtc-em3027 kmod-usb-hid kmod-usb-storage wpad-basic-mbedtls - UBOOT := trimslice-mmc -endef -TARGET_DEVICES += compulab_trimslice +include $(SUBTARGET).mk $(eval $(call BuildImage)) diff --git a/target/linux/tegra/image/armv7.mk b/target/linux/tegra/image/armv7.mk new file mode 100644 index 000000000000..24e8e7c14233 --- /dev/null +++ b/target/linux/tegra/image/armv7.mk @@ -0,0 +1,9 @@ +define Device/compulab_trimslice + DEVICE_VENDOR := CompuLab + DEVICE_MODEL := TrimSlice + DEVICE_DTS := tegra20-trimslice + DEVICE_PACKAGES := kmod-leds-gpio kmod-r8169 kmod-rt2800-usb \ + kmod-rtc-em3027 kmod-usb-hid kmod-usb-storage wpad-basic-mbedtls + UBOOT := trimslice-mmc +endef +TARGET_DEVICES += compulab_trimslice diff --git a/target/linux/tegra/image/generic-bootscript b/target/linux/tegra/image/bootscript.txt similarity index 100% rename from target/linux/tegra/image/generic-bootscript rename to target/linux/tegra/image/bootscript.txt