From patchwork Mon Oct 23 12:41:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 737245 Delivered-To: patch@linaro.org Received: by 2002:adf:dd81:0:b0:32d:baff:b0ca with SMTP id x1csp1504391wrl; Mon, 23 Oct 2023 05:42:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF8i18yhoBwavLFV15RMIJmAs24fOx83wjXhxrNyj8uOBs69dDGKnzU9n45E6RL2Qlu83Y/ X-Received: by 2002:a05:600c:4594:b0:405:39b4:313e with SMTP id r20-20020a05600c459400b0040539b4313emr7233014wmo.13.1698064935502; Mon, 23 Oct 2023 05:42:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698064935; cv=none; d=google.com; s=arc-20160816; b=pJqwHtin3zA+OCMXNRu66EPJLwpePLjP32lUA6e09/S7SfKGvR4cFXkIJ8ZVQ2Bfvr wTemJ+tXPS4WqWOCLbj83JN9hYJ2Sflj51ymerNCIqYjLGQ2n+eRm3DsC/fopLjz/VFQ 2H+k5OjTlggGmOWrUxaEAcpCQtAcnO1pHB6BH3KSeHhkY8q/rVCHumpJKTYwOr4PR4e+ qUaqIBTagL6yMd9bZtsGSd2tnlJ5EUranSiO6wETVP3NKIIDzHPTXfycSKSnAwHpjN/O Maq7UHdWiv/sU5Vj737kPajqsKQCr/UNH5fbshj7Hocd28DctMsYGsWeI2eUHAlAm09x 9DTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:cc:to:in-reply-to:references :message-id:content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=w2Gm2qW8CI3twfeJwFyfYbSo2l9H9vkxemh5kc2EPnw=; fh=isopec8cbUWZAQZ5l6JxzGY97UU9PoBfO9QnF/c8t60=; b=S/0Lyc/G8ZAKdi9tO5HCevxiVas5/9D/CQMXOGjoGAy8YCvweemWDSVj3w7bnLHzWe /erPnGxHeHnEScgWZEwR+glUsPe3hZdN0K7Sy8SJ4wGrsnlPbu/xiJLRsFwVkfHKMYF2 iCNc5+i1ymK1v7qz5YADtdvd1HBRQi9lAf8KeP8QjJjyMOWI2XwGRSAULAeGjQVUQlSZ 1UvpBU3bhHmcmFjxakZ1oq8BGoG9ZHJpdQoSA0b4kM5fqItvn0WQ4zQNuj2MIjnsuVGM +lSPGx7EGb/ybF8JxlY3bF/p7vpIVGl0xVG7EO8DiYFph4n0qlexL9ImJn9KkzBjTjpG RWDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="b/vCbcoW"; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id 21-20020a05600c029500b0040563e1fa62si5323528wmk.173.2023.10.23.05.42.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 05:42:15 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="b/vCbcoW"; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9A5EB878DD; Mon, 23 Oct 2023 14:41:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="b/vCbcoW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CF663878D6; Mon, 23 Oct 2023 14:41:53 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1B32B878C0 for ; Mon, 23 Oct 2023 14:41:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=neil.armstrong@linaro.org Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-4083f613275so26842795e9.2 for ; Mon, 23 Oct 2023 05:41:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698064906; x=1698669706; darn=lists.denx.de; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=w2Gm2qW8CI3twfeJwFyfYbSo2l9H9vkxemh5kc2EPnw=; b=b/vCbcoWtlEpglopxzWDEGqcYYSg/oVuIN6HLkvzRZPOe+b11WESgQmFKoriTeyisZ XNDNLJD45I0j1Qg3K+mTBGKkPYHA4iboaSuIxZLlaR/OHs+lFfHHBo5xga9n2e/XyutV wN+yjosZQgR9iN9xLw1sduVlryXzQ1xIRJ+MgJxfNGYBazDPjahAlVw29+X2ZOTtVoS/ ihY4q7LuK1+rljYwKY4sgBF2c76YOyf4sCvaviMLi6OF6ldbaiJ+P+WyIeAKiiTUzNJK 6Q5R4zhMGfEz2sshm1zWtz7WREjvVYvnh5Dcum5lyv3Ne0FxpZn6jUHXPXEkoZF3HPfl Iidw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698064906; x=1698669706; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w2Gm2qW8CI3twfeJwFyfYbSo2l9H9vkxemh5kc2EPnw=; b=jBqo+xKu1F9OtiQBmUykH+LHIB879xSVBFAaFu6lW6KQ9Kr5BGbx6aeKHB5Eqba5cd VNQQJ55CFW98Lr+5L62wKuQqT5F6GUz74qOqXs+aIFL0pS2CxilYZcqXM8m5l/lTlKUB 4bwiI1/SM3YHKpoETS9uWyv3kNt7R4TqmcW0L5uuNq45y/8MOi/nNEc09PkeoyrMYbe2 oGjZMlGJFyMfVNRjKmAU12XMtETL461JIJT3gsyFqIRGpfWTwlgHAlGxUn8mITt5p6Gb x7ttfia2QN84dJaXGBouATKXsoMcSKXT7lhYajZafnpOcAYqAUfYs/3PP9xMXYHJet/q u7ig== X-Gm-Message-State: AOJu0YwofaVDfkf+ogynpb2zUwo+9AKfgPCyd0ih+3xgOTX/UdtXzkZ4 GY6yN8HUSSF5O0OQO+Le6OiG7A== X-Received: by 2002:a05:600c:6027:b0:405:3b1f:968b with SMTP id az39-20020a05600c602700b004053b1f968bmr6825481wmb.21.1698064906592; Mon, 23 Oct 2023 05:41:46 -0700 (PDT) Received: from [127.0.1.1] ([2a01:e0a:982:cbb0:a36e:a5d9:26ae:74b1]) by smtp.gmail.com with ESMTPSA id h14-20020a05600c314e00b003fbe4cecc3bsm14230609wmo.16.2023.10.23.05.41.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 05:41:46 -0700 (PDT) From: Neil Armstrong Date: Mon, 23 Oct 2023 14:41:35 +0200 Subject: [PATCH 2/4] configs: meson64: declare addr out of EXTRA_ENV_SETTINGS MIME-Version: 1.0 Message-Id: <20231023-usb-dfu-boot-v1-2-df9d121c67c1@linaro.org> References: <20231023-usb-dfu-boot-v1-0-df9d121c67c1@linaro.org> In-Reply-To: <20231023-usb-dfu-boot-v1-0-df9d121c67c1@linaro.org> To: Christian Hewitt , Vyacheslav Bocharov , Beniamino Galvani Cc: u-boot-amlogic@groups.io, u-boot@lists.denx.de, Neil Armstrong X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1772; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=50KIZnOqvNzyxzkIO5HCZht4MBGtQOUqUQcQnYWKgpw=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBlNmoHpp7oRpJjFZoQi+Crxg6Cdc3af8kT8WQTv /1AZ9SWXWWJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZTZqBwAKCRB33NvayMhJ 0TFrEAC/1le8pWwL2IYcWgdgmvOrCVZiskwAFTirGqTAZFaA9f3+IMV57qmITu3XtbJWixIYWWX yGYD2xcvlAr9Xtz007Thb6/BPtKknJdPaD4ayTPBGaZmganiTggqc6oyacR0aoRZZEIcBhtgZXB v4GWOqNhHmTJKFEnPlKRov+/dh1BpSeD8lfjeaweQRE34G5kbXCDlxt336dnPBTasH/k8fZeE5N bTjMTj6EMkQRpuYZ2OvINLawkRyPAMBe3EH8ObZL5ygopwoHaqxyqn0ba+pr6mkhjFS400Brn41 dhZzMdKMjSJFfJGyhFV/X7DbGfpBU3nBf48Y2qmcUOBi9zxWKsj58LWylAxwu3OHxUsdqL02I07 azwfZXVmXJ/2RM+WDGDvHqRjBayz6qjpaH3/49E6o9ByJhirkYyWZ2v635R/wWLMKJ+buObPptK 2+Vs3gtCseOg+0zew7YniuBBSz+rJ7EjLits4aFnT3iD884PGlAVQNS1l2nomvcS7NYMj2euQi9 ndv5rM8yNzfZYiUI6a39bFj8bcwYk3pinT0KkXrqYZNOYEdy45p0yogUSh4u/n6cMpYmjhbVKWH 3SzcbVqO89hXN+ABx18byCxAApG36QR2d8UD4Ou0L+Zfr4o5UYjXuRdJs2Ql9WCZSJGyZR2BH47 REDtbCmJpUBxKAg== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean In order to reuse addresses for DFU RAM, define them separately, it's cleaner and will be easier to override. Signed-off-by: Neil Armstrong --- include/configs/meson64.h | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/include/configs/meson64.h b/include/configs/meson64.h index 801cdae470..a64817ec9b 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -84,6 +84,15 @@ func(DHCP, dhcp, na) #endif +#define BOOTM_SIZE __stringify(0x1700000) +#define KERNEL_ADDR_R __stringify(0x08080000) +#define KERNEL_COMP_ADDR_R __stringify(0x0d080000) +#define FDT_ADDR_R __stringify(0x08008000) +#define SCRIPT_ADDR_R __stringify(0x08000000) +#define PXEFILE_ADDR_R __stringify(0x01080000) +#define FDTOVERLAY_ADDR_R __stringify(0x01000000) +#define RAMDISK_ADDR_R __stringify(0x13000000) + #include #ifndef CFG_EXTRA_ENV_SETTINGS @@ -91,14 +100,14 @@ "stdin=" STDIN_CFG "\0" \ "stdout=" STDOUT_CFG "\0" \ "stderr=" STDOUT_CFG "\0" \ - "kernel_comp_addr_r=0x0d080000\0" \ + "kernel_comp_addr_r=" KERNEL_COMP_ADDR_R "\0" \ "kernel_comp_size=0x2000000\0" \ - "fdt_addr_r=0x08008000\0" \ - "scriptaddr=0x08000000\0" \ - "kernel_addr_r=0x08080000\0" \ - "pxefile_addr_r=0x01080000\0" \ - "fdtoverlay_addr_r=0x01000000\0" \ - "ramdisk_addr_r=0x13000000\0" \ + "fdt_addr_r=" FDT_ADDR_R "\0" \ + "scriptaddr=" SCRIPT_ADDR_R "\0" \ + "kernel_addr_r=" KERNEL_ADDR_R "\0" \ + "pxefile_addr_r=" PXEFILE_ADDR_R "\0" \ + "fdtoverlay_addr_r=" FDTOVERLAY_ADDR_R "\0" \ + "ramdisk_addr_r=" RAMDISK_ADDR_R "\0" \ "fdtfile=amlogic/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ BOOTENV #endif