From patchwork Mon May 2 15:34:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1625180 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=QKn824Mu; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KsRy667slz9s2R for ; Tue, 3 May 2022 01:35:56 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4E86B83DDC; Mon, 2 May 2022 17:35:49 +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="QKn824Mu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1846B83E2B; Mon, 2 May 2022 17:35:48 +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, T_SCC_BODY_TEXT_LINE 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 C36F383B2C for ; Mon, 2 May 2022 17:35:40 +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=21218ba5da=ovidiu.panait@windriver.com Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 242FTxs6002755; Mon, 2 May 2022 08:35:23 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : cc : subject : date : message-id : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=o+9bM7BxJOc6egzuu281Pqtv1hcdms/sBiGuGlNzgIg=; b=QKn824MuapP7OqsPuYKFQQWufc5K5HEFFsj0w41Y2ld5z09Nt2RZAowY22qJ1fx8PBJf waNGtd8UxIN+yXVVqf43Cewm1t4aYv3a1l18WL452lG6lZxrjhtqeff37iqTIc8BrEHh hKmiy9Kc3kcrsmOESv/SRYx6TbJ3YN8ENvOr3AKkuItUNPP9TdFZ0yzVSRBFm0Wnm74H +yJl+HkYP5KGnE/HMkNibx8fPU85cPPm+gPjO5m1+x4wAKJuc6Zh/F+rOI4ODhtp3PMh G5WvAVSK7uOUJ/l6SSDM4/CCArVq+8cnVCFQ5/T/q5oP8E5Khq/z2RCKnFTeFA+a23EK NA== Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2169.outbound.protection.outlook.com [104.47.59.169]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3fs0d39dxs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 02 May 2022 08:35:22 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C/WZE61/u0jh0P6u8ya7gW7ErXzkU3v0Vw2q1F16i0V9PPs76LGXrh3pOu6YSOeKCxwPNi+M06y5X41/m1OFTDYVCJScCj3n1N7w5LnTR/7/7AS5Vgn71Bp1tr2dlCBORzVNmCTqWMlN3dBElzdZUXWvcjzy//OHv93tp42fCfI/KrLjAGwI1pprQ1ZM49t5WSwjreGo9FMXKQRurnF2tHKyi5NhaHRdo3tbWvlb0xi4DP5Ta6jHGVjoa+w4M6aI7oAhp9zS6SNKXh+C7rJp4YgQ3j5+SdDBB2wWQO7lHvu2zoUD3rlHBEU+a0xu1biPShl7MvFVWlm0gx4yI8zGBA== 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=o+9bM7BxJOc6egzuu281Pqtv1hcdms/sBiGuGlNzgIg=; b=eFaxkPX/4WzUZ5bEYjTGWygPv575HMdU7ikORm8HnL3E06zYfflCOsC6HZMKrCv6CVZR/Wuq0FLwiJEgpJplgEtnzEzkwE172OX/HUOg7/gnDPT9dNeCivw7QoryAbOA0KiscvS+ks7Z8qJ/1SXjcc2QT42s11bdS79amUToR9i/GXqnrJntgXzn/ChD1LMZf8jJPR7MzZMGydbwdSAwHjrecH/LdGZVF2hglgi1j8VQbt74Io8oB2M8atSz6ptKJaWScRUgZaxtH1HoPnBmfWeni8ekF4NYURdQd6VInSV/Y4tkwe7y+7Ow6uB3QZzFR+psM9lsCQns/PhCH3jY7A== 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 Received: from DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) by CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Mon, 2 May 2022 15:35:19 +0000 Received: from DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::806f:3f7a:c1be:ff34]) by DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::806f:3f7a:c1be:ff34%7]) with mapi id 15.20.5186.028; Mon, 2 May 2022 15:35:19 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: Ovidiu Panait , Dzmitry Sankouski , Heinrich Schuchardt , Rick Chen , Simon Glass , Tim Harvey Subject: [PATCH] board_r: use IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC) in board_init_r() Date: Mon, 2 May 2022 18:34:56 +0300 Message-Id: <20220502153456.2670982-1-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.36.0 X-ClientProxiedBy: VI1PR09CA0160.eurprd09.prod.outlook.com (2603:10a6:800:120::14) To DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ef33c7b8-8f1a-470e-3199-08da2c515d19 X-MS-TrafficTypeDiagnostic: CO1PR11MB4867: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: nm9INQuuhWD7cA7R2WEdDgSckpjuQhk9+9Fa9U7SRzD1w4ea2TMhhOuAXpFeBZG3viTJZ/WLGMssKxsq6DGiPqO3gG6szL9ZABQhx9KBhD/pzPCSYfOG9a9cGqI3fdHgknWYTWXCEXyNxk86TjYPN0thxm4Ws7m5IwAzY6XQYuftuzOPOvzjUBQc94NGG63ud7FcXEUpH7zsxVHTXerD/S9rhfpysZ2bJtiZ4Lw13mahcNEmw3FCgEMfZ5wsFswunBAgeJ0RXmMBT8oCeBfub/vty57s5J23Tn8vlpjDnLStj9kTTSkYpsgwCtFXN7hOM59l0Y+53nb77RCJtUqyR0V8C9QuNSVzNLWSjh0ILVuG0lMv9WwvYKmsveR2NZ6Z2lI6h8r44phX7uP/3E6d+aEgxMpIKq6dXvnlifCCn0Qm7bB7GMR5x81qzFE9Z4A+1X2FEh9lp5bB4sN45bpDHiU7G85H/U1lGenTzx4CADSQb/cUYvxVhkoKmizCWQAKKGOxEXq5coFj3oWu+j67Il+vvYskexAb0mZo3RmW1bueSYJe+a9TLhcbGbUInDp2X5MAFzrc3TW6KRgxwEvaxr6KHS3jpjxhkfGlcCcUPgsrmxfIFH/2I+RqMGq5fiF70lAlj7BtbJei1KrYOZ1v/io44wCqbHEYa7XtvyrycwsaGL+f0MBxb0WLk62rY9QcBBZD8eG4eRfXG1lgFv9rXA== 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:(13230001)(4636009)(366004)(86362001)(44832011)(52116002)(38350700002)(38100700002)(26005)(2616005)(316002)(36756003)(1076003)(6506007)(6666004)(6916009)(5660300002)(54906003)(2906002)(8676002)(66946007)(66556008)(4326008)(8936002)(83380400001)(66476007)(186003)(6512007)(508600001)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SqN+henrzz7NnDDNYnsW9EJ98ok/3JkfaaveiU2tsf0GiOTadPHbCWWnF1z7tdiGtureFa9PitqpxbsawpPr1NJ9fUIAIsIy3JbJAdi5czf8Gkx7Z4/teMys9C3GASwdAu+TYYO1wiYOVxHlknoC/mlUNewT5XjigkJSaS6cZiP3O/OCytAvMGkDZL2ksq23T/gIFmWVAV6j4K6QjCCwMd2K/p3cvC+oD2wpsRJGGTd05hhZ6pXi4nS7EoCQJjsPy4INQS19rOaRgeaM7/gg1rPNZeyQcS3km7xW6pG8e9HJ/bmWJqXYYuuKsCJjSG62ICPMtNbY5VPvzdL069xPAWM8yNVdBTmqPaIOxdy9xTcVMKiXwmpTt+1ZsNk85lOw2ILXhRBEms2IhHXEUjudc7utlSXp8U/qx04g0qMTfYjEkpsu/Qshb3RuClJ+Vdl4OG0TMuIDX1LjldnqgFYUN8plECDAiYTijXOM0A5wiGqk5nr7eGDlR+moZLysJbVBa28ucH/GEeLNKtiYacMFV7VA2w25rULuuYv2Mj93skMOQ+dBKOz3grDPCofrV5KaDNXkTn2hI363o/b3eImg3i5kqpD4Q8fYJSw8V4Do2ilI6vLikcRhRwIMjAgS/UC2p6K+44OElpaJlY5tuC5e9qo04GfApwfe/XnGCqeKI2PIdb+6KLnyqXGdLif4FKCkd7YQJlgv3W6tO9p1xTbVGlWTkPGeQwrf+5HK9jp32QFC/FB14EGHZFg1oGVuY/v8CtRmUxNKNDNdPOmffMvUyEnLgz+E7yYgveHaSaEwt3+6T729TSi2u/NG/odHEcQOyRl5pZXcfe5QK50voK+yaoZOmOeZRKIAGVXHsy8YwV0+H5ezvPvceFhkqWQzzQFzwr022fq+Fi7ghYziGrjyM5TQmlH5ZC1tXN8ojGYIJEW22nQ2MoA/CI1oHJOecnavbP6zPMIuy6ileYzhyVfjV37tONWBKZDP0eRaxn8S6FUuANc6X4OmH7JHgBVsHfgGeQavyo2fjkAL2JCCAoNvpnTQR1KCyBIOH3rYqYZAZctIQ1/doXdD8Ze8hK2K/CBuBWtbaPuSf1HNPyO8WL8+FS6qCyzK6s1SeL8c96X7viOo3Yh9PVzTcqtIoO6ibGJb02vElpOsR3vCqCY7WUwjrQ3HDyWJrVm3T1TwW06GI5844Z9ZoslATI0MjAkZpIIoue/E/hccXoo9e9Bv6cRGBy+7+J4TCzjXCv8s7xlh4ym9K6j5cJYHaPyGmIb0/uLFapIj1IbRuSykEi6wneGZGHLfJzr5tPD5LGwrAXj0Vkf1WM9RMiCBGseFiFftqDuW5y8lpGDOSiZx6bB4MJL+U6vWrC44wPvMrBCY/dfn05s1WiLBPogBDKduuRb/lIJFrjIPFuaa1yOEenM2bF/EldXzCLsW9c9kB6xyA1DLEClJhWTl9nf2DijQKME9QmKbAwcV8n4KhAwOBAcXeIaEpfOl7DJ993KsTMcrQErxy2VLE+WGULo4k7QzNDV3rkpmKXPy83ICyQmB0jMKS+H5E42VS+DXsSpKyK+3bCUlnXf4Sb5ocW0/epeFF5rhtEQN5NGnD9+/7iqhIB2MlXCJOUJTUD5QnZl2O77rSwcnMSkuAIxG0FUrNIghzgRUPDBaUEuqSzNCWI3YPIPX+p+jv7a25puGwXUdeeKOxdsB/FCnwNjLZkdYJVJa/uKvN4DwFWsKfkCmowcYK803s+ywrpS+8IHWAOghRHMqKWvxtIw= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: ef33c7b8-8f1a-470e-3199-08da2c515d19 X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5327.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 May 2022 15:35:19.6782 (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: nJo1xegncxus9WyznIaCz1LYrdAGzw2qxdG0VpygvccFRXUDSQRE1O4sbqDELEPbB7LMCzNniT6Pb7NRkYqcKOSS6EAIzTxvdghfGT4XYyM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB4867 X-Proofpoint-GUID: 31XFCk5PQ7LNgzRgrI6qMNnWV0c9BP-J X-Proofpoint-ORIG-GUID: 31XFCk5PQ7LNgzRgrI6qMNnWV0c9BP-J X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.858,Hydra:6.0.486,FMLib:17.11.64.514 definitions=2022-05-02_04,2022-05-02_03,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 clxscore=1011 suspectscore=0 lowpriorityscore=0 phishscore=0 impostorscore=0 adultscore=0 mlxscore=0 mlxlogscore=666 spamscore=0 malwarescore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2205020122 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 Drop CONFIG_NEEDS_MANUAL_RELOC ifdefs in board_init_r() and use IS_ENABLED() instead. Also, use the MANUAL_RELOC() macro to update the initcall pointers. Signed-off-by: Ovidiu Panait --- common/board_r.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index 93c9c2e50d..6f4aca2077 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -61,6 +61,7 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; @@ -810,19 +811,15 @@ void board_init_r(gd_t *new_gd, ulong dest_addr) if (CONFIG_IS_ENABLED(X86_64) && !IS_ENABLED(CONFIG_EFI_APP)) arch_setup_gd(new_gd); -#ifdef CONFIG_NEEDS_MANUAL_RELOC - int i; -#endif - #if !defined(CONFIG_X86) && !defined(CONFIG_ARM) && !defined(CONFIG_ARM64) gd = new_gd; #endif gd->flags &= ~GD_FLG_LOG_READY; -#ifdef CONFIG_NEEDS_MANUAL_RELOC - for (i = 0; i < ARRAY_SIZE(init_sequence_r); i++) - init_sequence_r[i] += gd->reloc_off; -#endif + if (IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC)) { + for (int i = 0; i < ARRAY_SIZE(init_sequence_r); i++) + MANUAL_RELOC(init_sequence_r[i]); + } if (initcall_run_list(init_sequence_r)) hang();