Message ID | 20211030065140.3589529-3-ovidiu.panait@windriver.com |
---|---|
State | Superseded |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=YoZ5yN7A; 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=<UNKNOWN>) 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)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hh94H2jCxz9sXM for <incoming@patchwork.ozlabs.org>; Sat, 30 Oct 2021 17:53:35 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 53131835D8; Sat, 30 Oct 2021 08:53:13 +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="YoZ5yN7A"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0CC9583362; Sat, 30 Oct 2021 08:52:41 +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=ham autolearn_force=no version=3.4.2 Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.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 18B7083433 for <u-boot@lists.denx.de>; Sat, 30 Oct 2021 08:52:30 +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 (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 19U6lcN2024625; Fri, 29 Oct 2021 23:52:24 -0700 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=KWpsHpdd5zCFUAqClvsKI+g5XKgE7WjyGh0O6iO30II=; b=YoZ5yN7AwyvtH7+ppS66iM2r9bXOnjy05Gh/QNdsdZgSZ8IYxgth2mHzPMrjqa8uvSWu EMhyBWMe7/LiVa6wnjsyc2FE3PqJivP65MvhXq7U6LxaONGIYWG3LbPm9OMBc/xgeXKa Knn4RkTz+VJks+DgsLg8IQX+9UJxreAbM4+10opA4J4pHvHl9zlCcrZSLy+89Gbf1vyc Xk0hTZJjUr0jtP/iRm5W+lQxtGJDts8rmLc9lI4VSCyN4Usss27LlCLJZHKyR/xvGwbS JLRBo9RzOfKGOIwJgJW/BOwxmIASQq1uqjNUxlE4KSjLvGRwjmUcjgz9qvijxSWNCen+ zw== Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2042.outbound.protection.outlook.com [104.47.66.42]) by mx0a-0064b401.pphosted.com with ESMTP id 3c0jekrk8w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 29 Oct 2021 23:52:24 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EggjN3y8akLoxq6s2TylkJHpYe8Qt4vA1JQ1hPUZimW4/7fiUuT67WO/7fmL7Xar55ju5kDW1IuA/EE/fdOsyeikPSXPTzsH4MgE72y1xa99DBgph5vAf3+AGT6qHEQ+yifB7Qz8VPJDmpysX8Uo3e9ZYntikdjhcoC8XD1YiTCTj0FsU3hi6KjtslRMsC9uTFZ82YOshp18G1cS2JzTQUA0dpRUphiG8LobCM8C2c5APhcWvtJsYxF0gLxelZsKzEm8xmT5qfJ9G2fsCVKVezuXilmnOu6JCUw7gP/MjGkuJ5Bvus1svsJH4bMCRwOwKIyqn0nRcvg1R0dTueqtMQ== 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=KWpsHpdd5zCFUAqClvsKI+g5XKgE7WjyGh0O6iO30II=; b=Z3rQG05O6PI3GUB9yRx/jiVJegKe41NnIQx4xesk1MDWRHJURk020QzMpR9KhxvZt9ff/8EVp91Qy9QjBwIk9MQc2tKUmrzEzlobx/dmqm0sN2GUbY9hDbKdniDwzeJLyr7DkrrZ4uJ54uwBi8bI12ZapBpMg7YNGZHWtyK4had4r/SkmWFddwforzDnaM80KaZIzKzDvPAf5oDezl9/qd9uDwZZq6eUffZULjEUxKKiAfX8Vi7ygYxurjOu+A7nevdS4hDzz2XVf5bXpr8RJQE/bU8qHKkR1UeDio3miY8j4TVhXUEDsqz91Den8TpHbHBOLqiDixpAV5Ebr1Dvfw== 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:23 +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:23 +0000 From: Ovidiu Panait <ovidiu.panait@windriver.com> To: u-boot@lists.denx.de Cc: Ovidiu Panait <ovidiu.panait@windriver.com>, AKASHI Takahiro <takahiro.akashi@linaro.org>, Bin Meng <bmeng.cn@gmail.com>, Simon Glass <sjg@chromium.org>, Tim Harvey <tharvey@gateworks.com> Subject: [PATCH 3/7] common: board_r: drop initr_kgdb wrapper Date: Sat, 30 Oct 2021 09:51:36 +0300 Message-Id: <20211030065140.3589529-3-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> Content-Transfer-Encoding: 8bit Content-Type: text/plain 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:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ae31617a-c927-4009-f74b-08d99b71d369 X-MS-TrafficTypeDiagnostic: DM6PR11MB3612: X-Microsoft-Antispam-PRVS: <DM6PR11MB36122D9E948EBCCCE6547C77FE889@DM6PR11MB3612.namprd11.prod.outlook.com> X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dVe8eYRE//XDR4pfq0/XYhCQhm+Ruq2j5fM2BgqUZOFMKIt9ikZXOTWqXITZde3+SXBwXw1upftn7GUTcolJ5X5Wbv0m3/d+ZwfYv2jy4g2bBXWuDAahj8XTM8lJO9bbPtG12FJrsLns447r7zo0Njg6hbCfd5zi+IZI+dRp254GpgxrEW9dCaYooVu68Ei47npAA8x1zxwr8HxiYx5iz7H8XXjFv0US8hX+nMFPso2t9kmEgGj/+sKf1MMv6cL7e9FoKZoNnjPalA48JM2FYZcySEuOZNpGiIZ+sAKEhGy+wrw3+RiGHyFJ4aPvHux5zW9tAJdyR1JSp6uAcSlcbf4Pjqn5XQ0luZRH3ftkIPsRSqwi5zrQ7Nc6kwpgCWlp9+q6OkMiw7Wq09mp4/NHOZlH/2HFurlhXVs/aAjpTeXyUJyag0+cj4Ek0dnCvoul7k0uvcyjBOgcgIULhgP9oWc3nBitx1SseIRw4NAznGfRl8D3Te4YSNWIb3cI7RmW1hyN9EnBW/z+XRhvRLxymizD57IoTAjwq93VMIoOU7PqY+GbtDwUl2du4zKZ/j3wqCyZH6eOYhi76QipMco/ts3fwFHUsuxn0PUeoCF9Uden/vWLbKsNBLd8h7jD5hPXUcyAly4xPz7E0CXvJdNNJh0BlN+CSliD4h8uSVYd9qkt9Y/2WiQdwLm0xH8KYMs3SqzIlKEVcAOZFtmBPOS5/w== 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: QOKnvxzq21Fir4JqI0L9v2Od1LOG/XIixjuhCxRzC841JfxUF8e0S+7FrunD8IFu+iN7y/G+E9LI0F9E9MgyDVpUAG7T1RYLKg9bJylJlehM1Qvtg8XSEUuqooZjjKJJccCBFqqKDMMUOR/UlE4LvpEJLVT0Sq0XMcfRsM7ippxkR8OXmP0HwmPjBblJRgHxytpUYNEL+eAt5Za/hm6tu+V0qUU9ACK+NhHHyKMTVfo2b06NjsbBRnEnLmu49jfluwiyY1E2WuQ+V3W8s4x5f8uOoU5us1yMigJObWoCnBg+bGxNqtQZIWBiKPwDpO2/3bckHu4lprOvhsG/uxkqHCM51pJWCtqz3eUhpu+Pq8oboTYqiWCeJsvv+EoAPOeAMvGTNyVS+RXBAV6HauNislYj8ONREn9R1uuhydAi5VE8U1LnrAvHLBQHXm4pVur80p0ncOx5Gwko7IfJyiYHbCxrUwAIvdb3+zBMitn8uVHFcrltJxY0N0/F1kcKQM8vgjLinSrsQyz1zKXiVfCBdx0oxROgR99gzSz51Y9L2cJpnLQXNqK3kK7koHFomR6BC6ICVGbAzJI4zl59vfaP5p/tq4mm3K2ynrMBk3W2R3DSGZ7BS1s12EVII9Uvm8KSHxc/tP5SoT+Q9HO4HRklA3Zn/Afptc8Qc29N/e57gZi4ouBC1gboKKYCx6ZX0OqXd/vYTxBtB96JzSesTyIKe0S8u7WZ9fSabYzmeRW6YIKdXJDOxwIEp3LkK863z1YNwBnsHC4SXF5vSRMl9zv3ztpZMyJflUf0dVFj5AtzNKz1BQpzTIJUJkBfbkjRASNGcmXknwS0hDcMdPc/dDrVBw1+qobG3OY8TFBz+x8H6KbpUgw9cYt0XCf97uIMdxr82USIUfNAqtDGn+ucqNW4L42sp4KAb7U63x41WHUcgJi3m+36Hdk0tSF/WY2gy79M3cVUld9SlsreLGrhB7Zr3xY5RX8RUc9QAkxCljkIBcjcaiw0pKXmEYD+iZZ3xLdnORUayro0afrcq8g4KIN2jB6sTyx0azzD55PjZ+8x7b0L2roJShgczvJZOP1XuxgV1fOLKCR7a/Xpmbx1DLRWl/9SZm9DCdnOUWXpxvbvsS35jrLOmd/4m+9rZvFJrwnJO6bvJeWg+hUe/+sblGjQlw++ukYzJZHLyXH67cP3N+8wmd9+GIqAXF8VJ4LxTEWhdVQH6sw4AKhfUgpwHUl4mVY4OJUtnpGxQd8jgxpn2ByLx7eRwEivO0cOOw+2aCK3kKfZYyz+GZibxSUPQ89zkiPgCUP1jHf2StnB6oeqerc5hpK7YawJNZachS+zT/xIIobhl5YQlD98lf76IGBft53VWILadmSXgGlSUsexuue8RAoSCm2CjXOY7wNTWZHAtntWqimaxg9UX0b79cNt9BHhFW30Db92jawIKfdOlAizakck1BWi+cZ9Sy3WNFHVZ8bJqSTFyIIEk+VeeoSWF1a3L03Nkh5n/kj+7FGIDNqNzedfCrlmoa1UmZMjUL8clDP6Kbsly9+rMHSUG2IZTXQQFfFntBlHrHf0YSnCrpxp24W3RiZcoE5vA9yGbSVLGjbYQTK+To0fZ9/buNxB8Nn5mQ2F3LLKy0YOYEKu9uYndQPLacVZTY+2zwdJc4fUI6dItaXaq5Q8BXoaKFctcg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: ae31617a-c927-4009-f74b-08d99b71d369 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:23.1496 (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: 5sc+I9iMoKjtQeiE8m5PSO6ozdFDtj3dySRnJnl0fPS76V9rMRvzHzzSQmd0TTfgiPIsKgvZ1Yygm0Wy3mwd8FKKb1W/Z1qvbb7iVZLG9Cg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3612 X-Proofpoint-ORIG-GUID: 0mj8twXjbPvG9EhpfDNI0oR7j8kCYcid X-Proofpoint-GUID: 0mj8twXjbPvG9EhpfDNI0oR7j8kCYcid 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 adultscore=0 priorityscore=1501 clxscore=1015 mlxlogscore=680 bulkscore=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 mlxscore=0 lowpriorityscore=0 impostorscore=0 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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean |
Series |
[1/7] common: spl: move armv7m-specific code to spl_perform_fixups()
|
expand
|
diff --git a/common/board_r.c b/common/board_r.c index a5c1af9c1f..1c7397b29e 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -498,15 +498,6 @@ static int initr_ethaddr(void) } #endif /* CONFIG_CMD_NET */ -#ifdef CONFIG_CMD_KGDB -static int initr_kgdb(void) -{ - puts("KGDB: "); - kgdb_init(); - return 0; -} -#endif - #if defined(CONFIG_LED_STATUS) static int initr_status_led(void) { @@ -750,7 +741,7 @@ static init_fnc_t init_sequence_r[] = { #endif INIT_FUNC_WATCHDOG_RESET #ifdef CONFIG_CMD_KGDB - initr_kgdb, + kgdb_init, #endif interrupt_init, #if defined(CONFIG_MICROBLAZE) || defined(CONFIG_M68K) diff --git a/common/kgdb.c b/common/kgdb.c index 4493a15919..29b09fcfe5 100644 --- a/common/kgdb.c +++ b/common/kgdb.c @@ -527,15 +527,18 @@ handle_exception (struct pt_regs *regs) * kgdb_init must be called *after* the * monitor is relocated into ram */ -void -kgdb_init(void) +int kgdb_init(void) { + puts("KGDB: "); + kgdb_serial_init(); debugger_exception_handler = handle_exception; initialized = 1; putDebugStr("kgdb ready\n"); puts("ready\n"); + + return 0; } void diff --git a/include/kgdb.h b/include/kgdb.h index 616ce4451f..0609eadade 100644 --- a/include/kgdb.h +++ b/include/kgdb.h @@ -39,7 +39,7 @@ typedef kgdb_data; /* these functions are provided by the generic kgdb support */ -extern void kgdb_init(void); +extern int kgdb_init(void); extern void kgdb_error(int); extern int kgdb_output_string(const char *, unsigned int); extern void breakpoint(void);
Add a return value to kgdb_init and use it directly in the post-relocation init sequence, rather than using a wrapper stub. Also, move the "KGDB" print message inside kgdb_init(). Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> --- common/board_r.c | 11 +---------- common/kgdb.c | 7 +++++-- include/kgdb.h | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-)