Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2194456/?format=api
{ "id": 2194456, "url": "http://patchwork.ozlabs.org/api/patches/2194456/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/20260209-cleanup-v2-14-73a3a84ddbdb@nxp.com/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/projects/18/?format=api", "name": "U-Boot", "link_name": "uboot", "list_id": "u-boot.lists.denx.de", "list_email": "u-boot@lists.denx.de", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260209-cleanup-v2-14-73a3a84ddbdb@nxp.com>", "list_archive_url": null, "date": "2026-02-09T01:30:18", "name": "[v2,14/14] treewide: Clean up DECLARE_GLOBAL_DATA_PTR usage", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "34cd91a43f7c21248f5a4710488ed9718fcd6c75", "submitter": { "id": 80723, "url": "http://patchwork.ozlabs.org/api/people/80723/?format=api", "name": "Peng Fan", "email": "peng.fan@oss.nxp.com" }, "delegate": { "id": 3651, "url": "http://patchwork.ozlabs.org/api/users/3651/?format=api", "username": "trini", "first_name": "Tom", "last_name": "Rini", "email": "trini@ti.com" }, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/20260209-cleanup-v2-14-73a3a84ddbdb@nxp.com/mbox/", "series": [ { "id": 491455, "url": "http://patchwork.ozlabs.org/api/series/491455/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=491455", "date": "2026-02-09T01:30:04", "name": "treewide: Clean up usage of DECLARE_GLOBAL_DATA_PTR", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/491455/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2194456/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2194456/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com\n header.a=rsa-sha256 header.s=selector1-NXP1-onmicrosoft-com\n header.b=MnvD3f6Q;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=85.214.62.61; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)", "phobos.denx.de;\n dmarc=none (p=none dis=none) header.from=oss.nxp.com", "phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de", "phobos.denx.de;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com\n header.b=\"MnvD3f6Q\";\n\tdkim-atps=neutral", "phobos.denx.de;\n dmarc=none (p=none dis=none) header.from=oss.nxp.com", "phobos.denx.de;\n spf=pass smtp.mailfrom=peng.fan@oss.nxp.com", "dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=oss.nxp.com;" ], "Received": [ "from phobos.denx.de (phobos.denx.de [85.214.62.61])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4f8RxN2tfkz1xvY\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 09 Feb 2026 12:31:36 +1100 (AEDT)", "from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id E396183C23;\n\tMon, 9 Feb 2026 02:29:33 +0100 (CET)", "by phobos.denx.de (Postfix, from userid 109)\n id 5E6F883DC9; Mon, 9 Feb 2026 02:29:29 +0100 (CET)", "from OSPPR02CU001.outbound.protection.outlook.com\n (mail-norwayeastazlp170130007.outbound.protection.outlook.com\n [IPv6:2a01:111:f403:c20f::7])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id A5BF783DAE\n for <u-boot@lists.denx.de>; Mon, 9 Feb 2026 02:29:22 +0100 (CET)", "from PAXPR04MB8459.eurprd04.prod.outlook.com (2603:10a6:102:1da::15)\n by PAXPR04MB8491.eurprd04.prod.outlook.com (2603:10a6:102:1df::8)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9587.14; Mon, 9 Feb\n 2026 01:29:19 +0000", "from PAXPR04MB8459.eurprd04.prod.outlook.com\n ([fe80::4972:7eaa:b9f6:7b5e]) by PAXPR04MB8459.eurprd04.prod.outlook.com\n ([fe80::4972:7eaa:b9f6:7b5e%7]) with mapi id 15.20.9587.013; Mon, 9 Feb 2026\n 01:29:19 +0000" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de", "X-Spam-Level": "", "X-Spam-Status": "No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,\n DKIM_VALID,FORGED_SPF_HELO,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,\n T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2", "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;\n b=lp5BySwB//R91lqMp5DyJcRAJunj2bDNkZW77XRaRBG9kXrU/pZJ+DuJcIsYTfwI3YNAqzMVF06tuc0PkTGWhBN9idT2VQkbngy/OtNv2HYXtUsHiKS+R1pzzfrrb+0n96+vykF2poQT7yT27/6henj3x6GWgvu5oKNuhhBj0KzdAC3JbqSmny2BIQwID+l6z/50TDAbqkjoruwN6EcEnV2TFRmkKjXU9y4xgViUckmG6c3A5HEiya6e9wjqGAJK2Wj6WiduP0SeIviyTlGLqE5fkbzn0pJCZqVGY8ua+soYipLj/GEd09Iyuhcpm4N/UiP6hxm3sY0F4A1+77V5FQ==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector10001;\n 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;\n bh=cOkbImrUBqKSAs1TsSPYDtUTWeuDlZpIs/PdjZTEjPw=;\n b=yRrn2WX4uLmOe/nRQ4rNzxVa++dJ8i2aylYmfJY/tfR0ylY/dFF1GgtZ0i4rz6Qqau+xP9F5ePddiU/B99YZ04qhxGNUTCaUD0KritaVgDdo5iI4Ln5QZVPsdNLlSUyyc9KeIJrsMHSPnoRDAv7VBDsyGoFyLuQZ+YX65RHfVI93GzLg6rPYyCxxuG7nO/uJI/CUQQJgscbZmiAwBC7vvvT/3eNdZFtXiEmSt/8TxUZg2LUxAMcFwjk1ykud9sU/halXO80vY16JY2kMQz7QPSJfOgv7bgwWDltdGT40ySUhJXPSl6p97IHh575rB0pyQquo6k72bC1bUJwzc1PyQQ==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com;\n dkim=pass header.d=oss.nxp.com; arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com;\n s=selector1-NXP1-onmicrosoft-com;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=cOkbImrUBqKSAs1TsSPYDtUTWeuDlZpIs/PdjZTEjPw=;\n b=MnvD3f6QEF7eMqaiU60QJln2XEciZKLYXMXxP3aBnzP/fmy4ZOHGzPkSlpbm7QPVwxfvA2cs+IZ/2aDSr+9ljscmGp/d/rThDcT9yKFkidxlIssL/iKmjrfxGD7lFzgve9bGkRlv0qj1wcWgOmPBEgjUOpEAkygq8Ywa10kFDgy3yWa4S6JliAxpXUEEpL6m5dHnR7t5M6v2kVbqErW24py9yJ0GtsUoJTyhMIG2t6jyIbj/ZPPsJ8EJR8QSP2+9+kJW6U604oLHaINBiCaLx+NABxPpjyuFiEePySjb5xrKhnPvgt4h2iQ+dTFm2sC9+4eFXhZQRVIVYA6f2W5EIA==", "From": "\"Peng Fan (OSS)\" <peng.fan@oss.nxp.com>", "Date": "Mon, 09 Feb 2026 09:30:18 +0800", "Subject": "[PATCH v2 14/14] treewide: Clean up DECLARE_GLOBAL_DATA_PTR usage", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "7bit", "Message-Id": "<20260209-cleanup-v2-14-73a3a84ddbdb@nxp.com>", "References": "<20260209-cleanup-v2-0-73a3a84ddbdb@nxp.com>", "In-Reply-To": "<20260209-cleanup-v2-0-73a3a84ddbdb@nxp.com>", "To": "u-boot@lists.denx.de, Tom Rini <trini@konsulko.com>", "Cc": "Peng Fan <peng.fan@nxp.com>,\n Patrice Chotard <patrice.chotard@foss.st.com>,\n Anshul Dalal <anshuld@ti.com>, Yao Zi <me@ziyao.cc>", "X-Mailer": "b4 0.14.2", "X-ClientProxiedBy": "SG2PR06CA0207.apcprd06.prod.outlook.com\n (2603:1096:4:68::15) To PAXPR04MB8459.eurprd04.prod.outlook.com\n (2603:10a6:102:1da::15)", "MIME-Version": "1.0", "X-MS-Exchange-MessageSentRepresentingType": "1", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "PAXPR04MB8459:EE_|PAXPR04MB8491:EE_", "X-MS-Office365-Filtering-Correlation-Id": "75aea70d-a648-45e3-f28e-08de677aa4d8", "X-MS-Exchange-SharedMailbox-RoutingAgent-Processed": "True", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;\n ARA:13230040|1800799024|366016|376014|52116014|19092799006|7053199007|13003099007|38350700014;", "X-Microsoft-Antispam-Message-Info": "=?utf-8?q?Arakb4YaM9fqoZsr7CwCgEPq4Eh71oV?=\n\t=?utf-8?q?8F03qIB6CxIR32YO9MrhQF8fr8VeyqSxfiTX9V0UieBWoOD8A+KI4RKwW7bW6DACw?=\n\t=?utf-8?q?DFfuMPzrWGhHQtVQ2IKGxc1WnjUbdEaqVQE91y3lyXplE2OnHQUUl4uoQMYMuC5d6?=\n\t=?utf-8?q?cFwMMbsf6N8Ji0k9IUDGc5F9KiPyNIndELFyC24QbHIu0f/Kuc91zGbjMiuCK8Rf+?=\n\t=?utf-8?q?PpSQcO10It04KJ+xf/6sH0we7k9p4XmqrvGkBmuczgXbtgBxtLC4QyvqLhtBF20LW?=\n\t=?utf-8?q?kwU2vEfQpZmUUZbnlbFVuXeA+bGh3AeybGesOk25j29aKD4STnDH7fifiWMrDlM8A?=\n\t=?utf-8?q?4eOawmTUIDOyaCNLhx77o/NY02NkOBRgiuS95k7CbPaZCGZZvBDFayziZnOOY8LIs?=\n\t=?utf-8?q?cDvAC+uMQN0wOjxv+a7XATVt+Bh+cNvLW4P0YGr3n6EC2oz9rIzBPHWsBmMo9IoWt?=\n\t=?utf-8?q?v6NAD9kb+z47iLDfYVBjG5UpPFZRBI/kFrOPrb3LVvKYTCKKMWp9s2hiREs81ShXN?=\n\t=?utf-8?q?TIa4m+4rb8YEQDWmsqkzso10bBcwqG9lr7P0iCrYEUfBTEmtLwNP9GyKL+jXVZHbe?=\n\t=?utf-8?q?JzRk4TYBY2W46OAWNFVtpiaGnHX+wo4QnhpL/pWmsWinOSCLgJImLT293mIIPzpQR?=\n\t=?utf-8?q?KmEZjoKihlsEKGNiF7+LiIlSZl4kXYTetOTgAHNYLoBf4Pz4qb365OZBYBvpvCCIt?=\n\t=?utf-8?q?rZWWtdXup3U9BHMA2l8+KzwiqMHOkoQ7WKOsA6VEM0ROjF6I6iVflJN45z02t9+LM?=\n\t=?utf-8?q?lEbwY4X+4iCKjhNpBaJgztARuxpct9RMg9aPl2JNdcbex/Oy7H3ZTL8ekLDNRQE/l?=\n\t=?utf-8?q?FFfDbOlkhKOP+CXSfW3reGDHN8pdWnJ+Ii8QTbixhwYwyHj+VYzfEBVpbGjoG8DGS?=\n\t=?utf-8?q?SNVjaCeMAJaMFyjMYD/7MORAw/vAd6xnt8YKRJ/fsH0WZRW8kdTpfTO8r9j/oi2L5?=\n\t=?utf-8?q?yJEootI+CIxm+ayAbjflg0KSHoHw8OATVUt5FSP5CKGeUEH+/tJwtw/oYUS+5kEt+?=\n\t=?utf-8?q?MvZ2KFDrxcNe1zeJwZlza92Jjmaakuv4Y7zPePb/T5lM0uoEueE4LMdoaspHhJSTY?=\n\t=?utf-8?q?vsVFCXi5Wof1DJsSj3nDIzFbsUs58g2TR2h/BgNcEYkNdrcMN47E3lFZCAjllifVl?=\n\t=?utf-8?q?rkGZm0D6zchGG2bZsTrdgWP3gM6Ah12YwqtSlf6BiHPy3/xDaSY/uDV5l5T84AgFY?=\n\t=?utf-8?q?mxCNufIAwcqWy3zKWO3umf99oAEDlRJrxsFZMqV9LjGe3zb0knTcYv9A3JdXTPPMx?=\n\t=?utf-8?q?AQBn+aFNlgHQa/UPFy6RecanTZBnhYcUT3PaTT6oQodD8gQbGjlYC41T7pFLJ677z?=\n\t=?utf-8?q?VH8NE7H7xjUOpmi7Inoh1SHaXnqFE4URbYbDAZ5bdqVyy82YOwauY6OpkVuAzql/k?=\n\t=?utf-8?q?kuE5rf/3oX6+054xIMHoo7bFSrtyOeLOlBwPHIfzV4TcV2p5uSD/fL+txPHDUQqhv?=\n\t=?utf-8?q?ZshlykwT7hFsPie336wjU2/YbibTJVUaaQy44IASXEz2BoQUvXqBTFT/4LNYtCBLS?=\n\t=?utf-8?q?7Wtjhylax4qTHauEBm5Ie0f28l0BQIZRgYTpSJG5GgO4/CENDZJw=3D?=", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:PAXPR04MB8459.eurprd04.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230040)(1800799024)(366016)(376014)(52116014)(19092799006)(7053199007)(13003099007)(38350700014);\n DIR:OUT; SFP:1101;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?8tSawnefccD+GpoFoh+z9N02CEAt?=\n\t=?utf-8?q?Wuf8zhQkdMVmTEzIbpUREQAbeuQ8OcHF26pLFZjwDt9URM1VNg2tvc5Gc3NkiKXjL?=\n\t=?utf-8?q?YoJSAXZqN8ZPLNf/CvveQZ9fktxzm9Nzcdodqq06Nm63eH7+9841l+8QCUlCrA9EJ?=\n\t=?utf-8?q?+JX58UC8Swo0M0aZtUlgAYzjepZWlukQdq7XN9m1kRKv4xyTcBanAn9ZhL/2zjX4t?=\n\t=?utf-8?q?mMQlBkFPq19tBUMKnyRfG5Se7/wEBblcnBZI3RuJNgBE68iyXzWODz/Ab0b+uNnOs?=\n\t=?utf-8?q?Nv93znwwThSp+i7WEYLhuQcQ+XFPqQAcicjfbjgsyALqFujUx+ZPas1k1CZuojDdw?=\n\t=?utf-8?q?flALs9ZTkx73RXppNz0L9kEmUPz1RkQ8nMXSPsA+As4RI25DNWhwwWRgQ97Mmz/i2?=\n\t=?utf-8?q?Oxjj5J8b5KHd9fZAXYmQ5f5yDjrafjiJDyfNLgizxoar//m9ZPM/XEixpeY2oTh86?=\n\t=?utf-8?q?oWjxJ7Mlt1oPEayK0l3LC7QmORXXa4W0V7+NkxVSF2pInCMko1cxEo//FWl8j2QZR?=\n\t=?utf-8?q?usRQEYeN8BlEHbyrNN1hokWQGqu/RFjsH6uQLG+p1EYF+o6Yxp8xcOQtms/sLZC6Y?=\n\t=?utf-8?q?03qNFKFn4zDd//dhHdtqED13ZsLn6JJzmp1hkrzvfnH51+TThrhlXp0OyqmoKnW1h?=\n\t=?utf-8?q?ti9WrS8BX3r0HSWoUuasXlN3FL9+RM4dsk4NgsKib6H8AO3xoaA44xe3T6UlxkG0t?=\n\t=?utf-8?q?TrMUv1f7BJw23Pb9rYEy6RCGMhITS+l4LSvNPEZ/pqScDpigR4DvlWFwjGpWNnV7m?=\n\t=?utf-8?q?iGY6FhtWQ5PRMTPiL6i/6VAs2bAT19NqrGNnDW18i8t/7ojmL3ULpojft4lIMBzwX?=\n\t=?utf-8?q?WRJYcMr4im5tRmKxyC0t/VRya64i1Be/VjRWTiS5jmFS4Ic/ycPStHFtWyyGyaccb?=\n\t=?utf-8?q?BlI+5Iqun5RrbBePCjWRWmFBv2t5b03+iPQjnq+DdG6MheKDroy2pZNzsar4YSmG5?=\n\t=?utf-8?q?SidW4PRF+LGRHV5baG5a2htVEad+ABs2+RT7U/MDQX5E0efumlnIDpAjGJN5xypaC?=\n\t=?utf-8?q?DxFnz/F7urxso1wOEaoxV6Modn3ev9wKCBt0vJJ5IqE5uVl3TxMa6itG4qzHJFIlj?=\n\t=?utf-8?q?tNEbdKhGKFRYkHsLTIg6X2jqq/IxRncBGwxm8DMP1cHts1s55hjoUsTZjAwcRYNKJ?=\n\t=?utf-8?q?pomT/h487Sqpb4QOEVeog8HnPQV5PVpKTY3qf+zuUL9myKkwc6U/mLnL4VfR9FhxK?=\n\t=?utf-8?q?RYHf31zosOF5ruGmhpN5+nvbXPb4XY5P7x/EBnydJeL62HNdP5FqQ+18utFNMR4JI?=\n\t=?utf-8?q?gLkEeWtfPVfwmnaEMxJkJyCTsSC8PBV/YkISSy6fVOdk1n8SNQXFFt55AmT4dhvzA?=\n\t=?utf-8?q?y2wpKD2LIunLA5TCu45cN/Ygnt9+yiyDHfHlB/XlgbfGXrJlMPQMFX/zzEmzOtJSX?=\n\t=?utf-8?q?Rkk9uEidV+DfjMzGty+R3VVLYicxv19yk2QHDZ7QxhAwufhRsfFNR0sn5UTgbjNBD?=\n\t=?utf-8?q?Qv1d+BM716So9hQsSdAWVHRBNnBgQ8K8INGEMnu3GRFdEVW1h05NpHZEayYAuSXxb?=\n\t=?utf-8?q?ac0+PzdG4kBXpJst8+/Lve8OquF+/JryNx3L2VPcuAmc5pHOMy+Wz4nLnYoeHX9gj?=\n\t=?utf-8?q?ekUxUnnVgel/dEM3o68i6LCsM2gFkbISerhUZ0d0lBvCARWkknwjB7fZ7ngAvsKSR?=\n\t=?utf-8?q?s+XbXz1QoViO1gqU0FhLbMzsLOgVZYwg=3D=3D?=", "X-OriginatorOrg": "oss.nxp.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 75aea70d-a648-45e3-f28e-08de677aa4d8", "X-MS-Exchange-CrossTenant-AuthSource": "PAXPR04MB8459.eurprd04.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "09 Feb 2026 01:29:19.4792 (UTC)", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-CrossTenant-Id": "686ea1d3-bc2b-4c6f-a92c-d99c5c301635", "X-MS-Exchange-CrossTenant-MailboxType": "HOSTED", "X-MS-Exchange-CrossTenant-UserPrincipalName": "\n T+tCOfhcOSx3050vFub8gXOHIK25wYzCumZsfcWs7PT61CSlVN3bMxgCznpgOGGiwTr3ymSyqHODAymnQ6Tz9g==", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "PAXPR04MB8491", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.39", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<https://lists.denx.de/options/u-boot>,\n <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>,\n <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.8 at phobos.denx.de", "X-Virus-Status": "Clean" }, "content": "From: Peng Fan <peng.fan@nxp.com>\n\nRemove DECLARE_GLOBAL_DATA_PTR from files where gd is not used, and\ndrop the unnecessary inclusion of asm/global_data.h.\n\nHeaders should be included directly by the files that need them,\nrather than indirectly via global_data.h.\n\nReviewed-by: Patrice Chotard <patrice.chotard@foss.st.com> #STMicroelectronics boards and STM32MP1 ram test driver\nTested-by: Anshul Dalal <anshuld@ti.com> #TI boards\nAcked-by: Yao Zi <me@ziyao.cc> #TH1520\nSigned-off-by: Peng Fan <peng.fan@nxp.com>\n---\n arch/arc/lib/bootm.c | 3 ---\n arch/arm/cpu/armv7/s5p4418/cpu.c | 3 ---\n arch/arm/mach-aspeed/ast2600/spl.c | 3 ---\n arch/arm/mach-imx/imx8/clock.c | 3 ---\n arch/arm/mach-imx/imx8/fdt.c | 3 ---\n arch/arm/mach-imx/imx8/iomux.c | 3 ---\n arch/arm/mach-imx/imx8m/clock_imx8mm.c | 3 ---\n arch/arm/mach-imx/imx8ulp/cgc.c | 3 ---\n arch/arm/mach-imx/imx8ulp/clock.c | 3 ---\n arch/arm/mach-imx/imx9/clock.c | 3 ---\n arch/arm/mach-imx/imx9/clock_root.c | 3 ---\n arch/arm/mach-imx/misc.c | 3 ---\n arch/arm/mach-imx/spl_imx_romapi.c | 3 ---\n arch/arm/mach-meson/board-axg.c | 3 ---\n arch/arm/mach-meson/board-g12a.c | 3 ---\n arch/arm/mach-meson/board-gx.c | 3 ---\n arch/arm/mach-socfpga/clock_manager_agilex.c | 3 ---\n arch/arm/mach-socfpga/clock_manager_agilex5.c | 3 ---\n arch/arm/mach-socfpga/clock_manager_n5x.c | 3 ---\n arch/arm/mach-socfpga/clock_manager_s10.c | 3 ---\n arch/arm/mach-socfpga/mailbox_s10.c | 3 ---\n arch/arm/mach-socfpga/misc_gen5.c | 3 ---\n arch/arm/mach-socfpga/misc_soc64.c | 3 ---\n arch/arm/mach-socfpga/mmu-arm64_s10.c | 3 ---\n arch/arm/mach-socfpga/reset_manager_s10.c | 3 ---\n arch/arm/mach-socfpga/spl_agilex.c | 3 ---\n arch/arm/mach-socfpga/spl_agilex5.c | 3 ---\n arch/arm/mach-socfpga/spl_agilex7m.c | 3 ---\n arch/arm/mach-socfpga/spl_gen5.c | 3 ---\n arch/arm/mach-socfpga/spl_n5x.c | 3 ---\n arch/arm/mach-socfpga/spl_s10.c | 3 ---\n arch/arm/mach-socfpga/system_manager_soc64.c | 3 ---\n arch/microblaze/lib/bootm.c | 3 ---\n arch/mips/mach-ath79/qca956x/ddr.c | 3 ---\n arch/mips/mach-mscc/cpu.c | 3 ---\n arch/mips/mach-mtmips/ddr_cal.c | 3 ---\n arch/mips/mach-octeon/cvmx-pko.c | 2 --\n arch/nios2/lib/bootm.c | 3 ---\n arch/riscv/cpu/andes/spl.c | 3 ---\n arch/riscv/cpu/cv1800b/dram.c | 3 ---\n arch/riscv/cpu/generic/dram.c | 3 ---\n arch/riscv/cpu/k230/dram.c | 3 ---\n arch/riscv/cpu/th1520/spl.c | 2 --\n arch/sh/lib/bootm.c | 3 ---\n arch/x86/cpu/ivybridge/model_206ax.c | 3 ---\n arch/x86/lib/init_helpers.c | 3 ---\n arch/x86/lib/zimage.c | 3 ---\n arch/xtensa/lib/time.c | 3 ---\n board/BuR/brsmarc1/board.c | 3 ---\n board/BuR/common/common.c | 3 ---\n board/Marvell/octeontx/smc.c | 3 ---\n board/Marvell/octeontx2/smc.c | 3 ---\n board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c | 2 --\n board/advantech/imx8mp_rsb3720a1/spl.c | 2 --\n board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c | 2 --\n board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c | 3 ---\n board/andestech/voyager/voyager.c | 3 ---\n board/armltd/vexpress64/vexpress64.c | 3 ---\n board/beacon/imx8mm/spl.c | 3 ---\n board/beacon/imx8mn/spl.c | 3 ---\n board/beacon/imx8mp/spl.c | 3 ---\n board/beagle/beagleboneai64/beagleboneai64.c | 2 --\n board/beagle/beagleplay/beagleplay.c | 2 --\n board/broadcom/bcmns/ns.c | 3 ---\n board/cloos/imx8mm_phg/imx8mm_phg.c | 3 ---\n board/cloos/imx8mm_phg/spl.c | 3 ---\n board/compulab/imx8mm-cl-iot-gate/spl.c | 2 --\n board/coreboot/coreboot/coreboot.c | 3 ---\n board/cssi/cmpc885/cmpc885.c | 2 --\n board/data_modul/imx8mm_edm_sbc/imx8mm_data_modul_edm_sbc.c | 2 --\n board/data_modul/imx8mm_edm_sbc/spl.c | 2 --\n board/data_modul/imx8mp_edm_sbc/imx8mp_data_modul_edm_sbc.c | 2 --\n board/data_modul/imx8mp_edm_sbc/spl.c | 2 --\n board/dhelectronics/dh_imx8mp/common.c | 2 --\n board/dhelectronics/dh_imx8mp/imx8mp_dhcom_pdk2.c | 2 --\n board/dhelectronics/dh_imx8mp/spl.c | 2 --\n board/emcraft/imx8mp_navqp/spl.c | 3 ---\n board/emulation/qemu-riscv/qemu-riscv.c | 2 --\n board/engicam/imx8mm/icore_mx8mm.c | 2 --\n board/engicam/imx8mm/spl.c | 2 --\n board/engicam/imx8mp/icore_mx8mp.c | 3 ---\n board/engicam/imx8mp/spl.c | 3 ---\n board/gdsys/mpc8308/gazerbeam.c | 3 ---\n board/google/imx8mq_phanbell/imx8mq_phanbell.c | 3 ---\n board/highbank/highbank.c | 3 ---\n board/kontron/osm-s-mx8mp/osm-s-mx8mp.c | 3 ---\n board/kontron/osm-s-mx93/osm-s-mx93.c | 3 ---\n board/kontron/pitx_imx8m/pitx_imx8m.c | 2 --\n board/mntre/imx8mq_reform2/imx8mq_reform2.c | 3 ---\n board/msc/sm2s_imx8mp/sm2s_imx8mp.c | 2 --\n board/msc/sm2s_imx8mp/spl.c | 3 ---\n board/nxp/imx8mm_evk/spl.c | 3 ---\n board/nxp/imx8qm_mek/imx8qm_mek.c | 3 ---\n board/nxp/imx8qxp_mek/imx8qxp_mek.c | 3 ---\n board/phytec/imx8mp-libra-fpsc/spl.c | 3 ---\n board/phytec/phycore_imx8mm/phycore-imx8mm.c | 3 ---\n board/phytec/phycore_imx8mm/spl.c | 3 ---\n board/phytec/phycore_imx8mp/phycore-imx8mp.c | 3 ---\n board/phytec/phycore_imx8mp/spl.c | 3 ---\n board/phytec/phycore_imx93/phycore-imx93.c | 3 ---\n board/polyhex/imx8mp_debix_model_a/imx8mp_debix_model_a.c | 3 ---\n board/polyhex/imx8mp_debix_model_a/spl.c | 3 ---\n board/purism/librem5/librem5.c | 2 --\n board/purism/librem5/spl.c | 2 --\n board/qualcomm/dragonboard410c/dragonboard410c.c | 3 ---\n board/qualcomm/dragonboard820c/dragonboard820c.c | 3 ---\n board/renesas/common/gen3-common.c | 3 ---\n board/renesas/common/gen4-common.c | 3 ---\n board/renesas/common/gen5-common.c | 3 ---\n board/ronetix/imx8mq-cm/imx8mq_cm.c | 2 --\n board/samsung/common/exynos5-dt.c | 3 ---\n board/samsung/common/misc.c | 3 ---\n board/st/stm32f429-discovery/stm32f429-discovery.c | 3 ---\n board/st/stm32f429-evaluation/stm32f429-evaluation.c | 3 ---\n board/st/stm32f469-discovery/stm32f469-discovery.c | 3 ---\n board/st/stm32f746-disco/stm32f746-disco.c | 3 ---\n board/st/stm32h743-disco/stm32h743-disco.c | 3 ---\n board/st/stm32h743-eval/stm32h743-eval.c | 3 ---\n board/st/stm32h747-disco/stm32h747-disco.c | 3 ---\n board/st/stm32h750-art-pi/stm32h750-art-pi.c | 3 ---\n board/technexion/pico-imx8mq/pico-imx8mq.c | 3 ---\n board/ti/am62x/evm.c | 2 --\n board/ti/am64x/evm.c | 2 --\n board/ti/j784s4/evm.c | 2 --\n board/toradex/apalis-imx8/apalis-imx8.c | 3 ---\n board/toradex/apalis_t30/apalis_t30.c | 3 ---\n board/toradex/colibri-imx8x/colibri-imx8x.c | 3 ---\n board/toradex/colibri_t20/colibri_t20.c | 3 ---\n board/toradex/common/tdx-cfg-block.c | 3 ---\n board/toradex/smarc-imx8mp/smarc-imx8mp.c | 3 ---\n board/toradex/smarc-imx8mp/spl.c | 3 ---\n board/toradex/verdin-imx8mm/spl.c | 3 ---\n board/toradex/verdin-imx8mm/verdin-imx8mm.c | 3 ---\n board/toradex/verdin-imx8mp/spl.c | 3 ---\n board/toradex/verdin-imx8mp/verdin-imx8mp.c | 3 ---\n board/xilinx/zynq/bootimg.c | 3 ---\n boot/bootmeth-uclass.c | 2 --\n boot/fdt_simplefb.c | 3 ---\n boot/image-sig.c | 2 --\n boot/image.c | 3 ---\n cmd/bloblist.c | 3 ---\n cmd/bootefi.c | 3 ---\n cmd/bootm.c | 3 ---\n cmd/date.c | 3 ---\n cmd/mem.c | 3 ---\n cmd/sound.c | 3 ---\n cmd/spl.c | 3 ---\n common/cli_hush.c | 3 ---\n common/stdio.c | 3 ---\n drivers/block/sandbox.c | 3 ---\n drivers/bootcount/pmic_pfuze100.c | 2 --\n drivers/cache/sandbox_cache.c | 3 ---\n drivers/clk/altera/clk-agilex.c | 3 ---\n drivers/clk/altera/clk-agilex5.c | 3 ---\n drivers/clk/altera/clk-mem-n5x.c | 3 ---\n drivers/clk/altera/clk-n5x.c | 3 ---\n drivers/clk/rockchip/clk_px30.c | 3 ---\n drivers/clk/rockchip/clk_rk3308.c | 3 ---\n drivers/clk/rockchip/clk_rk3528.c | 2 --\n drivers/clk/rockchip/clk_rk3568.c | 2 --\n drivers/clk/rockchip/clk_rk3576.c | 2 --\n drivers/clk/rockchip/clk_rk3588.c | 2 --\n drivers/clk/rockchip/clk_rv1108.c | 3 ---\n drivers/clk/rockchip/clk_rv1126.c | 2 --\n drivers/cpu/bcm283x_cpu.c | 3 ---\n drivers/cpu/cpu-uclass.c | 2 --\n drivers/cpu/imx8_cpu.c | 3 ---\n drivers/cpu/mtk_cpu.c | 3 ---\n drivers/firmware/arm-ffa/arm-ffa-uclass.c | 3 ---\n drivers/firmware/arm-ffa/arm-ffa.c | 3 ---\n drivers/firmware/arm-ffa/ffa-emul-uclass.c | 3 ---\n drivers/firmware/arm-ffa/sandbox_ffa.c | 3 ---\n drivers/gpio/gpio-uclass.c | 3 ---\n drivers/gpio/nx_gpio.c | 3 ---\n drivers/i2c/mxc_i2c.c | 3 ---\n drivers/i2c/nx_i2c.c | 3 ---\n drivers/i2c/ocores_i2c.c | 3 ---\n drivers/i2c/soft_i2c.c | 3 ---\n drivers/i2c/synquacer_i2c.c | 2 --\n drivers/mailbox/imx-mailbox.c | 2 --\n drivers/misc/atsha204a-i2c.c | 3 ---\n drivers/misc/fs_loader.c | 3 ---\n drivers/misc/imx8/fuse.c | 3 ---\n drivers/mmc/ca_dw_mmc.c | 3 ---\n drivers/mmc/f_sdh30.c | 2 --\n drivers/mmc/jz_mmc.c | 3 ---\n drivers/mmc/msm_sdhci.c | 3 ---\n drivers/mmc/mv_sdhci.c | 3 ---\n drivers/mtd/nand/raw/pxa3xx_nand.c | 3 ---\n drivers/mtd/nand/raw/tegra_nand.c | 3 ---\n drivers/mtd/nvmxip/nvmxip_qspi.c | 3 ---\n drivers/mtd/spi/sf-uclass.c | 3 ---\n drivers/net/dwmac_s700.c | 3 ---\n drivers/net/fec_mxc.c | 3 ---\n drivers/net/gmac_rockchip.c | 2 --\n drivers/net/mvneta.c | 3 ---\n drivers/net/octeontx/smi.c | 3 ---\n drivers/net/phy/fixed.c | 3 ---\n drivers/net/phy/phy.c | 3 ---\n drivers/net/phy/xilinx_gmii2rgmii.c | 3 ---\n drivers/net/sandbox-raw.c | 3 ---\n drivers/net/sandbox.c | 3 ---\n drivers/net/ti/keystone_net.c | 3 ---\n drivers/net/xilinx_axi_emac.c | 3 ---\n drivers/pci/pci_octeontx.c | 3 ---\n drivers/pci/pcie_dw_meson.c | 3 ---\n drivers/pci/pcie_dw_qcom.c | 3 ---\n drivers/pci/pcie_dw_rockchip.c | 3 ---\n drivers/pci/pcie_dw_ti.c | 3 ---\n drivers/pci/pcie_layerscape.c | 3 ---\n drivers/pci/pcie_starfive_jh7110.c | 3 ---\n drivers/pci_endpoint/pci_ep-uclass.c | 3 ---\n drivers/phy/marvell/comphy_core.c | 3 ---\n drivers/phy/omap-usb2-phy.c | 3 ---\n drivers/phy/rockchip/phy-rockchip-pcie.c | 3 ---\n drivers/phy/rockchip/phy-rockchip-typec.c | 3 ---\n drivers/pinctrl/mtmips/pinctrl-mt7628.c | 3 ---\n drivers/pinctrl/nexell/pinctrl-nexell.c | 3 ---\n drivers/pinctrl/nexell/pinctrl-s5pxx18.c | 3 ---\n drivers/pinctrl/nxp/pinctrl-imx-mmio.c | 3 ---\n drivers/pinctrl/nxp/pinctrl-imx.c | 3 ---\n drivers/pinctrl/nxp/pinctrl-imx8.c | 3 ---\n drivers/pinctrl/nxp/pinctrl-mxs.c | 3 ---\n drivers/power/domain/imx8m-power-domain.c | 3 ---\n drivers/power/pmic/bd71837.c | 3 ---\n drivers/power/pmic/mc34708.c | 3 ---\n drivers/power/pmic/mp5416.c | 3 ---\n drivers/power/pmic/pca9450.c | 3 ---\n drivers/power/regulator/pwm_regulator.c | 3 ---\n drivers/pwm/pwm-sifive.c | 3 ---\n drivers/pwm/rk_pwm.c | 3 ---\n drivers/pwm/sunxi_pwm.c | 3 ---\n drivers/ram/stm32mp1/stm32mp1_tests.c | 3 ---\n drivers/reboot-mode/reboot-mode-gpio.c | 2 --\n drivers/reboot-mode/reboot-mode-rtc.c | 2 --\n drivers/remoteproc/rproc-uclass.c | 2 --\n drivers/serial/ns16550.c | 3 ---\n drivers/serial/sandbox.c | 3 ---\n drivers/serial/serial_adi_uart4.c | 2 --\n drivers/serial/serial_htif.c | 3 ---\n drivers/serial/serial_xen.c | 3 ---\n drivers/smem/msm_smem.c | 3 ---\n drivers/spi/ca_sflash.c | 3 ---\n drivers/spi/microchip_coreqspi.c | 2 --\n drivers/spi/mvebu_a3700_spi.c | 3 ---\n drivers/spi/omap3_spi.c | 3 ---\n drivers/spi/spi-sunxi.c | 3 ---\n drivers/spi/spi-synquacer.c | 2 --\n drivers/spi/spi-uclass.c | 3 ---\n drivers/spi/tegra210_qspi.c | 3 ---\n drivers/spmi/spmi-msm.c | 3 ---\n drivers/thermal/imx_tmu.c | 3 ---\n drivers/timer/ostm_timer.c | 3 ---\n drivers/timer/sp804_timer.c | 3 ---\n drivers/usb/common/common.c | 3 ---\n drivers/usb/phy/rockchip_usb2_phy.c | 3 ---\n drivers/usb/tcpm/tcpm.c | 2 --\n drivers/video/hx8238d.c | 2 --\n drivers/video/imx/mxc_ipuv3_fb.c | 3 ---\n drivers/video/nexell_display.c | 3 ---\n drivers/video/rockchip/rk_lvds.c | 3 ---\n drivers/video/rockchip/rk_mipi.c | 3 ---\n drivers/video/sandbox_sdl.c | 3 ---\n drivers/video/tidss/tidss_drv.c | 2 --\n drivers/video/zynqmp/zynqmp_dpsub.c | 3 ---\n drivers/watchdog/armada-37xx-wdt.c | 3 ---\n drivers/watchdog/at91sam9_wdt.c | 3 ---\n drivers/watchdog/mt7621_wdt.c | 3 ---\n drivers/watchdog/orion_wdt.c | 3 ---\n drivers/watchdog/sbsa_gwdt.c | 3 ---\n drivers/watchdog/wdt-uclass.c | 3 ---\n fs/fs.c | 3 ---\n fs/ubifs/ubifs.c | 3 ---\n include/relocate.h | 2 --\n lib/efi_loader/efi_capsule.c | 3 ---\n lib/efi_loader/efi_gop.c | 3 ---\n lib/efi_loader/efi_rng.c | 3 ---\n net/eth-uclass.c | 3 ---\n net/tftp.c | 3 ---\n net/wget.c | 3 ---\n test/cmd/exit.c | 3 ---\n test/cmd/test_echo.c | 3 ---\n test/cmd/test_pause.c | 3 ---\n test/dm/blk.c | 3 ---\n test/dm/i3c.c | 2 --\n test/lib/test_print.c | 3 ---\n test/log/log_filter.c | 3 ---\n 287 files changed, 810 deletions(-)", "diff": "diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c\nindex b143392ee6c2c16a4da87dc375c45bcf969474c6..91bce5235a554ef9d48a256fb3e67ba51304e236 100644\n--- a/arch/arc/lib/bootm.c\n+++ b/arch/arc/lib/bootm.c\n@@ -10,9 +10,6 @@\n #include <irq_func.h>\n #include <log.h>\n #include <asm/cache.h>\n-#include <asm/global_data.h>\n-\n-DECLARE_GLOBAL_DATA_PTR;\n \n static int cleanup_before_linux(void)\n {\ndiff --git a/arch/arm/cpu/armv7/s5p4418/cpu.c b/arch/arm/cpu/armv7/s5p4418/cpu.c\nindex 27ffb450378f5b3edf9d66ad8e4ef093551fe188..2c5504395594f7079bd08b50d788669efb357501 100644\n--- a/arch/arm/cpu/armv7/s5p4418/cpu.c\n+++ b/arch/arm/cpu/armv7/s5p4418/cpu.c\n@@ -7,7 +7,6 @@\n #include <command.h>\n #include <asm/system.h>\n #include <asm/cache.h>\n-#include <asm/global_data.h>\n #include <asm/sections.h>\n #include <asm/io.h>\n #include <asm/arch/nexell.h>\n@@ -15,8 +14,6 @@\n #include <asm/arch/tieoff.h>\n #include <cpu_func.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #ifndef\tCONFIG_ARCH_CPU_INIT\n #error must be define the macro \"CONFIG_ARCH_CPU_INIT\"\n #endif\ndiff --git a/arch/arm/mach-aspeed/ast2600/spl.c b/arch/arm/mach-aspeed/ast2600/spl.c\nindex 0c5a82ed0947bcbbd8376cf73c1f685186f654bb..60f2c5d291e3fe8adb7c1b6513b993ec291fd9ac 100644\n--- a/arch/arm/mach-aspeed/ast2600/spl.c\n+++ b/arch/arm/mach-aspeed/ast2600/spl.c\n@@ -9,9 +9,6 @@\n #include <linux/err.h>\n #include <asm/io.h>\n #include <asm/arch/scu_ast2600.h>\n-#include <asm/global_data.h>\n-\n-DECLARE_GLOBAL_DATA_PTR;\n \n void board_init_f(ulong dummy)\n {\ndiff --git a/arch/arm/mach-imx/imx8/clock.c b/arch/arm/mach-imx/imx8/clock.c\nindex 4e49b5bf3755a91ec89eeb7416c857c4a87393c2..e37d3bf31e450841e8c19f8dc4e08dd4edca4005 100644\n--- a/arch/arm/mach-imx/imx8/clock.c\n+++ b/arch/arm/mach-imx/imx8/clock.c\n@@ -3,12 +3,9 @@\n * Copyright 2018 NXP\n */\n \n-#include <asm/global_data.h>\n #include <linux/errno.h>\n #include <asm/arch/clock.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n u32 mxc_get_clock(enum mxc_clock clk)\n {\n \tswitch (clk) {\ndiff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c\nindex ce78c8ce919a1c7e3e792c1b13316f8cf3454dbf..8337edc2f62b8a02418efa706f95ca1612e214a9 100644\n--- a/arch/arm/mach-imx/imx8/fdt.c\n+++ b/arch/arm/mach-imx/imx8/fdt.c\n@@ -6,7 +6,6 @@\n #include <log.h>\n #include <firmware/imx/sci/sci.h>\n #include <asm/arch/sys_proto.h>\n-#include <asm/global_data.h>\n #include <dm/ofnode.h>\n #include <fdt_support.h>\n #include <linux/libfdt.h>\n@@ -14,8 +13,6 @@\n #include <cpu.h>\n #include <dm.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static bool check_owned_resource(sc_rsrc_t rsrc_id)\n {\n \tbool owned;\ndiff --git a/arch/arm/mach-imx/imx8/iomux.c b/arch/arm/mach-imx/imx8/iomux.c\nindex 3e27d75827a5f4469275d3ffc6906afb538fd3c5..b6175a50226ccc941260807badb38cdfce04f44c 100644\n--- a/arch/arm/mach-imx/imx8/iomux.c\n+++ b/arch/arm/mach-imx/imx8/iomux.c\n@@ -4,13 +4,10 @@\n */\n \n #include <log.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/arch/iomux.h>\n #include <firmware/imx/sci/sci.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /*\n * configures a single pad in the iomuxer\n */\ndiff --git a/arch/arm/mach-imx/imx8m/clock_imx8mm.c b/arch/arm/mach-imx/imx8m/clock_imx8mm.c\nindex 77c8efc7899cc33c0c0be94a20925434e10249cc..b7b3702041ee418a6f3c517cc99cd37aa9597ba9 100644\n--- a/arch/arm/mach-imx/imx8m/clock_imx8mm.c\n+++ b/arch/arm/mach-imx/imx8m/clock_imx8mm.c\n@@ -8,7 +8,6 @@\n #include <asm/arch/clock.h>\n #include <asm/arch/imx-regs.h>\n #include <asm/arch/sys_proto.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <div64.h>\n #include <errno.h>\n@@ -16,8 +15,6 @@\n #include <linux/delay.h>\n #include <phy.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static struct anamix_pll *ana_pll = (struct anamix_pll *)ANATOP_BASE_ADDR;\n \n static u32 get_root_clk(enum clk_root_index clock_id);\ndiff --git a/arch/arm/mach-imx/imx8ulp/cgc.c b/arch/arm/mach-imx/imx8ulp/cgc.c\nindex f9d8ed5b048b616cac1b1398f906444beed09ae2..69585a3605b6be75b44b092752dc138b82287496 100644\n--- a/arch/arm/mach-imx/imx8ulp/cgc.c\n+++ b/arch/arm/mach-imx/imx8ulp/cgc.c\n@@ -10,12 +10,9 @@\n #include <asm/arch/cgc.h>\n #include <asm/arch/clock.h>\n #include <asm/arch/sys_proto.h>\n-#include <asm/global_data.h>\n #include <linux/delay.h>\n #include <hang.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static struct cgc1_regs *cgc1_regs = (struct cgc1_regs *)0x292C0000UL;\n static struct cgc2_regs *cgc2_regs = (struct cgc2_regs *)0x2da60000UL;\n \ndiff --git a/arch/arm/mach-imx/imx8ulp/clock.c b/arch/arm/mach-imx/imx8ulp/clock.c\nindex c390f20d7694660f039ada2a595f3df5facfe8a6..1b5cbd56f50ba4df08f18154c8a7eeadfef28346 100644\n--- a/arch/arm/mach-imx/imx8ulp/clock.c\n+++ b/arch/arm/mach-imx/imx8ulp/clock.c\n@@ -12,11 +12,8 @@\n #include <asm/arch/pcc.h>\n #include <asm/arch/cgc.h>\n #include <asm/arch/sys_proto.h>\n-#include <asm/global_data.h>\n #include <linux/delay.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define PLL_USB_EN_USB_CLKS_MASK\t(0x01 << 6)\n #define PLL_USB_PWR_MASK\t\t(0x01 << 12)\n #define PLL_USB_ENABLE_MASK\t\t(0x01 << 13)\ndiff --git a/arch/arm/mach-imx/imx9/clock.c b/arch/arm/mach-imx/imx9/clock.c\nindex e65cabef2c96a3e707112ba07a646fd5babbbe6a..14a2bdf5762fab557c4a0e9c7733e4224ec7111f 100644\n--- a/arch/arm/mach-imx/imx9/clock.c\n+++ b/arch/arm/mach-imx/imx9/clock.c\n@@ -10,7 +10,6 @@\n #include <asm/arch/imx-regs.h>\n #include <asm/arch/ccm_regs.h>\n #include <asm/arch/sys_proto.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <div64.h>\n #include <errno.h>\n@@ -19,8 +18,6 @@\n #include <log.h>\n #include <phy.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static struct anatop_reg *ana_regs = (struct anatop_reg *)ANATOP_BASE_ADDR;\n \n static struct imx_intpll_rate_table imx9_intpll_tbl[] = {\ndiff --git a/arch/arm/mach-imx/imx9/clock_root.c b/arch/arm/mach-imx/imx9/clock_root.c\nindex 5dbc398e97f8b79e367eef9079b7cb6ad066360a..acf79a40584ee8ea90c586847ca95816ad73c087 100644\n--- a/arch/arm/mach-imx/imx9/clock_root.c\n+++ b/arch/arm/mach-imx/imx9/clock_root.c\n@@ -11,11 +11,8 @@\n #include <asm/arch/clock.h>\n #include <asm/arch/imx-regs.h>\n #include <asm/arch/sys_proto.h>\n-#include <asm/global_data.h>\n #include <linux/iopoll.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static struct ccm_reg *ccm_reg = (struct ccm_reg *)CCM_BASE_ADDR;\n \n static enum ccm_clk_src clk_root_mux[][4] = {\ndiff --git a/arch/arm/mach-imx/misc.c b/arch/arm/mach-imx/misc.c\nindex 7452b82f110557726d66c458f4cd69589118b525..90d91b2300ad1273463451f7757abf92f14c7efb 100644\n--- a/arch/arm/mach-imx/misc.c\n+++ b/arch/arm/mach-imx/misc.c\n@@ -6,14 +6,11 @@\n #include <lmb.h>\n #include <log.h>\n #include <asm/arch/sys_proto.h>\n-#include <asm/global_data.h>\n #include <linux/delay.h>\n #include <linux/errno.h>\n #include <asm/io.h>\n #include <asm/mach-imx/regs-common.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* 1 second delay should be plenty of time for block reset. */\n #define\tRESET_MAX_TIMEOUT\t1000000\n \ndiff --git a/arch/arm/mach-imx/spl_imx_romapi.c b/arch/arm/mach-imx/spl_imx_romapi.c\nindex b7008df8e35ad381ea6e75d02e372c74b65a5817..d36536e600e50ec930f70b5684e658d005cb25d2 100644\n--- a/arch/arm/mach-imx/spl_imx_romapi.c\n+++ b/arch/arm/mach-imx/spl_imx_romapi.c\n@@ -7,13 +7,10 @@\n #include <image.h>\n #include <imx_container.h>\n #include <log.h>\n-#include <asm/global_data.h>\n #include <linux/libfdt.h>\n #include <spl.h>\n #include <asm/arch/sys_proto.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* Caller need ensure the offset and size to align with page size */\n ulong spl_romapi_raw_seekable_read(u32 offset, u32 size, void *buf)\n {\ndiff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c\nindex 6535539184ccfbb4cb891f5510a8c63ad274d602..542792cad1b47423a95f6788be404cb9c14722b5 100644\n--- a/arch/arm/mach-meson/board-axg.c\n+++ b/arch/arm/mach-meson/board-axg.c\n@@ -10,13 +10,10 @@\n #include <asm/arch/eth.h>\n #include <asm/arch/axg.h>\n #include <asm/arch/mem.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/armv8/mmu.h>\n #include <linux/sizes.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int meson_get_boot_device(void)\n {\n \treturn readl(AXG_AO_SEC_GP_CFG0) & AXG_AO_BOOT_DEVICE;\ndiff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c\nindex dc4abe1e107469c8cdd3917fcecbcbb774632449..17722cb897d312e83fed6bca944fcb9ce4f23d53 100644\n--- a/arch/arm/mach-meson/board-g12a.c\n+++ b/arch/arm/mach-meson/board-g12a.c\n@@ -12,13 +12,10 @@\n #include <asm/arch/g12a.h>\n #include <asm/arch/mem.h>\n #include <asm/arch/meson-vpu.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/armv8/mmu.h>\n #include <linux/sizes.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int meson_get_boot_device(void)\n {\n \treturn readl(G12A_AO_SEC_GP_CFG0) & G12A_AO_BOOT_DEVICE;\ndiff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c\nindex 0370ed57e205073f431175eea9911e0d31861dab..d5c506df22b30177c1d02845124e0d0d544a5ce6 100644\n--- a/arch/arm/mach-meson/board-gx.c\n+++ b/arch/arm/mach-meson/board-gx.c\n@@ -11,14 +11,11 @@\n #include <asm/arch/gx.h>\n #include <asm/arch/mem.h>\n #include <asm/arch/meson-vpu.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/armv8/mmu.h>\n #include <linux/printk.h>\n #include <linux/sizes.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int meson_get_boot_device(void)\n {\n \treturn readl(GX_AO_SEC_GP_CFG0) & GX_AO_BOOT_DEVICE;\ndiff --git a/arch/arm/mach-socfpga/clock_manager_agilex.c b/arch/arm/mach-socfpga/clock_manager_agilex.c\nindex 9987d5bcee6fab4f4ce102c8e748dbcfbb032278..95c7f044952b05d7e935893bf4631e00ff209243 100644\n--- a/arch/arm/mach-socfpga/clock_manager_agilex.c\n+++ b/arch/arm/mach-socfpga/clock_manager_agilex.c\n@@ -10,12 +10,9 @@\n #include <malloc.h>\n #include <asm/arch/clock_manager.h>\n #include <asm/arch/system_manager.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <dt-bindings/clock/agilex-clock.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static ulong cm_get_rate_dm(u32 id)\n {\n \tstruct udevice *dev;\ndiff --git a/arch/arm/mach-socfpga/clock_manager_agilex5.c b/arch/arm/mach-socfpga/clock_manager_agilex5.c\nindex 7ec28d91ef326222e880ea8920575c09cbe96ab4..fa068a9eeb16a67f41d3c2cabf65e04bb8f0d9d6 100644\n--- a/arch/arm/mach-socfpga/clock_manager_agilex5.c\n+++ b/arch/arm/mach-socfpga/clock_manager_agilex5.c\n@@ -14,7 +14,6 @@\n #include <stdio.h>\n #include <time.h>\n #include <vsprintf.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <linux/kernel.h>\n #include <linux/string.h>\n@@ -23,8 +22,6 @@\n #include <asm/arch/system_manager.h>\n #include <dt-bindings/clock/agilex5-clock.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static ulong cm_get_rate_dm(u32 id)\n {\n \tstruct udevice *dev;\ndiff --git a/arch/arm/mach-socfpga/clock_manager_n5x.c b/arch/arm/mach-socfpga/clock_manager_n5x.c\nindex c4c071330fc34857396b91aa1bd4d29895be1047..8e47b4b8f5bda1b6e1e71a91e16b2e4a427c48c1 100644\n--- a/arch/arm/mach-socfpga/clock_manager_n5x.c\n+++ b/arch/arm/mach-socfpga/clock_manager_n5x.c\n@@ -6,15 +6,12 @@\n \n #include <asm/arch/clock_manager.h>\n #include <asm/arch/system_manager.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <clk.h>\n #include <dm.h>\n #include <dt-bindings/clock/n5x-clock.h>\n #include <malloc.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static ulong cm_get_rate_dm(u32 id)\n {\n \tstruct udevice *dev;\ndiff --git a/arch/arm/mach-socfpga/clock_manager_s10.c b/arch/arm/mach-socfpga/clock_manager_s10.c\nindex d6c64e9801076824a32c096b9260a58fd25b01f5..fd27470f967f87ab2f32bad53d405bdf47c88fff 100644\n--- a/arch/arm/mach-socfpga/clock_manager_s10.c\n+++ b/arch/arm/mach-socfpga/clock_manager_s10.c\n@@ -7,14 +7,11 @@\n #include <compiler.h>\n #include <dm/device.h>\n #include <linux/errno.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/arch/clock_manager.h>\n #include <asm/arch/handoff_soc64.h>\n #include <asm/arch/system_manager.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /*\n * function to write the bypass register which requires a poll of the\n * busy bit\ndiff --git a/arch/arm/mach-socfpga/mailbox_s10.c b/arch/arm/mach-socfpga/mailbox_s10.c\nindex f9c34e857117bd5c5e2ef62630fc12e85fd325d7..5e8768168d3f14da8bfe67d138f0a7919ca428e7 100644\n--- a/arch/arm/mach-socfpga/mailbox_s10.c\n+++ b/arch/arm/mach-socfpga/mailbox_s10.c\n@@ -8,15 +8,12 @@\n #include <asm/arch/mailbox_s10.h>\n #include <asm/arch/smc_api.h>\n #include <asm/arch/system_manager.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/secure.h>\n #include <asm/system.h>\n #include <hang.h>\n #include <wait_bit.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define MBOX_READL(reg)\t\t\t\\\n \t readl(SOCFPGA_MAILBOX_ADDRESS + (reg))\n \ndiff --git a/arch/arm/mach-socfpga/misc_gen5.c b/arch/arm/mach-socfpga/misc_gen5.c\nindex 5259ef54d734aa0575a05c05e26da7280fba7c59..ae33051c00f23d26ecdd1a010de1f3eff4d60e71 100644\n--- a/arch/arm/mach-socfpga/misc_gen5.c\n+++ b/arch/arm/mach-socfpga/misc_gen5.c\n@@ -6,7 +6,6 @@\n #include <config.h>\n #include <cpu_func.h>\n #include <init.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <env.h>\n #include <errno.h>\n@@ -28,8 +27,6 @@\n \n #include <dt-bindings/reset/altr,rst-mgr.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static struct pl310_regs *const pl310 =\n \t(struct pl310_regs *)CFG_SYS_PL310_BASE;\n static struct nic301_registers *nic301_regs =\ndiff --git a/arch/arm/mach-socfpga/misc_soc64.c b/arch/arm/mach-socfpga/misc_soc64.c\nindex 5222b384434aa29bba13dc4e62059f91cc3d7cd8..356240a647e85c903b59ec7e6f5d4188c4eadd79 100644\n--- a/arch/arm/mach-socfpga/misc_soc64.c\n+++ b/arch/arm/mach-socfpga/misc_soc64.c\n@@ -17,11 +17,8 @@\n #include <asm/arch/system_manager.h>\n #include <asm/io.h>\n #include <asm/system.h>\n-#include <asm/global_data.h>\n #include <mach/clock_manager.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* Agilex5 Sub Device Jtag ID List */\n #define A3690_JTAG_ID\t0x036090DD\n #define A3694_JTAG_ID\t0x436090DD\ndiff --git a/arch/arm/mach-socfpga/mmu-arm64_s10.c b/arch/arm/mach-socfpga/mmu-arm64_s10.c\nindex 1dc44ab47972bac02215514e8e5a8478c9272e05..1a7f8d42415984c5edb4199c0b355c2dbfe7d666 100644\n--- a/arch/arm/mach-socfpga/mmu-arm64_s10.c\n+++ b/arch/arm/mach-socfpga/mmu-arm64_s10.c\n@@ -5,9 +5,6 @@\n */\n \n #include <asm/armv8/mmu.h>\n-#include <asm/global_data.h>\n-\n-DECLARE_GLOBAL_DATA_PTR;\n \n #if IS_ENABLED(CONFIG_TARGET_SOCFPGA_AGILEX5)\n static struct mm_region socfpga_agilex5_mem_map[] = {\ndiff --git a/arch/arm/mach-socfpga/reset_manager_s10.c b/arch/arm/mach-socfpga/reset_manager_s10.c\nindex abb62a9b49ff339b06e914e917a82f92df1be039..7e1ecc1cd1d935f743ba357deb7ef48fd9bd4fae 100644\n--- a/arch/arm/mach-socfpga/reset_manager_s10.c\n+++ b/arch/arm/mach-socfpga/reset_manager_s10.c\n@@ -7,7 +7,6 @@\n \n #include <errno.h>\n #include <hang.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/secure.h>\n #include <asm/arch/reset_manager.h>\n@@ -20,8 +19,6 @@\n #include <linux/intel-smc.h>\n #include <wait_bit.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define TIMEOUT_300MS 300\n \n /* F2S manager registers */\ndiff --git a/arch/arm/mach-socfpga/spl_agilex.c b/arch/arm/mach-socfpga/spl_agilex.c\nindex 48f258a37b4b61f854bdd0b9a41430a2b0dde4f5..53a9aa55f804b24b96f548adb6c17ee976551ac7 100644\n--- a/arch/arm/mach-socfpga/spl_agilex.c\n+++ b/arch/arm/mach-socfpga/spl_agilex.c\n@@ -7,7 +7,6 @@\n \n #include <init.h>\n #include <log.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/utils.h>\n #include <hang.h>\n@@ -22,8 +21,6 @@\n #include <wdt.h>\n #include <dm/uclass.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n u32 reset_flag(u32 flag)\n {\n \t/* Check rstmgr.stat for warm reset status */\ndiff --git a/arch/arm/mach-socfpga/spl_agilex5.c b/arch/arm/mach-socfpga/spl_agilex5.c\nindex 1be347360f50dfc44ed92af56c7cc7e6992fb8a2..2c3e40b664abd28497f554a6501ead21b331ca76 100644\n--- a/arch/arm/mach-socfpga/spl_agilex5.c\n+++ b/arch/arm/mach-socfpga/spl_agilex5.c\n@@ -6,7 +6,6 @@\n */\n \n #include <init.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <hang.h>\n #include <spl.h>\n@@ -19,8 +18,6 @@\n #include <wdt.h>\n #include <dm/uclass.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n u32 reset_flag(u32 flag)\n {\n \t/* Check rstmgr.stat for warm reset status */\ndiff --git a/arch/arm/mach-socfpga/spl_agilex7m.c b/arch/arm/mach-socfpga/spl_agilex7m.c\nindex 90065ccee6f00880862c27862b20ca292531eafb..7371202a7124a37073bdf58959e3ff41d5a85a25 100644\n--- a/arch/arm/mach-socfpga/spl_agilex7m.c\n+++ b/arch/arm/mach-socfpga/spl_agilex7m.c\n@@ -15,14 +15,11 @@\n #include <asm/arch/misc.h>\n #include <asm/arch/reset_manager.h>\n #include <asm/arch/system_manager.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/u-boot.h>\n #include <asm/utils.h>\n #include <dm/uclass.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n void board_init_f(ulong dummy)\n {\n \tint ret;\ndiff --git a/arch/arm/mach-socfpga/spl_gen5.c b/arch/arm/mach-socfpga/spl_gen5.c\nindex df79cfe0f7fafd4e84f27a23a6b66054fcf8afc3..08b756db2cae13c687f6c593c6afa823eb93b7e9 100644\n--- a/arch/arm/mach-socfpga/spl_gen5.c\n+++ b/arch/arm/mach-socfpga/spl_gen5.c\n@@ -6,7 +6,6 @@\n #include <hang.h>\n #include <init.h>\n #include <log.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/utils.h>\n #include <image.h>\n@@ -25,8 +24,6 @@\n #include <dm/uclass.h>\n #include <linux/bitops.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n u32 spl_boot_device(void)\n {\n \tconst u32 bsel = readl(socfpga_get_sysmgr_addr() +\ndiff --git a/arch/arm/mach-socfpga/spl_n5x.c b/arch/arm/mach-socfpga/spl_n5x.c\nindex 81283ef71620034ca173048c27cefed6a62c32d2..a49be8379210c6641904b8491404e6bdc888f704 100644\n--- a/arch/arm/mach-socfpga/spl_n5x.c\n+++ b/arch/arm/mach-socfpga/spl_n5x.c\n@@ -10,7 +10,6 @@\n #include <asm/arch/misc.h>\n #include <asm/arch/reset_manager.h>\n #include <asm/arch/system_manager.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/utils.h>\n #include <dm/uclass.h>\n@@ -20,8 +19,6 @@\n #include <spl.h>\n #include <watchdog.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n void board_init_f(ulong dummy)\n {\n \tint ret;\ndiff --git a/arch/arm/mach-socfpga/spl_s10.c b/arch/arm/mach-socfpga/spl_s10.c\nindex fa83ff96adc862afb2209ba91c031ce89517e97b..a0d3c96d4562892ff795258c1f609f33a3562911 100644\n--- a/arch/arm/mach-socfpga/spl_s10.c\n+++ b/arch/arm/mach-socfpga/spl_s10.c\n@@ -7,7 +7,6 @@\n #include <hang.h>\n #include <init.h>\n #include <log.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/utils.h>\n #include <debug_uart.h>\n@@ -22,8 +21,6 @@\n #include <watchdog.h>\n #include <dm/uclass.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n void board_init_f(ulong dummy)\n {\n \tconst struct cm_config *cm_default_cfg = cm_get_default_config();\ndiff --git a/arch/arm/mach-socfpga/system_manager_soc64.c b/arch/arm/mach-socfpga/system_manager_soc64.c\nindex 913f93c8f94d8eed319f52161a9e63bedab05eea..a5c0387190b26a87eec1292816e25467c9818d59 100644\n--- a/arch/arm/mach-socfpga/system_manager_soc64.c\n+++ b/arch/arm/mach-socfpga/system_manager_soc64.c\n@@ -6,12 +6,9 @@\n \n #include <asm/arch/handoff_soc64.h>\n #include <asm/arch/system_manager.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <linux/bitfield.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #if IS_ENABLED(CONFIG_TARGET_SOCFPGA_AGILEX5)\n /*\n * Setting RESET_PULSE_OVERRIDE bit for successful reset staggering pulse\ndiff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c\nindex 4879a41aab3bb141a6e6b5d532484c1fb7221b80..2410515f4ac504ab6e64bd0e70922f854d3e15e9 100644\n--- a/arch/microblaze/lib/bootm.c\n+++ b/arch/microblaze/lib/bootm.c\n@@ -17,12 +17,9 @@\n #include <image.h>\n #include <log.h>\n #include <asm/cache.h>\n-#include <asm/global_data.h>\n #include <u-boot/zlib.h>\n #include <asm/byteorder.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static void boot_jump_linux(struct bootm_headers *images, int flag)\n {\n \tvoid (*thekernel)(char *cmdline, ulong rd, ulong dt);\ndiff --git a/arch/mips/mach-ath79/qca956x/ddr.c b/arch/mips/mach-ath79/qca956x/ddr.c\nindex 2e46e24f48309871e44b1ca2c59b1106228c6bcc..754e2573e37d7b2e722dff4259abe087cf788e9d 100644\n--- a/arch/mips/mach-ath79/qca956x/ddr.c\n+++ b/arch/mips/mach-ath79/qca956x/ddr.c\n@@ -5,7 +5,6 @@\n * Based on QSDK\n */\n \n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/addrspace.h>\n #include <asm/types.h>\n@@ -182,8 +181,6 @@\n \tDDR_CTL_CONFIG_MISC_SRC1_SRAM_SYNC_SET(0x1) | \\\n \tDDR_CTL_CONFIG_MISC_SRC2_SRAM_SYNC_SET(0x1)\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n void qca956x_ddr_init(void)\n {\n \tu32 ddr_config, ddr_config2, ddr_config3, mod_val, \\\ndiff --git a/arch/mips/mach-mscc/cpu.c b/arch/mips/mach-mscc/cpu.c\nindex 22b1b98e0ef4e545b7bbcd0100c6b0c6b5403c66..8ae6fb9437ae407b27fe75bdcdfefb5137092c1d 100644\n--- a/arch/mips/mach-mscc/cpu.c\n+++ b/arch/mips/mach-mscc/cpu.c\n@@ -4,7 +4,6 @@\n */\n \n #include <init.h>\n-#include <asm/global_data.h>\n #include <linux/bitops.h>\n \n #include <asm/io.h>\n@@ -14,8 +13,6 @@\n #include <mach/tlb.h>\n #include <mach/ddr.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #if CFG_SYS_SDRAM_SIZE <= SZ_64M\n #define MSCC_RAM_TLB_SIZE SZ_64M\n #define MSCC_ATTRIB2 MMU_REGIO_INVAL\ndiff --git a/arch/mips/mach-mtmips/ddr_cal.c b/arch/mips/mach-mtmips/ddr_cal.c\nindex e2e1760a64681a07c26158de0c4e036d993c564f..5fc4e0c49e86528a280cc158cd27680409ba9e32 100644\n--- a/arch/mips/mach-mtmips/ddr_cal.c\n+++ b/arch/mips/mach-mtmips/ddr_cal.c\n@@ -7,13 +7,10 @@\n \n #include <asm/addrspace.h>\n #include <asm/cacheops.h>\n-#include <asm/global_data.h>\n #include <linux/bitops.h>\n #include <linux/io.h>\n #include <mach/mc.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define COARSE_MIN_START\t6\n #define FINE_MIN_START\t\t15\n #define COARSE_MAX_START\t7\ndiff --git a/arch/mips/mach-octeon/cvmx-pko.c b/arch/mips/mach-octeon/cvmx-pko.c\nindex 8a9181362bda894922f2adab59c51bcef6492563..432488f7815bc95ea0c20f60844c4699071381fd 100644\n--- a/arch/mips/mach-octeon/cvmx-pko.c\n+++ b/arch/mips/mach-octeon/cvmx-pko.c\n@@ -52,8 +52,6 @@\n #include <mach/cvmx-helper-pki.h>\n #include <mach/cvmx-helper-pko.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define CVMX_PKO_NQ_PER_PORT_MAX 32\n \n static cvmx_pko_return_value_t cvmx_pko2_config_port(short ipd_port,\ndiff --git a/arch/nios2/lib/bootm.c b/arch/nios2/lib/bootm.c\nindex 71319839ba21b68b714ffa59e044ea486b58847d..294ebfb508ba786d98df179ac4230549cedac5a7 100644\n--- a/arch/nios2/lib/bootm.c\n+++ b/arch/nios2/lib/bootm.c\n@@ -10,9 +10,6 @@\n #include <image.h>\n #include <irq_func.h>\n #include <log.h>\n-#include <asm/global_data.h>\n-\n-DECLARE_GLOBAL_DATA_PTR;\n \n #define NIOS_MAGIC 0x534f494e /* enable command line and initrd passing */\n \ndiff --git a/arch/riscv/cpu/andes/spl.c b/arch/riscv/cpu/andes/spl.c\nindex a13dc4095a457372cbc1e64f1b11170a95c92d3d..1e19fad92884617368300dac881ea73435383dbb 100644\n--- a/arch/riscv/cpu/andes/spl.c\n+++ b/arch/riscv/cpu/andes/spl.c\n@@ -8,11 +8,8 @@\n #include <init.h>\n #include <log.h>\n #include <spl.h>\n-#include <asm/global_data.h>\n #include <asm/system.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #if CONFIG_IS_ENABLED(RAM_SUPPORT)\n struct legacy_img_hdr *spl_get_load_buffer(ssize_t offset, size_t size)\n {\ndiff --git a/arch/riscv/cpu/cv1800b/dram.c b/arch/riscv/cpu/cv1800b/dram.c\nindex 91007c0a3d341bfd7927e73525ec6c6c5983b17d..5d7659887b9a41ea1e6f87681e0e07c6400ab55d 100644\n--- a/arch/riscv/cpu/cv1800b/dram.c\n+++ b/arch/riscv/cpu/cv1800b/dram.c\n@@ -5,11 +5,8 @@\n \n #include <fdtdec.h>\n #include <init.h>\n-#include <asm/global_data.h>\n #include <linux/sizes.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int dram_init(void)\n {\n \treturn fdtdec_setup_mem_size_base();\ndiff --git a/arch/riscv/cpu/generic/dram.c b/arch/riscv/cpu/generic/dram.c\nindex 91007c0a3d341bfd7927e73525ec6c6c5983b17d..5d7659887b9a41ea1e6f87681e0e07c6400ab55d 100644\n--- a/arch/riscv/cpu/generic/dram.c\n+++ b/arch/riscv/cpu/generic/dram.c\n@@ -5,11 +5,8 @@\n \n #include <fdtdec.h>\n #include <init.h>\n-#include <asm/global_data.h>\n #include <linux/sizes.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int dram_init(void)\n {\n \treturn fdtdec_setup_mem_size_base();\ndiff --git a/arch/riscv/cpu/k230/dram.c b/arch/riscv/cpu/k230/dram.c\nindex b2d3e4fd6a96d7fc6ca8b8507f4eba85f7e9c9b5..5d7659887b9a41ea1e6f87681e0e07c6400ab55d 100644\n--- a/arch/riscv/cpu/k230/dram.c\n+++ b/arch/riscv/cpu/k230/dram.c\n@@ -3,13 +3,10 @@\n * Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>\n */\n \n-#include <asm/global_data.h>\n #include <fdtdec.h>\n #include <init.h>\n #include <linux/sizes.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int dram_init(void)\n {\n \treturn fdtdec_setup_mem_size_base();\ndiff --git a/arch/riscv/cpu/th1520/spl.c b/arch/riscv/cpu/th1520/spl.c\nindex b95470485f6d5cf6125f285145c291ef9102e02c..ceb934021d9f0102e1258a4dcead80b76f91ca82 100644\n--- a/arch/riscv/cpu/th1520/spl.c\n+++ b/arch/riscv/cpu/th1520/spl.c\n@@ -10,8 +10,6 @@\n #include <log.h>\n #include <init.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define TH1520_SUBSYS_CLK\t\t(void __iomem *)(0xffff011000 + 0x220)\n #define TH1520_SUBSYS_CLK_VO_EN\tBIT(2)\n #define TH1520_SUBSYS_CLK_VI_EN\tBIT(1)\ndiff --git a/arch/sh/lib/bootm.c b/arch/sh/lib/bootm.c\nindex bb0f59e0aa23d1172244c51d55df310c63be6816..1c118870dad684b457325a823e8f08bca28be94a 100644\n--- a/arch/sh/lib/bootm.c\n+++ b/arch/sh/lib/bootm.c\n@@ -13,11 +13,8 @@\n #include <env.h>\n #include <image.h>\n #include <asm/byteorder.h>\n-#include <asm/global_data.h>\n #include <asm/zimage.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #ifdef CONFIG_SH_SDRAM_OFFSET\n #define GET_INITRD_START(initrd, linux) (initrd - linux + CONFIG_SH_SDRAM_OFFSET)\n #else\ndiff --git a/arch/x86/cpu/ivybridge/model_206ax.c b/arch/x86/cpu/ivybridge/model_206ax.c\nindex b72de96a277eb0fe8c7bd0a899f5b264303aca87..ed0ad686b3faf946deab19c9e78a21959e477ceb 100644\n--- a/arch/x86/cpu/ivybridge/model_206ax.c\n+++ b/arch/x86/cpu/ivybridge/model_206ax.c\n@@ -14,7 +14,6 @@\n #include <asm/cpu.h>\n #include <asm/cpu_common.h>\n #include <asm/cpu_x86.h>\n-#include <asm/global_data.h>\n #include <asm/msr.h>\n #include <asm/msr-index.h>\n #include <asm/mtrr.h>\n@@ -23,8 +22,6 @@\n #include <asm/turbo.h>\n #include <asm/arch/model_206ax.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static void enable_vmx(void)\n {\n \tstruct cpuid_result regs;\ndiff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c\nindex bd0efde00c1090d47c7cbc9ed7227f328ec06ff7..96943cb8c462d82127a98289accca7c0eff8187c 100644\n--- a/arch/x86/lib/init_helpers.c\n+++ b/arch/x86/lib/init_helpers.c\n@@ -5,13 +5,10 @@\n */\n \n #include <init.h>\n-#include <asm/global_data.h>\n #include <linux/errno.h>\n #include <asm/mtrr.h>\n #include <asm/u-boot-x86.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int init_cache_f_r(void)\n {\n \tbool do_mtrr = CONFIG_IS_ENABLED(X86_32BIT_INIT) ||\ndiff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c\nindex 2ea9bcf59c2796bad6fb5682866a5ab4fd05a9ba..a5f2231aa523356de93368338b5fd249b8abad6e 100644\n--- a/arch/x86/lib/zimage.c\n+++ b/arch/x86/lib/zimage.c\n@@ -30,7 +30,6 @@\n #include <asm/bootm.h>\n #include <asm/bootparam.h>\n #include <asm/efi.h>\n-#include <asm/global_data.h>\n #ifdef CONFIG_SYS_COREBOOT\n #include <asm/arch/timestamp.h>\n #endif\n@@ -38,8 +37,6 @@\n #include <linux/ctype.h>\n #include <linux/libfdt.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /*\n * Memory lay-out:\n *\ndiff --git a/arch/xtensa/lib/time.c b/arch/xtensa/lib/time.c\nindex 319635c6b0936515f2cd219f122bc62858817830..1fe33a4c62b948cf5b3c85b5a7cb67e7ec5c323a 100644\n--- a/arch/xtensa/lib/time.c\n+++ b/arch/xtensa/lib/time.c\n@@ -5,12 +5,9 @@\n \n #include <clock_legacy.h>\n #include <time.h>\n-#include <asm/global_data.h>\n #include <linux/delay.h>\n #include <linux/stringify.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #if XCHAL_HAVE_CCOUNT\n static ulong get_ccount(void)\n {\ndiff --git a/board/BuR/brsmarc1/board.c b/board/BuR/brsmarc1/board.c\nindex c05eec6b35ed1d5e871e80efd24641e130595f80..01d7a8c39e23f087ea539d722084234caa8b5efd 100644\n--- a/board/BuR/brsmarc1/board.c\n+++ b/board/BuR/brsmarc1/board.c\n@@ -18,7 +18,6 @@\n #include <asm/arch/clock.h>\n #include <asm/arch/sys_proto.h>\n #include <asm/arch/mem.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/gpio.h>\n #include <asm/emif.h>\n@@ -30,8 +29,6 @@\n /* -- defines for used GPIO Hardware -- */\n #define PER_RESET\t\t(2 * 32 + 0)\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #if defined(CONFIG_XPL_BUILD)\n static const struct ddr_data ddr3_data = {\n \t.datardsratio0 = MT41K256M16HA125E_RD_DQS,\ndiff --git a/board/BuR/common/common.c b/board/BuR/common/common.c\nindex 3513f43a9f560d28d0da68d229ecf3a1b7cf6c19..bbafecd79097070e3eb9462bccc05626f8bbc76a 100644\n--- a/board/BuR/common/common.c\n+++ b/board/BuR/common/common.c\n@@ -13,12 +13,9 @@\n #include <env.h>\n #include <fdtdec.h>\n #include <i2c.h>\n-#include <asm/global_data.h>\n #include <linux/delay.h>\n #include \"bur_common.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* --------------------------------------------------------------------------*/\n \n int ft_board_setup(void *blob, struct bd_info *bd)\ndiff --git a/board/Marvell/octeontx/smc.c b/board/Marvell/octeontx/smc.c\nindex 8df32049bda69e99cf28c0dd78e372cc94790d4d..ab6284a732cfa2c3057149bff5df69f9f25f3a95 100644\n--- a/board/Marvell/octeontx/smc.c\n+++ b/board/Marvell/octeontx/smc.c\n@@ -5,13 +5,10 @@\n * https://spdx.org/licenses\n */\n \n-#include <asm/global_data.h>\n #include <asm/ptrace.h>\n #include <asm/system.h>\n #include <asm/arch/smc.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n ssize_t smc_dram_size(unsigned int node)\n {\n \tstruct pt_regs regs;\ndiff --git a/board/Marvell/octeontx2/smc.c b/board/Marvell/octeontx2/smc.c\nindex 9e3169576c65ec052001ce43d57f1143d68a46d6..10645a74f6990555afbd81a48fe7561d1621658b 100644\n--- a/board/Marvell/octeontx2/smc.c\n+++ b/board/Marvell/octeontx2/smc.c\n@@ -5,15 +5,12 @@\n * https://spdx.org/licenses\n */\n \n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/psci.h>\n #include <asm/ptrace.h>\n #include <asm/system.h>\n #include <asm/arch/smc.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n ssize_t smc_dram_size(unsigned int node)\n {\n \tstruct pt_regs regs;\ndiff --git a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c\nindex 8c9e98308765c0b3d70d22337fbf6a654c408d03..a9a12a4f659139d60adfe157c5398339ecda9469 100644\n--- a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c\n+++ b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c\n@@ -26,8 +26,6 @@\n #include <linux/kernel.h>\n #include <power/pmic.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #ifdef CONFIG_NAND_MXS\n static void setup_gpmi_nand(void)\n {\ndiff --git a/board/advantech/imx8mp_rsb3720a1/spl.c b/board/advantech/imx8mp_rsb3720a1/spl.c\nindex 1f7c1f25adcf969d6a980a5795e89e9295b2a692..fb8e84377598cfde5bd8e274ef0fd23c759c7504 100644\n--- a/board/advantech/imx8mp_rsb3720a1/spl.c\n+++ b/board/advantech/imx8mp_rsb3720a1/spl.c\n@@ -29,8 +29,6 @@\n #include <power/pmic.h>\n #include <power/pca9450.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int spl_board_boot_device(enum boot_device boot_dev_spl)\n {\n #ifdef CONFIG_SPL_BOOTROM_SUPPORT\ndiff --git a/board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c b/board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c\nindex accd300df04d658eb1ca39b4649966feb08129e4..fbe8b247e696d2a043c396145963676a08149236 100644\n--- a/board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c\n+++ b/board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c\n@@ -16,8 +16,6 @@\n #include <asm/arch/sys_proto.h>\n /* #include <power-domain.h> */\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define UART_PAD_CTRL\t((SC_PAD_CONFIG_OUT_IN << PADRING_CONFIG_SHIFT) | \\\n \t\t\t(SC_PAD_ISO_OFF << PADRING_LPCONFIG_SHIFT) | \\\n \t\t\t(SC_PAD_28FDSOI_DSE_DV_HIGH << PADRING_DSE_SHIFT) | \\\ndiff --git a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c\nindex 3def182f2967e24fb2b444632866877da9725d3d..8214e62776882d7730d37e36203c0ae4b44f59ac 100644\n--- a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c\n+++ b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c\n@@ -8,7 +8,6 @@\n #include <env.h>\n #include <errno.h>\n #include <init.h>\n-#include <asm/global_data.h>\n #include <linux/delay.h>\n #include <linux/libfdt.h>\n #include <asm/io.h>\n@@ -19,8 +18,6 @@\n #include <asm/arch/iomux.h>\n #include <asm/arch/sys_proto.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define UART_PAD_CTRL\t((SC_PAD_CONFIG_OUT_IN << PADRING_CONFIG_SHIFT) | \\\n \t\t\t (SC_PAD_ISO_OFF << PADRING_LPCONFIG_SHIFT) | \\\n \t\t\t (SC_PAD_28FDSOI_DSE_DV_HIGH << PADRING_DSE_SHIFT) | \\\ndiff --git a/board/andestech/voyager/voyager.c b/board/andestech/voyager/voyager.c\nindex dc8f13477754eb5410b041129a9601a6177f41c3..23fd0910ef82c39b2d38db5110ef4d2da7eac73b 100644\n--- a/board/andestech/voyager/voyager.c\n+++ b/board/andestech/voyager/voyager.c\n@@ -5,7 +5,6 @@\n */\n \n #include <asm/csr.h>\n-#include <asm/global_data.h>\n #include <asm/sbi.h>\n #include <config.h>\n #include <cpu_func.h>\n@@ -19,8 +18,6 @@\n #include <net.h>\n #include <spl.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int dram_init(void)\n {\n \treturn fdtdec_setup_mem_size_base();\ndiff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c\nindex e8f1c2fe9fe26e7007d73b64cdd2155c6e742743..d68da0e3d650923d924949eb67dff498279702a5 100644\n--- a/board/armltd/vexpress64/vexpress64.c\n+++ b/board/armltd/vexpress64/vexpress64.c\n@@ -12,7 +12,6 @@\n #include <errno.h>\n #include <net.h>\n #include <netdev.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <linux/compiler.h>\n #include <linux/sizes.h>\n@@ -24,8 +23,6 @@\n #include <virtio.h>\n #endif\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static const struct pl01x_serial_plat serial_plat = {\n \t.base = V2M_UART0,\n \t.type = TYPE_PL011,\ndiff --git a/board/beacon/imx8mm/spl.c b/board/beacon/imx8mm/spl.c\nindex 93ee5b7ee0cdf8a6b227b4731c4f48b06e2d7ffc..1e5935788ff6bcf9617de0ba13fd725243304047 100644\n--- a/board/beacon/imx8mm/spl.c\n+++ b/board/beacon/imx8mm/spl.c\n@@ -5,7 +5,6 @@\n #include <init.h>\n #include <log.h>\n #include <spl.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/mach-imx/iomux-v3.h>\n #include <asm/arch/clock.h>\n@@ -23,8 +22,6 @@\n #include <power/pmic.h>\n #include <power/bd71837.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int spl_board_boot_device(enum boot_device boot_dev_spl)\n {\n \tswitch (boot_dev_spl) {\ndiff --git a/board/beacon/imx8mn/spl.c b/board/beacon/imx8mn/spl.c\nindex e91d3fdcf5edc978e92a6a4f349a08501d9c6085..46db42ec92111fcaff1a0d3c36d45dc44f3e044b 100644\n--- a/board/beacon/imx8mn/spl.c\n+++ b/board/beacon/imx8mn/spl.c\n@@ -9,7 +9,6 @@\n #include <log.h>\n #include <asm/io.h>\n #include <errno.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/arch/ddr.h>\n #include <asm/arch/imx8mn_pins.h>\n@@ -32,8 +31,6 @@\n #include <dm/uclass-internal.h>\n #include <dm/device-internal.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int spl_board_boot_device(enum boot_device boot_dev_spl)\n {\n \treturn BOOT_DEVICE_BOOTROM;\ndiff --git a/board/beacon/imx8mp/spl.c b/board/beacon/imx8mp/spl.c\nindex 027fae38278638e9a238c86637153ed12353cc4f..e82e385b774bba3853753d24f7448938bb5c12a1 100644\n--- a/board/beacon/imx8mp/spl.c\n+++ b/board/beacon/imx8mp/spl.c\n@@ -8,7 +8,6 @@\n #include <init.h>\n #include <log.h>\n #include <spl.h>\n-#include <asm/global_data.h>\n #include <asm/arch/clock.h>\n #include <asm/arch/imx8mp_pins.h>\n #include <asm/arch/sys_proto.h>\n@@ -22,8 +21,6 @@\n #include <dm/uclass.h>\n #include <dm/device.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int spl_board_boot_device(enum boot_device boot_dev_spl)\n {\n \treturn BOOT_DEVICE_BOOTROM;\ndiff --git a/board/beagle/beagleboneai64/beagleboneai64.c b/board/beagle/beagleboneai64/beagleboneai64.c\nindex 500fcc58ed81a6a91c882938c304c616ddc4b393..27b1f22562c48c1bc242a77cd8fbc66398bd55c8 100644\n--- a/board/beagle/beagleboneai64/beagleboneai64.c\n+++ b/board/beagle/beagleboneai64/beagleboneai64.c\n@@ -13,8 +13,6 @@\n #include <fdt_support.h>\n #include <spl.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct efi_fw_image fw_images[] = {\n \t{\n \t\t.image_type_id = BEAGLEBONEAI64_TIBOOT3_IMAGE_GUID,\ndiff --git a/board/beagle/beagleplay/beagleplay.c b/board/beagle/beagleplay/beagleplay.c\nindex 9bc9ca30e952671838722d0f5aaccc036bb3f35f..70d296de9f863445854ec670730beecacedde092 100644\n--- a/board/beagle/beagleplay/beagleplay.c\n+++ b/board/beagle/beagleplay/beagleplay.c\n@@ -14,8 +14,6 @@\n \n #include <asm/arch/hardware.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct efi_fw_image fw_images[] = {\n \t{\n \t\t.image_type_id = BEAGLEPLAY_TIBOOT3_IMAGE_GUID,\ndiff --git a/board/broadcom/bcmns/ns.c b/board/broadcom/bcmns/ns.c\nindex 47a01227a353d75314b0641a47facf4f565585b9..cb53ec68cf8c5e105ef1c198e81f0ab5cbde5c1a 100644\n--- a/board/broadcom/bcmns/ns.c\n+++ b/board/broadcom/bcmns/ns.c\n@@ -9,12 +9,9 @@\n #include <log.h>\n #include <ram.h>\n #include <serial.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/armv7m.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int dram_init(void)\n {\n \treturn fdtdec_setup_mem_size_base();\ndiff --git a/board/cloos/imx8mm_phg/imx8mm_phg.c b/board/cloos/imx8mm_phg/imx8mm_phg.c\nindex 091c9a59a52b66bbe63b044cc34b20fcd52c187f..1ca1c07e08ed82f5b3f183cf1f3d7b07ee881408 100644\n--- a/board/cloos/imx8mm_phg/imx8mm_phg.c\n+++ b/board/cloos/imx8mm_phg/imx8mm_phg.c\n@@ -7,14 +7,11 @@\n #include <init.h>\n #include <miiphy.h>\n #include <netdev.h>\n-#include <asm/global_data.h>\n \n #include <asm/arch/clock.h>\n #include <asm/arch/sys_proto.h>\n #include <asm/io.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static int setup_fec(void)\n {\n \tstruct iomuxc_gpr_base_regs *gpr =\ndiff --git a/board/cloos/imx8mm_phg/spl.c b/board/cloos/imx8mm_phg/spl.c\nindex b8892ed2fccd80bf483db833b62a8bf55817d67e..b2340a0ded3dc152d64ca0e8ebfd4800ce382bc1 100644\n--- a/board/cloos/imx8mm_phg/spl.c\n+++ b/board/cloos/imx8mm_phg/spl.c\n@@ -10,7 +10,6 @@\n #include <init.h>\n #include <log.h>\n #include <spl.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/mach-imx/iomux-v3.h>\n #include <asm/arch/clock.h>\n@@ -28,8 +27,6 @@\n #include <power/pmic.h>\n #include <power/pca9450.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int spl_board_boot_device(enum boot_device boot_dev_spl)\n {\n \tswitch (boot_dev_spl) {\ndiff --git a/board/compulab/imx8mm-cl-iot-gate/spl.c b/board/compulab/imx8mm-cl-iot-gate/spl.c\nindex 6d9af2538b630a0939d557ab35368b803dfe2fb9..daac6dca4ce81ded7b3136e647f102a4a27e5cb2 100644\n--- a/board/compulab/imx8mm-cl-iot-gate/spl.c\n+++ b/board/compulab/imx8mm-cl-iot-gate/spl.c\n@@ -32,8 +32,6 @@\n \n #include \"ddr/ddr.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int spl_board_boot_device(enum boot_device boot_dev_spl)\n {\n \tswitch (boot_dev_spl) {\ndiff --git a/board/coreboot/coreboot/coreboot.c b/board/coreboot/coreboot/coreboot.c\nindex f2ca10767681d83ecc5e10868d8586421b2c7901..d0e8db6cdfe5c382c5857092921dad93b150bc50 100644\n--- a/board/coreboot/coreboot/coreboot.c\n+++ b/board/coreboot/coreboot/coreboot.c\n@@ -7,9 +7,6 @@\n #include <init.h>\n #include <smbios.h>\n #include <asm/cb_sysinfo.h>\n-#include <asm/global_data.h>\n-\n-DECLARE_GLOBAL_DATA_PTR;\n \n int board_early_init_r(void)\n {\ndiff --git a/board/cssi/cmpc885/cmpc885.c b/board/cssi/cmpc885/cmpc885.c\nindex 49c13056edcb35af47508e5c6cbfbe097dabfd97..552349d104aa4657743e30705331de903798351b 100644\n--- a/board/cssi/cmpc885/cmpc885.c\n+++ b/board/cssi/cmpc885/cmpc885.c\n@@ -26,8 +26,6 @@\n \n #include \"../common/common.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define ADDR_CPLD_R_RESET\t\t((unsigned short __iomem *)CONFIG_CPLD_BASE)\n #define ADDR_CPLD_R_ETAT\t\t((unsigned short __iomem *)(CONFIG_CPLD_BASE + 2))\n #define ADDR_CPLD_R_TYPE\t\t((unsigned char __iomem *)(CONFIG_CPLD_BASE + 3))\ndiff --git a/board/data_modul/imx8mm_edm_sbc/imx8mm_data_modul_edm_sbc.c b/board/data_modul/imx8mm_edm_sbc/imx8mm_data_modul_edm_sbc.c\nindex e271d060efa6b8b36dc5f81d0eba5c2e80e5b10c..ab4a484d393f9510cb492111f27dc0ef7832b2c9 100644\n--- a/board/data_modul/imx8mm_edm_sbc/imx8mm_data_modul_edm_sbc.c\n+++ b/board/data_modul/imx8mm_edm_sbc/imx8mm_data_modul_edm_sbc.c\n@@ -14,8 +14,6 @@\n \n #include \"../common/common.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int board_late_init(void)\n {\n \tstruct udevice *dev;\ndiff --git a/board/data_modul/imx8mm_edm_sbc/spl.c b/board/data_modul/imx8mm_edm_sbc/spl.c\nindex a9ef049652ac0f8a5c1937a5e5f5f743780631d4..c6a5740c7a7050164dbe480407f7434e8a36ad01 100644\n--- a/board/data_modul/imx8mm_edm_sbc/spl.c\n+++ b/board/data_modul/imx8mm_edm_sbc/spl.c\n@@ -27,8 +27,6 @@\n \n #include \"../common/common.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int data_modul_imx_edm_sbc_board_power_init(void)\n {\n \tstruct udevice *dev;\ndiff --git a/board/data_modul/imx8mp_edm_sbc/imx8mp_data_modul_edm_sbc.c b/board/data_modul/imx8mp_edm_sbc/imx8mp_data_modul_edm_sbc.c\nindex d6f0a917023db26980f3d83f1f7e639a31c846e0..5c319df1cdee84a6f2f4de10921fd27f9d999256 100644\n--- a/board/data_modul/imx8mp_edm_sbc/imx8mp_data_modul_edm_sbc.c\n+++ b/board/data_modul/imx8mp_edm_sbc/imx8mp_data_modul_edm_sbc.c\n@@ -17,8 +17,6 @@\n \n #include \"../common/common.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static void dmo_setup_second_mac_address(void)\n {\n \tu8 enetaddr[6];\ndiff --git a/board/data_modul/imx8mp_edm_sbc/spl.c b/board/data_modul/imx8mp_edm_sbc/spl.c\nindex f81b7274556f634b114f7c853fa2f529cd846c22..314f7e87a9d3d06175399d6c80431bd5a704bb14 100644\n--- a/board/data_modul/imx8mp_edm_sbc/spl.c\n+++ b/board/data_modul/imx8mp_edm_sbc/spl.c\n@@ -28,8 +28,6 @@\n \n #include \"../common/common.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int data_modul_imx_edm_sbc_board_power_init(void)\n {\n \tstruct udevice *dev;\ndiff --git a/board/dhelectronics/dh_imx8mp/common.c b/board/dhelectronics/dh_imx8mp/common.c\nindex f6db9f678042f100f2401ae077f5a426736a297b..5d89c94970dbd281cff9b46e69a8a88b0bd102d5 100644\n--- a/board/dhelectronics/dh_imx8mp/common.c\n+++ b/board/dhelectronics/dh_imx8mp/common.c\n@@ -8,8 +8,6 @@\n \n #include \"lpddr4_timing.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n u8 dh_get_memcfg(void)\n {\n \tstruct gpio_desc gpio[4];\ndiff --git a/board/dhelectronics/dh_imx8mp/imx8mp_dhcom_pdk2.c b/board/dhelectronics/dh_imx8mp/imx8mp_dhcom_pdk2.c\nindex 5c35a5bf447665768f9d154e9dfc16a7129ec3b2..3fe98d36f5b2b8b75fa29fc92deec90f5bfca1fe 100644\n--- a/board/dhelectronics/dh_imx8mp/imx8mp_dhcom_pdk2.c\n+++ b/board/dhelectronics/dh_imx8mp/imx8mp_dhcom_pdk2.c\n@@ -20,8 +20,6 @@\n #include \"../common/dh_common.h\"\n #include \"../common/dh_imx.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int mach_cpu_init(void)\n {\n \ticache_enable();\ndiff --git a/board/dhelectronics/dh_imx8mp/spl.c b/board/dhelectronics/dh_imx8mp/spl.c\nindex 714f846521e0b9308c9fbacc039df36f773c3409..727e1ff3774d7e1e5789e0acd61114bf9ce66c7f 100644\n--- a/board/dhelectronics/dh_imx8mp/spl.c\n+++ b/board/dhelectronics/dh_imx8mp/spl.c\n@@ -29,8 +29,6 @@\n \n #include \"lpddr4_timing.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define UART_PAD_CTRL\t(PAD_CTL_DSE6 | PAD_CTL_FSEL1)\n #define WDOG_PAD_CTRL\t(PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE)\n \ndiff --git a/board/emcraft/imx8mp_navqp/spl.c b/board/emcraft/imx8mp_navqp/spl.c\nindex 7f30f3af74220a6548abd051c17dea061c532cdb..5ee94d078f8f163bf23acb3e8da1807c3b09c13c 100644\n--- a/board/emcraft/imx8mp_navqp/spl.c\n+++ b/board/emcraft/imx8mp_navqp/spl.c\n@@ -8,7 +8,6 @@\n #include <asm/arch/ddr.h>\n #include <asm/arch/imx8mp_pins.h>\n #include <asm/arch/sys_proto.h>\n-#include <asm/global_data.h>\n #include <asm/mach-imx/boot_mode.h>\n #include <asm/sections.h>\n #include <dm/device.h>\n@@ -20,8 +19,6 @@\n #include <power/pmic.h>\n #include <spl.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int spl_board_boot_device(enum boot_device boot_dev_spl)\n {\n \treturn BOOT_DEVICE_BOOTROM;\ndiff --git a/board/emulation/qemu-riscv/qemu-riscv.c b/board/emulation/qemu-riscv/qemu-riscv.c\nindex 97c8211c1008fd265e63b62b266c8a983cae9042..ce5bc34ca71e5f6eddf340b842d03b17371c7ef6 100644\n--- a/board/emulation/qemu-riscv/qemu-riscv.c\n+++ b/board/emulation/qemu-riscv/qemu-riscv.c\n@@ -15,8 +15,6 @@\n #include <virtio_types.h>\n #include <virtio.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #if IS_ENABLED(CONFIG_MTD_NOR_FLASH)\n int is_flash_available(void)\n {\ndiff --git a/board/engicam/imx8mm/icore_mx8mm.c b/board/engicam/imx8mm/icore_mx8mm.c\nindex 236337546aeea42bf14006dbc32f9ba8ecc4a6b7..bb70e7d4ff802cd26a98df3a6ca8f8ca52853d86 100644\n--- a/board/engicam/imx8mm/icore_mx8mm.c\n+++ b/board/engicam/imx8mm/icore_mx8mm.c\n@@ -19,8 +19,6 @@\n #include <asm/mach-imx/gpio.h>\n #include <asm/mach-imx/iomux-v3.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #if IS_ENABLED(CONFIG_FEC_MXC)\n \n #define FEC_RST_PAD IMX_GPIO_NR(3, 7)\ndiff --git a/board/engicam/imx8mm/spl.c b/board/engicam/imx8mm/spl.c\nindex d51ae241e85cd5fd0646dba2f2a5a6ab607eab57..5a6bcb1747a012c4aa9c6f7ab9bfa97a4c9603b1 100644\n--- a/board/engicam/imx8mm/spl.c\n+++ b/board/engicam/imx8mm/spl.c\n@@ -17,8 +17,6 @@\n #include <asm/arch/ddr.h>\n #include <asm/sections.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int spl_board_boot_device(enum boot_device boot_dev_spl)\n {\n \tswitch (boot_dev_spl) {\ndiff --git a/board/engicam/imx8mp/icore_mx8mp.c b/board/engicam/imx8mp/icore_mx8mp.c\nindex bfdc447c4784f7a8e73900a284b83fc9b301e503..864afa92aee0afbd994b35ec01e9f13598a4b572 100644\n--- a/board/engicam/imx8mp/icore_mx8mp.c\n+++ b/board/engicam/imx8mp/icore_mx8mp.c\n@@ -14,7 +14,6 @@\n #include <miiphy.h>\n #include <netdev.h>\n #include <linux/delay.h>\n-#include <asm/global_data.h>\n #include <asm/mach-imx/iomux-v3.h>\n #include <asm-generic/gpio.h>\n #include <asm/arch/imx8mp_pins.h>\n@@ -22,8 +21,6 @@\n #include <asm/arch/sys_proto.h>\n #include <asm/mach-imx/gpio.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static void setup_fec(void)\n {\n \tstruct iomuxc_gpr_base_regs *gpr =\ndiff --git a/board/engicam/imx8mp/spl.c b/board/engicam/imx8mp/spl.c\nindex cd31aa6041d1397fb5b465d174f0c2c52f5596d3..c1aa28a17bc26797cb387818a885c0a9adf81836 100644\n--- a/board/engicam/imx8mp/spl.c\n+++ b/board/engicam/imx8mp/spl.c\n@@ -12,7 +12,6 @@\n #include <init.h>\n #include <log.h>\n #include <spl.h>\n-#include <asm/global_data.h>\n #include <asm/arch/clock.h>\n #include <asm/arch/imx8mp_pins.h>\n #include <asm/arch/sys_proto.h>\n@@ -24,8 +23,6 @@\n #include <power/pmic.h>\n #include <power/pca9450.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int spl_board_boot_device(enum boot_device boot_dev_spl)\n {\n \treturn BOOT_DEVICE_BOOTROM;\ndiff --git a/board/gdsys/mpc8308/gazerbeam.c b/board/gdsys/mpc8308/gazerbeam.c\nindex 05e4d84460ae1e163721b80c7b33020129fcab89..123dda21423b1ff7701adc4a718bb83613a8fc03 100644\n--- a/board/gdsys/mpc8308/gazerbeam.c\n+++ b/board/gdsys/mpc8308/gazerbeam.c\n@@ -17,13 +17,10 @@\n #include <sysinfo.h>\n #include <tpm-v1.h>\n #include <video_osd.h>\n-#include <asm/global_data.h>\n \n #include \"../common/ihs_mdio.h\"\n #include \"../../../drivers/sysinfo/gazerbeam.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct ihs_mdio_info ihs_mdio_info[] = {\n \t{ .fpga = NULL, .name = \"ihs0\", .base = 0x58 },\n \t{ .fpga = NULL, .name = \"ihs1\", .base = 0x58 },\ndiff --git a/board/google/imx8mq_phanbell/imx8mq_phanbell.c b/board/google/imx8mq_phanbell/imx8mq_phanbell.c\nindex 9544d6dd19a800cfb265a9fc3351962b99fceb2b..2f16f1da26ca2a583ce27df732f791ef60052fdd 100644\n--- a/board/google/imx8mq_phanbell/imx8mq_phanbell.c\n+++ b/board/google/imx8mq_phanbell/imx8mq_phanbell.c\n@@ -7,7 +7,6 @@\n #include <init.h>\n #include <malloc.h>\n #include <errno.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <miiphy.h>\n #include <netdev.h>\n@@ -21,8 +20,6 @@\n #include <asm/arch/clock.h>\n #include <spl.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define UART_PAD_CTRL\t(PAD_CTL_DSE6 | PAD_CTL_FSEL1)\n \n #define WDOG_PAD_CTRL\t(PAD_CTL_DSE6 | PAD_CTL_HYS | PAD_CTL_PUE)\ndiff --git a/board/highbank/highbank.c b/board/highbank/highbank.c\nindex 0ec88447384a7814a081f9978d3603050eb02803..62a7b5b0420ff59e36344b12040d449eac7df22f 100644\n--- a/board/highbank/highbank.c\n+++ b/board/highbank/highbank.c\n@@ -11,7 +11,6 @@\n #include <init.h>\n #include <net.h>\n #include <scsi.h>\n-#include <asm/global_data.h>\n \n #include <linux/sizes.h>\n #include <asm/io.h>\n@@ -37,8 +36,6 @@\n #define HB_SCU_A9_PWR_DORMANT\t\t2\n #define HB_SCU_A9_PWR_OFF\t\t3\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n void cphy_disable_overrides(void);\n \n /*\ndiff --git a/board/kontron/osm-s-mx8mp/osm-s-mx8mp.c b/board/kontron/osm-s-mx8mp/osm-s-mx8mp.c\nindex 3db7176f723714e5717a5024bd669609b6045159..739a78d2c8b43ab5dc1d7e641743c394d511f9a2 100644\n--- a/board/kontron/osm-s-mx8mp/osm-s-mx8mp.c\n+++ b/board/kontron/osm-s-mx8mp/osm-s-mx8mp.c\n@@ -5,7 +5,6 @@\n \n #include <asm/arch/imx-regs.h>\n #include <asm/arch/sys_proto.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/mach-imx/boot_mode.h>\n #include <dm/uclass.h>\n@@ -22,8 +21,6 @@\n \n #include \"../common/hw-uid.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #if IS_ENABLED(CONFIG_KONTRON_HW_UID)\n struct uid_otp_loc uid_otp_locations[] = {\n \t{\ndiff --git a/board/kontron/osm-s-mx93/osm-s-mx93.c b/board/kontron/osm-s-mx93/osm-s-mx93.c\nindex d4645285771c658857199f7a74cee45f1159db1e..b6feef549d163905a9a30120cefa4be4a2c05ef1 100644\n--- a/board/kontron/osm-s-mx93/osm-s-mx93.c\n+++ b/board/kontron/osm-s-mx93/osm-s-mx93.c\n@@ -6,7 +6,6 @@\n #include <asm/arch/clock.h>\n #include <asm/arch/imx-regs.h>\n #include <asm/arch/sys_proto.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/mach-imx/boot_mode.h>\n #include <dm/uclass.h>\n@@ -23,8 +22,6 @@\n \n #include \"../common/hw-uid.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int board_early_init_f(void)\n {\n \treturn 0;\ndiff --git a/board/kontron/pitx_imx8m/pitx_imx8m.c b/board/kontron/pitx_imx8m/pitx_imx8m.c\nindex 2ee97169c6f5b125f52efa5d72163430582f3eef..f71fa57b808b6c765949c7042bf4cec18a4b475f 100644\n--- a/board/kontron/pitx_imx8m/pitx_imx8m.c\n+++ b/board/kontron/pitx_imx8m/pitx_imx8m.c\n@@ -15,8 +15,6 @@\n #include <linux/delay.h>\n #include <linux/kernel.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define UART_PAD_CTRL\t(PAD_CTL_DSE6 | PAD_CTL_FSEL1)\n #define WDOG_PAD_CTRL\t(PAD_CTL_DSE6 | PAD_CTL_HYS | PAD_CTL_PUE)\n \ndiff --git a/board/mntre/imx8mq_reform2/imx8mq_reform2.c b/board/mntre/imx8mq_reform2/imx8mq_reform2.c\nindex 6ee1c5c52a19a7f724095f831c62e27c20c871f1..bcb31564a73680d1d99b13f7d426108f78e9d66f 100644\n--- a/board/mntre/imx8mq_reform2/imx8mq_reform2.c\n+++ b/board/mntre/imx8mq_reform2/imx8mq_reform2.c\n@@ -8,7 +8,6 @@\n #include <init.h>\n #include <malloc.h>\n #include <errno.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <miiphy.h>\n #include <netdev.h>\n@@ -26,8 +25,6 @@\n #include <linux/delay.h>\n #include <power/pmic.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define WDOG_PAD_CTRL\t(PAD_CTL_DSE6 | PAD_CTL_HYS | PAD_CTL_PUE)\n \n static iomux_v3_cfg_t const wdog_pads[] = {\ndiff --git a/board/msc/sm2s_imx8mp/sm2s_imx8mp.c b/board/msc/sm2s_imx8mp/sm2s_imx8mp.c\nindex b1ce014bd55d1bee6f26c0dd53445d57f4511309..b2f763dcc02144c03a7272235193ac0bc25d8983 100644\n--- a/board/msc/sm2s_imx8mp/sm2s_imx8mp.c\n+++ b/board/msc/sm2s_imx8mp/sm2s_imx8mp.c\n@@ -18,8 +18,6 @@\n #include <asm-generic/gpio.h>\n #include <linux/delay.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static void setup_fec(void)\n {\n \tstruct iomuxc_gpr_base_regs *gpr =\ndiff --git a/board/msc/sm2s_imx8mp/spl.c b/board/msc/sm2s_imx8mp/spl.c\nindex b1b5561838dc55a8569177679d678865a10987db..902179aad29e3981965b470673877641b690e691 100644\n--- a/board/msc/sm2s_imx8mp/spl.c\n+++ b/board/msc/sm2s_imx8mp/spl.c\n@@ -17,7 +17,6 @@\n #include <log.h>\n #include <mmc.h>\n #include <spl.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/arch/clock.h>\n #include <asm/arch/ddr.h>\n@@ -33,8 +32,6 @@\n #include <power/pmic.h>\n #include <power/rn5t567_pmic.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int spl_board_boot_device(enum boot_device boot_dev_spl)\n {\n \treturn BOOT_DEVICE_BOOTROM;\ndiff --git a/board/nxp/imx8mm_evk/spl.c b/board/nxp/imx8mm_evk/spl.c\nindex cd251d274ff68a4e70f0449b4e72f8ec479dace2..5c588046ff4b596bab261e660a93367114f34994 100644\n--- a/board/nxp/imx8mm_evk/spl.c\n+++ b/board/nxp/imx8mm_evk/spl.c\n@@ -10,7 +10,6 @@\n #include <init.h>\n #include <log.h>\n #include <spl.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/mach-imx/iomux-v3.h>\n #include <asm/arch/clock.h>\n@@ -28,8 +27,6 @@\n #include <power/pmic.h>\n #include <power/pca9450.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int spl_board_boot_device(enum boot_device boot_dev_spl)\n {\n \tswitch (boot_dev_spl) {\ndiff --git a/board/nxp/imx8qm_mek/imx8qm_mek.c b/board/nxp/imx8qm_mek/imx8qm_mek.c\nindex 72527f774ca93edc6cd62c9c9e3d265d7dd586e4..56f577714e70dd76c185c1f2021bf7b874866025 100644\n--- a/board/nxp/imx8qm_mek/imx8qm_mek.c\n+++ b/board/nxp/imx8qm_mek/imx8qm_mek.c\n@@ -7,7 +7,6 @@\n #include <env.h>\n #include <errno.h>\n #include <init.h>\n-#include <asm/global_data.h>\n #include <linux/libfdt.h>\n #include <fdt_support.h>\n #include <asm/io.h>\n@@ -18,8 +17,6 @@\n #include <asm/arch/iomux.h>\n #include <asm/arch/sys_proto.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define UART_PAD_CTRL\t((SC_PAD_CONFIG_OUT_IN << PADRING_CONFIG_SHIFT) | \\\n \t\t\t (SC_PAD_ISO_OFF << PADRING_LPCONFIG_SHIFT) | \\\n \t\t\t (SC_PAD_28FDSOI_DSE_DV_HIGH << PADRING_DSE_SHIFT) | \\\ndiff --git a/board/nxp/imx8qxp_mek/imx8qxp_mek.c b/board/nxp/imx8qxp_mek/imx8qxp_mek.c\nindex adb9556a021c89b9c37d081c6b6909e32338ee00..4bf6645b893fd1bf5ad35b97166dcaa3d926c4d1 100644\n--- a/board/nxp/imx8qxp_mek/imx8qxp_mek.c\n+++ b/board/nxp/imx8qxp_mek/imx8qxp_mek.c\n@@ -7,7 +7,6 @@\n #include <env.h>\n #include <errno.h>\n #include <init.h>\n-#include <asm/global_data.h>\n #include <linux/delay.h>\n #include <linux/libfdt.h>\n #include <fsl_esdhc_imx.h>\n@@ -21,8 +20,6 @@\n #include <asm/arch/iomux.h>\n #include <asm/arch/sys_proto.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define GPIO_PAD_CTRL\t((SC_PAD_CONFIG_NORMAL << PADRING_CONFIG_SHIFT) | \\\n \t\t\t (SC_PAD_ISO_OFF << PADRING_LPCONFIG_SHIFT) | \\\n \t\t\t (SC_PAD_28FDSOI_DSE_DV_HIGH << PADRING_DSE_SHIFT) | \\\ndiff --git a/board/phytec/imx8mp-libra-fpsc/spl.c b/board/phytec/imx8mp-libra-fpsc/spl.c\nindex d704d588579ecbc90ddf7a4070a13b3807ff064a..08111641aa6796470d81d991c6ac804e310b24b1 100644\n--- a/board/phytec/imx8mp-libra-fpsc/spl.c\n+++ b/board/phytec/imx8mp-libra-fpsc/spl.c\n@@ -8,7 +8,6 @@\n #include <asm/arch/ddr.h>\n #include <asm/arch/imx8mp_pins.h>\n #include <asm/arch/sys_proto.h>\n-#include <asm/global_data.h>\n #include <asm/mach-imx/boot_mode.h>\n #include <asm/mach-imx/gpio.h>\n #include <asm/mach-imx/mxc_i2c.h>\n@@ -24,8 +23,6 @@\n #include \"../common/imx8m_som_detection.h\"\n #endif\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define EEPROM_ADDR\t\t0x51\n \n int spl_board_boot_device(enum boot_device boot_dev_spl)\ndiff --git a/board/phytec/phycore_imx8mm/phycore-imx8mm.c b/board/phytec/phycore_imx8mm/phycore-imx8mm.c\nindex f6ae0bf03087064ad58bafd3facb587a84d96ef6..9f6a4ec704da89d79d37fa1e669824488353dfe1 100644\n--- a/board/phytec/phycore_imx8mm/phycore-imx8mm.c\n+++ b/board/phytec/phycore_imx8mm/phycore-imx8mm.c\n@@ -5,14 +5,11 @@\n */\n \n #include <asm/arch/sys_proto.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/mach-imx/boot_mode.h>\n #include <env.h>\n #include <miiphy.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static int setup_fec(void)\n {\n \tstruct iomuxc_gpr_base_regs *gpr =\ndiff --git a/board/phytec/phycore_imx8mm/spl.c b/board/phytec/phycore_imx8mm/spl.c\nindex faff064779c19a3eeace4bf14c74c5278f4087cd..e688793bc7451b4f8f8e37d1c8058b864cc3503e 100644\n--- a/board/phytec/phycore_imx8mm/spl.c\n+++ b/board/phytec/phycore_imx8mm/spl.c\n@@ -8,7 +8,6 @@\n #include <asm/arch/ddr.h>\n #include <asm/arch/imx8mm_pins.h>\n #include <asm/arch/sys_proto.h>\n-#include <asm/global_data.h>\n #include <asm/mach-imx/boot_mode.h>\n #include <asm/mach-imx/iomux-v3.h>\n #include <asm/sections.h>\n@@ -19,8 +18,6 @@\n \n #include \"../common/imx8m_som_detection.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define EEPROM_ADDR\t\t0x51\n #define EEPROM_ADDR_FALLBACK\t0x59\n \ndiff --git a/board/phytec/phycore_imx8mp/phycore-imx8mp.c b/board/phytec/phycore_imx8mp/phycore-imx8mp.c\nindex b345dc7c9856fd1fb149a1a7d6718a910c57be22..5f0a7ee6a94493b93a9c9419aaf4fb82d251cb40 100644\n--- a/board/phytec/phycore_imx8mp/phycore-imx8mp.c\n+++ b/board/phytec/phycore_imx8mp/phycore-imx8mp.c\n@@ -5,7 +5,6 @@\n */\n \n #include <asm/arch/sys_proto.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/mach-imx/boot_mode.h>\n #include <env.h>\n@@ -17,8 +16,6 @@\n \n #include \"../common/imx8m_som_detection.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define EEPROM_ADDR\t\t0x51\n #define EEPROM_ADDR_FALLBACK\t0x59\n \ndiff --git a/board/phytec/phycore_imx8mp/spl.c b/board/phytec/phycore_imx8mp/spl.c\nindex cb8e450b995669b0259d9d31055f992be576d30a..fc7aefd0073475298ab3ff58920b38d3883b3e81 100644\n--- a/board/phytec/phycore_imx8mp/spl.c\n+++ b/board/phytec/phycore_imx8mp/spl.c\n@@ -8,7 +8,6 @@\n #include <asm/arch/ddr.h>\n #include <asm/arch/imx8mp_pins.h>\n #include <asm/arch/sys_proto.h>\n-#include <asm/global_data.h>\n #include <asm/mach-imx/boot_mode.h>\n #include <asm/mach-imx/gpio.h>\n #include <asm/mach-imx/mxc_i2c.h>\n@@ -23,8 +22,6 @@\n #include \"lpddr4_timing.h\"\n #include \"../common/imx8m_som_detection.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define EEPROM_ADDR\t\t0x51\n #define EEPROM_ADDR_FALLBACK\t0x59\n \ndiff --git a/board/phytec/phycore_imx93/phycore-imx93.c b/board/phytec/phycore_imx93/phycore-imx93.c\nindex cfc6d91f20f2dad1e9ce517ce0e750f6226ed4f8..cdaedd52c141002b9ebafe4555a3f3877bff4d8c 100644\n--- a/board/phytec/phycore_imx93/phycore-imx93.c\n+++ b/board/phytec/phycore_imx93/phycore-imx93.c\n@@ -7,15 +7,12 @@\n */\n \n #include <asm/arch/sys_proto.h>\n-#include <asm/global_data.h>\n #include <asm/mach-imx/boot_mode.h>\n #include <env.h>\n #include <fdt_support.h>\n \n #include \"../common/imx93_som_detection.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define EEPROM_ADDR 0x50\n \n int board_init(void)\ndiff --git a/board/polyhex/imx8mp_debix_model_a/imx8mp_debix_model_a.c b/board/polyhex/imx8mp_debix_model_a/imx8mp_debix_model_a.c\nindex c709d01748315a0f45712574f773df274caa2a4f..7f0925074fabfdbe5ac0bf8f58cd93707fd31a12 100644\n--- a/board/polyhex/imx8mp_debix_model_a/imx8mp_debix_model_a.c\n+++ b/board/polyhex/imx8mp_debix_model_a/imx8mp_debix_model_a.c\n@@ -8,7 +8,6 @@\n #include <asm/arch/clock.h>\n #include <asm/arch/imx8mp_pins.h>\n #include <asm/arch/sys_proto.h>\n-#include <asm/global_data.h>\n #include <asm/mach-imx/gpio.h>\n #include <asm/mach-imx/iomux-v3.h>\n #include <env.h>\n@@ -18,8 +17,6 @@\n #include <miiphy.h>\n #include <netdev.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static void setup_fec(void)\n {\n \tstruct iomuxc_gpr_base_regs *gpr =\ndiff --git a/board/polyhex/imx8mp_debix_model_a/spl.c b/board/polyhex/imx8mp_debix_model_a/spl.c\nindex 6cbd1815cad5815c556cbec2456bc2997ee64945..c154ad7a1cefdd80682dc850d74803e57890617f 100644\n--- a/board/polyhex/imx8mp_debix_model_a/spl.c\n+++ b/board/polyhex/imx8mp_debix_model_a/spl.c\n@@ -8,7 +8,6 @@\n #include <asm/arch/ddr.h>\n #include <asm/arch/imx8mp_pins.h>\n #include <asm/arch/sys_proto.h>\n-#include <asm/global_data.h>\n #include <asm/mach-imx/boot_mode.h>\n #include <asm/sections.h>\n #include <dm/device.h>\n@@ -20,8 +19,6 @@\n #include <power/pmic.h>\n #include <spl.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int spl_board_boot_device(enum boot_device boot_dev_spl)\n {\n \treturn BOOT_DEVICE_BOOTROM;\ndiff --git a/board/purism/librem5/librem5.c b/board/purism/librem5/librem5.c\nindex 5178ee6929d8f7c278c8c9a8beb0541982c4ae0f..a2bc0c08f0b50fe681d717cc236c6f6185623b76 100644\n--- a/board/purism/librem5/librem5.c\n+++ b/board/purism/librem5/librem5.c\n@@ -31,8 +31,6 @@\n #include <usb/xhci.h>\n #include \"librem5.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int board_early_init_f(void)\n {\n \treturn 0;\ndiff --git a/board/purism/librem5/spl.c b/board/purism/librem5/spl.c\nindex ed57554a2bc314a42c4be7c0e18e78d6c1d45199..568224f973244117672de4f2536a5de72e822702 100644\n--- a/board/purism/librem5/spl.c\n+++ b/board/purism/librem5/spl.c\n@@ -29,8 +29,6 @@\n #include <linux/usb/gadget.h>\n #include \"librem5.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n void spl_dram_init(void)\n {\n \t/* ddr init */\ndiff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c\nindex 4698b9d5e3e47a9b0389d9f6bafab9dd6db56a41..36e4d49046e39a35e8a8fcdf605576366608ff2b 100644\n--- a/board/qualcomm/dragonboard410c/dragonboard410c.c\n+++ b/board/qualcomm/dragonboard410c/dragonboard410c.c\n@@ -15,13 +15,10 @@\n #include <net.h>\n #include <usb.h>\n #include <asm/cache.h>\n-#include <asm/global_data.h>\n #include <asm/gpio.h>\n #include <fdt_support.h>\n #include <linux/delay.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static u32 msm_board_serial(void)\n {\n \tstruct mmc *mmc_dev;\ndiff --git a/board/qualcomm/dragonboard820c/dragonboard820c.c b/board/qualcomm/dragonboard820c/dragonboard820c.c\nindex 12a9273ec4b9d240bc2eaed2834d5265290153ec..236022a99f12ff4aef182f6e6fece03e39f0dd84 100644\n--- a/board/qualcomm/dragonboard820c/dragonboard820c.c\n+++ b/board/qualcomm/dragonboard820c/dragonboard820c.c\n@@ -10,7 +10,6 @@\n #include <init.h>\n #include <env.h>\n #include <asm/cache.h>\n-#include <asm/global_data.h>\n #include <linux/arm-smccc.h>\n #include <linux/psci.h>\n #include <dm.h>\n@@ -24,8 +23,6 @@\n /* Strength (sdc1) */\n #define SDC1_HDRV_PULL_CTL_REG (TLMM_BASE_ADDR + 0x0012D000)\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static void sdhci_power_init(void)\n {\n \tconst u32 TLMM_PULL_MASK = 0x3;\ndiff --git a/board/renesas/common/gen3-common.c b/board/renesas/common/gen3-common.c\nindex f89ae81e95ec551b8b254fd0fee0b9839f798b85..5c543807b64b6cc495703060db22b451baaeb046 100644\n--- a/board/renesas/common/gen3-common.c\n+++ b/board/renesas/common/gen3-common.c\n@@ -12,15 +12,12 @@\n #include <fdt_support.h>\n #include <hang.h>\n #include <init.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <dm/uclass-internal.h>\n #include <asm/arch/renesas.h>\n #include <asm-generic/u-boot.h>\n #include <linux/libfdt.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* If the firmware passed a device tree use it for e.g. U-Boot DRAM setup. */\n extern u64 rcar_atf_boot_args[];\n \ndiff --git a/board/renesas/common/gen4-common.c b/board/renesas/common/gen4-common.c\nindex 81c6f6f4c6ddbf78f50657bef9a31a4f3e8e6099..ac87f2f08e3a42d7920cb0fcb54eb7dd6b08b14e 100644\n--- a/board/renesas/common/gen4-common.c\n+++ b/board/renesas/common/gen4-common.c\n@@ -8,7 +8,6 @@\n #include <asm/arch/renesas.h>\n #include <asm/arch/sys_proto.h>\n #include <asm/armv8/mmu.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/mach-types.h>\n #include <asm/processor.h>\n@@ -17,8 +16,6 @@\n #include <image.h>\n #include <linux/errno.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static void init_generic_timer(void)\n {\n \tconst u32 freq = CONFIG_SYS_CLK_FREQ;\ndiff --git a/board/renesas/common/gen5-common.c b/board/renesas/common/gen5-common.c\nindex 3b724e59049c0b451b6e346a6ecb9846c3226e97..c60a76c50382d1d6cb1ca81b5beabbf03ded3962 100644\n--- a/board/renesas/common/gen5-common.c\n+++ b/board/renesas/common/gen5-common.c\n@@ -5,7 +5,6 @@\n \n #include <asm/arch/renesas.h>\n #include <asm/arch/sys_proto.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/mach-types.h>\n #include <asm/processor.h>\n@@ -13,8 +12,6 @@\n #include <asm-generic/u-boot.h>\n #include <linux/errno.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static void init_generic_timer(void)\n {\n \tconst u32 freq = CONFIG_SYS_CLK_FREQ;\ndiff --git a/board/ronetix/imx8mq-cm/imx8mq_cm.c b/board/ronetix/imx8mq-cm/imx8mq_cm.c\nindex 602216854ba475eab72035e3bf1182fda5434a7d..e41cfefe37587dad774a5a432be98cac0be97363 100644\n--- a/board/ronetix/imx8mq-cm/imx8mq_cm.c\n+++ b/board/ronetix/imx8mq-cm/imx8mq_cm.c\n@@ -10,8 +10,6 @@\n #include <asm/arch/sys_proto.h>\n #include <asm/arch/clock.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define UART_PAD_CTRL\t(PAD_CTL_DSE6 | PAD_CTL_FSEL1)\n \n #define WDOG_PAD_CTRL\t(PAD_CTL_DSE6 | PAD_CTL_HYS | PAD_CTL_PUE)\ndiff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c\nindex 68edd1ec2826841c74702fd8f16f8e98b7519a18..2ba2d6330fd0c7b8d50fe9d23bc855e372e81b7a 100644\n--- a/board/samsung/common/exynos5-dt.c\n+++ b/board/samsung/common/exynos5-dt.c\n@@ -9,7 +9,6 @@\n #include <env.h>\n #include <fdtdec.h>\n #include <log.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <errno.h>\n #include <i2c.h>\n@@ -36,8 +35,6 @@\n #include <samsung/misc.h>\n #include <tmu.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static int exynos_set_regulator(const char *name, uint uv)\n {\n \tstruct udevice *dev;\ndiff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c\nindex c134a9d70e249328cc774c1dbd0fdfa3d4fdb744..85e564f27ee5c79a0e4d2a36fe2069c2cb06f258 100644\n--- a/board/samsung/common/misc.c\n+++ b/board/samsung/common/misc.c\n@@ -8,7 +8,6 @@\n #include <command.h>\n #include <env.h>\n #include <libtizen.h>\n-#include <asm/global_data.h>\n #include <linux/delay.h>\n #include <linux/printk.h>\n #include <samsung/misc.h>\n@@ -37,8 +36,6 @@\n #include <power/pmic.h>\n #include <mmc.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #ifdef CONFIG_SET_DFU_ALT_INFO\n void set_dfu_alt_info(char *interface, char *devstr)\n {\ndiff --git a/board/st/stm32f429-discovery/stm32f429-discovery.c b/board/st/stm32f429-discovery/stm32f429-discovery.c\nindex 4b0defda1ecb148f283f22ce7ad505386aea4309..333b78c27f348b288eadb39bcf63db541c6b236a 100644\n--- a/board/st/stm32f429-discovery/stm32f429-discovery.c\n+++ b/board/st/stm32f429-discovery/stm32f429-discovery.c\n@@ -14,13 +14,10 @@\n #include <env.h>\n #include <init.h>\n #include <log.h>\n-#include <asm/global_data.h>\n \n #include <asm/io.h>\n #include <asm/arch/stm32.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int dram_init(void)\n {\n \tint rv;\ndiff --git a/board/st/stm32f429-evaluation/stm32f429-evaluation.c b/board/st/stm32f429-evaluation/stm32f429-evaluation.c\nindex 88c825334a8d06321d51b541388fc7f2d0e8395f..feba46d38e4a53e8b9187f6813e49c4b5ec6c868 100644\n--- a/board/st/stm32f429-evaluation/stm32f429-evaluation.c\n+++ b/board/st/stm32f429-evaluation/stm32f429-evaluation.c\n@@ -8,13 +8,10 @@\n #include <env.h>\n #include <init.h>\n #include <log.h>\n-#include <asm/global_data.h>\n \n #include <asm/io.h>\n #include <asm/arch/stm32.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int dram_init(void)\n {\n \tint rv;\ndiff --git a/board/st/stm32f469-discovery/stm32f469-discovery.c b/board/st/stm32f469-discovery/stm32f469-discovery.c\nindex 7aab7f71d0cf91756bf35553f5afc8cba82a4da6..d153efdc2b4b07cf8af8548e8e61a205f9e98ec2 100644\n--- a/board/st/stm32f469-discovery/stm32f469-discovery.c\n+++ b/board/st/stm32f469-discovery/stm32f469-discovery.c\n@@ -8,13 +8,10 @@\n #include <env.h>\n #include <init.h>\n #include <log.h>\n-#include <asm/global_data.h>\n \n #include <asm/io.h>\n #include <asm/arch/stm32.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int dram_init(void)\n {\n \tint rv;\ndiff --git a/board/st/stm32f746-disco/stm32f746-disco.c b/board/st/stm32f746-disco/stm32f746-disco.c\nindex 07bc8a5f0a27eabf8e36396034bc94156c6caca5..4b1e443100d1b0448cba8654fb723e0872f678aa 100644\n--- a/board/st/stm32f746-disco/stm32f746-disco.c\n+++ b/board/st/stm32f746-disco/stm32f746-disco.c\n@@ -15,7 +15,6 @@\n #include <spl.h>\n #include <splash.h>\n #include <video.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/armv7m.h>\n #include <asm/arch/stm32.h>\n@@ -23,8 +22,6 @@\n #include <asm/gpio.h>\n #include <linux/delay.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int dram_init(void)\n {\n #ifndef CONFIG_XPL_BUILD\ndiff --git a/board/st/stm32h743-disco/stm32h743-disco.c b/board/st/stm32h743-disco/stm32h743-disco.c\nindex d00f55379c5ce9c0f685191e9623ad3c7983fc48..6c5c6710926fa507df0cafcd8cb977b56ad597e1 100644\n--- a/board/st/stm32h743-disco/stm32h743-disco.c\n+++ b/board/st/stm32h743-disco/stm32h743-disco.c\n@@ -7,9 +7,6 @@\n #include <dm.h>\n #include <init.h>\n #include <log.h>\n-#include <asm/global_data.h>\n-\n-DECLARE_GLOBAL_DATA_PTR;\n \n int dram_init(void)\n {\ndiff --git a/board/st/stm32h743-eval/stm32h743-eval.c b/board/st/stm32h743-eval/stm32h743-eval.c\nindex d00f55379c5ce9c0f685191e9623ad3c7983fc48..6c5c6710926fa507df0cafcd8cb977b56ad597e1 100644\n--- a/board/st/stm32h743-eval/stm32h743-eval.c\n+++ b/board/st/stm32h743-eval/stm32h743-eval.c\n@@ -7,9 +7,6 @@\n #include <dm.h>\n #include <init.h>\n #include <log.h>\n-#include <asm/global_data.h>\n-\n-DECLARE_GLOBAL_DATA_PTR;\n \n int dram_init(void)\n {\ndiff --git a/board/st/stm32h747-disco/stm32h747-disco.c b/board/st/stm32h747-disco/stm32h747-disco.c\nindex 645685a64f19c66e5e81d29eb319f4869863a509..24a229bf0a29906bb3c2197e36ec6ef2f6e8a85f 100644\n--- a/board/st/stm32h747-disco/stm32h747-disco.c\n+++ b/board/st/stm32h747-disco/stm32h747-disco.c\n@@ -8,9 +8,6 @@\n #include <dm.h>\n #include <init.h>\n #include <log.h>\n-#include <asm/global_data.h>\n-\n-DECLARE_GLOBAL_DATA_PTR;\n \n int dram_init(void)\n {\ndiff --git a/board/st/stm32h750-art-pi/stm32h750-art-pi.c b/board/st/stm32h750-art-pi/stm32h750-art-pi.c\nindex 31c85c6816e98c4567b399f301829c168333b388..244bb5eefb3a3bb2b253e91a03664497d6808b56 100644\n--- a/board/st/stm32h750-art-pi/stm32h750-art-pi.c\n+++ b/board/st/stm32h750-art-pi/stm32h750-art-pi.c\n@@ -7,9 +7,6 @@\n #include <dm.h>\n #include <init.h>\n #include <log.h>\n-#include <asm/global_data.h>\n-\n-DECLARE_GLOBAL_DATA_PTR;\n \n int dram_init(void)\n {\ndiff --git a/board/technexion/pico-imx8mq/pico-imx8mq.c b/board/technexion/pico-imx8mq/pico-imx8mq.c\nindex 1659db112fa150a24dc35e1bbba7ef852bfd0328..5515fc09f996ff08cfbcbc6b0abe009db2915085 100644\n--- a/board/technexion/pico-imx8mq/pico-imx8mq.c\n+++ b/board/technexion/pico-imx8mq/pico-imx8mq.c\n@@ -7,7 +7,6 @@\n #include <init.h>\n #include <malloc.h>\n #include <errno.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <miiphy.h>\n #include <netdev.h>\n@@ -24,8 +23,6 @@\n #include <spl.h>\n #include <power/pmic.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define UART_PAD_CTRL\t(PAD_CTL_DSE6 | PAD_CTL_FSEL1)\n \n #define WDOG_PAD_CTRL\t(PAD_CTL_DSE6 | PAD_CTL_HYS | PAD_CTL_PUE)\ndiff --git a/board/ti/am62x/evm.c b/board/ti/am62x/evm.c\nindex 2e8336900d1ca8dee9502868d026b290524ffbcb..49e58ad6d6c88d1e4cd41c3a273be6f7441ab609 100644\n--- a/board/ti/am62x/evm.c\n+++ b/board/ti/am62x/evm.c\n@@ -32,8 +32,6 @@\n #define board_is_am62x_lp_skevm() board_ti_k3_is(\"AM62-LP-SKEVM\")\n #define board_is_am62x_sip_skevm() board_ti_k3_is(\"AM62SIP-SKEVM\")\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #if CONFIG_IS_ENABLED(SPLASH_SCREEN)\n static struct splash_location default_splash_locations[] = {\n \t{\ndiff --git a/board/ti/am64x/evm.c b/board/ti/am64x/evm.c\nindex 25076a8a5886e2161ef6572aab7e84fc58ff1f06..764e3011bac35910081713985c0f4564237f91a1 100644\n--- a/board/ti/am64x/evm.c\n+++ b/board/ti/am64x/evm.c\n@@ -27,8 +27,6 @@\n #define board_is_am64x_skevm() (board_ti_k3_is(\"AM64-SKEVM\") || \\\n \t\t\t\tboard_ti_k3_is(\"AM64B-SKEVM\"))\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct efi_fw_image fw_images[] = {\n \t{\n \t\t.image_type_id = AM64X_SK_TIBOOT3_IMAGE_GUID,\ndiff --git a/board/ti/j784s4/evm.c b/board/ti/j784s4/evm.c\nindex cabb3017ee142d8bf572c75b24813c9080d982cd..8a4d40a5a95986279ddf61496c1d0cf394eb95e9 100644\n--- a/board/ti/j784s4/evm.c\n+++ b/board/ti/j784s4/evm.c\n@@ -14,8 +14,6 @@\n #include <asm/arch/k3-ddr.h>\n #include \"../common/fdt_ops.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct efi_fw_image fw_images[] = {\n \t{\n \t\t.image_type_id = AM69_SK_TIBOOT3_IMAGE_GUID,\ndiff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c\nindex a8c3820869331632b101c50f9d6a19e9c96dd446..b915673d9e37e3e784af8cac9b024207f8638ad7 100644\n--- a/board/toradex/apalis-imx8/apalis-imx8.c\n+++ b/board/toradex/apalis-imx8/apalis-imx8.c\n@@ -5,7 +5,6 @@\n \n #include <cpu_func.h>\n #include <init.h>\n-#include <asm/global_data.h>\n \n #include <asm/arch/clock.h>\n #include <asm/arch/imx8-pins.h>\n@@ -24,8 +23,6 @@\n \n #include \"../common/tdx-cfg-block.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define UART_PAD_CTRL\t((SC_PAD_CONFIG_OUT_IN << PADRING_CONFIG_SHIFT) | \\\n \t\t\t (SC_PAD_ISO_OFF << PADRING_LPCONFIG_SHIFT) | \\\n \t\t\t (SC_PAD_28FDSOI_DSE_DV_HIGH << PADRING_DSE_SHIFT) | \\\ndiff --git a/board/toradex/apalis_t30/apalis_t30.c b/board/toradex/apalis_t30/apalis_t30.c\nindex 2c785da41eaa411f00e83723cde4593ee10486d6..8dad41f4122f106c4b54db89685840fca9131543 100644\n--- a/board/toradex/apalis_t30/apalis_t30.c\n+++ b/board/toradex/apalis_t30/apalis_t30.c\n@@ -11,7 +11,6 @@\n #include <asm/arch/pinmux.h>\n #include <asm/arch-tegra/ap.h>\n #include <asm/arch-tegra/tegra.h>\n-#include <asm/global_data.h>\n #include <asm/gpio.h>\n #include <asm/io.h>\n #include <dm.h>\n@@ -23,8 +22,6 @@\n \n #include \"pinmux-config-apalis_t30.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define PMU_I2C_ADDRESS\t\t0x2D\n #define MAX_I2C_RETRY\t\t3\n \ndiff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c\nindex 2a71e7b92de425b4759f07b29d833049d38e008b..0a86420700dd054b1e08ccb11b60da2df7cc9e62 100644\n--- a/board/toradex/colibri-imx8x/colibri-imx8x.c\n+++ b/board/toradex/colibri-imx8x/colibri-imx8x.c\n@@ -5,7 +5,6 @@\n \n #include <cpu_func.h>\n #include <init.h>\n-#include <asm/global_data.h>\n \n #include <asm/arch/clock.h>\n #include <asm/arch/imx8-pins.h>\n@@ -21,8 +20,6 @@\n \n #include \"../common/tdx-cfg-block.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define UART_PAD_CTRL\t((SC_PAD_CONFIG_OUT_IN << PADRING_CONFIG_SHIFT) | \\\n \t\t\t (SC_PAD_ISO_OFF << PADRING_LPCONFIG_SHIFT) | \\\n \t\t\t (SC_PAD_28FDSOI_DSE_DV_HIGH << PADRING_DSE_SHIFT) | \\\ndiff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c\nindex 05c3377a60bc0d43de4e49355c46dc1f87010782..ccfe2c4933c5f163c7148ffae05d55f67f9c9cc1 100644\n--- a/board/toradex/colibri_t20/colibri_t20.c\n+++ b/board/toradex/colibri_t20/colibri_t20.c\n@@ -13,7 +13,6 @@\n #include <asm/arch-tegra/ap.h>\n #include <asm/arch-tegra/board.h>\n #include <asm/arch-tegra/tegra.h>\n-#include <asm/global_data.h>\n #include <asm/gpio.h>\n #include <asm/io.h>\n #include <i2c.h>\n@@ -21,8 +20,6 @@\n #include <linux/delay.h>\n #include \"../common/tdx-common.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define PMU_I2C_ADDRESS\t\t0x34\n #define MAX_I2C_RETRY\t\t3\n #define PMU_SUPPLYENE\t\t0x14\ndiff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c\nindex 0fc3759695fc1043d566b28082b0a5196173f15e..e53530175aeef26e6afd0525578c1b7078877e1c 100644\n--- a/board/toradex/common/tdx-cfg-block.c\n+++ b/board/toradex/common/tdx-cfg-block.c\n@@ -4,7 +4,6 @@\n */\n \n #include <config.h>\n-#include <asm/global_data.h>\n #include \"tdx-cfg-block.h\"\n #include \"tdx-eeprom.h\"\n \n@@ -22,8 +21,6 @@\n #include <nand.h>\n #include <asm/mach-types.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define TAG_VALID\t0xcf01\n #define TAG_MAC\t\t0x0000\n #define TAG_CAR_SERIAL\t0x0021\ndiff --git a/board/toradex/smarc-imx8mp/smarc-imx8mp.c b/board/toradex/smarc-imx8mp/smarc-imx8mp.c\nindex 915b413b15e9aa94bf59df5b9c0c4deb18f0cb10..38fb3d61f5bf08678eb1c58ce158e1178ccf8166 100644\n--- a/board/toradex/smarc-imx8mp/smarc-imx8mp.c\n+++ b/board/toradex/smarc-imx8mp/smarc-imx8mp.c\n@@ -2,14 +2,11 @@\n /* Copyright (C) 2024 Toradex */\n \n #include <init.h>\n-#include <asm/global_data.h>\n #include <asm-generic/gpio.h>\n #include <linux/errno.h>\n \n #include \"../common/tdx-cfg-block.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int board_phys_sdram_size(phys_size_t *size)\n {\n \tif (!size)\ndiff --git a/board/toradex/smarc-imx8mp/spl.c b/board/toradex/smarc-imx8mp/spl.c\nindex 32233c0e1ab9c4afc0051791ffec863a6bfddcd0..511f62e871b3f030dbc618bdf1ebb91862334f38 100644\n--- a/board/toradex/smarc-imx8mp/spl.c\n+++ b/board/toradex/smarc-imx8mp/spl.c\n@@ -8,7 +8,6 @@\n #include <asm/arch/clock.h>\n #include <asm/arch/ddr.h>\n #include <asm/arch/sys_proto.h>\n-#include <asm/global_data.h>\n #include <asm/mach-imx/boot_mode.h>\n #include <dm/device.h>\n #include <power/pmic.h>\n@@ -16,8 +15,6 @@\n \n #include \"lpddr4_timing.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int spl_board_boot_device(enum boot_device boot_dev_spl)\n {\n \treturn BOOT_DEVICE_BOOTROM;\ndiff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c\nindex 3c2d0ba1dd463236a990eb397ee8bb16b73d878a..10b9991e3bf92c81568f96caca32f61481211b4d 100644\n--- a/board/toradex/verdin-imx8mm/spl.c\n+++ b/board/toradex/verdin-imx8mm/spl.c\n@@ -11,7 +11,6 @@\n #include <asm/arch/ddr.h>\n #include <asm/arch/imx8mm_pins.h>\n #include <asm/arch/sys_proto.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/mach-imx/boot_mode.h>\n #include <asm/mach-imx/iomux-v3.h>\n@@ -27,8 +26,6 @@\n #include <power/pmic.h>\n #include <spl.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define I2C_PMIC_BUS_ID 1\n \n int spl_board_boot_device(enum boot_device boot_dev_spl)\ndiff --git a/board/toradex/verdin-imx8mm/verdin-imx8mm.c b/board/toradex/verdin-imx8mm/verdin-imx8mm.c\nindex b44024158453c48611a872eaacdbe0ba612d4580..b56f5bf30a836b84057c601f79059c48aa758e7b 100644\n--- a/board/toradex/verdin-imx8mm/verdin-imx8mm.c\n+++ b/board/toradex/verdin-imx8mm/verdin-imx8mm.c\n@@ -7,7 +7,6 @@\n #include <init.h>\n #include <asm/arch/clock.h>\n #include <asm/arch/sys_proto.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <hang.h>\n #include <i2c.h>\n@@ -17,8 +16,6 @@\n \n #include \"../common/tdx-cfg-block.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define I2C_PMIC\t0\n \n enum pcb_rev_t {\ndiff --git a/board/toradex/verdin-imx8mp/spl.c b/board/toradex/verdin-imx8mp/spl.c\nindex 8628112a78258cdbb935761467522033fe6b7593..b39058b1b5d9223a6abade2a8993cffaddec4b96 100644\n--- a/board/toradex/verdin-imx8mp/spl.c\n+++ b/board/toradex/verdin-imx8mp/spl.c\n@@ -7,7 +7,6 @@\n #include <init.h>\n #include <log.h>\n #include <spl.h>\n-#include <asm/global_data.h>\n #include <asm/arch/clock.h>\n #include <asm/arch/imx8mp_pins.h>\n #include <asm/arch/sys_proto.h>\n@@ -22,8 +21,6 @@\n #include <power/pca9450.h>\n #include \"lpddr4_timing.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int spl_board_boot_device(enum boot_device boot_dev_spl)\n {\n \treturn BOOT_DEVICE_BOOTROM;\ndiff --git a/board/toradex/verdin-imx8mp/verdin-imx8mp.c b/board/toradex/verdin-imx8mp/verdin-imx8mp.c\nindex 34ce25512e8b54d30ef57553255b04e5f822c10c..59b4607f065142d22aae963457e85419380eb378 100644\n--- a/board/toradex/verdin-imx8mp/verdin-imx8mp.c\n+++ b/board/toradex/verdin-imx8mp/verdin-imx8mp.c\n@@ -8,7 +8,6 @@\n #include <asm/arch/imx8mp_pins.h>\n #include <asm/arch/sys_proto.h>\n #include <asm-generic/gpio.h>\n-#include <asm/global_data.h>\n #include <asm/mach-imx/gpio.h>\n #include <asm/mach-imx/iomux-v3.h>\n #include <errno.h>\n@@ -21,8 +20,6 @@\n \n #include \"../common/tdx-cfg-block.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define UART_PAD_CTRL\t(PAD_CTL_DSE6 | PAD_CTL_FSEL1)\n \n /* Verdin UART_3, Console/Debug UART */\ndiff --git a/board/xilinx/zynq/bootimg.c b/board/xilinx/zynq/bootimg.c\nindex 9eb0735f55d3ca9e5f22ac895aff3b2f856b1b5b..52400672799440260e288d0119b99e1123977d5b 100644\n--- a/board/xilinx/zynq/bootimg.c\n+++ b/board/xilinx/zynq/bootimg.c\n@@ -5,15 +5,12 @@\n \n #include <log.h>\n #include <part.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/arch/hardware.h>\n #include <asm/arch/sys_proto.h>\n #include <u-boot/md5.h>\n #include <zynq_bootimg.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define ZYNQ_IMAGE_PHDR_OFFSET\t\t0x09C\n #define ZYNQ_IMAGE_FSBL_LEN_OFFSET\t0x040\n #define ZYNQ_PART_HDR_CHKSUM_WORD_COUNT\t0x0F\ndiff --git a/boot/bootmeth-uclass.c b/boot/bootmeth-uclass.c\nindex a9709465f6e75690cc06510de38bac3eba8f04bf..c841dd0d6d4435751c152175b622314ea7ca3dd5 100644\n--- a/boot/bootmeth-uclass.c\n+++ b/boot/bootmeth-uclass.c\n@@ -19,8 +19,6 @@\n #include <mapmem.h>\n #include <dm/uclass-internal.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int bootmeth_get_state_desc(struct udevice *dev, char *buf, int maxsize)\n {\n \tconst struct bootmeth_ops *ops = bootmeth_get_ops(dev);\ndiff --git a/boot/fdt_simplefb.c b/boot/fdt_simplefb.c\nindex 5822131767d19991a921c8d1eeb5da058a065f76..69c7c2e24c03ce3850bf35a3b49e1512ff363855 100644\n--- a/boot/fdt_simplefb.c\n+++ b/boot/fdt_simplefb.c\n@@ -8,14 +8,11 @@\n \n #include <dm.h>\n #include <fdt_support.h>\n-#include <asm/global_data.h>\n #include <linux/libfdt.h>\n #include <video.h>\n #include <spl.h>\n #include <bloblist.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static int fdt_simplefb_configure_node(void *blob, int off)\n {\n \tint xsize, ysize;\ndiff --git a/boot/image-sig.c b/boot/image-sig.c\nindex 6bc74866eaedca3f17e78136ebad2c7c74178928..4eab017bc2db26ecac04f221e6d24b752aa24765 100644\n--- a/boot/image-sig.c\n+++ b/boot/image-sig.c\n@@ -5,8 +5,6 @@\n \n #include <log.h>\n #include <malloc.h>\n-#include <asm/global_data.h>\n-DECLARE_GLOBAL_DATA_PTR;\n #include <image.h>\n #include <relocate.h>\n #include <u-boot/ecdsa.h>\ndiff --git a/boot/image.c b/boot/image.c\nindex dd96f712b6fbe6ba9f0de8739b37b6868bc14a25..3f7452547636ef5dd99dc9baac6e2cacdbe203a3 100644\n--- a/boot/image.c\n+++ b/boot/image.c\n@@ -24,12 +24,9 @@\n #include <fdt_support.h>\n #endif\n \n-#include <asm/global_data.h>\n #include <linux/errno.h>\n #include <asm/io.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* Set this if we have less than 4 MB of malloc() space */\n #if CONFIG_SYS_MALLOC_LEN < (4096 * 1024)\n #define CONSERVE_MEMORY\t\ttrue\ndiff --git a/cmd/bloblist.c b/cmd/bloblist.c\nindex 333ae558142c9efe9003e7ee89a91384fc4b727e..318a1af0220db92effe96dfc20a0210c5b6aa18b 100644\n--- a/cmd/bloblist.c\n+++ b/cmd/bloblist.c\n@@ -8,9 +8,6 @@\n \n #include <bloblist.h>\n #include <command.h>\n-#include <asm/global_data.h>\n-\n-DECLARE_GLOBAL_DATA_PTR;\n \n static int do_bloblist_info(struct cmd_tbl *cmdtp, int flag, int argc,\n \t\t\t char *const argv[])\ndiff --git a/cmd/bootefi.c b/cmd/bootefi.c\nindex b8f5bb3595044b7130994637e4123f6e3c1272aa..85f41c3b0a06483d1dc414a9fa7e8688ae86ff6f 100644\n--- a/cmd/bootefi.c\n+++ b/cmd/bootefi.c\n@@ -17,11 +17,8 @@\n #include <mapmem.h>\n #include <vsprintf.h>\n #include <asm-generic/sections.h>\n-#include <asm/global_data.h>\n #include <linux/string.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static struct efi_device_path *test_image_path;\n static struct efi_device_path *test_device_path;\n \ndiff --git a/cmd/bootm.c b/cmd/bootm.c\nindex 2c5aea26d98e518c0306e73390f83549e7fb1ca5..ca7cec91fadc5fec5f8fde68160e64ba55507e9f 100644\n--- a/cmd/bootm.c\n+++ b/cmd/bootm.c\n@@ -15,14 +15,11 @@\n #include <malloc.h>\n #include <nand.h>\n #include <asm/byteorder.h>\n-#include <asm/global_data.h>\n #include <linux/ctype.h>\n #include <linux/err.h>\n #include <u-boot/zlib.h>\n #include <mapmem.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #if defined(CONFIG_CMD_IMI)\n static int image_info(unsigned long addr);\n #endif\ndiff --git a/cmd/date.c b/cmd/date.c\nindex 8614f0227614c2ae602271e2d8235c6403b3b41e..d047872289c316d6f6ef3bc288ec06691f10cd9e 100644\n--- a/cmd/date.c\n+++ b/cmd/date.c\n@@ -11,9 +11,6 @@\n #include <dm.h>\n #include <rtc.h>\n #include <i2c.h>\n-#include <asm/global_data.h>\n-\n-DECLARE_GLOBAL_DATA_PTR;\n \n static const char * const weekdays[] = {\n \t\"Sun\", \"Mon\", \"Tues\", \"Wednes\", \"Thurs\", \"Fri\", \"Satur\",\ndiff --git a/cmd/mem.c b/cmd/mem.c\nindex 8690fc1e4e6b93d78b48cf4c080c7f52bf2504c8..68eb6989b945b6a3eebd3eba69f74bf79da519bc 100644\n--- a/cmd/mem.c\n+++ b/cmd/mem.c\n@@ -28,15 +28,12 @@\n #include <time.h>\n #include <vsprintf.h>\n #include <watchdog.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <linux/bitops.h>\n #include <linux/compiler.h>\n #include <linux/ctype.h>\n #include <linux/delay.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* Create a compile-time value */\n #if MEM_SUPPORT_64BIT_DATA\n #define HELP_Q \", .q\"\ndiff --git a/cmd/sound.c b/cmd/sound.c\nindex 8f67cbd96e17a90249b6a36ca898c7076445e19c..7546059022f930d18687964cacf455e3deab1a2d 100644\n--- a/cmd/sound.c\n+++ b/cmd/sound.c\n@@ -8,9 +8,6 @@\n #include <dm.h>\n #include <fdtdec.h>\n #include <sound.h>\n-#include <asm/global_data.h>\n-\n-DECLARE_GLOBAL_DATA_PTR;\n \n /* Initilaise sound subsystem */\n static int do_init(struct cmd_tbl *cmdtp, int flag, int argc,\ndiff --git a/cmd/spl.c b/cmd/spl.c\nindex f591dc07fb66c4689aadcc27f9f245dbc5a49e7b..ddbbd4a817283ede766e24c46212a7db6b8cf709 100644\n--- a/cmd/spl.c\n+++ b/cmd/spl.c\n@@ -9,11 +9,8 @@\n #include <env.h>\n #include <image.h>\n #include <log.h>\n-#include <asm/global_data.h>\n #include <linux/libfdt.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static const char **subcmd_list[] = {\n \n \t[SPL_EXPORT_FDT] = (const char * []) {\ndiff --git a/common/cli_hush.c b/common/cli_hush.c\nindex fb087960c9206b1e7fe4454bae53f6bc1cec1bdf..fe8fe93bd5466c7494d4bb08a8b652364644fe9d 100644\n--- a/common/cli_hush.c\n+++ b/common/cli_hush.c\n@@ -84,7 +84,6 @@\n #include <cli_hush.h>\n #include <command.h> /* find_cmd */\n #include <vsprintf.h>\n-#include <asm/global_data.h>\n #endif\n #ifndef __U_BOOT__\n #include <ctype.h> /* isalpha, isdigit */\n@@ -125,8 +124,6 @@\n #endif\n \n #ifdef __U_BOOT__\n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define EXIT_SUCCESS 0\n #define EOF -1\n #define syntax() syntax_err()\ndiff --git a/common/stdio.c b/common/stdio.c\nindex 3eeb289dd8bff201327de4af73f313e9c5128c5d..fc9659442098165981ed7a4bb0cfbae00e7d1a2d 100644\n--- a/common/stdio.c\n+++ b/common/stdio.c\n@@ -18,11 +18,8 @@\n #include <serial.h>\n #include <splash.h>\n #include <i2c.h>\n-#include <asm/global_data.h>\n #include <dm/device-internal.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static struct stdio_dev devs;\n struct stdio_dev *stdio_devices[] = { NULL, NULL, NULL };\n char *stdio_names[MAX_FILES] = { \"stdin\", \"stdout\", \"stderr\" };\ndiff --git a/drivers/block/sandbox.c b/drivers/block/sandbox.c\nindex 9cb27561a97f450a0c9abf5647bd5c23fad1a50d..4b3de0529ce4ea7890ed436d4f64e061ec86ed48 100644\n--- a/drivers/block/sandbox.c\n+++ b/drivers/block/sandbox.c\n@@ -10,13 +10,10 @@\n #include <os.h>\n #include <malloc.h>\n #include <sandbox_host.h>\n-#include <asm/global_data.h>\n #include <dm/device_compat.h>\n #include <dm/device-internal.h>\n #include <linux/errno.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static unsigned long host_block_read(struct udevice *dev,\n \t\t\t\t lbaint_t start, lbaint_t blkcnt,\n \t\t\t\t void *buffer)\ndiff --git a/drivers/bootcount/pmic_pfuze100.c b/drivers/bootcount/pmic_pfuze100.c\nindex 8c529f5592b43e19a41ed48234cf92f2b797cb68..dd11344322b3c3f3ad282875273d5d436628e29e 100644\n--- a/drivers/bootcount/pmic_pfuze100.c\n+++ b/drivers/bootcount/pmic_pfuze100.c\n@@ -13,8 +13,6 @@\n #include <power/pmic.h>\n #include <power/pfuze100_pmic.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define PFUZE_BC_MAGIC 0xdead\n \n struct bootcount_pmic_priv {\ndiff --git a/drivers/cache/sandbox_cache.c b/drivers/cache/sandbox_cache.c\nindex 375892fafb02e9e0ea391a53f9bbc6c90cc37994..b27960f1bfa936b172365911a15105b22816e671 100644\n--- a/drivers/cache/sandbox_cache.c\n+++ b/drivers/cache/sandbox_cache.c\n@@ -6,9 +6,6 @@\n #include <cache.h>\n #include <dm.h>\n #include <errno.h>\n-#include <asm/global_data.h>\n-\n-DECLARE_GLOBAL_DATA_PTR;\n \n static int sandbox_get_info(struct udevice *dev, struct cache_info *info)\n {\ndiff --git a/drivers/clk/altera/clk-agilex.c b/drivers/clk/altera/clk-agilex.c\nindex fdbf834bb2f6ae85025a2d11f25f8b1de025871d..9d49561512bf1cea549d6a49bbbb7c00526871f6 100644\n--- a/drivers/clk/altera/clk-agilex.c\n+++ b/drivers/clk/altera/clk-agilex.c\n@@ -6,7 +6,6 @@\n \n #include <log.h>\n #include <wait_bit.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/system.h>\n #include <clk-uclass.h>\n@@ -19,8 +18,6 @@\n \n #include <asm/arch/clock_manager.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct socfpga_clk_plat {\n \tvoid __iomem *regs;\n \tint pllgrp;\ndiff --git a/drivers/clk/altera/clk-agilex5.c b/drivers/clk/altera/clk-agilex5.c\nindex fb1e72ffc5cdef4d641982daf2b57f185ec327c8..92b91a9dfc8d8207283b2c5bbbcae77e0f2df30c 100644\n--- a/drivers/clk/altera/clk-agilex5.c\n+++ b/drivers/clk/altera/clk-agilex5.c\n@@ -12,7 +12,6 @@\n #include <stdio.h>\n #include <time.h>\n #include <vsprintf.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/system.h>\n #include <dm/lists.h>\n@@ -26,8 +25,6 @@\n #include <wait_bit.h>\n #include <clk-uclass.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define CLKMGR_CTRL_SWCTRLBTCLKEN_MASK\t\tBIT(8)\n #define CLKMGR_CTRL_SWCTRLBTCLKSEL_MASK\t\tBIT(9)\n \ndiff --git a/drivers/clk/altera/clk-mem-n5x.c b/drivers/clk/altera/clk-mem-n5x.c\nindex b75f52d203b23b600b53ddbdf0fe5d2ef38c01a6..ac59571a8532af966e80a7f31af18c5c7bda9902 100644\n--- a/drivers/clk/altera/clk-mem-n5x.c\n+++ b/drivers/clk/altera/clk-mem-n5x.c\n@@ -4,7 +4,6 @@\n */\n \n #include <asm/arch/clock_manager.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include \"clk-mem-n5x.h\"\n #include <clk-uclass.h>\n@@ -13,8 +12,6 @@\n #include <dm/util.h>\n #include <dt-bindings/clock/n5x-clock.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct socfpga_mem_clk_plat {\n \tvoid __iomem *regs;\n };\ndiff --git a/drivers/clk/altera/clk-n5x.c b/drivers/clk/altera/clk-n5x.c\nindex 9e4e7a1d90879bf89cb07212b9d3c894bb203fc7..185c9028a78dce18c290274f3d415877629950b3 100644\n--- a/drivers/clk/altera/clk-n5x.c\n+++ b/drivers/clk/altera/clk-n5x.c\n@@ -4,7 +4,6 @@\n */\n \n #include <asm/arch/clock_manager.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <clk-uclass.h>\n #include <dm.h>\n@@ -12,8 +11,6 @@\n #include <dm/util.h>\n #include <dt-bindings/clock/n5x-clock.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct socfpga_clk_plat {\n \tvoid __iomem *regs;\n };\ndiff --git a/drivers/clk/rockchip/clk_px30.c b/drivers/clk/rockchip/clk_px30.c\nindex b5054e84c3269d40f70d01a6d755264d85f32a3a..d143a6b85ee6a2be57778abdab162f5ca3d4df80 100644\n--- a/drivers/clk/rockchip/clk_px30.c\n+++ b/drivers/clk/rockchip/clk_px30.c\n@@ -13,15 +13,12 @@\n #include <asm/arch-rockchip/clock.h>\n #include <asm/arch-rockchip/cru_px30.h>\n #include <asm/arch-rockchip/hardware.h>\n-#include <asm/global_data.h>\n #include <dm/device-internal.h>\n #include <dm/lists.h>\n #include <dt-bindings/clock/px30-cru.h>\n #include <linux/bitops.h>\n #include <linux/delay.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n enum {\n \tVCO_MAX_HZ\t= 3200U * 1000000,\n \tVCO_MIN_HZ\t= 800 * 1000000,\ndiff --git a/drivers/clk/rockchip/clk_rk3308.c b/drivers/clk/rockchip/clk_rk3308.c\nindex e73bb6790af262c81a2ae11d94d700ec307d8861..97043b8693c03de423b4d724f1db153fcb6c3ff6 100644\n--- a/drivers/clk/rockchip/clk_rk3308.c\n+++ b/drivers/clk/rockchip/clk_rk3308.c\n@@ -10,7 +10,6 @@\n #include <log.h>\n #include <malloc.h>\n #include <syscon.h>\n-#include <asm/global_data.h>\n #include <asm/arch-rockchip/clock.h>\n #include <asm/arch-rockchip/cru_rk3308.h>\n #include <asm/arch-rockchip/hardware.h>\n@@ -19,8 +18,6 @@\n #include <dt-bindings/clock/rk3308-cru.h>\n #include <linux/bitops.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n enum {\n \tVCO_MAX_HZ\t= 3200U * 1000000,\n \tVCO_MIN_HZ\t= 800 * 1000000,\ndiff --git a/drivers/clk/rockchip/clk_rk3528.c b/drivers/clk/rockchip/clk_rk3528.c\nindex d58557ff56de1b5e69cf0f51aa6ac9ab99bafd5f..bcdc0f930d25e3716673a40b304011b4a9bb6eae 100644\n--- a/drivers/clk/rockchip/clk_rk3528.c\n+++ b/drivers/clk/rockchip/clk_rk3528.c\n@@ -17,8 +17,6 @@\n #include <dt-bindings/clock/rockchip,rk3528-cru.h>\n #include <linux/delay.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define DIV_TO_RATE(input_rate, div)\t((input_rate) / ((div) + 1))\n \n /*\ndiff --git a/drivers/clk/rockchip/clk_rk3568.c b/drivers/clk/rockchip/clk_rk3568.c\nindex 533031caead6818fe41774c9efee969fdd428dbc..bb49af358e6056d21c873ef739dd2ba8c889e2c1 100644\n--- a/drivers/clk/rockchip/clk_rk3568.c\n+++ b/drivers/clk/rockchip/clk_rk3568.c\n@@ -16,8 +16,6 @@\n #include <dm/lists.h>\n #include <dt-bindings/clock/rk3568-cru.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #if CONFIG_IS_ENABLED(OF_PLATDATA)\n struct rk3568_clk_plat {\n \tstruct dtd_rockchip_rk3568_cru dtd;\ndiff --git a/drivers/clk/rockchip/clk_rk3576.c b/drivers/clk/rockchip/clk_rk3576.c\nindex 125b08ee8322e26ae91b3e8ef8c1fc398db2eab8..1026af27ca133e15a93a15445da5998481b742a6 100644\n--- a/drivers/clk/rockchip/clk_rk3576.c\n+++ b/drivers/clk/rockchip/clk_rk3576.c\n@@ -17,8 +17,6 @@\n #include <dt-bindings/clock/rockchip,rk3576-cru.h>\n #include <linux/delay.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define DIV_TO_RATE(input_rate, div)\t((input_rate) / ((div) + 1))\n \n static struct rockchip_pll_rate_table rk3576_24m_pll_rates[] = {\ndiff --git a/drivers/clk/rockchip/clk_rk3588.c b/drivers/clk/rockchip/clk_rk3588.c\nindex 8c3a113526f902ef25bd0f661b28a021b18744f2..be401a9faeec90b69fcd8c918c7ca1dc0dee29d8 100644\n--- a/drivers/clk/rockchip/clk_rk3588.c\n+++ b/drivers/clk/rockchip/clk_rk3588.c\n@@ -17,8 +17,6 @@\n #include <dm/lists.h>\n #include <dt-bindings/clock/rockchip,rk3588-cru.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define DIV_TO_RATE(input_rate, div)\t((input_rate) / ((div) + 1))\n \n static struct rockchip_pll_rate_table rk3588_pll_rates[] = {\ndiff --git a/drivers/clk/rockchip/clk_rv1108.c b/drivers/clk/rockchip/clk_rv1108.c\nindex 75202a66aa68c1a4f820bab29b317ea484f95632..e1b9ccf1236ae6c82f9ce0103e6a228ebd1b511e 100644\n--- a/drivers/clk/rockchip/clk_rv1108.c\n+++ b/drivers/clk/rockchip/clk_rv1108.c\n@@ -11,7 +11,6 @@\n #include <log.h>\n #include <malloc.h>\n #include <syscon.h>\n-#include <asm/global_data.h>\n #include <asm/arch-rockchip/clock.h>\n #include <asm/arch-rockchip/cru_rv1108.h>\n #include <asm/arch-rockchip/hardware.h>\n@@ -21,8 +20,6 @@\n #include <linux/delay.h>\n #include <linux/stringify.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n enum {\n \tVCO_MAX_HZ\t= 2400U * 1000000,\n \tVCO_MIN_HZ\t= 600 * 1000000,\ndiff --git a/drivers/clk/rockchip/clk_rv1126.c b/drivers/clk/rockchip/clk_rv1126.c\nindex aeeea95691479e8a6a450fb25b27f1b86d9494cb..39920d34b75a338838a2235aa72cb9d3ac302864 100644\n--- a/drivers/clk/rockchip/clk_rv1126.c\n+++ b/drivers/clk/rockchip/clk_rv1126.c\n@@ -18,8 +18,6 @@\n #include <dm/lists.h>\n #include <dt-bindings/clock/rockchip,rv1126-cru.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define RV1126_CPUCLK_RATE(_rate, _aclk_div, _pclk_div)\t\t\\\n {\t\t\t\t\t\t\t\t\\\n \t.rate\t= _rate##U,\t\t\t\t\t\\\ndiff --git a/drivers/cpu/bcm283x_cpu.c b/drivers/cpu/bcm283x_cpu.c\nindex 59a7b142c95210aced2604dae20b020e29acb76c..ad638cd8fff91a6ed5e77cac6a1147eaeca610ee 100644\n--- a/drivers/cpu/bcm283x_cpu.c\n+++ b/drivers/cpu/bcm283x_cpu.c\n@@ -11,7 +11,6 @@\n #include <asm/armv8/cpu.h>\n #include <asm/cache.h>\n #include <asm/io.h>\n-#include <asm/global_data.h>\n #include <asm/system.h>\n #include <asm-generic/sections.h>\n #include <linux/bitops.h>\n@@ -19,8 +18,6 @@\n #include <linux/delay.h>\n #include \"armv8_cpu.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct bcm_plat {\n \tu64 release_addr;\n };\ndiff --git a/drivers/cpu/cpu-uclass.c b/drivers/cpu/cpu-uclass.c\nindex 2c8e46c05e39259e2d0a3e018f2ca26e3f8e1479..b73768de918647f7aa2749ea6b0def0af5d69bdc 100644\n--- a/drivers/cpu/cpu-uclass.c\n+++ b/drivers/cpu/cpu-uclass.c\n@@ -15,8 +15,6 @@\n #include <linux/err.h>\n #include <relocate.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int cpu_probe_all(void)\n {\n \tint ret = uclass_probe_all(UCLASS_CPU);\ndiff --git a/drivers/cpu/imx8_cpu.c b/drivers/cpu/imx8_cpu.c\nindex 5f17122c36c5c87a27f24c66da1858fd6422a1a8..3cd00199548e0a772a8ffe636c1d16f2f4fd7148 100644\n--- a/drivers/cpu/imx8_cpu.c\n+++ b/drivers/cpu/imx8_cpu.c\n@@ -6,7 +6,6 @@\n #include <cpu.h>\n #include <dm.h>\n #include <thermal.h>\n-#include <asm/global_data.h>\n #include <asm/ptrace.h>\n #include <asm/system.h>\n #include <firmware/imx/sci/sci.h>\n@@ -18,8 +17,6 @@\n #include <linux/clk-provider.h>\n #include <linux/psci.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define IMX_REV_LEN\t4\n struct cpu_imx_plat {\n \tconst char *name;\ndiff --git a/drivers/cpu/mtk_cpu.c b/drivers/cpu/mtk_cpu.c\nindex 2a08be9b6d181c64e147bfd32f919e0a63289e98..4f4e5480eac56f53a0d80efa0e0b106d9b224da4 100644\n--- a/drivers/cpu/mtk_cpu.c\n+++ b/drivers/cpu/mtk_cpu.c\n@@ -10,12 +10,9 @@\n #include <dm.h>\n #include <regmap.h>\n #include <syscon.h>\n-#include <asm/global_data.h>\n #include <linux/err.h>\n #include <linux/io.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct mtk_cpu_plat {\n \tstruct regmap *hwver;\n };\ndiff --git a/drivers/firmware/arm-ffa/arm-ffa-uclass.c b/drivers/firmware/arm-ffa/arm-ffa-uclass.c\nindex 96c64964bb73b05e094f7ab71a5e68c3195f3edf..76a8775e911c8497fd43ca76dbbfcb0dfc865d42 100644\n--- a/drivers/firmware/arm-ffa/arm-ffa-uclass.c\n+++ b/drivers/firmware/arm-ffa/arm-ffa-uclass.c\n@@ -12,15 +12,12 @@\n #include <malloc.h>\n #include <string.h>\n #include <u-boot/uuid.h>\n-#include <asm/global_data.h>\n #include <dm/device-internal.h>\n #include <dm/devres.h>\n #include <dm/root.h>\n #include <linux/errno.h>\n #include <linux/sizes.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* Error mapping declarations */\n \n int ffa_to_std_errmap[MAX_NUMBER_FFA_ERR] = {\ndiff --git a/drivers/firmware/arm-ffa/arm-ffa.c b/drivers/firmware/arm-ffa/arm-ffa.c\nindex 94e6105cb38ebcadff3d248870a5a0bce5cb9384..9e6b5dcc542fd54abe58180887d7888a1c429f4a 100644\n--- a/drivers/firmware/arm-ffa/arm-ffa.c\n+++ b/drivers/firmware/arm-ffa/arm-ffa.c\n@@ -10,12 +10,9 @@\n #include <arm_ffa_priv.h>\n #include <dm.h>\n #include <log.h>\n-#include <asm/global_data.h>\n #include <dm/device-internal.h>\n #include <linux/errno.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /**\n * invoke_ffa_fn() - SMC wrapper\n * @args: FF-A ABI arguments to be copied to Xn registers\ndiff --git a/drivers/firmware/arm-ffa/ffa-emul-uclass.c b/drivers/firmware/arm-ffa/ffa-emul-uclass.c\nindex 1521d9b66ac3e97cc25975c10b305105760e8d3e..6198d6873541c16d02c079a47579236cec68c5fa 100644\n--- a/drivers/firmware/arm-ffa/ffa-emul-uclass.c\n+++ b/drivers/firmware/arm-ffa/ffa-emul-uclass.c\n@@ -8,7 +8,6 @@\n #include <dm.h>\n #include <mapmem.h>\n #include <string.h>\n-#include <asm/global_data.h>\n #include <asm/sandbox_arm_ffa.h>\n #include <asm/sandbox_arm_ffa_priv.h>\n #include <dm/device-internal.h>\n@@ -17,8 +16,6 @@\n #include <linux/errno.h>\n #include <linux/sizes.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* The partitions (SPs) table */\n static struct ffa_partition_desc sandbox_partitions[SANDBOX_PARTITIONS_CNT] = {\n \t{\ndiff --git a/drivers/firmware/arm-ffa/sandbox_ffa.c b/drivers/firmware/arm-ffa/sandbox_ffa.c\nindex 44b32a829ddfe9a94084c05b0135a1ffe8a343e8..f1e8de4bf0df04c2e76e03fba13339e152fd4975 100644\n--- a/drivers/firmware/arm-ffa/sandbox_ffa.c\n+++ b/drivers/firmware/arm-ffa/sandbox_ffa.c\n@@ -8,13 +8,10 @@\n #include <arm_ffa.h>\n #include <dm.h>\n #include <log.h>\n-#include <asm/global_data.h>\n #include <asm/sandbox_arm_ffa_priv.h>\n #include <dm/device-internal.h>\n #include <linux/errno.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /**\n * sandbox_ffa_discover() - perform sandbox FF-A discovery\n * @dev: The sandbox FF-A bus device\ndiff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c\nindex 38151ef1bee7d5ef0c4b26fcafb98a7260611abb..7651d5360d688ec1a7962ca651120ca299ce3478 100644\n--- a/drivers/gpio/gpio-uclass.c\n+++ b/drivers/gpio/gpio-uclass.c\n@@ -18,15 +18,12 @@\n #include <fdtdec.h>\n #include <malloc.h>\n #include <acpi/acpi_device.h>\n-#include <asm/global_data.h>\n #include <asm/gpio.h>\n #include <dm/device_compat.h>\n #include <linux/bug.h>\n #include <linux/ctype.h>\n #include <linux/delay.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define GPIO_ALLOC_BITS\t32\n \n /**\ndiff --git a/drivers/gpio/nx_gpio.c b/drivers/gpio/nx_gpio.c\nindex 741b2ff7f177919efd1ce34ea13c2993aa2890d2..5abbb34daea7e5db0c4aabe54a4e1b56c58087b9 100644\n--- a/drivers/gpio/nx_gpio.c\n+++ b/drivers/gpio/nx_gpio.c\n@@ -7,12 +7,9 @@\n #include <dm.h>\n #include <errno.h>\n #include <malloc.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/gpio.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct nx_gpio_regs {\n \tu32\tdata;\t\t/* Data register */\n \tu32\toutputenb;\t/* Output Enable register */\ndiff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c\nindex 2dfc1c4eab5d83e617407f49a8c783ef61778b3a..268bb39f009fbd2dc06159807cc8e9dac531ea4c 100644\n--- a/drivers/i2c/mxc_i2c.c\n+++ b/drivers/i2c/mxc_i2c.c\n@@ -18,7 +18,6 @@\n #include <log.h>\n #include <asm/arch/clock.h>\n #include <asm/arch/imx-regs.h>\n-#include <asm/global_data.h>\n #include <dm/device_compat.h>\n #include <linux/delay.h>\n #include <linux/errno.h>\n@@ -30,8 +29,6 @@\n #include <dm.h>\n #include <dm/pinctrl.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define I2C_QUIRK_FLAG\t\t(1 << 0)\n \n #define IMX_I2C_REGSHIFT\t2\ndiff --git a/drivers/i2c/nx_i2c.c b/drivers/i2c/nx_i2c.c\nindex 8562dd82bd630f7872f5f3f22f34f1f65e567ded..706b7adefe8ac1b28e2afb6f8fe1c1a9b2276c94 100644\n--- a/drivers/i2c/nx_i2c.c\n+++ b/drivers/i2c/nx_i2c.c\n@@ -7,7 +7,6 @@\n #include <asm/arch/reset.h>\n #include <asm/arch/clk.h>\n #include <asm/arch/nx_gpio.h>\n-#include <asm/global_data.h>\n #include <linux/delay.h>\n \n #define I2C_WRITE 0\n@@ -45,8 +44,6 @@\n \n #define DEFAULT_SPEED 100000 /* default I2C speed [Hz] */\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct nx_i2c_regs {\n \tuint iiccon;\n \tuint iicstat;\ndiff --git a/drivers/i2c/ocores_i2c.c b/drivers/i2c/ocores_i2c.c\nindex cf714d22ee4634a4b19c905cec9443f2da6c8a38..32704ee885454d695dcb6ede129fd8934c1d19b9 100644\n--- a/drivers/i2c/ocores_i2c.c\n+++ b/drivers/i2c/ocores_i2c.c\n@@ -12,7 +12,6 @@\n * Andreas Larsson <andreas@gaisler.com>\n */\n \n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <clk.h>\n #include <dm.h>\n@@ -75,8 +74,6 @@ struct ocores_i2c_bus {\n \tu8 (*getreg)(struct ocores_i2c_bus *i2c, int reg);\n };\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* Boolean attribute values */\n enum {\n \tFALSE = 0,\ndiff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c\nindex 79f7a3205022afebfe736c1995af4386371d99a4..4102375e5b7390b5cfc96d46d3920880f6c0f797 100644\n--- a/drivers/i2c/soft_i2c.c\n+++ b/drivers/i2c/soft_i2c.c\n@@ -25,7 +25,6 @@\n #endif\n #endif\n #include <i2c.h>\n-#include <asm/global_data.h>\n #include <linux/delay.h>\n \n #if defined(CONFIG_SOFT_I2C_GPIO_SCL)\n@@ -82,8 +81,6 @@\n \n /* #define\tDEBUG_I2C\t*/\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #ifndef\tI2C_SOFT_DECLARATIONS\n # define I2C_SOFT_DECLARATIONS\n #endif\ndiff --git a/drivers/i2c/synquacer_i2c.c b/drivers/i2c/synquacer_i2c.c\nindex 6672d9435e330cbf32b23677f94815185be6b92d..6e5722327c5f749ad2203629e2e362977db61414 100644\n--- a/drivers/i2c/synquacer_i2c.c\n+++ b/drivers/i2c/synquacer_i2c.c\n@@ -112,8 +112,6 @@\n #define SPEED_FM\t\t400\t// Fast Mode\n #define SPEED_SM\t\t100\t// Standard Mode\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct synquacer_i2c {\n \tvoid __iomem *base;\n \tunsigned long pclkrate;\ndiff --git a/drivers/mailbox/imx-mailbox.c b/drivers/mailbox/imx-mailbox.c\nindex b1e0465e7a8bfa204664e487825f4221784a760c..c7eaa3de96f4a4b96b11fd331323e4f2c2a45e27 100644\n--- a/drivers/mailbox/imx-mailbox.c\n+++ b/drivers/mailbox/imx-mailbox.c\n@@ -15,8 +15,6 @@\n /* This driver only exposes the status bits to keep with the\n * polling methodology of u-boot.\n */\n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define IMX_MU_CHANS\t\t24\n \n #define IMX_MU_V2_PAR_OFF\t0x4\ndiff --git a/drivers/misc/atsha204a-i2c.c b/drivers/misc/atsha204a-i2c.c\nindex 3b9046da880c106859978d36a5a10a1e6ce2259b..aa3094fcc016a53eaf7c54b87c61fb1e7d7c12aa 100644\n--- a/drivers/misc/atsha204a-i2c.c\n+++ b/drivers/misc/atsha204a-i2c.c\n@@ -15,7 +15,6 @@\n #include <errno.h>\n #include <atsha204a-i2c.h>\n #include <log.h>\n-#include <asm/global_data.h>\n #include <linux/delay.h>\n #include <linux/bitrev.h>\n #include <u-boot/crc.h>\n@@ -25,8 +24,6 @@\n #define ATSHA204A_TRANSACTION_RETRY\t5\n #define ATSHA204A_EXECTIME\t\t5000\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static inline u16 atsha204a_crc16(const u8 *buffer, size_t len)\n {\n \treturn bitrev16(crc16(0, buffer, len));\ndiff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c\nindex 2928cf75f89e7b7829a2dd0595499900850334cc..6af4c7f15e7b910b03922131ddb0db0d21be6590 100644\n--- a/drivers/misc/fs_loader.c\n+++ b/drivers/misc/fs_loader.c\n@@ -13,7 +13,6 @@\n #include <fs.h>\n #include <fs_loader.h>\n #include <log.h>\n-#include <asm/global_data.h>\n #include <dm/device-internal.h>\n #include <dm/root.h>\n #include <linux/string.h>\n@@ -25,8 +24,6 @@\n #include <ubi_uboot.h>\n #endif\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /**\n * struct firmware - A place for storing firmware and its attribute data.\n *\ndiff --git a/drivers/misc/imx8/fuse.c b/drivers/misc/imx8/fuse.c\nindex 90d251a440589ca07e545ae1303121a74f888188..872713e30b6c15fee6f79f9e4b86a4ee81237bd5 100644\n--- a/drivers/misc/imx8/fuse.c\n+++ b/drivers/misc/imx8/fuse.c\n@@ -8,11 +8,8 @@\n #include <fuse.h>\n #include <firmware/imx/sci/sci.h>\n #include <asm/arch/sys_proto.h>\n-#include <asm/global_data.h>\n #include <linux/arm-smccc.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define FSL_ECC_WORD_START_1\t 0x10\n #define FSL_ECC_WORD_END_1\t 0x10F\n \ndiff --git a/drivers/mmc/ca_dw_mmc.c b/drivers/mmc/ca_dw_mmc.c\nindex 1af5ec0532ea0933981e2663d97e6474eadccbba..d5a4453a62e0a79b1bf0964359defbaf4c19f546 100644\n--- a/drivers/mmc/ca_dw_mmc.c\n+++ b/drivers/mmc/ca_dw_mmc.c\n@@ -6,7 +6,6 @@\n \n #include <dwmmc.h>\n #include <fdtdec.h>\n-#include <asm/global_data.h>\n #include <linux/libfdt.h>\n #include <malloc.h>\n #include <errno.h>\n@@ -26,8 +25,6 @@\n \n #define MIN_FREQ (400000)\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct ca_mmc_plat {\n \tstruct mmc_config cfg;\n \tstruct mmc mmc;\ndiff --git a/drivers/mmc/f_sdh30.c b/drivers/mmc/f_sdh30.c\nindex f47cf8485216e60bb5d9ff2b2becca0749116c94..f0356e1e9609bb5fcfcf3cf9e0c4974988fde260 100644\n--- a/drivers/mmc/f_sdh30.c\n+++ b/drivers/mmc/f_sdh30.c\n@@ -29,8 +29,6 @@ struct f_sdh30_plat {\n \tconst struct f_sdh30_data *data;\n };\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static void f_sdh30_e51_init(struct udevice *dev)\n {\n \tstruct f_sdh30_plat *plat = dev_get_plat(dev);\ndiff --git a/drivers/mmc/jz_mmc.c b/drivers/mmc/jz_mmc.c\nindex fc10bb256a4df53107d54fe89f060e8f37dd72f1..651d98683055329f17428a7b3d4ae685982a2861 100644\n--- a/drivers/mmc/jz_mmc.c\n+++ b/drivers/mmc/jz_mmc.c\n@@ -8,7 +8,6 @@\n \n #include <malloc.h>\n #include <mmc.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/unaligned.h>\n #include <errno.h>\n@@ -419,8 +418,6 @@ int jz_mmc_init(void __iomem *base)\n #else /* CONFIG_DM_MMC */\n \n #include <dm.h>\n-DECLARE_GLOBAL_DATA_PTR;\n-\n static int jz_mmc_dm_send_cmd(struct udevice *dev, struct mmc_cmd *cmd,\n \t\t\t struct mmc_data *data)\n {\ndiff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c\nindex 38dc36a21940efc070028deade3e3eebaf862222..66f3cf2de4f0d71aa34df03447ee37e1ced043d3 100644\n--- a/drivers/mmc/msm_sdhci.c\n+++ b/drivers/mmc/msm_sdhci.c\n@@ -13,7 +13,6 @@\n #include <reset.h>\n #include <sdhci.h>\n #include <wait_bit.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <linux/bitops.h>\n #include <power/regulator.h>\n@@ -61,8 +60,6 @@ struct msm_sdhc_variant_info {\n \tu32 core_vendor_spec_capabilities0;\n };\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static int msm_sdc_clk_init(struct udevice *dev)\n {\n \tstruct msm_sdhc *prv = dev_get_priv(dev);\ndiff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c\nindex 2da5334c21f13c1ad93b4154c6dd4c637868cbf0..a8b63a203870caffcd60a42f411c511f6690841e 100644\n--- a/drivers/mmc/mv_sdhci.c\n+++ b/drivers/mmc/mv_sdhci.c\n@@ -6,7 +6,6 @@\n #include <dm.h>\n #include <malloc.h>\n #include <sdhci.h>\n-#include <asm/global_data.h>\n #include <linux/mbus.h>\n \n #define MVSDH_NAME \"mv_sdh\"\n@@ -14,8 +13,6 @@\n #define SDHCI_WINDOW_CTRL(win)\t\t(0x4080 + ((win) << 4))\n #define SDHCI_WINDOW_BASE(win)\t\t(0x4084 + ((win) << 4))\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct mv_sdhci_plat {\n \tstruct mmc_config cfg;\n \tstruct mmc mmc;\ndiff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c\nindex 7bf54fa46540b95df9c53843046d9fbc7bb8b2b2..7324dc72e0a61023c30068ab5a5c0ce1c2fd4a30 100644\n--- a/drivers/mtd/nand/raw/pxa3xx_nand.c\n+++ b/drivers/mtd/nand/raw/pxa3xx_nand.c\n@@ -9,7 +9,6 @@\n #include <malloc.h>\n #include <fdtdec.h>\n #include <nand.h>\n-#include <asm/global_data.h>\n #include <dm/device_compat.h>\n #include <dm/devres.h>\n #include <linux/bitops.h>\n@@ -30,8 +29,6 @@\n \n #include \"pxa3xx_nand.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define TIMEOUT_DRAIN_FIFO\t5\t/* in ms */\n #define\tCHIP_DELAY_TIMEOUT\t200\n #define NAND_STOP_DELAY\t\t40\ndiff --git a/drivers/mtd/nand/raw/tegra_nand.c b/drivers/mtd/nand/raw/tegra_nand.c\nindex ef43dcad079b23db418ee305ad90aecc1be89881..0bee7eace908806da450fcf9c8d88419036f0be4 100644\n--- a/drivers/mtd/nand/raw/tegra_nand.c\n+++ b/drivers/mtd/nand/raw/tegra_nand.c\n@@ -7,7 +7,6 @@\n */\n \n #include <log.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <memalign.h>\n #include <nand.h>\n@@ -26,8 +25,6 @@\n #include <linux/printk.h>\n #include \"tegra_nand.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define NAND_CMD_TIMEOUT_MS\t\t10\n \n #define SKIPPED_SPARE_BYTES\t\t4\ndiff --git a/drivers/mtd/nvmxip/nvmxip_qspi.c b/drivers/mtd/nvmxip/nvmxip_qspi.c\nindex 1a109bee557a58d65b08a7bf108442029c0ffd42..383971bea6659072982e28bea108a95402e4952a 100644\n--- a/drivers/mtd/nvmxip/nvmxip_qspi.c\n+++ b/drivers/mtd/nvmxip/nvmxip_qspi.c\n@@ -11,9 +11,6 @@\n #include <nvmxip.h>\n #include <linux/errno.h>\n \n-#include <asm/global_data.h>\n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define NVMXIP_QSPI_DRV_NAME \"nvmxip_qspi\"\n \n /**\ndiff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c\nindex 102a92368267b28a6602aa7edb025794ed212aad..a9db5296b2da1a32bc3eda58692841dddbab603a 100644\n--- a/drivers/mtd/spi/sf-uclass.c\n+++ b/drivers/mtd/spi/sf-uclass.c\n@@ -11,13 +11,10 @@\n #include <malloc.h>\n #include <spi.h>\n #include <spi_flash.h>\n-#include <asm/global_data.h>\n #include <dm/device-internal.h>\n #include <test/test.h>\n #include \"sf_internal.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int spi_flash_read_dm(struct udevice *dev, u32 offset, size_t len, void *buf)\n {\n \treturn log_ret(sf_get_ops(dev)->read(dev, offset, len, buf));\ndiff --git a/drivers/net/dwmac_s700.c b/drivers/net/dwmac_s700.c\nindex 969d247b4f3ae2e8b3e683f281208db44aee259f..76daab961c017da86cf50635c5f9cc163e5b54a3 100644\n--- a/drivers/net/dwmac_s700.c\n+++ b/drivers/net/dwmac_s700.c\n@@ -5,7 +5,6 @@\n * Actions DWMAC specific glue layer\n */\n \n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <dm.h>\n #include <clk.h>\n@@ -24,8 +23,6 @@\n #define RMII_REF_CLK_MFP_CTL0\t\t(0x0 << 6)\n #define CLKO_25M_EN_MFP_CTL3\t\tBIT(30)\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static void dwmac_board_setup(void)\n {\n \tclrbits_le32(MFP_CTL0, (RMII_TXD01_MFP_CTL0 | RMII_RXD01_MFP_CTL0 |\ndiff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c\nindex 1c51e936b5be96f8ef4a9d76c39d797287edf384..3d32bad083183ea467ad73d69d7c3c6da64b7215 100644\n--- a/drivers/net/fec_mxc.c\n+++ b/drivers/net/fec_mxc.c\n@@ -18,7 +18,6 @@\n #include <net.h>\n #include <netdev.h>\n #include <asm/cache.h>\n-#include <asm/global_data.h>\n #include <linux/delay.h>\n #include <power/regulator.h>\n \n@@ -36,8 +35,6 @@\n #include \"fec_mxc.h\"\n #include <eth_phy.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /*\n * Timeout the transfer after 5 mS. This is usually a bit more, since\n * the code in the tightloops this timeout is used in adds some overhead.\ndiff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c\nindex c8cfe7448d4daa7e793b3fba8380de6545dd55d0..2b6080dd9ee014ee432ff6596d5a82fbd96a72a0 100644\n--- a/drivers/net/gmac_rockchip.c\n+++ b/drivers/net/gmac_rockchip.c\n@@ -11,7 +11,6 @@\n #include <net.h>\n #include <phy.h>\n #include <syscon.h>\n-#include <asm/global_data.h>\n #include <asm/arch-rockchip/periph.h>\n #include <asm/arch-rockchip/clock.h>\n #include <asm/arch-rockchip/hardware.h>\n@@ -28,7 +27,6 @@\n #include <linux/bitops.h>\n #include \"designware.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n #define DELAY_ENABLE(soc, tx, rx) \\\n \t(((tx) ? soc##_TXCLK_DLY_ENA_GMAC_ENABLE : soc##_TXCLK_DLY_ENA_GMAC_DISABLE) | \\\n \t((rx) ? soc##_RXCLK_DLY_ENA_GMAC_ENABLE : soc##_RXCLK_DLY_ENA_GMAC_DISABLE))\ndiff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c\nindex 1640868c24af0628306ed570d4d8f413fdb064ba..baa18202d6e23097de6e08394fb586929637b800 100644\n--- a/drivers/net/mvneta.c\n+++ b/drivers/net/mvneta.c\n@@ -20,7 +20,6 @@\n #include <config.h>\n #include <malloc.h>\n #include <asm/cache.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <dm/device_compat.h>\n #include <dm/devres.h>\n@@ -37,8 +36,6 @@\n #include <linux/mbus.h>\n #include <asm-generic/gpio.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define MVNETA_NR_CPUS\t\t1\n #define ETH_HLEN\t\t14\t/* Total octets in header */\n \ndiff --git a/drivers/net/octeontx/smi.c b/drivers/net/octeontx/smi.c\nindex 217bcac2ce290cf4ec72a3ace1dda77b22fefcf4..5a822b64427be716bcb23e2fa08a99784015622f 100644\n--- a/drivers/net/octeontx/smi.c\n+++ b/drivers/net/octeontx/smi.c\n@@ -10,15 +10,12 @@\n #include <pci.h>\n #include <pci_ids.h>\n #include <phy.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <linux/ctype.h>\n #include <linux/delay.h>\n \n #define PCI_DEVICE_ID_OCTEONTX_SMI 0xA02B\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n enum octeontx_smi_mode {\n \tCLAUSE22 = 0,\n \tCLAUSE45 = 1,\ndiff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c\nindex 11d3616497697b7003bba4b2e3006d6d1b6d6d15..4ab709a14d5f4d1f59bd600edd5a20f0f9032690 100644\n--- a/drivers/net/phy/fixed.c\n+++ b/drivers/net/phy/fixed.c\n@@ -10,9 +10,6 @@\n #include <phy.h>\n #include <dm.h>\n #include <fdt_support.h>\n-#include <asm/global_data.h>\n-\n-DECLARE_GLOBAL_DATA_PTR;\n \n static int fixedphy_probe(struct phy_device *phydev)\n {\ndiff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c\nindex b58283fe3d5f2f8c6dd22283677d68e2fa5cb1e5..d7e0c4fe02dd8b45d7a99bc7bf3eba7a64ca8c49 100644\n--- a/drivers/net/phy/phy.c\n+++ b/drivers/net/phy/phy.c\n@@ -17,7 +17,6 @@\n #include <miiphy.h>\n #include <phy.h>\n #include <errno.h>\n-#include <asm/global_data.h>\n #include <asm-generic/gpio.h>\n #include <dm/device_compat.h>\n #include <dm/of_extra.h>\n@@ -26,8 +25,6 @@\n #include <linux/err.h>\n #include <linux/compiler.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* Generic PHY support and helper functions */\n \n /**\ndiff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c\nindex e44b7b75bd585c13364dd2f6f6495dc941b855e7..f5a7dd349c91dc5fa858cd913a57ddd3c249d719 100644\n--- a/drivers/net/phy/xilinx_gmii2rgmii.c\n+++ b/drivers/net/phy/xilinx_gmii2rgmii.c\n@@ -8,9 +8,6 @@\n #include <dm.h>\n #include <log.h>\n #include <phy.h>\n-#include <asm/global_data.h>\n-\n-DECLARE_GLOBAL_DATA_PTR;\n \n #define ZYNQ_GMII2RGMII_REG\t\t0x10\n #define ZYNQ_GMII2RGMII_SPEED_MASK\t(BMCR_SPEED1000 | BMCR_SPEED100)\ndiff --git a/drivers/net/sandbox-raw.c b/drivers/net/sandbox-raw.c\nindex 1d716716778cbf372e89fad71ec7b62ad5ebbbf2..c3d40f0b59ed7e2e9eb7bbbdda385a744e2d77c7 100644\n--- a/drivers/net/sandbox-raw.c\n+++ b/drivers/net/sandbox-raw.c\n@@ -12,9 +12,6 @@\n #include <env.h>\n #include <malloc.h>\n #include <net.h>\n-#include <asm/global_data.h>\n-\n-DECLARE_GLOBAL_DATA_PTR;\n \n static int reply_arp;\n static struct in_addr arp_ip;\ndiff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c\nindex 2011fd31f41aa8b5a7c2ba7f08fb56acf8fcee50..0ea50c484c05967aac335a9d321da68dd67328bf 100644\n--- a/drivers/net/sandbox.c\n+++ b/drivers/net/sandbox.c\n@@ -10,7 +10,6 @@\n #include <log.h>\n #include <malloc.h>\n #include <asm/eth.h>\n-#include <asm/global_data.h>\n #include <asm/test.h>\n #include <asm/types.h>\n \n@@ -84,8 +83,6 @@ struct icmphdr {\n #define ICMP_ECHO_REPLY\t\t0\n #define IPPROTO_ICMP\t\t1\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static const u8 null_ethaddr[6];\n static bool skip_timeout;\n \ndiff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c\nindex d4abc9a041102c584bdcec57280112e9c4acf079..40c98e72e4d3e4a5d77afd73d177d82a24e89dc2 100644\n--- a/drivers/net/ti/keystone_net.c\n+++ b/drivers/net/ti/keystone_net.c\n@@ -7,7 +7,6 @@\n */\n #include <command.h>\n #include <console.h>\n-#include <asm/global_data.h>\n #include <linux/delay.h>\n #include <linux/printk.h>\n \n@@ -26,8 +25,6 @@\n \n #include \"cpsw_mdio.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #ifdef KEYSTONE2_EMAC_GIG_ENABLE\n #define emac_gigabit_enable(x)\tkeystone2_eth_gigabit_enable(x)\n #else\ndiff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c\nindex fb48feb4469a06356ddfd9da188fb639f538edfe..e9cc5db52d25c60739bbfc73335a556a3093953e 100644\n--- a/drivers/net/xilinx_axi_emac.c\n+++ b/drivers/net/xilinx_axi_emac.c\n@@ -15,7 +15,6 @@\n #include <log.h>\n #include <net.h>\n #include <malloc.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <phy.h>\n #include <miiphy.h>\n@@ -23,8 +22,6 @@\n #include <linux/delay.h>\n #include <eth_phy.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* Link setup */\n #define XAE_EMMC_LINKSPEED_MASK\t0xC0000000 /* Link speed */\n #define XAE_EMMC_LINKSPD_10\t0x00000000 /* Link Speed mask for 10 Mbit */\ndiff --git a/drivers/pci/pci_octeontx.c b/drivers/pci/pci_octeontx.c\nindex 875cf7f7115d5a1a3ae5cd1a292e7fff518091bb..6752112a878284746384d1c82b846ec1a29101f5 100644\n--- a/drivers/pci/pci_octeontx.c\n+++ b/drivers/pci/pci_octeontx.c\n@@ -11,14 +11,11 @@\n #include <log.h>\n #include <malloc.h>\n #include <pci.h>\n-#include <asm/global_data.h>\n \n #include <asm/io.h>\n \n #include <linux/ioport.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /*\n * This driver supports multiple types of operations / host bridges / busses:\n *\ndiff --git a/drivers/pci/pcie_dw_meson.c b/drivers/pci/pcie_dw_meson.c\nindex 483b07ce078d751f6d33e22e4a633c915e4cf929..1eff6d1b0edcef3da058a97dfa9248b97114ae3a 100644\n--- a/drivers/pci/pcie_dw_meson.c\n+++ b/drivers/pci/pcie_dw_meson.c\n@@ -16,7 +16,6 @@\n #include <power-domain.h>\n #include <reset.h>\n #include <syscon.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm-generic/gpio.h>\n #include <dm/device_compat.h>\n@@ -27,8 +26,6 @@\n \n #include \"pcie_dw_common.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /**\n * struct meson_pcie - Amlogic Meson DW PCIe controller state\n *\ndiff --git a/drivers/pci/pcie_dw_qcom.c b/drivers/pci/pcie_dw_qcom.c\nindex 978754e847231f13f740f8e48f645dba44c0a7b0..10c45aaba2068c2666a6a13f8908170a15d2fa6d 100644\n--- a/drivers/pci/pcie_dw_qcom.c\n+++ b/drivers/pci/pcie_dw_qcom.c\n@@ -10,7 +10,6 @@\n #include <syscon.h>\n #include <malloc.h>\n #include <power/regulator.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm-generic/gpio.h>\n #include <dm/device_compat.h>\n@@ -21,8 +20,6 @@\n \n #include \"pcie_dw_common.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct qcom_pcie;\n \n struct qcom_pcie_ops {\ndiff --git a/drivers/pci/pcie_dw_rockchip.c b/drivers/pci/pcie_dw_rockchip.c\nindex 208aa30463af6a73f1dffaa89bf1c28273d548eb..61117fa95e6fba20f36bf812fa8a5e6ca1e6ef5e 100644\n--- a/drivers/pci/pcie_dw_rockchip.c\n+++ b/drivers/pci/pcie_dw_rockchip.c\n@@ -13,7 +13,6 @@\n #include <reset.h>\n #include <syscon.h>\n #include <asm/arch-rockchip/clock.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm-generic/gpio.h>\n #include <dm/device_compat.h>\n@@ -24,8 +23,6 @@\n \n #include \"pcie_dw_common.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /**\n * struct rk_pcie - RK DW PCIe controller state\n *\ndiff --git a/drivers/pci/pcie_dw_ti.c b/drivers/pci/pcie_dw_ti.c\nindex dc6e65273b798c5be03f8b2878df8fcb8a8e38c1..37c295fdd385c95d9a0d3e553197d2ce5f2519bf 100644\n--- a/drivers/pci/pcie_dw_ti.c\n+++ b/drivers/pci/pcie_dw_ti.c\n@@ -10,7 +10,6 @@\n #include <power-domain.h>\n #include <regmap.h>\n #include <syscon.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm-generic/gpio.h>\n #include <dm/device_compat.h>\n@@ -20,8 +19,6 @@\n \n #include \"pcie_dw_common.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define PCIE_VENDORID_MASK\tGENMASK(15, 0)\n #define PCIE_DEVICEID_SHIFT\t16\n \ndiff --git a/drivers/pci/pcie_layerscape.c b/drivers/pci/pcie_layerscape.c\nindex 1be33095b9cee07e563f841ecafa8c1b5ef0bfe5..db7c4f47916a41acced471d731b551d8fa895f5b 100644\n--- a/drivers/pci/pcie_layerscape.c\n+++ b/drivers/pci/pcie_layerscape.c\n@@ -6,7 +6,6 @@\n */\n \n #include <log.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <errno.h>\n #include <malloc.h>\n@@ -16,8 +15,6 @@\n #endif\n #include \"pcie_layerscape.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n LIST_HEAD(ls_pcie_list);\n \n unsigned int dbi_readl(struct ls_pcie *pcie, unsigned int offset)\ndiff --git a/drivers/pci/pcie_starfive_jh7110.c b/drivers/pci/pcie_starfive_jh7110.c\nindex 0908ae16b67335e2c81762f48219a43941713ec5..761e64be58a590c4ec6433c1b44db19ae7fa7bd3 100644\n--- a/drivers/pci/pcie_starfive_jh7110.c\n+++ b/drivers/pci/pcie_starfive_jh7110.c\n@@ -15,7 +15,6 @@\n #include <regmap.h>\n #include <reset.h>\n #include <syscon.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm-generic/gpio.h>\n #include <dm/device_compat.h>\n@@ -39,8 +38,6 @@\n #define STG_SYSCON_RP_NEP_OFFSET 0xe8\n #define STG_SYSCON_K_RP_NEP_MASK BIT(8)\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct starfive_pcie {\n \tstruct pcie_plda plda;\n \tstruct clk_bulk\tclks;\ndiff --git a/drivers/pci_endpoint/pci_ep-uclass.c b/drivers/pci_endpoint/pci_ep-uclass.c\nindex 902d1a51eaa3e819883e0c63f001cfb5a1399a56..b71defe4019f6c234f37070aeb7af5e1b5ffec8d 100644\n--- a/drivers/pci_endpoint/pci_ep-uclass.c\n+++ b/drivers/pci_endpoint/pci_ep-uclass.c\n@@ -13,12 +13,9 @@\n \n #include <dm.h>\n #include <errno.h>\n-#include <asm/global_data.h>\n #include <linux/log2.h>\n #include <pci_ep.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int pci_ep_write_header(struct udevice *dev, uint fn, struct pci_ep_header *hdr)\n {\n \tstruct pci_ep_ops *ops = pci_ep_get_ops(dev);\ndiff --git a/drivers/phy/marvell/comphy_core.c b/drivers/phy/marvell/comphy_core.c\nindex a4121423873ba457fde69744af20e951329c16f9..b074d58f9f6a4017b5e7ce4b692ac73342f2cad6 100644\n--- a/drivers/phy/marvell/comphy_core.c\n+++ b/drivers/phy/marvell/comphy_core.c\n@@ -7,7 +7,6 @@\n \n #include <dm.h>\n #include <fdtdec.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <dm/device_compat.h>\n #include <linux/err.h>\n@@ -18,8 +17,6 @@\n \n #define COMPHY_MAX_CHIP 4\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static const char *get_speed_string(u32 speed)\n {\n \tstatic const char * const speed_strings[] = {\ndiff --git a/drivers/phy/omap-usb2-phy.c b/drivers/phy/omap-usb2-phy.c\nindex 2be0178882a417e7ce1587849179952e41323fd8..6df4ff4eb056b06a4bfbdd135cbdf231eb29b4ec 100644\n--- a/drivers/phy/omap-usb2-phy.c\n+++ b/drivers/phy/omap-usb2-phy.c\n@@ -6,7 +6,6 @@\n * Written by Jean-Jacques Hiblot <jjhiblot@ti.com>\n */\n \n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <dm.h>\n #include <errno.h>\n@@ -39,8 +38,6 @@\n #define USB2PHY_USE_CHG_DET_REG\t\tBIT(29)\n #define USB2PHY_DIS_CHG_DET\t\tBIT(28)\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct omap_usb2_phy {\n \tstruct regmap *pwr_regmap;\n \tulong flags;\ndiff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchip/phy-rockchip-pcie.c\nindex 660037034ec0368f991ab01e8015fb812eb696f6..5775101c4cb56fa57a331089d593b23b948af6ae 100644\n--- a/drivers/phy/rockchip/phy-rockchip-pcie.c\n+++ b/drivers/phy/rockchip/phy-rockchip-pcie.c\n@@ -9,7 +9,6 @@\n \n #include <clk.h>\n #include <dm.h>\n-#include <asm/global_data.h>\n #include <dm/device_compat.h>\n #include <generic-phy.h>\n #include <reset.h>\n@@ -19,8 +18,6 @@\n #include <linux/iopoll.h>\n #include <asm/arch-rockchip/clock.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /*\n * The higher 16-bit of this register is used for write protection\n * only if BIT(x + 16) set to 1 the BIT(x) can be written.\ndiff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c\nindex 66d1d32d25cbb74df1df26ea6ce3fb9638e13910..305d5b0dd48ddc05a8fde6090296b62b05bf74b3 100644\n--- a/drivers/phy/rockchip/phy-rockchip-typec.c\n+++ b/drivers/phy/rockchip/phy-rockchip-typec.c\n@@ -10,7 +10,6 @@\n \n #include <clk.h>\n #include <dm.h>\n-#include <asm/global_data.h>\n #include <dm/device_compat.h>\n #include <dm/lists.h>\n #include <generic-phy.h>\n@@ -21,8 +20,6 @@\n #include <linux/iopoll.h>\n #include <asm/arch-rockchip/clock.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define usleep_range(a, b) udelay((b))\n \n #define CMN_SSM_BANDGAP\t\t\t(0x21 << 2)\ndiff --git a/drivers/pinctrl/mtmips/pinctrl-mt7628.c b/drivers/pinctrl/mtmips/pinctrl-mt7628.c\nindex dc7acec4a77f6a767f339b4672e49ecb44de0ef1..be3a28eb94d0fc9e0d7fc98e50673dad937d2935 100644\n--- a/drivers/pinctrl/mtmips/pinctrl-mt7628.c\n+++ b/drivers/pinctrl/mtmips/pinctrl-mt7628.c\n@@ -6,15 +6,12 @@\n */\n \n #include <dm.h>\n-#include <asm/global_data.h>\n #include <dm/pinctrl.h>\n #include <linux/bitops.h>\n #include <linux/io.h>\n \n #include \"pinctrl-mtmips-common.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define AGPIO_OFS\t\t\t0\n #define GPIOMODE1_OFS\t\t\t0x24\n #define GPIOMODE2_OFS\t\t\t0x28\ndiff --git a/drivers/pinctrl/nexell/pinctrl-nexell.c b/drivers/pinctrl/nexell/pinctrl-nexell.c\nindex d5be7baf50ddc06b5817870d593699af238fd19e..af1acd91649fbe886be059ba8a2371d65900a83b 100644\n--- a/drivers/pinctrl/nexell/pinctrl-nexell.c\n+++ b/drivers/pinctrl/nexell/pinctrl-nexell.c\n@@ -7,13 +7,10 @@\n \n #include <dm.h>\n #include <errno.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include \"pinctrl-nexell.h\"\n #include \"pinctrl-s5pxx18.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* given a pin-name, return the address of pin config registers */\n unsigned long pin_to_bank_base(struct udevice *dev, const char *pin_name,\n \t\t\t u32 *pin)\ndiff --git a/drivers/pinctrl/nexell/pinctrl-s5pxx18.c b/drivers/pinctrl/nexell/pinctrl-s5pxx18.c\nindex a6ae5764fbc1c31e258622ef15ed08aeefeaf90f..aeed3f1e1e1e2d21274b6f985ad3feacf580d66d 100644\n--- a/drivers/pinctrl/nexell/pinctrl-s5pxx18.c\n+++ b/drivers/pinctrl/nexell/pinctrl-s5pxx18.c\n@@ -9,15 +9,12 @@\n \n #include <dm.h>\n #include <errno.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <dm/pinctrl.h>\n #include <dm/root.h>\n #include \"pinctrl-nexell.h\"\n #include \"pinctrl-s5pxx18.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static void nx_gpio_set_bit(u32 *value, u32 bit, int enable)\n {\n \tregister u32 newvalue;\ndiff --git a/drivers/pinctrl/nxp/pinctrl-imx-mmio.c b/drivers/pinctrl/nxp/pinctrl-imx-mmio.c\nindex 2f4228a9fc5f960da4b461d01ac49ddbeec0b92d..7cdbbbba747ba29c41897fa1cf9e27450be11ce1 100644\n--- a/drivers/pinctrl/nxp/pinctrl-imx-mmio.c\n+++ b/drivers/pinctrl/nxp/pinctrl-imx-mmio.c\n@@ -5,7 +5,6 @@\n \n #include <malloc.h>\n #include <mapmem.h>\n-#include <asm/global_data.h>\n #include <dm/device_compat.h>\n #include <dm/devres.h>\n #include <linux/bitops.h>\n@@ -16,8 +15,6 @@\n \n #include \"pinctrl-imx.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int imx_pinctrl_set_state_mmio(struct udevice *dev, struct udevice *config)\n {\n \tstruct imx_pinctrl_priv *priv = dev_get_priv(dev);\ndiff --git a/drivers/pinctrl/nxp/pinctrl-imx.c b/drivers/pinctrl/nxp/pinctrl-imx.c\nindex 7d91ccfb26f1c7764deb59aa75663b4e5ed56393..d801176858190f3d41b3fdd2c3dd4dfc388daaa0 100644\n--- a/drivers/pinctrl/nxp/pinctrl-imx.c\n+++ b/drivers/pinctrl/nxp/pinctrl-imx.c\n@@ -5,7 +5,6 @@\n \n #include <malloc.h>\n #include <mapmem.h>\n-#include <asm/global_data.h>\n #include <dm/device_compat.h>\n #include <dm/devres.h>\n #include <linux/bitops.h>\n@@ -16,8 +15,6 @@\n \n #include \"pinctrl-imx.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int imx_pinctrl_set_state_common(struct udevice *dev, struct udevice *config,\n \t\t\t\t int pin_size, u32 **pin_data, int *npins)\n {\ndiff --git a/drivers/pinctrl/nxp/pinctrl-imx8.c b/drivers/pinctrl/nxp/pinctrl-imx8.c\nindex 9b3b5aec07adce51e6220db6edb822f460fbc39c..23865ee6428c36952f21e8d8c4f26017797985d4 100644\n--- a/drivers/pinctrl/nxp/pinctrl-imx8.c\n+++ b/drivers/pinctrl/nxp/pinctrl-imx8.c\n@@ -9,14 +9,11 @@\n #include <asm/io.h>\n #include <firmware/imx/sci/sci.h>\n #include <misc.h>\n-#include <asm/global_data.h>\n #include <dm/device.h>\n #include <dm/pinctrl.h>\n \n #include \"pinctrl-imx.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define PADRING_IFMUX_EN_SHIFT\t\t31\n #define PADRING_IFMUX_EN_MASK\t\tBIT(31)\n #define PADRING_GP_EN_SHIFT\t\t30\ndiff --git a/drivers/pinctrl/nxp/pinctrl-mxs.c b/drivers/pinctrl/nxp/pinctrl-mxs.c\nindex 85ab5fdf6404c97364370f7d8b74dbe1e44be2eb..8b7647380143d7265330438c96920a2ad0d4d6c1 100644\n--- a/drivers/pinctrl/nxp/pinctrl-mxs.c\n+++ b/drivers/pinctrl/nxp/pinctrl-mxs.c\n@@ -5,7 +5,6 @@\n */\n \n #include <log.h>\n-#include <asm/global_data.h>\n #include <dm/device_compat.h>\n #include <dm/devres.h>\n #include <linux/io.h>\n@@ -15,8 +14,6 @@\n #include <dm/read.h>\n #include \"pinctrl-mxs.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct mxs_pinctrl_priv {\n \tvoid __iomem *base;\n \tconst struct mxs_regs *regs;\ndiff --git a/drivers/power/domain/imx8m-power-domain.c b/drivers/power/domain/imx8m-power-domain.c\nindex a7e64971a2abc211e275094bacdc705a2be625e8..1c731b897cc4c99c30d8aeee95a597e93601c227 100644\n--- a/drivers/power/domain/imx8m-power-domain.c\n+++ b/drivers/power/domain/imx8m-power-domain.c\n@@ -7,7 +7,6 @@\n #include <dm.h>\n #include <malloc.h>\n #include <power-domain-uclass.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/mach-imx/sys_proto.h>\n #include <dm/device-internal.h>\n@@ -22,8 +21,6 @@\n #include <dt-bindings/power/imx8mp-power.h>\n #include <dt-bindings/power/imx8mq-power.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define GPC_PGC_CPU_MAPPING\t\t\t0x0ec\n #define IMX8MP_GPC_PGC_CPU_MAPPING\t\t0x1cc\n \ndiff --git a/drivers/power/pmic/bd71837.c b/drivers/power/pmic/bd71837.c\nindex a5df2570fc3e6a2dcaa4f1277c1a4fd341d66f63..136427947653b88d2e7d0961d78594c3b65f2246 100644\n--- a/drivers/power/pmic/bd71837.c\n+++ b/drivers/power/pmic/bd71837.c\n@@ -7,14 +7,11 @@\n #include <dm.h>\n #include <i2c.h>\n #include <log.h>\n-#include <asm/global_data.h>\n #include <linux/printk.h>\n #include <power/pmic.h>\n #include <power/regulator.h>\n #include <power/bd71837.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static const struct pmic_child_info pmic_children_info[] = {\n \t/* buck */\n \t{ .prefix = \"b\", .driver = BD718XX_REGULATOR_DRIVER},\ndiff --git a/drivers/power/pmic/mc34708.c b/drivers/power/pmic/mc34708.c\nindex 43badb5767a589c74e70529da159406905b6f66d..0ec52e25a9e8813e0cf5c9f3dbd39d75feaa3b8a 100644\n--- a/drivers/power/pmic/mc34708.c\n+++ b/drivers/power/pmic/mc34708.c\n@@ -9,11 +9,8 @@\n #include <errno.h>\n #include <fsl_pmic.h>\n #include <i2c.h>\n-#include <asm/global_data.h>\n #include <power/pmic.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static int mc34708_reg_count(struct udevice *dev)\n {\n \treturn PMIC_NUM_OF_REGS;\ndiff --git a/drivers/power/pmic/mp5416.c b/drivers/power/pmic/mp5416.c\nindex 9d44f0ae655e843682d1286c9a795f402519fbcf..899c2beeb37c87c34ed06bd9589f08d2cb604c29 100644\n--- a/drivers/power/pmic/mp5416.c\n+++ b/drivers/power/pmic/mp5416.c\n@@ -9,9 +9,6 @@\n #include <power/pmic.h>\n #include <power/regulator.h>\n #include <power/mp5416.h>\n-#include <asm/global_data.h>\n-\n-DECLARE_GLOBAL_DATA_PTR;\n \n static const struct pmic_child_info pmic_children_info[] = {\n \t/* buck */\ndiff --git a/drivers/power/pmic/pca9450.c b/drivers/power/pmic/pca9450.c\nindex e5c1f037b613400e2b0f465983bbaa70471d97b1..c95e6357ee84b1039eef9bf00854d4b7954b62a9 100644\n--- a/drivers/power/pmic/pca9450.c\n+++ b/drivers/power/pmic/pca9450.c\n@@ -10,7 +10,6 @@\n #include <dm/lists.h>\n #include <i2c.h>\n #include <log.h>\n-#include <asm/global_data.h>\n #include <linux/delay.h>\n #include <linux/printk.h>\n #include <power/pmic.h>\n@@ -18,8 +17,6 @@\n #include <power/pca9450.h>\n #include <sysreset.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static const struct pmic_child_info pmic_children_info[] = {\n \t/* buck */\n \t{ .prefix = \"b\", .driver = PCA9450_REGULATOR_DRIVER},\ndiff --git a/drivers/power/regulator/pwm_regulator.c b/drivers/power/regulator/pwm_regulator.c\nindex ff738faadc52d0e7847d3e3f8b6e9167b25d82a8..adde5156c7647064bd366bd4b75bf6d6378e9830 100644\n--- a/drivers/power/regulator/pwm_regulator.c\n+++ b/drivers/power/regulator/pwm_regulator.c\n@@ -11,12 +11,9 @@\n #include <errno.h>\n #include <log.h>\n #include <pwm.h>\n-#include <asm/global_data.h>\n #include <dm/device_compat.h>\n #include <power/regulator.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct pwm_regulator_info {\n \t/* pwm id corresponding to the PWM driver */\n \tint pwm_id;\ndiff --git a/drivers/pwm/pwm-sifive.c b/drivers/pwm/pwm-sifive.c\nindex e9777c71f5e0b845bbaebdaf71185b5509059cf9..dea7bc574952c43055039d6a5aefdab54f17db2a 100644\n--- a/drivers/pwm/pwm-sifive.c\n+++ b/drivers/pwm/pwm-sifive.c\n@@ -17,7 +17,6 @@\n #include <dm.h>\n #include <pwm.h>\n #include <regmap.h>\n-#include <asm/global_data.h>\n #include <linux/io.h>\n #include <linux/log2.h>\n #include <linux/bitfield.h>\n@@ -40,8 +39,6 @@\n #define PWM_SIFIVE_CHANNEL_ENABLE_VAL 0\n #define PWM_SIFIVE_CHANNEL_DISABLE_VAL 0xffff\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct pwm_sifive_regs {\n \tunsigned long cfg;\n \tunsigned long cnt;\ndiff --git a/drivers/pwm/rk_pwm.c b/drivers/pwm/rk_pwm.c\nindex 0a64eb01dc2bad5e1e7a9a4a65f929270564f764..b51dee31a9873b3d4769aca3034927d2f2d79162 100644\n--- a/drivers/pwm/rk_pwm.c\n+++ b/drivers/pwm/rk_pwm.c\n@@ -11,14 +11,11 @@\n #include <pwm.h>\n #include <regmap.h>\n #include <syscon.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/arch-rockchip/pwm.h>\n #include <linux/bitops.h>\n #include <power/regulator.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct rockchip_pwm_data {\n \tstruct rockchip_pwm_regs regs;\n \tunsigned int prescaler;\ndiff --git a/drivers/pwm/sunxi_pwm.c b/drivers/pwm/sunxi_pwm.c\nindex 2140a05b6796bbcf1c99b5a5024103aa1102a48c..1dd2428da771999445c123f4730f4142a41019cd 100644\n--- a/drivers/pwm/sunxi_pwm.c\n+++ b/drivers/pwm/sunxi_pwm.c\n@@ -9,13 +9,10 @@\n #include <pwm.h>\n #include <regmap.h>\n #include <syscon.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/arch/pwm.h>\n #include <power/regulator.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define OSC_24MHZ 24000000\n \n struct sunxi_pwm_priv {\ndiff --git a/drivers/ram/stm32mp1/stm32mp1_tests.c b/drivers/ram/stm32mp1/stm32mp1_tests.c\nindex 6108faa70730cea425568a331503c38fe7baad40..3b41d6045ada32d471d8d5933961f7938ba8afd4 100644\n--- a/drivers/ram/stm32mp1/stm32mp1_tests.c\n+++ b/drivers/ram/stm32mp1/stm32mp1_tests.c\n@@ -10,7 +10,6 @@\n #include <log.h>\n #include <rand.h>\n #include <watchdog.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <linux/log2.h>\n #include \"stm32mp1_tests.h\"\n@@ -19,8 +18,6 @@\n \n #define PATTERN_DEFAULT\t\"-\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static int get_bufsize(char *string, int argc, char *argv[], int arg_nb,\n \t\t size_t *bufsize, size_t default_size, size_t min_size)\n {\ndiff --git a/drivers/reboot-mode/reboot-mode-gpio.c b/drivers/reboot-mode/reboot-mode-gpio.c\nindex 22ee40c343338022a3c2921a779b32930748a653..8d3e53d50ee69a7bbad009c8f1cc590a4fc5872b 100644\n--- a/drivers/reboot-mode/reboot-mode-gpio.c\n+++ b/drivers/reboot-mode/reboot-mode-gpio.c\n@@ -10,8 +10,6 @@\n #include <reboot-mode/reboot-mode-gpio.h>\n #include <reboot-mode/reboot-mode.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static int reboot_mode_get(struct udevice *dev, u32 *buf)\n {\n \tint ret;\ndiff --git a/drivers/reboot-mode/reboot-mode-rtc.c b/drivers/reboot-mode/reboot-mode-rtc.c\nindex 4f4ad63febc106acd7f40de8757fe0db95bf6bee..adca584d622d8b65691fc12012548af4357a1ea8 100644\n--- a/drivers/reboot-mode/reboot-mode-rtc.c\n+++ b/drivers/reboot-mode/reboot-mode-rtc.c\n@@ -9,8 +9,6 @@\n #include <reboot-mode/reboot-mode.h>\n #include <rtc.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static int reboot_mode_get(struct udevice *dev, u32 *buf)\n {\n \tif (!buf)\ndiff --git a/drivers/remoteproc/rproc-uclass.c b/drivers/remoteproc/rproc-uclass.c\nindex 2dbd3a21cea6382a7ec02e52b2c0eb757197d434..47cb64fec777b28ecd435d645c5ca2879e0e4bc6 100644\n--- a/drivers/remoteproc/rproc-uclass.c\n+++ b/drivers/remoteproc/rproc-uclass.c\n@@ -22,8 +22,6 @@\n #include <linux/compat.h>\n #include <linux/printk.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct resource_table {\n \tu32 ver;\n \tu32 num;\ndiff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c\nindex 4f7de3ea2152193a3916ca7b5bd052eda4a48bac..c885b46cf56fcaec955fc5c5fbcdb1c09470a29a 100644\n--- a/drivers/serial/ns16550.c\n+++ b/drivers/serial/ns16550.c\n@@ -14,13 +14,10 @@\n #include <reset.h>\n #include <spl.h>\n #include <watchdog.h>\n-#include <asm/global_data.h>\n #include <linux/err.h>\n #include <linux/types.h>\n #include <asm/io.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define UART_LCRVAL UART_LCR_8N1\t\t/* 8 data, 1 stop, no parity */\n #define UART_MCRVAL (UART_MCR_DTR | \\\n \t\t UART_MCR_RTS)\t\t/* RTS/DTR */\ndiff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c\nindex cc0491bc3c8753e7488f01f3f31cf0dd4bdca834..658cbd2bbc90930ab7af1a6ce2c9a3b025074500 100644\n--- a/drivers/serial/sandbox.c\n+++ b/drivers/serial/sandbox.c\n@@ -14,13 +14,10 @@\n #include <os.h>\n #include <serial.h>\n #include <video.h>\n-#include <asm/global_data.h>\n #include <linux/compiler.h>\n #include <asm/serial.h>\n #include <asm/state.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static size_t _sandbox_serial_written = 1;\n static bool sandbox_serial_enabled = true;\n \ndiff --git a/drivers/serial/serial_adi_uart4.c b/drivers/serial/serial_adi_uart4.c\nindex 45f8315d0a07d90312ff6965f4e736cf217a27c3..784310ba2311f87cdd2034acbadac9ea899a7d1a 100644\n--- a/drivers/serial/serial_adi_uart4.c\n+++ b/drivers/serial/serial_adi_uart4.c\n@@ -80,8 +80,6 @@\n #define ERXS\t\t\tBIT(8)\n #define ETXS\t\t\tBIT(9)\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct uart4_reg {\n \tu32 revid;\n \tu32 control;\ndiff --git a/drivers/serial/serial_htif.c b/drivers/serial/serial_htif.c\nindex 2a93bbbcc9f8d534be5937180b9709e9f517f4ab..690de3fc0854a989655c67ae2eefd83741750233 100644\n--- a/drivers/serial/serial_htif.c\n+++ b/drivers/serial/serial_htif.c\n@@ -8,14 +8,11 @@\n #include <fdtdec.h>\n #include <log.h>\n #include <watchdog.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <linux/compiler.h>\n #include <serial.h>\n #include <linux/err.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define HTIF_DATA_BITS\t\t48\n #define HTIF_DATA_MASK\t\t((1ULL << HTIF_DATA_BITS) - 1)\n #define HTIF_DATA_SHIFT\t\t0\ndiff --git a/drivers/serial/serial_xen.c b/drivers/serial/serial_xen.c\nindex e05805f63726a399cfd030546939bc039627dd8c..4ba8d3ee641d0db10b86b3711c77ad8666b37c9a 100644\n--- a/drivers/serial/serial_xen.c\n+++ b/drivers/serial/serial_xen.c\n@@ -7,7 +7,6 @@\n #include <dm.h>\n #include <serial.h>\n #include <watchdog.h>\n-#include <asm/global_data.h>\n \n #include <linux/bug.h>\n \n@@ -20,8 +19,6 @@\n #include <xen/interface/io/console.h>\n #include <xen/interface/io/ring.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n u32 console_evtchn;\n \n /*\ndiff --git a/drivers/smem/msm_smem.c b/drivers/smem/msm_smem.c\nindex b6b92d3530d26bd55910324757b3055ecfae115c..7a50d5a5792c1ceaf74c7433f01fc3428d9c967a 100644\n--- a/drivers/smem/msm_smem.c\n+++ b/drivers/smem/msm_smem.c\n@@ -7,7 +7,6 @@\n \n #include <errno.h>\n #include <dm.h>\n-#include <asm/global_data.h>\n #include <dm/device_compat.h>\n #include <dm/devres.h>\n #include <dm/of_access.h>\n@@ -20,8 +19,6 @@\n #include <linux/sizes.h>\n #include <smem.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /*\n * The Qualcomm shared memory system is an allocate-only heap structure that\n * consists of one of more memory areas that can be accessed by the processors\ndiff --git a/drivers/spi/ca_sflash.c b/drivers/spi/ca_sflash.c\nindex db32e39add2f5e9ca973c628fc4359862644d86d..f00df93a5f58a94f463c8ccc3da2b9c0fa1efb24 100644\n--- a/drivers/spi/ca_sflash.c\n+++ b/drivers/spi/ca_sflash.c\n@@ -21,9 +21,6 @@\n #include <spi.h>\n #include <spi-mem.h>\n #include <reset.h>\n-#include <asm/global_data.h>\n-\n-DECLARE_GLOBAL_DATA_PTR;\n \n struct ca_sflash_regs {\n \tu32 idr;\t\t/* 0x00:Flash word ID Register */\ndiff --git a/drivers/spi/microchip_coreqspi.c b/drivers/spi/microchip_coreqspi.c\nindex a84b257fb1ab5232a9b651f1a66a53561da60e32..b3ff611e8f7e6fa6dd879e0e3736fd18afdcd105 100644\n--- a/drivers/spi/microchip_coreqspi.c\n+++ b/drivers/spi/microchip_coreqspi.c\n@@ -18,8 +18,6 @@\n #include <linux/sizes.h>\n #include <asm/gpio.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /*\n * QSPI Control register mask defines\n */\ndiff --git a/drivers/spi/mvebu_a3700_spi.c b/drivers/spi/mvebu_a3700_spi.c\nindex fde9b142fb89957d22e2a90e1c09cf1e00c323f1..79836d7e271502a349f7c15c8d7f8fcce148cbfe 100644\n--- a/drivers/spi/mvebu_a3700_spi.c\n+++ b/drivers/spi/mvebu_a3700_spi.c\n@@ -11,14 +11,11 @@\n #include <spi.h>\n #include <clk.h>\n #include <wait_bit.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <dm/device_compat.h>\n #include <linux/bitops.h>\n #include <asm/gpio.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define MVEBU_SPI_A3700_XFER_RDY\t\tBIT(1)\n #define MVEBU_SPI_A3700_FIFO_FLUSH\t\tBIT(9)\n #define MVEBU_SPI_A3700_BYTE_LEN\t\tBIT(5)\ndiff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c\nindex 35bd87660978abdf6bf84ec9add0cb6225856245..b2d115aded470b7d9d21371b13c4c1aa384f2859 100644\n--- a/drivers/spi/omap3_spi.c\n+++ b/drivers/spi/omap3_spi.c\n@@ -20,13 +20,10 @@\n #include <spi.h>\n #include <time.h>\n #include <malloc.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <linux/bitops.h>\n #include <omap3_spi.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct omap2_mcspi_platform_config {\n \tunsigned int regs_offset;\n };\ndiff --git a/drivers/spi/spi-sunxi.c b/drivers/spi/spi-sunxi.c\nindex e00532a371b420d0fe88b337b0fd68ac71ef5bba..0bdc112d249f6f800ced064e5ebbfdeb0b12bbc0 100644\n--- a/drivers/spi/spi-sunxi.c\n+++ b/drivers/spi/spi-sunxi.c\n@@ -26,7 +26,6 @@\n #include <fdt_support.h>\n #include <reset.h>\n #include <wait_bit.h>\n-#include <asm/global_data.h>\n #include <dm/device_compat.h>\n #include <linux/bitops.h>\n \n@@ -35,8 +34,6 @@\n \n #include <linux/iopoll.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* sun4i spi registers */\n #define SUN4I_RXDATA_REG\t\t0x00\n #define SUN4I_TXDATA_REG\t\t0x04\ndiff --git a/drivers/spi/spi-synquacer.c b/drivers/spi/spi-synquacer.c\nindex a3c0ad17121cdbaa7998acd973bd8be8eb46032a..66c97da610b90bdfcadc4b15a5a913c88afdceb3 100644\n--- a/drivers/spi/spi-synquacer.c\n+++ b/drivers/spi/spi-synquacer.c\n@@ -99,8 +99,6 @@\n #define TXBIT\t1\n #define RXBIT\t2\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct synquacer_spi_plat {\n \tvoid __iomem *base;\n \tbool aces, rtm;\ndiff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c\nindex 49b584c648d6ffb273f9d5c3f3b773799d26a1fe..60401633341af191f0d70fc3b599cf5652ec4973 100644\n--- a/drivers/spi/spi-uclass.c\n+++ b/drivers/spi/spi-uclass.c\n@@ -12,14 +12,11 @@\n #include <spi.h>\n #include <spi-mem.h>\n #include <dm/device_compat.h>\n-#include <asm/global_data.h>\n #include <dm/device-internal.h>\n #include <dm/uclass-internal.h>\n #include <dm/lists.h>\n #include <dm/util.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define SPI_DEFAULT_SPEED_HZ 100000\n \n static int spi_set_speed_mode(struct udevice *bus, int speed, int mode)\ndiff --git a/drivers/spi/tegra210_qspi.c b/drivers/spi/tegra210_qspi.c\nindex b969a7993d40551cac96c64a18e74db716c35e3c..0f77fbc8d41815425d467b66939bae669c744ad6 100644\n--- a/drivers/spi/tegra210_qspi.c\n+++ b/drivers/spi/tegra210_qspi.c\n@@ -9,7 +9,6 @@\n #include <dm.h>\n #include <log.h>\n #include <time.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/arch/clock.h>\n #include <asm/arch-tegra/clk_rst.h>\n@@ -19,8 +18,6 @@\n #include <linux/delay.h>\n #include \"tegra_spi.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* COMMAND1 */\n #define QSPI_CMD1_GO\t\t\tBIT(31)\n #define QSPI_CMD1_M_S\t\t\tBIT(30)\ndiff --git a/drivers/spmi/spmi-msm.c b/drivers/spmi/spmi-msm.c\nindex f3cd98c3db83d23f5d5bc9199c8ca5c9084f44a6..b89dd0b406baaa9413c1c45996d26d2452a3bed1 100644\n--- a/drivers/spmi/spmi-msm.c\n+++ b/drivers/spmi/spmi-msm.c\n@@ -10,13 +10,10 @@\n #include <dm.h>\n #include <errno.h>\n #include <fdtdec.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <dm/device_compat.h>\n #include <spmi/spmi.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* PMIC Arbiter configuration registers */\n #define PMIC_ARB_VERSION 0x0000\n #define PMIC_ARB_VERSION_V2_MIN 0x20010000\ndiff --git a/drivers/thermal/imx_tmu.c b/drivers/thermal/imx_tmu.c\nindex c8389d507ee31a39467ea393dd5a18ff9385e3c2..1bde4d07f52efec6b5d0b8abe7add50df60f4597 100644\n--- a/drivers/thermal/imx_tmu.c\n+++ b/drivers/thermal/imx_tmu.c\n@@ -5,7 +5,6 @@\n */\n \n #include <config.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/arch/clock.h>\n #include <asm/arch/sys_proto.h>\n@@ -19,8 +18,6 @@\n #include <malloc.h>\n #include <thermal.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define SITES_MAX\t16\n #define FLAGS_VER2\t0x1\n #define FLAGS_VER3\t0x2\ndiff --git a/drivers/timer/ostm_timer.c b/drivers/timer/ostm_timer.c\nindex 314f956cdfb7a62dd103af4bc6b1f787127d2b68..3841d3c90d089491bbe0e5746de31f4f10584d05 100644\n--- a/drivers/timer/ostm_timer.c\n+++ b/drivers/timer/ostm_timer.c\n@@ -7,7 +7,6 @@\n \n #include <clock_legacy.h>\n #include <malloc.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <dm.h>\n #include <clk.h>\n@@ -22,8 +21,6 @@\n #define OSTM_CTL\t0x20\n #define OSTM_CTL_D\tBIT(1)\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct ostm_priv {\n \tfdt_addr_t\tregs;\n };\ndiff --git a/drivers/timer/sp804_timer.c b/drivers/timer/sp804_timer.c\nindex 3e57f4b98bab98d5ea92f9f67de1a8f7a606351b..05532e3330cae52d5874b1b6a117e48ad59f05be 100644\n--- a/drivers/timer/sp804_timer.c\n+++ b/drivers/timer/sp804_timer.c\n@@ -8,15 +8,12 @@\n #include <dm.h>\n #include <init.h>\n #include <log.h>\n-#include <asm/global_data.h>\n #include <dm/ofnode.h>\n #include <mapmem.h>\n #include <dt-structs.h>\n #include <timer.h>\n #include <asm/io.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define SP804_TIMERX_LOAD\t\t0x00\n #define SP804_TIMERX_VALUE\t\t0x04\n #define SP804_TIMERX_CONTROL\t\t0x08\ndiff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c\nindex 13e9a61072a973acc9a2a7096867bb6d26fe6123..22aa6525c96d4c169685ebca103e247625ceddd8 100644\n--- a/drivers/usb/common/common.c\n+++ b/drivers/usb/common/common.c\n@@ -7,14 +7,11 @@\n */\n \n #include <dm.h>\n-#include <asm/global_data.h>\n #include <linux/printk.h>\n #include <linux/usb/otg.h>\n #include <linux/usb/ch9.h>\n #include <linux/usb/phy.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static const char *const usb_dr_modes[] = {\n \t[USB_DR_MODE_UNKNOWN]\t\t= \"\",\n \t[USB_DR_MODE_HOST]\t\t= \"host\",\ndiff --git a/drivers/usb/phy/rockchip_usb2_phy.c b/drivers/usb/phy/rockchip_usb2_phy.c\nindex ce9a7b5b81952a942525fdd504b552cfa93de9f2..bdbd0d44813aea53c3bbfe9365b045199d134b3c 100644\n--- a/drivers/usb/phy/rockchip_usb2_phy.c\n+++ b/drivers/usb/phy/rockchip_usb2_phy.c\n@@ -5,15 +5,12 @@\n \n #include <hang.h>\n #include <log.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <linux/bitops.h>\n #include <linux/delay.h>\n \n #include \"../gadget/dwc2_udc_otg_priv.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define BIT_WRITEABLE_SHIFT\t16\n \n struct usb2phy_reg {\ndiff --git a/drivers/usb/tcpm/tcpm.c b/drivers/usb/tcpm/tcpm.c\nindex 0aee57cb2f4a44af7b483e0e609e39ba584a06c0..3061b466d7c7e3736469018f25e8b7906ebf3cf3 100644\n--- a/drivers/usb/tcpm/tcpm.c\n+++ b/drivers/usb/tcpm/tcpm.c\n@@ -19,8 +19,6 @@\n #include <usb/tcpm.h>\n #include \"tcpm-internal.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n const char * const tcpm_states[] = {\n \tFOREACH_TCPM_STATE(GENERATE_TCPM_STRING)\n };\ndiff --git a/drivers/video/hx8238d.c b/drivers/video/hx8238d.c\nindex f0220e4cc07946907c393f57cf634c944a03f411..b6980b1aec1cdb48ae763298d890ba9aa6814b99 100644\n--- a/drivers/video/hx8238d.c\n+++ b/drivers/video/hx8238d.c\n@@ -16,8 +16,6 @@\n #include <panel.h>\n #include <spi.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* Register Address */\n #define HX8238D_OUTPUT_CTRL_ADDR 0x01\n #define HX8238D_LCD_AC_CTRL_ADDR 0x02\ndiff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c\nindex ab416fdd33c1842582acf051318f08ae0adb0ecc..ef5d4faf3b38e0540d5d7f67d4c9c2227cb486f9 100644\n--- a/drivers/video/imx/mxc_ipuv3_fb.c\n+++ b/drivers/video/imx/mxc_ipuv3_fb.c\n@@ -21,7 +21,6 @@\n #include \"ipu_regs.h\"\n #include \"mxcfb.h\"\n #include <asm/cache.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/mach-imx/video.h>\n #include <linux/err.h>\n@@ -37,8 +36,6 @@\n #include <dm/devres.h>\n #include <video.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static int mxcfb_map_video_memory(struct fb_info *fbi);\n static int mxcfb_unmap_video_memory(struct fb_info *fbi);\n \ndiff --git a/drivers/video/nexell_display.c b/drivers/video/nexell_display.c\nindex ea3776258a005a9262583e6e860c19d73a5cc3da..e0416b70ec0f99f5762e01f0a409d6b50f272145 100644\n--- a/drivers/video/nexell_display.c\n+++ b/drivers/video/nexell_display.c\n@@ -16,14 +16,11 @@\n #include <linux/compat.h>\n #include <linux/err.h>\n #include <video.h>\t\t/* For struct video_uc_plat */\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/arch/display.h>\n #include <asm/arch/display_dev.h>\n #include \"videomodes.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #if !defined(CONFIG_DM) && !defined(CONFIG_OF_CONTROL)\n static struct nx_display_dev *dp_dev;\n #endif\ndiff --git a/drivers/video/rockchip/rk_lvds.c b/drivers/video/rockchip/rk_lvds.c\nindex c969dae30b6912b122a1a8ae0c2a4789c7015312..97c8619a6d8f0cecdba4f70928eff600d2eeaf79 100644\n--- a/drivers/video/rockchip/rk_lvds.c\n+++ b/drivers/video/rockchip/rk_lvds.c\n@@ -10,7 +10,6 @@\n #include <panel.h>\n #include <regmap.h>\n #include <syscon.h>\n-#include <asm/global_data.h>\n #include <asm/gpio.h>\n #include <asm/arch-rockchip/clock.h>\n #include <asm/arch-rockchip/grf_rk3288.h>\n@@ -19,8 +18,6 @@\n #include <dt-bindings/clock/rk3288-cru.h>\n #include <dt-bindings/video/rk3288.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /**\n * struct rk_lvds_priv - private rockchip lvds display driver info\n *\ndiff --git a/drivers/video/rockchip/rk_mipi.c b/drivers/video/rockchip/rk_mipi.c\nindex 0a603083ba9a561501ab2d8f37e00ea98b734aa0..e7b5973ca589681ad0abee39022057b4a3ad4750 100644\n--- a/drivers/video/rockchip/rk_mipi.c\n+++ b/drivers/video/rockchip/rk_mipi.c\n@@ -10,7 +10,6 @@\n #include <log.h>\n #include <panel.h>\n #include <regmap.h>\n-#include <asm/global_data.h>\n #include \"rk_mipi.h\"\n #include <syscon.h>\n #include <asm/gpio.h>\n@@ -22,8 +21,6 @@\n #include <asm/arch-rockchip/grf_rk3399.h>\n #include <asm/arch-rockchip/rockchip_mipi_dsi.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n int rk_mipi_read_timing(struct udevice *dev,\n \t\t\tstruct display_timing *timing)\n {\ndiff --git a/drivers/video/sandbox_sdl.c b/drivers/video/sandbox_sdl.c\nindex 69dfa9302735b0f23bf3c4065516135ccb89d7f0..48da350080a72986a99c5dd619a9810f8781e8b7 100644\n--- a/drivers/video/sandbox_sdl.c\n+++ b/drivers/video/sandbox_sdl.c\n@@ -7,15 +7,12 @@\n #include <fdtdec.h>\n #include <log.h>\n #include <video.h>\n-#include <asm/global_data.h>\n #include <asm/sdl.h>\n #include <asm/state.h>\n #include <asm/u-boot-sandbox.h>\n #include <dm/device-internal.h>\n #include <dm/test.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n enum {\n \t/* Default LCD size we support */\n \tLCD_MAX_WIDTH\t\t= 1366,\ndiff --git a/drivers/video/tidss/tidss_drv.c b/drivers/video/tidss/tidss_drv.c\nindex 790ff6e591c00c33ee073cbb20c5dbe778a3d481..c231fd0341ebe08344276a74937a75ddba4576f3 100644\n--- a/drivers/video/tidss/tidss_drv.c\n+++ b/drivers/video/tidss/tidss_drv.c\n@@ -42,8 +42,6 @@\n #include \"tidss_regs.h\"\n #include \"tidss_oldi.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* Panel parameters */\n enum {\n \tLCD_MAX_WIDTH\t\t= 1920,\ndiff --git a/drivers/video/zynqmp/zynqmp_dpsub.c b/drivers/video/zynqmp/zynqmp_dpsub.c\nindex a0efd3393f5fe2c3a468caec4ad81deef18dbdbf..fba65bb3d5bb77f6a9518b90e570fdc102950760 100644\n--- a/drivers/video/zynqmp/zynqmp_dpsub.c\n+++ b/drivers/video/zynqmp/zynqmp_dpsub.c\n@@ -20,12 +20,9 @@\n #include <linux/delay.h>\n #include <linux/ioport.h>\n #include <dm/device_compat.h>\n-#include <asm/global_data.h>\n \n #include \"zynqmp_dpsub.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* Maximum supported resolution */\n #define WIDTH\t\t\t\t1024\n #define HEIGHT\t\t\t\t768\ndiff --git a/drivers/watchdog/armada-37xx-wdt.c b/drivers/watchdog/armada-37xx-wdt.c\nindex 4b51178e1b8c8e6cb92287ad9ac9c27f4c839271..d7a6b8de492ddc8bf698eaeeef74f996dc8a3b29 100644\n--- a/drivers/watchdog/armada-37xx-wdt.c\n+++ b/drivers/watchdog/armada-37xx-wdt.c\n@@ -7,14 +7,11 @@\n \n #include <dm.h>\n #include <wdt.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/arch/cpu.h>\n #include <asm/arch/soc.h>\n #include <dm/device_compat.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct a37xx_wdt {\n \tvoid __iomem *sel_reg;\n \tvoid __iomem *reg;\ndiff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c\nindex 72e13787448e366036dce4a451cc2294e5b60a0d..2fb25126b8cbb22e819c376dba5da720dbe3f30f 100644\n--- a/drivers/watchdog/at91sam9_wdt.c\n+++ b/drivers/watchdog/at91sam9_wdt.c\n@@ -15,7 +15,6 @@\n */\n \n #include <log.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <asm/arch/at91_wdt.h>\n #include <div64.h>\n@@ -23,8 +22,6 @@\n #include <errno.h>\n #include <wdt.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /*\n * AT91SAM9 watchdog runs a 12bit counter @ 256Hz,\n * use this to convert a watchdog\ndiff --git a/drivers/watchdog/mt7621_wdt.c b/drivers/watchdog/mt7621_wdt.c\nindex 6308d9632a8115f83daf765ca860133c2fd340fa..08ef3d84e26d3f9bc1a3f8d0e22d7945da0a3f9a 100644\n--- a/drivers/watchdog/mt7621_wdt.c\n+++ b/drivers/watchdog/mt7621_wdt.c\n@@ -11,12 +11,9 @@\n \n #include <dm.h>\n #include <wdt.h>\n-#include <asm/global_data.h>\n #include <linux/bitops.h>\n #include <linux/io.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct mt762x_wdt {\n \tvoid __iomem *regs;\n };\ndiff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c\nindex 4562b2a37e3478da2f5b117f52a89051491653ff..a2000b968c9b90114e157006862f324bfb6c00a5 100644\n--- a/drivers/watchdog/orion_wdt.c\n+++ b/drivers/watchdog/orion_wdt.c\n@@ -16,15 +16,12 @@\n #include <clk.h>\n #include <log.h>\n #include <wdt.h>\n-#include <asm/global_data.h>\n #include <linux/bitops.h>\n #include <linux/kernel.h>\n #include <asm/io.h>\n #include <asm/arch/cpu.h>\n #include <asm/arch/soc.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct orion_wdt_priv {\n \tvoid __iomem *reg;\n \tint wdt_counter_offset;\ndiff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c\nindex 03585529bb636a763fcbd536646bbd453735d1bc..807884c5bc73d20409a8cfd5dfa2f94fab3e5692 100644\n--- a/drivers/watchdog/sbsa_gwdt.c\n+++ b/drivers/watchdog/sbsa_gwdt.c\n@@ -5,7 +5,6 @@\n * Copyright 2020 NXP\n */\n \n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <dm/device.h>\n #include <dm/fdtaddr.h>\n@@ -15,8 +14,6 @@\n #include <watchdog.h>\n #include <wdt.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* SBSA Generic Watchdog register definitions */\n /* refresh frame */\n #define SBSA_GWDT_WRR\t\t0x000\ndiff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c\nindex b32590069d97651f02468c70a85dfb6a4442fce6..438833b2245eaf2af62dfb80c754e146fd43441c 100644\n--- a/drivers/watchdog/wdt-uclass.c\n+++ b/drivers/watchdog/wdt-uclass.c\n@@ -14,13 +14,10 @@\n #include <sysreset.h>\n #include <time.h>\n #include <wdt.h>\n-#include <asm/global_data.h>\n #include <dm/device-internal.h>\n #include <dm/lists.h>\n #include <linux/kernel.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n #define WATCHDOG_TIMEOUT_SECS\t(CONFIG_WATCHDOG_TIMEOUT_MSECS / 1000)\n \n struct wdt_priv {\ndiff --git a/fs/fs.c b/fs/fs.c\nindex 319c55c440aaffb8e59975fa6ea0c06e98cc894f..8ea50a6c13c403106ccc639c7c4e7fa2c4445a48 100644\n--- a/fs/fs.c\n+++ b/fs/fs.c\n@@ -24,7 +24,6 @@\n #include <ubifs_uboot.h>\n #include <btrfs.h>\n #include <asm/cache.h>\n-#include <asm/global_data.h>\n #include <asm/io.h>\n #include <div64.h>\n #include <linux/math64.h>\n@@ -34,8 +33,6 @@\n #include <erofs.h>\n #include <exfat.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static struct blk_desc *fs_dev_desc;\n static int fs_dev_part;\n static struct disk_partition fs_partition;\ndiff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c\nindex 40bad0e7da7afe76a37cbec7d4fc64ad944f198e..b0cc0d2e1b2279669382149a02962c79950dd14e 100644\n--- a/fs/ubifs/ubifs.c\n+++ b/fs/ubifs/ubifs.c\n@@ -16,7 +16,6 @@\n #include <log.h>\n #include <malloc.h>\n #include <memalign.h>\n-#include <asm/global_data.h>\n #include \"ubifs.h\"\n #include <part.h>\n #include <dm/devres.h>\n@@ -31,8 +30,6 @@\n #include <abuf.h>\n #endif\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* compress.c */\n \n /*\ndiff --git a/include/relocate.h b/include/relocate.h\nindex 8ca25e1105e6b9536d4df82c1e413e8bea232b6b..331be1387288e5597ce6dbc6baf842c2f0831d62 100644\n--- a/include/relocate.h\n+++ b/include/relocate.h\n@@ -8,9 +8,7 @@\n #define _RELOCATE_H_\n \n #ifndef USE_HOSTCC\n-#include <asm/global_data.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n #endif\n \n /**\ndiff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c\nindex 89e63ed8dd5cd43f9800f83784e3e72c37b59f54..d66ddd1bbf860bc536430f8684777894ab08142a 100644\n--- a/lib/efi_loader/efi_capsule.c\n+++ b/lib/efi_loader/efi_capsule.c\n@@ -21,7 +21,6 @@\n #include <mapmem.h>\n #include <sort.h>\n #include <sysreset.h>\n-#include <asm/global_data.h>\n #include <u-boot/uuid.h>\n \n #include <asm/sections.h>\n@@ -29,8 +28,6 @@\n #include <crypto/pkcs7_parser.h>\n #include <linux/err.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n const efi_guid_t efi_guid_capsule_report = EFI_CAPSULE_REPORT_GUID;\n static const efi_guid_t efi_guid_firmware_management_capsule_id =\n \t\tEFI_FIRMWARE_MANAGEMENT_CAPSULE_ID_GUID;\ndiff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c\nindex 3abb47d610e658b67ba15ed3dcc0317fb3f96c0a..9403e09691e1a6e93dd35df5be1f9fede6dfea1f 100644\n--- a/lib/efi_loader/efi_gop.c\n+++ b/lib/efi_loader/efi_gop.c\n@@ -13,9 +13,6 @@\n #include <malloc.h>\n #include <mapmem.h>\n #include <video.h>\n-#include <asm/global_data.h>\n-\n-DECLARE_GLOBAL_DATA_PTR;\n \n static const efi_guid_t efi_gop_guid = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID;\n \ndiff --git a/lib/efi_loader/efi_rng.c b/lib/efi_loader/efi_rng.c\nindex 4734f95eee1df3ebaa53be958b04acc8e2d0332e..7810b4e47ead4f2605d9688bffb4c75881dc7fe8 100644\n--- a/lib/efi_loader/efi_rng.c\n+++ b/lib/efi_loader/efi_rng.c\n@@ -10,9 +10,6 @@\n #include <efi_rng.h>\n #include <log.h>\n #include <rng.h>\n-#include <asm/global_data.h>\n-\n-DECLARE_GLOBAL_DATA_PTR;\n \n const efi_guid_t efi_guid_rng_protocol = EFI_RNG_PROTOCOL_GUID;\n \ndiff --git a/net/eth-uclass.c b/net/eth-uclass.c\nindex a233912fd8e8e6a18e2bb982c834abfd3ab41c2f..5c437143a3075e4bc3654b34e9afba500c10bf65 100644\n--- a/net/eth-uclass.c\n+++ b/net/eth-uclass.c\n@@ -14,15 +14,12 @@\n #include <log.h>\n #include <net.h>\n #include <nvmem.h>\n-#include <asm/global_data.h>\n #include <dm/device-internal.h>\n #include <dm/uclass-internal.h>\n #include <net/pcap.h>\n #include \"eth_internal.h\"\n #include <eth_phy.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /**\n * struct eth_device_priv - private structure for each Ethernet device\n *\ndiff --git a/net/tftp.c b/net/tftp.c\nindex 78ec44159c1be7ac40bd57f54c62d965932d8c87..73d6a6a3c1bd984d9eb26763dd4e31708fec55ed 100644\n--- a/net/tftp.c\n+++ b/net/tftp.c\n@@ -16,12 +16,9 @@\n #include <mapmem.h>\n #include <net.h>\n #include <net6.h>\n-#include <asm/global_data.h>\n #include <net/tftp.h>\n #include \"bootp.h\"\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /*\n * We cannot use the 'tftpput' command in xPL phases. Given how the\n * support is integrated in the code, this is how we disable that support\ndiff --git a/net/wget.c b/net/wget.c\nindex d3642958bf0ede476411369545c65231dff14089..49bfb9fcb96dfb5684ab10bd247fb21169e83851 100644\n--- a/net/wget.c\n+++ b/net/wget.c\n@@ -4,7 +4,6 @@\n * Copyright Duncan Hare <dh@synoia.com> 2017\n */\n \n-#include <asm/global_data.h>\n #include <command.h>\n #include <display_options.h>\n #include <env.h>\n@@ -17,8 +16,6 @@\n #include <net/wget.h>\n #include <stdlib.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* The default, change with environment variable 'httpdstp' */\n #define SERVER_PORT\t\t80\n \ndiff --git a/test/cmd/exit.c b/test/cmd/exit.c\nindex fdde054b92898884f61821e8a6a8ac779667fc89..e20bc5f7b98cda77b0a458231df72fb3dc7e3312 100644\n--- a/test/cmd/exit.c\n+++ b/test/cmd/exit.c\n@@ -7,11 +7,8 @@\n \n #include <console.h>\n #include <mapmem.h>\n-#include <asm/global_data.h>\n #include <test/ut.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* Declare a new exit test */\n #define EXIT_TEST(_name, _flags)\tUNIT_TEST(_name, _flags, exit)\n \ndiff --git a/test/cmd/test_echo.c b/test/cmd/test_echo.c\nindex 8b306cc907fbce7eb900caefdfa72ca1fc0d49ac..7ed534742f77a3d21775a9e5c49b19ca36e5ef9e 100644\n--- a/test/cmd/test_echo.c\n+++ b/test/cmd/test_echo.c\n@@ -6,14 +6,11 @@\n */\n \n #include <command.h>\n-#include <asm/global_data.h>\n #include <display_options.h>\n #include <test/lib.h>\n #include <test/test.h>\n #include <test/ut.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n struct test_data {\n \tchar *cmd;\n \tchar *expected;\ndiff --git a/test/cmd/test_pause.c b/test/cmd/test_pause.c\nindex 174c31a3852eaf731d287d023e88a6af476a2371..b2cf60d3e74ed84fa844ce7b1401cf2be7a691e1 100644\n--- a/test/cmd/test_pause.c\n+++ b/test/cmd/test_pause.c\n@@ -5,12 +5,9 @@\n * Copyright 2022, Samuel Dionne-Riel <samuel@dionne-riel.com>\n */\n \n-#include <asm/global_data.h>\n #include <test/lib.h>\n #include <test/ut.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static int lib_test_hush_pause(struct unit_test_state *uts)\n {\n \t/* Test default message */\ndiff --git a/test/dm/blk.c b/test/dm/blk.c\nindex 1b928b27d9cdbd0299d8081f0e3795ab88432219..f67869107da1cda6a5b8dabaec27b64b538c70be 100644\n--- a/test/dm/blk.c\n+++ b/test/dm/blk.c\n@@ -8,14 +8,11 @@\n #include <part.h>\n #include <sandbox_host.h>\n #include <usb.h>\n-#include <asm/global_data.h>\n #include <asm/state.h>\n #include <dm/test.h>\n #include <test/test.h>\n #include <test/ut.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* Test that block devices can be created */\n static int dm_test_blk_base(struct unit_test_state *uts)\n {\ndiff --git a/test/dm/i3c.c b/test/dm/i3c.c\nindex 81336e67555d148142574b7d2a4c2bf80c080302..816ecabd7228648ee32f64a7f68fefcc2c04653c 100644\n--- a/test/dm/i3c.c\n+++ b/test/dm/i3c.c\n@@ -8,8 +8,6 @@\n #include <dm/test.h>\n #include <test/ut.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* Basic test of the i3c uclass */\n static int dm_test_i3c_base(struct unit_test_state *uts)\n {\ndiff --git a/test/lib/test_print.c b/test/lib/test_print.c\nindex cd7f3f85769682fe8da73570d2f47adaab25055d..2aeb034b12112d070bb708e70e925ade8f8ad297 100644\n--- a/test/lib/test_print.c\n+++ b/test/lib/test_print.c\n@@ -7,13 +7,10 @@\n \n #include <command.h>\n #include <display_options.h>\n-#include <asm/global_data.h>\n #include <test/lib.h>\n #include <test/test.h>\n #include <test/ut.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n static int test_print_freq(struct unit_test_state *uts,\n \t\t\t uint64_t freq, char *expected)\n {\ndiff --git a/test/log/log_filter.c b/test/log/log_filter.c\nindex 680c60164b623bb30bf0a5457c190bab8d97468a..147b83980cffd26d0bf20c5ff1641cf3545f8e3c 100644\n--- a/test/log/log_filter.c\n+++ b/test/log/log_filter.c\n@@ -6,12 +6,9 @@\n #include <console.h>\n #include <log.h>\n #include <vsprintf.h>\n-#include <asm/global_data.h>\n #include <test/log.h>\n #include <test/ut.h>\n \n-DECLARE_GLOBAL_DATA_PTR;\n-\n /* Test invalid options */\n static int log_test_filter_invalid(struct unit_test_state *uts)\n {\n", "prefixes": [ "v2", "14/14" ] }