From patchwork Thu May 5 17:11:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1627059 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=cr+eVkxM; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KvKzJ69nhz9sCq for ; Fri, 6 May 2022 03:13:32 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2D090840E9; Thu, 5 May 2022 19:12:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com 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=seco.com header.i=@seco.com header.b="cr+eVkxM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 51481840AD; Thu, 5 May 2022 19:12:21 +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_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02on0610.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe06::610]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5DF3D83FF8 for ; Thu, 5 May 2022 19:12:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AFOqeGLUVco2UWl09mVslK3cydPL/LorqcjjBuIy7TTRufSWL8LjmhIo71pIaJjp87zfSmUi6AvC4OlqGZcpdlTJfXtpL52vz0Xgsxqzk8bvHH/1lB96sdajPO6/lxpuV/S7YWc7uLboaBqY7JfCE/z80Ex9MUnfzBMwEttOtpIKeSUWGEuxHrDcw+Epqp0KI8f/c6gTxqOVL9DHa6wHXTqksmMfQgnHGMcGy9phIBc1MJ4Rinh7Tu13wRPVWCJ8BHsmvYK9rF59+H+qtYii0DShRHdeEPaKnPGpiWx+VHACjSya+pV5eM72NFfOpoq6qiVUtmbQGseBUFk9BHJp4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QkCRkIJ/fEJRqPl6Pqt8oIzpghrT4iVjeE1aVWjP03I=; b=GbP79Qc/PaQWg8Tkl7wxPnNqNyYhEoSnJ1R0tFNOns0TNIj0GpicySwNFuPQb2lM2XJKNFB2U2/d/U5GHYC6drTeDrLtJR4LHHgxkDGSjaSiLeeBx3esc3IVTvdAX/9RLfrw97LOlzdROwt+U7Q/xf45brvmjJ+KfXnk0kKm9HJK4eXnE+F2AWV5kxESYTUMgeweWEEHqH7gMmE9ARnjglomAYQxI9q0iheVg03o3OiwXVscluyGGRIN5NM14ddBbX0SYKOHxqpoyN/AOcIWut3p2Awb+YyetLQvqWWBzZRNIbGt3ztRq1uLtjHA98c/+P5CWwpYxMwZ8nJbnnlY2g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QkCRkIJ/fEJRqPl6Pqt8oIzpghrT4iVjeE1aVWjP03I=; b=cr+eVkxMD6/ZnheTn3RvtCUIV5KQZ2uLDcdCJH3vU7RiY5fXIaJI56lBpV+UONNbBDFL4H7f++T8J5LGNRQxdlBLVT7FFt73m8HhPy7wpsLKYaTOHSuNeJspACIiANfhJQ99sHaRi4CKbTfGl/cXlZbGz+IpLv/O8pRmTW2r0eRofA/X6IS2qq5zkOaCyopxmkoh4E086bbvAhwIlsLoilKF4Ari5RPEhLdb6m9+DsbKcU3CnamfHvsvvhf778SGxHGn+CrjERwMACzjPHLBduzEGUpmLt2HJdVy9hKX8uhb0Hq0nTFdbXvte7KB6G40zJqEhlDc5cCSiUU8FMq2CA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from VI1PR03MB4973.eurprd03.prod.outlook.com (2603:10a6:803:c5::12) by VI1PR03MB4397.eurprd03.prod.outlook.com (2603:10a6:803:51::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.27; Thu, 5 May 2022 17:12:17 +0000 Received: from VI1PR03MB4973.eurprd03.prod.outlook.com ([fe80::dc24:d72c:4fe6:847e]) by VI1PR03MB4973.eurprd03.prod.outlook.com ([fe80::dc24:d72c:4fe6:847e%7]) with mapi id 15.20.5206.027; Thu, 5 May 2022 17:12:17 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Simon Glass Cc: Heinrich Schuchardt , Mario Six , Ramon Fried , Tom Rini , Joe Hershberger , Sean Anderson Subject: [PATCH v4 06/16] sandbox: Move some mac addresses to device tree Date: Thu, 5 May 2022 13:11:35 -0400 Message-Id: <20220505171146.557773-7-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20220505171146.557773-1-sean.anderson@seco.com> References: <20220505171146.557773-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR05CA0044.namprd05.prod.outlook.com (2603:10b6:208:236::13) To VI1PR03MB4973.eurprd03.prod.outlook.com (2603:10a6:803:c5::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5a0eb0dd-a2ca-44dd-9e1a-08da2eba681e X-MS-TrafficTypeDiagnostic: VI1PR03MB4397:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 96sTblsP9dPISpNY/wThsJaRWmOBwrpC8Fal4eJ2ZRNSbAxjsNCrNMCABQbgiNFC+7w7p46QGHxLZkXdOk/fTitrI4ft/+ePjw0O4SCV1pnxRG2/9aJx9tf+1Mzb5/q3oH5t+PqEHZbbpJedd7bxWFoLupVkb1bdv9vC+mwmsh/L6/8SsCj5t5DHlpIl1RRVI6hHPiS/7+f9ZS98K24rB/MqZ0B028pLzCCqNelldSN50veVngYok6yDkC+0Y9MfsQsbeIODI7ZPls3IUDWVL4ZKuM+bKTgn+lly/CZ8auc7mfiO3HigClsL4Ae7fn32Q9gb5/uUjPZ0M/Bnlo06p0mTRPsYrtib4Mv2U3coX2yvKvXPrKWitAfkFmzwXixSwoGfLdOIvVB/oyA++XHJ+dgcwMlsEz0vTqGGIwnY92KQHGCjibLhoq4oIcDpo2nlyirx4KdS7vqmrcmX55LNqga3RceRjCCuo/Q0IJwZYCC4ntkiJb1lA+Qm1oEZPFRUeu6pAhCmxWuwrVKrQS+8alz0Wou+PSjNAZI592lhJpP7hT1m3Zoj6AvQVjv3D/ERpArFHb7ED8OscIBvrRFmcfLoAe8PGJtARzUzaair54K40Xki13aH5UtWjci6UTmMkZOFKRmlpKxWdn3+didQv4X4NPCkeB1TPgpVVmGjvEb0Yq9Lp3LkeCOa/abnr4lECqxcKxHGWRvzDAZ2oAuzrg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR03MB4973.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(8936002)(4326008)(66476007)(86362001)(66946007)(66556008)(8676002)(44832011)(2906002)(5660300002)(38350700002)(38100700002)(52116002)(54906003)(6916009)(508600001)(316002)(186003)(26005)(2616005)(6506007)(6512007)(6666004)(6486002)(1076003)(107886003)(83380400001)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DxU3hNwfaXyCJGwD+8z0L3KLIK14VqR8dqGH0Ot3hZqAVs78aYuRDp3axuYicHwqGlyFk3menRxNkW0BYTCMKf09hB57672f9lRTY6dt+iCcz4Qq3owhQSECZFzhBzG/6ApyHUhW0qTX6upnTblj2J3joF6QMAWBkCshfom/MMOa7w1LzthAlZh4vTHR2ESHvqI8KU1HWLWPzJv3of2XMInK5vsqWA6zzkmu++fWlaV6O8pqDqjFPbH2N+fgO962Oj5GrZM/jQskSig3cgUT7gQX9Q+1m+Ezz8oAm1OhO1mAjOFQ9WWfZ4PUnuuYizs2IwXCOBtnPuohfbDhMrFbt0ITuLUGb/xkG0ut56dhJPmbAtml3uyXaTD+cvjlUj/rC/1+Aun4S/ct82lj+Q5LSsJw6ONdkIDvqfp3mPzlPnduWumLErFyNoo52fXQlcwzKX4b+K4qFAC861HaqbHRkyss6IhDcOq+x9MtLnnmq7bNDtBotlpdKKbC0vY+/vJTqxzQONs11eX+YsWQIAKFKvxPaWg9Zfi82XTJrf+xiB09LTJ0OOjrETX9tWaJ9ZzXSHx62Z0DBb/EifLcN/q0KhPKq/NuJf2N4E7TgwNggMLmvmVhQ2kv5Kel5PMfON4xo8veZmEnlSthyMxsCYBRSGEhnfvj9fQTqhjhmK8cvHErObxJwiPEhhQdQkOjkSA8+Yw6zeRYvnI3k4082Q/Ty7CeqL97BGXJrorBMh4g6O37Y0Mgzr8E4mkL/1tYN7Rh9ldSz1Te9zJiW31AmqBeWqh11+JKZcEwvxDyRM5fn+5RyYwO35tPVuc438FJJorBwfMTwf6if97S/jWJkJtQgvgAr/kFkgJQGjYlBz6wD7e6d8bxFyyn25Ln7t1noUz9kHo70InxOdJfIWASsazP8BlWtXm3SEuNYHVDnlba2hvmG8lFq6lxYo7uDVYbvKXdGfh4lUajJvuVpD9TFzn5i2ntJqY++bJB5F/TEQWgnXroFMhvdOPVHyafayfcCbnhCfA2kSn4rTSB6KWKgNe0AgVSF9qYsjijPAv8z9W62XNWsqMJAH9U7FbsPweDXa1zEeL6NK3E8YQUXthNdAHNSgxLM4e/9NBw0G7rs3giPgtmGtSbkvlfOdFqajRbPrVR7iKtAATkiHQ4tccFpWk219rSK8HSwW3Is34ulsu3Zcltr/2fJCpE8ozohqgvg2Fh2vNdo5BN4H68E5hQBI0bDuh0qsPPoFVZnuWkZrHhBIMnfly2M/kto4ObAV6E1E3oW70/OmE2LO195sf0ldL8XlhgtaYr//TcezSFrITqKPaI/QflFVYmBxXNUslZp+OWanMiyVXISkWpjcJ8FdS0udHqRHbKgV8lLxFZihYLaboJm/koM6S663e8xY5yll3c8Pl6dGDDOXZb80Y6BJNE4l2fkPsueHpK56MDu1q0bQ44WduAmttF7NrQVyzIssO/YHkXbADMlcgPuO+KYnK11XVvw8BpH6vRNMduB0R5Z8Iikr9LPpfxlazACvUAfawk/GbvIA657FRTFKi5SXURJ9LFCUVFZOEbNQQ6QN6Xv5U9yg2JZjq6xgICrkhCk9qVLIJxwZmRRSAqPelu/TZdylgEdzCYABU0LJsvUj29CIhxMHBY5fmf2LZ5nF7TDk4frXNK+LMn/rUKxh5eFgSjxJVRB9iMEtpdHFcu1f2uNVohs6KNow9Qh1K9CmmGNdXvCsdR9HBoo081knW7iGvdzS7dwNHXdlsXf0tlicOCYlQ= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5a0eb0dd-a2ca-44dd-9e1a-08da2eba681e X-MS-Exchange-CrossTenant-AuthSource: VI1PR03MB4973.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2022 17:12:17.3071 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: YMaI59WTv6LGoKyi8GuvfntoboyQHtCEr+wuCThIspQCFCGp0cX0hekzjwmhUjhM4sAB97YMwGbaLlUhF+VZmw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR03MB4397 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.5 at phobos.denx.de X-Virus-Status: Clean This prevents some conflicts when running sandbox with -D, since the "rom" mac address will be random and won't match the environment. We still need to keep addresses for eth1 and eth6 in the environment, because dm_test_eth_rotate expects to be able to disable them by removing their envaddr variables. This can likely be fixed in a future series by adding a function to cause sandbox eth_opts callback for a particular mac to fail immediately. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- (no changes since v1) arch/sandbox/dts/test.dts | 4 ++++ board/sandbox/sandbox.env | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index e486bdb531..318dc2dcb1 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -532,11 +532,13 @@ eth_5: eth@10003000 { compatible = "sandbox,eth"; reg = <0x10003000 0x1000>; + mac-address = [ 02 00 11 22 33 46 ]; }; eth_3: sbe5 { compatible = "sandbox,eth"; reg = <0x10005000 0x1000>; + mac-address = [ 02 00 11 22 33 45 ]; }; eth@10004000 { @@ -547,6 +549,7 @@ phy_eth0: phy-test-eth { compatible = "sandbox,eth"; reg = <0x10007000 0x1000>; + mac-address = [ 02 00 11 22 33 49 ]; phy-handle = <ðphy1>; phy-mode = "2500base-x"; }; @@ -554,6 +557,7 @@ dsa_eth0: dsa-test-eth { compatible = "sandbox,eth"; reg = <0x10006000 0x1000>; + mac-address = [ 02 00 11 22 33 48 ]; }; dsa-test { diff --git a/board/sandbox/sandbox.env b/board/sandbox/sandbox.env index 88ed7a9606..a2c19702d6 100644 --- a/board/sandbox/sandbox.env +++ b/board/sandbox/sandbox.env @@ -6,11 +6,7 @@ stdout=serial,vidconsole stderr=serial,vidconsole ethaddr=02:00:11:22:33:44 -eth3addr=02:00:11:22:33:45 -eth4addr=02:00:11:22:33:48 -eth5addr=02:00:11:22:33:46 eth6addr=02:00:11:22:33:47 -eth8addr=02:00:11:22:33:49 ipaddr=192.0.2.1 /*