From patchwork Sat Oct 30 06:51:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1548484 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=windriver.com header.i=@windriver.com header.a=rsa-sha256 header.s=PPS06212021 header.b=Da1R6XF9; 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 (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hh93M5YSDz9sSf for ; Sat, 30 Oct 2021 17:52:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D9EEC8350D; Sat, 30 Oct 2021 08:52:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=windriver.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=windriver.com header.i=@windriver.com header.b="Da1R6XF9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8C38882EBB; Sat, 30 Oct 2021 08:52:28 +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,MSGID_FROM_MTA_HEADER, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) (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 46A4882D95 for ; Sat, 30 Oct 2021 08:52:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=prvs=693705c626=ovidiu.panait@windriver.com Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 19U6fxC2003260; Sat, 30 Oct 2021 06:52:19 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=z9TkIDwIZJoPft/Axv4KY3Eb5ISOB1B/FvXQT5kJ5sQ=; b=Da1R6XF9cR8W7pYPkWRSj+gAI257skYrhiLC/OEkrX/RH4j7VyqsXbZ6iEt103r9NTU1 OZHLlg7FqGitL3855zj0xkFbFFKrj2SKZk+3xEFqefM5btLqLQZX0tt32G2C87IYMFp0 RMfJl26zGIeGx5qdV8ZUbs6g8IxFheAXziMlreTYJPeDYOXc9Uaz9ZSpvTrc9j2B4vKI XAS0yCOlVOq1VhawzS6qejtv/QSxlsVxAs6vdupP+CVXUEGxZrFl92fESSBE/rbVs3ut 1KF4LVwIqEZkeF4WC21+NYBmuu6jc64M6QEHxuB0CK8EF3LlRFi9UJUqiw/4Tw+C5cet BQ== Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2107.outbound.protection.outlook.com [104.47.55.107]) by mx0a-0064b401.pphosted.com with ESMTP id 3c0u92068r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 30 Oct 2021 06:52:19 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MZHt/rKi+5vjwsCNk2cnUahVS8+vhH9kb6PDmBon+kecLsyZbNBVCK8cbjHL1sFL3OVt4YzZklsc7DxqhQOsRzBG0N8NG+yuuRSAedARuFytycNAVXege+jGdvHhKQvRYXb1QY0YSCxZ+q6KtTdqMPgf6fuAr/udwpVhco/FqOd3CwXYXy3Df9PaUuqb1/ph2a35HwpNhYj2wxA+ZmPiKGwRWnlGefy4ETqeWzXF633xZqkE7rgoIYQRTB9uTI/0OAWuALOJwQ/ONR1SfZiycYGSvzrx8ndKTnNfd80IxEXg6QLiMPsy4g4j4FCwaZQkTjyHfD0Axz/UDsE2Eoj9Nw== 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=z9TkIDwIZJoPft/Axv4KY3Eb5ISOB1B/FvXQT5kJ5sQ=; b=ey1z8CcGDRULmT+UtcejIbdxlh/xA965i6vGCaMje+9UHCL2DwpEEezb2lSRecfT3tqfx0QPolcZNn87QB9tz/c5gb4ZgwrnPGRvWR4ZXq5tJgQrwO68Y1aOJWVP0FSuihVyFdmokKAkOoz8mqNRS1CiGh6+5bg0pS18wA+Ndco7yF/6Arx4Tr86vTUOQctS0QNFqolKlcso+ulAyc3n07YMGDb0zj/BKWLO91Deryve8y3O/qTAMUvJ/epw2Mrqlb0dlIj+apxxqSeg2FWkrzvvzOYRqu4MX2k0fz+pwP1xtaalN1JYiAg5DR1EnI9Hc3s5pDBs5Y210GWQJUd2zg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=windriver.com; Received: from DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) by DM6PR11MB3612.namprd11.prod.outlook.com (2603:10b6:5:13b::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.17; Sat, 30 Oct 2021 06:52:18 +0000 Received: from DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::6daa:43c4:6ef3:a6d3]) by DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::6daa:43c4:6ef3:a6d3%3]) with mapi id 15.20.4649.017; Sat, 30 Oct 2021 06:52:18 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: Ovidiu Panait , AKASHI Takahiro , Bin Meng , Daniel Schwierzeck , Simon Glass , Tim Harvey , Wolfgang Denk Subject: [PATCH 2/7] common: board_r: move bedbug_init() to common code Date: Sat, 30 Oct 2021 09:51:35 +0300 Message-Id: <20211030065140.3589529-2-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211030065140.3589529-1-ovidiu.panait@windriver.com> References: <20211030065140.3589529-1-ovidiu.panait@windriver.com> X-ClientProxiedBy: VI1PR03CA0061.eurprd03.prod.outlook.com (2603:10a6:803:50::32) To DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) MIME-Version: 1.0 Received: from otp-linux03.wrs.com (46.97.150.20) by VI1PR03CA0061.eurprd03.prod.outlook.com (2603:10a6:803:50::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.17 via Frontend Transport; Sat, 30 Oct 2021 06:52:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d678bafc-a9f1-490d-d4a8-08d99b71d053 X-MS-TrafficTypeDiagnostic: DM6PR11MB3612: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3968; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UYvi2NGjQ9nLwvFh+nurUUJ7YaNAYCLfXCQc/hofZP1eAavWe6X4RGBSzJ617CjGSO2vE4AqG8SpsDJ549OiyB0uPLSCj3e6baBftx3hgr5d0ClCrDtOI4NASRVsxMNeZ2SLiulSV1u9Y10CIfVAkV9HhGCZR7FvcEpiGDBopoutofPh7i/vFppM0LU17SAsXXgRF0TP97QQHrW48Jl7lcbqkJqUnP2H8LNFNpkpsHSVw4EjzZDFXgiwP0V5lb+gjYSr502eBl3geYZ1TPLwZkXbcBdCmSgmTHIrwsI3hngn9psanOJk/qmEQWqr8o1QXEp7qqIYxOk0gHjTnvlD9sqULdx8KQ9crGYpEx/eEb317o69Vsh5nFKAb0SEwTKSw2IesJhiFTL4njRt9yPlf9MsEkcCO88PKh4qIAiQlnoIHQ3PgKumL6V6dVuUofI2UKHdQz6yYmapW8e1HdrmXZVnL0tx0ZgKCXSrzoxJdeIvreLb2/H2zQKMELWdrTj+gkO8E8IOucirquwxwnguW4sgBw3fDtMAMqjO+E+kIse+HAo43GG1PYT0AcYAkizAHrmyzq7vQBn9Pb/Q0mdBXZpFYvocCzlGqDD+qiad421EVXCf37JqjP5IBNKQX8dkgD/rjA4kHkjaKHsgu+IBzFLLPlXykiLb7KF32GDHUSqtjpLVOkaD4ix0kShmCCx9fQeZmNOlompYY+hwG1aE5w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5327.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(186003)(2906002)(6506007)(5660300002)(4326008)(26005)(6666004)(956004)(52116002)(83380400001)(44832011)(508600001)(2616005)(6512007)(38350700002)(8676002)(66556008)(316002)(54906003)(6916009)(8936002)(36756003)(86362001)(66476007)(66946007)(6486002)(38100700002)(1076003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ywvswr1JNqRgYrhnWya13vw2HjFx4yBX6U+JOgeva4Gb/UdNAEzVJrpGWlZN1FOLtLZe2qFMNxcimbmEoPqztAAzEkKOvW12Zq8M3uwEcu9LVw0nxKIrg4OsjrXPkCj66ceYcabi5Lehg40PLD+9keJ28D2vWRBIrpqCUpdW6y7iJs+7J3WshKP/uoJkUEdQsmpTlEpDHPUYEpqo8vyvXlF3r/Ewh02NbTgWvduEI97+jve3lH8cV5BelzhO5zs4dHkNVx6QLKvq4HiWhY+JAG8HfKLAsN/bLf82GzRvbj3KMfndvq0WcOISu14jiA63X/qRvk+DM0c9FMS3Go/0qGZtcdW8dXqcy/sbKJtCGHPczPuuoA1GapWV9yhdhUna3EQ1lYsdUdJvFDbg9xlfMJ2C7s3gyTsCAC/Eb1fjZzsmkM0SB8Iv4c6xlfVb2V+57CWaCdZDkDPL6/yCW2+bwoWkzfx6Esm2IHwStmavJ/5soMmSTwiEPX6ZJMLQZbiVP+/11LsC0HQsUPxgE5zizaJlCGOFm5j/c+LTfCKlk1RgSz1uDoJ3OuCYh0cOW65d3BtiSHyFKbqo5LswmoQtxOeS59LmdfHfQWwhXL/iPtJNq3wBCb6nvSh65TqywDBikV8MkmmaGNMznx04WqRKlP8nF6auMR01Y6uVDXmBiPFnzdoKln71dkihzzMf/P/1CTCtjXRAsF0MC6zPlMV0A5WrTmkNfGEM/Wzd5fx8ntl8p138pohoZOP3leyamh3NQQPj5Zehk1yOlCvIjVrxyjvfCLQKgt+sPwbfdNvFfJCmvy9kwzL99Q4o/VZIff+kPeDGsRBpbrjmxzMX5e8uRlFNE9+24Vq+8L6gNK9H311Esrby8va6+5GVoEBCb0Oj6XKNp+cX0u0y6WAxrTR8TzKv+d+mRxg+adsyjIVQUqBXytNWpOh6ppBWlgvtd6rD7lo1tb+cPxbSfT4Ziis6IFj7TdZO/KrN+hl4kkceiPklaZgv+OzDv7P9vtiSd9/MHH98fi2c/Lw/ujcecQH4PsnJYMcgenqEeK38IwLvVIw+fWL46bwM0ZA7nM2ro9whKp2Rz248wYrCsZmsRnkreieEk6ETlsHrE03TzUu1HMvQFwIBA7lwfk8NsbIUNrrfAOE/ZLlc0KykXMyCl8apZRt1HfaCbX9HN7CDeMQYTfPmCu1UXouhixfcrz74/7qmiVfBx3TyMncg1lNuTb1N8FeiOFHtHv84C2rY0O46Zc/16cqw6N/w6R/b5jHSd2iczrWXN6hO4tmavsZbcn78ohgB9Pl+1qv5m672q5d0U3BKwi5P9wO+2zyuL9g8jdFg3XzlMFHlwYgjClqD/rx9/058DO/1TkWZ1K5ktEqkg1O4O/VierVhB99/iworucsPlRJnzd3jKOvrvRUGwXVnPChKQ4M8cCAWJ90dINTRrQnhH8crQd6kZz0mbvTjKfIPrdaA2ldDqGvBYw6FLZPyEIKTGJ35zgGANkdrFVyDQD3p2MGzCIoeXwPUXsuZalApKQ4/i2DanRQyWeeGCwgDgTkp+xFP68yX6PkUnYJE6Y1oeo77CxpRfM4vGOwXAWqavW+WI9MjzyocE3PjC4cThAdWmd76AsEy+pDkVUETC4Dts086eJ60rO5tuH5BLR6YokEG/CNiH9V7jWAWxlU+vg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: d678bafc-a9f1-490d-d4a8-08d99b71d053 X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5327.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2021 06:52:17.9814 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: j1nL1YfxxMxu92h5JR9v4M2RKuhVLiM29w+oWpXO/Ruj0NtnlgIUsfJpqzFBPFJJbVw2jnKJXhvaapLXuO1LLjk5hdvmhf/3UkI+eoq5pQI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3612 X-Proofpoint-GUID: Y4m0qNA8WJr07xf5U3NucfrEaxKhgy00 X-Proofpoint-ORIG-GUID: Y4m0qNA8WJr07xf5U3NucfrEaxKhgy00 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-10-30_02,2021-10-29_01,2020-04-07_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 suspectscore=0 impostorscore=0 phishscore=0 malwarescore=0 lowpriorityscore=0 bulkscore=0 adultscore=0 clxscore=1011 mlxscore=0 spamscore=0 mlxlogscore=865 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2110300035 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean bedbug/types.h is included to provide bedbug_init() declaration, which is an empty stub that is only called from the common init sequence. In order to get rid of this dependency and the associated #ifdef: * move the bedbug_init() declaration from include/bedbug/type.h to include/init.h * provide a weak stub for bedbug_init() in board_r.c, so each CPU can provide its own implementation, as explained in the function comment Signed-off-by: Ovidiu Panait --- cmd/bedbug.c | 14 -------------- common/board_r.c | 10 ++++++---- include/bedbug/type.h | 1 - include/init.h | 11 +++++++++++ 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/cmd/bedbug.c b/cmd/bedbug.c index 0bd67fcf47..7fc206bd26 100644 --- a/cmd/bedbug.c +++ b/cmd/bedbug.c @@ -38,20 +38,6 @@ int bedbug_puts (const char *str) return 0; } /* bedbug_puts */ - -/* ====================================================================== - * Initialize the bug_ctx structure used by the bedbug debugger. This is - * specific to the CPU since each has different debug registers and - * settings. - * ====================================================================== */ - -int bedbug_init(void) -{ - /* -------------------------------------------------- */ - return 0; -} /* bedbug_init */ - - /* ====================================================================== * Entry point from the interpreter to the disassembler. Repeated calls * will resume from the last disassembled address. diff --git a/common/board_r.c b/common/board_r.c index 31a59c585a..a5c1af9c1f 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -23,10 +23,6 @@ #include #include #include -/* TODO: can we just include all these headers whether needed or not? */ -#if defined(CONFIG_CMD_BEDBUG) -#include -#endif #include #include #include @@ -37,6 +33,7 @@ #include #include #include +/* TODO: can we just include all these headers whether needed or not? */ #if defined(CONFIG_CMD_KGDB) #include #endif @@ -568,6 +565,11 @@ static int initr_ide(void) } #endif +__weak int bedbug_init(void) +{ + return 0; +} + #if defined(CONFIG_PRAM) /* * Export available size of memory for Linux, taking into account the diff --git a/include/bedbug/type.h b/include/bedbug/type.h index f7a719caf0..99c3d4d83e 100644 --- a/include/bedbug/type.h +++ b/include/bedbug/type.h @@ -5,7 +5,6 @@ struct cmd_tbl; /* Supporting routines */ int bedbug_puts (const char *); -int bedbug_init(void); void bedbug860_init (void); void do_bedbug_breakpoint (struct pt_regs *); void bedbug_main_loop (unsigned long, struct pt_regs *); diff --git a/include/init.h b/include/init.h index c781789e36..e11472ac09 100644 --- a/include/init.h +++ b/include/init.h @@ -307,6 +307,17 @@ int board_early_init_r(void); */ int arch_initr_trap(void); +/** + * bedbug_init() - init bedbug debugger + * + * Initialize the bug_ctx structure used by the bedbug debugger. This is + * specific to the CPU since each has different debug registers and + * settings. + * + * Return: 0 if OK + */ +int bedbug_init(void); + /** * main_loop() - Enter the main loop of U-Boot *