From patchwork Fri Mar 10 13:43:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aegerter Andreas LCPF-CH X-Patchwork-Id: 1755234 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mt.com header.i=@mt.com header.a=rsa-sha256 header.s=selector2 header.b=r9nJOgBD; dkim-atps=neutral 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PY79f5jKKz1yWp for ; Sat, 11 Mar 2023 01:05:26 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7B84685C1A; Fri, 10 Mar 2023 15:05:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=mt.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=mt.com header.i=@mt.com header.b="r9nJOgBD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 81B6485F1A; Fri, 10 Mar 2023 14:43:42 +0100 (CET) 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 autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20725.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::725]) (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 5D2DD85F16 for ; Fri, 10 Mar 2023 14:43:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=mt.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Andreas.Aegerter@mt.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mfVkUw18I2hqlQqYqWlkIruOUVCtYUqLfwir2T0KRPyu+Stbfzdj0NdlP+5fcVWlDuNpad42tcf00Cd1fUNSOwwjGKEN35I8R4O5EKLR2EUZboNc96k5t6/eTVcZj/50/AcoTS5EJUoZpBe3ECv+YYNXTiVYinCOHtCj+XbWqd2uRUdOV4kp79T8d+BOzh+4y6nnY2gHGKrqqf6W3aUZ5xspy7r+C5lrLWvui1EKwC4xPRfdZhUR2LUxLuGzfi5dTDWJhj6wr42FVZIHA7G6uXbpC/JmKb3JpAwe7mvT0kkWoQWJ5OQ5wVTtGqHIqCmCsaabiPTRsZjvpEqfP6XcVQ== 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=mvSMEZn0av/DXZMmk6wjYqJFe+Ltm4VQzxnwRvGr8Dg=; b=e/7QaKeMNEsjguKKqIOHHwpxcdeqtOFgsJqqafVqj6DieLiig1lBC/cIQq/BdrxNVXOQmSLBku+DfeULCeIG2bLAfddBFtE9/ZIe7oNgZ+bgE6CcP2IbUFElYkA/X8LarLhipSeWKsN0Ue8x0Xp3oDanK2Jnw0dLXGPfOnjWue6W6BwP/BaQ/qDRl/uCUdp4EGmP9xpbTd/JTHyMd6CwJCMSQLNXiiUFoUxCr+LwwS6mjTenxON6tKN55AlF7mLm9I8tnytqKRGoIwb5XGJmj7GcF5Dwc4XCa6Hf6sBCt+uYTevaZxxVWBRURgf+eTArsv5TMHC2ge965yp0f/Fk2g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mt.com; dmarc=pass action=none header.from=mt.com; dkim=pass header.d=mt.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mt.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mvSMEZn0av/DXZMmk6wjYqJFe+Ltm4VQzxnwRvGr8Dg=; b=r9nJOgBD3ZXjEvvAeHbB2UfljYvZtn4sHvTlvvc+j+IwrKps6QENXpAhgmMcd57XcP+346YUIqhZetbkxppi6MtBICESrUHAwtBX1khHo8eLUOYC9EiyDG2KpPhsuUI4wVk4wQM0pqqaVJcpJFlm7HDBynyKSfnipbuv2GazJ8UFznolJVWU5nresUdsIX+8gWneAnPxqO+29RuFZ8K/Nr8eioDXoR/xpr+4eJ6rXePxV+TUDJfjdexehymZDt5ScoTBuFzA3Wp7baAPW/70NnTbI/LEfKr711l+ETEaWFwUFxzHhmRqJgSBnlHbhfGQcQTkIUDVlxtvigmYMLgVmg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=mt.com; Received: from GV1PR03MB8813.eurprd03.prod.outlook.com (2603:10a6:150:89::20) by DU0PR03MB9351.eurprd03.prod.outlook.com (2603:10a6:10:416::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.18; Fri, 10 Mar 2023 13:43:36 +0000 Received: from GV1PR03MB8813.eurprd03.prod.outlook.com ([fe80::b5a4:19a3:569f:ccd3]) by GV1PR03MB8813.eurprd03.prod.outlook.com ([fe80::b5a4:19a3:569f:ccd3%6]) with mapi id 15.20.6178.019; Fri, 10 Mar 2023 13:43:36 +0000 From: Andreas Aegerter To: u-boot@lists.denx.de Cc: Andreas Aegerter , Marcel Ziswiler Subject: [PATCH v1 1/2] colibri_imx6: fix linker issue enabling watchdog Date: Fri, 10 Mar 2023 14:43:32 +0100 Message-Id: <20230310134333.98573-2-andreas.aegerter@mt.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230310134333.98573-1-andreas.aegerter@mt.com> References: <20230310134333.98573-1-andreas.aegerter@mt.com> X-ClientProxiedBy: ZR2P278CA0040.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:47::11) To GV1PR03MB8813.eurprd03.prod.outlook.com (2603:10a6:150:89::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR03MB8813:EE_|DU0PR03MB9351:EE_ X-MS-Office365-Filtering-Correlation-Id: 023b52a3-d005-4d74-2349-08db216d72da X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xUv+SbI3JhHCHnYN1BugrQPT+2ab5hEv8ZGvz1CF0p5DsgsGt6ghTprjvxNIZ8YpLVzUf185bCQDBIpkVCcToCz9Bla8wx5N080IQmlvzEYol+JK+xaZlEU9KuqvNmmO3gg0UUOrrQmc4UU0CNLjJSTcpmn427hXM4uWXPZuDGTv5n1RGxjmCK9Ck57TFIX8ZHyUEUWu13rmu1YJ1kdPeYlzzl6hoQtitGLcAj2KBAQE3hXKjOVw+Kmbd1m+A5c+oLatD4gt6CF8+kQKP/mnIS+yO0jajpSutDfBTuwABDN/N0wUdq5RoUafAdD8oDsl8eVKTvTF0yDZFxAmxxXRNmD+wm4hRlNgPb8JYWiy2CxEn7/IgXMgEt3DxeHefCZGE1zfK7ntpkdlmeaeX8UPKAoFD3AXiDmISyhdf4XdLI1y8RXxYNbpnyEoaEyeMp7kf3LYtc7115CeJqBOK1wxTodqDGKFCKxxZ1ZOreciEXX+vk5bWgckCXAkxsGDK+fEJDuPNCbYpQvylCpNDJDy7CCZNTdjtaupQpoeQjFhJHq1//VVXDwka+JkGjKa3mBwH+34Z/D00Jk+wxA4gVYC5WrrLc0WmqM0lfP21oGeKO+cjM+tIqmwWTgaHCbw6E63h6EAqON+VE0G758ne882A0zFVKgHaJHEecpUg2hT9epiBo4pn7iM5OLkmBin9jfw9DS+k1ZQRPsPqhOadzXHHw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:GV1PR03MB8813.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(39860400002)(136003)(346002)(376002)(366004)(396003)(451199018)(8676002)(44832011)(2906002)(5660300002)(26005)(1076003)(8936002)(36756003)(6512007)(6916009)(4326008)(66556008)(66946007)(316002)(41300700001)(86362001)(54906003)(478600001)(52116002)(6486002)(38100700002)(6666004)(6506007)(38350700002)(186003)(66476007)(2616005)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qNNHi79D61b9fUmOVFgY/vLY7bc9zLA32eMTW39bxq3BhlOfnrhpQLAFNadIF5CEgBPP6tWerQnVBceg1zFoY79DP13Nx9XtO54t4UHUx2fxPTPsdP8Pfd6fv1jDbCjYnFQooIay06Ew/2g0A70ZYKtfHSc2HLVZMExz+1uheG38lBsOFXE/73B0KzD259Uebbp1z1cPq9jpQj6hEkXgOwVnJ5hMiHDulEn8YFJGKcF1J1ZrING8EEACAqQCBkIzYPWMPBeLoTYYd+DbbEH6sd1s9ufpdKPvDM/Lc5plHtfsnE6pWXhPSB1U2bjlZshtgeR8u4ZA/EsPWGrrvRgBg5yUYXS7g5mMQsvnWOdAjBo4aN9Z4msxur8xSlve+U41n79pSKgDIr8Zr1kWd4GBYt7wI/1J+pb5N2rsXJmeJ/QJSaenjqm+2NCTlHaKhLPsQe2LSuaBzgnlEcLpYYmBtTITJ4Z292dLl1XjTqIOxdH3wHZTVC2yIJD92NGIVFcmGpyHoIgoNYAGRLhZ47huM9YiDJE6mIR6uMzxOky8ApQbcNZEryCwud4maIY14to3eXhz5D+5B2kQCuRPlRoeOgVcEhVnLLyGebg78w3t3Uuh7V/FxlZPopH5k6QiaLlSGDPWgSEpgAqmKESwGkLd4unPHjrw4ZwxibOitVAwRmOPxLpoaITDL510/rz/PRk+73hma+wN6TrxIOfUIqZrLzgVLijDRJnHza/KAWbPmFyIBR3yeUyNbK4YzYmc+v0yfODESfWw/DQ3QDZKd6CCQF/QoDlgYZfui+bzoahJl4etLfYIC5Yv4xVef4VBCLPmGc8PT17/gUsKoSZOr5j57prwoEALhqx2XNHBv4iAQxEUY+PAJzNwOOa/mXsfObaR8qJQwifDvwxIDKuVEga1NitZjr3qo4xtJTEEy8fdMUdpFfZApgoB0o9mgnVanhy0fDp+Y3YoZPKfEzAKShCSmuYRdNZNb0wjgWJ+F0KwXwNuQkqZ9UV0Lfqy1evmnzNeIDUwBPW/93GGUy7GzV8KbgYqLkBd+K9F/gW50hfA8uPmAzNkEVUeNezinoydwtipiFFJY1GRqoffE+NNb0ThbLLLsk4f6D19uZd/EUbULAqCFd+LSH3MdpAmoJDM3BTUZlgjDUnEfHoOH3DHbFxvaKGkxlIlREOZ1XW7jBpxv1fUWphxY9FoZr3vvRBbclHLbN9kAzcP0faf/vpgQiHxbYBFaQRaPodRQVnJLZjJQCrDeF6UYsKNWwpTM/OClwCiLOL5LPuevS5xoEO/j1fbOMtgzMPxvn7IcKzvVNJlWE9mpOItZUa3zpSakDC3w7RZ38ZFwoxorExO22hidb0+5SuBNYlAFLhsWmglWIX7xiSdzwRbRPcl/P4mZgsJBOy+Wt2eOa1/EFYwyCvy6uAlBjySwBkscdlWjQg5t09BcuPJRQqGxfIDxA2kJdaRyOm7mWAcH0hZPfdct/Zq1k73/qeK6J5cKAeCd27qDd7cWHXrIsvbwDmhD2AATHGt+wyVtvKPfqacGNizi5vDYvmfb61bkkGsGof3wD5s+MkWNR1TI4fcEYFcXIf2Lc26/gNAwu3pDJHa1LxqIewEge/HjQ== X-OriginatorOrg: mt.com X-MS-Exchange-CrossTenant-Network-Message-Id: 023b52a3-d005-4d74-2349-08db216d72da X-MS-Exchange-CrossTenant-AuthSource: GV1PR03MB8813.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2023 13:43:36.6512 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fb4c0aee-6cd2-482f-a1a5-717e7c02496b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: vBXrG85DGU/BoCZYy7HJXZhbUuJ/guMb6V4bOZuTM+93GfP2Qo/lEeA0xXgnGWu1iIbaB9eogYFJ72PNDUeSfA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR03MB9351 X-Mailman-Approved-At: Fri, 10 Mar 2023 15:04:52 +0100 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 Using colibri_imx6_defconfig with additionally CONFIG_WATCHDOG, CONFIG_WDT and CONFIG_IMX_WATCHDOG enabled results in a linker error. arm-linux-gnueabihf-ld.bfd: arch/arm/lib/reset.o: in function `do_reset': /home/aegerter-1/u-boot/arch/arm/lib/reset.c:42: undefined reference to `reset_cpu' Define reset_cpu() also outside of SPL. Signed-off-by: Andreas Aegerter --- board/toradex/colibri_imx6/colibri_imx6.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index 65e0e9a156..dcae1c7280 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -1116,12 +1116,12 @@ int board_fit_config_name_match(const char *name) } #endif +#endif /* CONFIG_SPL_BUILD */ + void reset_cpu(void) { } -#endif /* CONFIG_SPL_BUILD */ - static struct mxc_serial_plat mxc_serial_plat = { .reg = (struct mxc_uart *)UART1_BASE, .use_dte = true,