From patchwork Thu May 15 15:09:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4033 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 0B13D3F97E for ; Thu, 15 May 2025 17:10:03 +0200 (CEST) Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-3a1f6c5f4f2sf438109f8f.2 for ; Thu, 15 May 2025 08:10:02 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1747321802; cv=pass; d=google.com; s=arc-20240605; b=G57roOWdNEyg4/HA18WAjzrk5bN/XkdJIAYA7WXfnn8MQvJ/Hyrnc1/jPi+In4dAcE kfcARrYfIVbIYdA2ndK0MoQhpqQKERsGTJ0RUx8n73mpbqqhNbAziDEbaO90qkwXTUJz J/Vsg89QaVCAiD50kr3DYzEUkrdw5zjdih83mIDADN/iDWoMcv1iHpPRDLk63RD8gu99 ziM5IbwAMW5l0dUOAUvt0gXWkWD8+nIwm1fQaQ2L5/oPJeg8u53OQE79eb/24M3rlQ4K xvy5PU0140G+rBUS2OMRvaCXKZSYVMVlnwR1d5iy+gO17u8/VDeZOHqxjduQpedsctTt Ohtg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:message-id:date:subject:cc:to :from:dkim-signature; bh=pRKbPjbxik9pb61Gbv5SRySgr4Jwjaa9MsqGmK9Bius=; fh=PLyYOmU/bUPA//pexIGf3pY8WjE/DJlbt0qy8iRKAKk=; b=BOaxdP9CV1KQOEBNIN2EU99KRNx9rhjoulVjqPyL/IUnlAb1IZBZd1n5IMCIPpakF2 VBecp5/yJa9AJEhgKCuKkrxNsWRYuvVXU7CV4d69pOYS7QAZLB8MIMm2Ad+jEZf8iXzL f0gS4QFMKx24Ags15H0kzZ0OR4oLa06X8EF3Py0tjMzwaPUUpvVP9dTf1V1+181c/aWx zlk4fPgpbHIRmsN6W5/FWxw7oPg3MqJEJr0UJW9EPZEeo53UEV4AQt2oshotR3L97aMJ l1EFx8v/WZIdPLvc0j/ZHqFkp7syGw+3xs6zB43yDskzcX8k5Pmdua9XwzN9kEJX4zzY UG9Q==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=qbId6vcZ; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1747321802; x=1747926602; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=pRKbPjbxik9pb61Gbv5SRySgr4Jwjaa9MsqGmK9Bius=; b=a1zpNP9I3M0RpMVsAUGvZ75xR0aMgeTazqWfWCATCvfXjyfI3nfNJdM+GpkOCLAt7p UTZD3ocpgExPCLGpa8rq5QYl02ge9lK113rhZ+eQUv4cCipkZ14e52n9u6VO0HCNL7pK HSimUvTMV0dDOy9s19yKaODzTPAsNXswVlh1s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747321802; x=1747926602; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=pRKbPjbxik9pb61Gbv5SRySgr4Jwjaa9MsqGmK9Bius=; b=CC2tWEomp+CXF8zfpMS4vs4p4BWP80PNHirA8WMsxbUbIwX5kw2z27Noifd2YtNguy RJQWnboloAo+R+kPWQ7mWq5U7d8KVWXXa8rWQrW4Buj1ZSFRjut3nrrVi68KiCNEDXb1 7UhIsonuZcjIITSApeT+EBx178xMu6NWNusg34OHEldmLGfqpkf5HX5Fh0Rt0lbBBHJ3 I9tNe9VT/4aumrbJ5lUiEF07QzbpJWtxKiVJdX7AD/J/mhEoDqqwfFa+GwfQND/Pm5S7 1Xp8Zw0OAeHsHzTfcqAb/KI2n65Epl7WJ4IWyQoilXOM6IR6360G4iAADLxNWaCR8UW/ kAQA== X-Forwarded-Encrypted: i=2; AJvYcCWFawybUOvZNvAQEjh6TuZu/h1CEAP4TqKcc745jYgeo5bABEfdbOn7LlfwukOs0o15bT5VbkIlxjyA9rNs@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YyMDFfkxSdndSonQAIGnI7dksP34D59w9vqpchJ0/ymkf3m/6St qIAeDMSovRI7CVODb0AClmVGZ6LNcTPU9HT+Id29rHWIy/o3fVaGzbMcSBfB4HGbbLsyyg== X-Google-Smtp-Source: AGHT+IFwQE32i2T26rEY+GgNwy/uSUkB4QizlgCMwhwZEwWu7v9JGWhh0ZuP2qP8137MC6+afg8yOA== X-Received: by 2002:a05:6000:2aa:b0:3a2:12a:e631 with SMTP id ffacd0b85a97d-3a35c847a45mr120526f8f.22.1747321802267; Thu, 15 May 2025 08:10:02 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AVT/gBElhZTCQawrud9VQS2WcWKH4lTcbSSZVFUJAf2GbEvP7Q== Received: by 2002:a05:600c:b8c:b0:43d:2313:7b45 with SMTP id 5b1f17b1804b1-442f8757d39ls6376565e9.1.-pod-prod-04-eu; Thu, 15 May 2025 08:10:00 -0700 (PDT) X-Received: by 2002:a05:600c:4ed3:b0:43c:e7a7:1e76 with SMTP id 5b1f17b1804b1-442f96e6f53mr25475785e9.1.1747321799977; Thu, 15 May 2025 08:09:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747321799; cv=none; d=google.com; s=arc-20240605; b=b5rgMMojndzPB+ePrnoJaGDgruTsQ6TH7W3cFXCI5soR1AfgrLJG3iL+oaNIgayOMQ 1h1pwH2oqCLDE3spA8uoSLeQv3skQDnpjZSRk0Qw/WSIImLMJvIoaFCLOSGWLqiYFzdU +M4xunva8c7kkIHKSTSv+DhgdwlsWyLxf66Rmb359lPIotY27y0S0qF4wKeWlKqZiQn/ uPZZXSQXgdgWj/yf0e8ByqAGgDn81jQayk+k5kT9DirGeTMhaCErDyI0rWzORxnyJ8mR 9Ak8IMsVEXlIezbMJkY7bHeXV6135DmMSdXchM1VjB1PUIMaN6KTqAoQHrlLfY5NNx9I uJXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=hcKIWhIr0d1PRc2yYCqhC8pwCdfs3NBC0ihNbHSP4Iw=; fh=ZVAWdi5PmMpYTc7bTG3AecifYn21Y7iIHZymJT9b8CY=; b=MxCJfubTIUiVZ3gD8pQlmIYQHh9hG1VbKqaGghv5R1eeuS8ZhFIINQtreypS37Yd/h irLY17vPX2bGs+/jCSVONcQF0Y1aY/CTI1QnYrnNI/HST0b9iAWpevsBLWk7KzIykt1S qoFqKdw+QEXSLIYuysLlpAGEcH9cc3JpJnYypp2nbgsZCdYu3YwlSaMTMLIkI8P/CT1j /9OixvMC/4Py5BSOzw/GLkTug5RLP8VXH+y4XHW3Xaq7Tu0++UuYpJojFpTd+XSLxWuW tlprJIa4eAOY0ghq6xc0hxQ940n3UBmyFelX8hm9lGjryTn6ziDETPrf9QOcbMfaGATU BTbA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=qbId6vcZ; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 5b1f17b1804b1-442d67d7a96sor48223345e9.1.2025.05.15.08.09.59 for (Google Transport Security); Thu, 15 May 2025 08:09:59 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Gm-Gg: ASbGnctAeg7hvcWoXTIUSMKL25B4Vqt0m1Ymkm1fSzf9B+hHm9bQZEFWbiW1iFWlDIf ++SxhJaMW1V/9TaT9dyq0ejzLq/arierjwgblt5/kLJ9ObcSs7+FzZ/psazB4bbhah0UkW90D+T utuOhPIq3J1/Qycms14JJiK1CzZp9mxYx4ov6pZraKqceb7c+8YrwvODXO8OJVIw4yni55Rw6Z7 uWwV8nC+IpasI9BGpe4qNqScXgvRvZNlbEgQOY8ckajLSLDoAnVokxomGj9IcQly/WhskMTkpAM lCVUj16hV5jM/MK5ZxvHRJz0UoUY9A66W5KTToaSmkca6j9Ar6TuvfEhGj9Sxw3geBsUIicmTnj AYOLpia8abkj4pWiBfQVqzSfYtZva5pDEsrJlfMMslyg= X-Received: by 2002:a05:600c:4ed3:b0:43c:e7a7:1e76 with SMTP id 5b1f17b1804b1-442f96e6f53mr25475415e9.1.1747321799524; Thu, 15 May 2025 08:09:59 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.client.m3-hotspots.de ([46.189.28.43]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f39e853asm74793875e9.26.2025.05.15.08.09.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 08:09:59 -0700 (PDT) From: Dario Binacchi To: u-boot@lists.denx.de Cc: linux-amarula@amarulasolutions.com, Michael Trimarchi , Dario Binacchi , Quentin Schulz , Fabio Estevam , Marek Vasut , "NXP i.MX U-Boot Team" , Paul Geurts , Peng Fan , Sean Anderson , Simon Glass , Stefano Babic , Tom Rini Subject: [PATCH v3 1/2] arm: imx: imx8m: soc: fix the macro name Date: Thu, 15 May 2025 17:09:51 +0200 Message-ID: <20250515150955.926708-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=qbId6vcZ; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Michael Trimarchi The function arch_spl_mmc_get_uboot_raw_sector() was never compiled, even when the option CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION was enabled. So rename the macro SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION to CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION. Fixes: 2a00d73d081a ("spl: mmc: Try to clean up raw-mode options") Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi Reviewed-by: Quentin Schulz Reviewed-by: Peng Fan --- (no changes since v2) Changes in v2: - Add Reviewed-by tag of Quentin Schulz arch/arm/mach-imx/imx8m/soc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 567e8e9e81a0..806adcf145fa 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -791,7 +791,7 @@ int boot_mode_getprisec(void) #endif #if defined(CONFIG_IMX8MN) || defined(CONFIG_IMX8MP) -#ifdef SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION +#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION #define IMG_CNTN_SET1_OFFSET GENMASK(22, 19) unsigned long arch_spl_mmc_get_uboot_raw_sector(struct mmc *mmc, unsigned long raw_sect) @@ -826,7 +826,7 @@ unsigned long arch_spl_mmc_get_uboot_raw_sector(struct mmc *mmc, return raw_sect; } -#endif /* SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION */ +#endif /* CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION */ #endif bool is_usb_boot(void) From patchwork Thu May 15 15:09:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4034 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 834C23F97E for ; Thu, 15 May 2025 17:10:05 +0200 (CEST) Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-3a0b589a2c6sf492492f8f.0 for ; Thu, 15 May 2025 08:10:05 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1747321805; cv=pass; d=google.com; s=arc-20240605; b=gbLKOa3UHd9hZHoGe7hMygiF16Q8xC8AjE2Akun/HizDErHGt8NQeQoNlbb0DLuFbm i1X5Oba2RmPVE2UqoWo5OgulseSED6O0gg54w/umqyue1Q20Gx4iwrWtMbBVsJgdESqc AWvrWTr+rUx6Isoonx6vOibRb53L1qYS3zqq9OFV5NwFEvLMz+YLhQpPQr8YoPwzVT7P nw2mgnqTsE2WYyBBw1Wmou7qJauWHmbZd1t8pzCGPN843Nm344gL4vB0ZLZdEopUgMjH sP3iTzpSNYP1hz3wuTV6B4coh+ceCz1O/ZX9+J+wHvGCIokj+eg9J5mAWTylnO78Lri8 PAvg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=62BxhpuojVasQULFepSZCuMHAiXneMshkiuM/tE10fI=; fh=9LPjUW3XplOg4qfuw8T9xiiImoIyFDOBQU2TQ2gDIFY=; b=didp5lhwYKOI7e4aoMHJMZPTu6XjiLTsudD2635V8zB3btaZ6GbdVGhqkmUWrC7lc+ 2AdD5PeqbSE1Vsm/maDnG+6ZTuPoU/OrUwYpffv/iE0p6cYI3i5xyXjPDCcOMYhBX6AD JLP+/36LtXqaySz1hN1DgxKhgLN1YPTMHWiR0YSNOjFVSUqwQVtq71kbijl8PdvOVpwo H0l0r5EZO7xGpdp6fYV2Zva6ySLKnZlE49dr/+ssIDVocWtMy1PE+/fMHkGUNIQmEeMH sH82MNMShRFuIPugC2UG1GxbLfphFfvyhMbXk/wJXlJrhQ7OkPC79/Uqjhkj/C0rP6Zy GrcA==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=qk+ia3LP; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1747321805; x=1747926605; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=62BxhpuojVasQULFepSZCuMHAiXneMshkiuM/tE10fI=; b=NV8GxlcsDOooPZgIicaeGCytooLgDgNOjy6PuvyvqEXVKYMp4yI9/85/tUoSHnfS92 Wlgf0IFIpKjujY1dDLyYl1gabP5EI4ucRejUAnhaCIyfh5/EmBG/AH36JtH/h0zBF/pY Zlf9PryDK9pr0dUarbX+DO7AgafvC11pQ543w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747321805; x=1747926605; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=62BxhpuojVasQULFepSZCuMHAiXneMshkiuM/tE10fI=; b=S6VlCcjU0Sgid9B4CoZdV3tCG1zyu9m5ytMIujX8uiPZTWkdVL4ZNmZ3UMLTwdp/kM 4KN2oSqTdFLpNH2kLsHR9RlVk6iPia0hiqeAjYF4hyRnGrBWqNgQBPQWgj5RMOcINQ8n 0HhVI/ZBBsARoM4JhA7Tbu5koL5LexiHLehEC6sNX7X4mO8C2uTUvOZgQh7KqsHiZimd GwkYCGPRjpfV2+9jFONGjQCA/cUBOY2Bn6nLQp9IlSObHzLmla+MtTfVU6CJ1A87xn7N 33NxoM1VXknKK6nbL5VKY55hIUvN27gDOkHNIoL2W8otHkPNYiYlWRieNzXe/QqPS2FF Grog== X-Forwarded-Encrypted: i=2; AJvYcCVdbibGrxxe2DF/xHQYfU9/wu6jyHyviw15DWN55MFx2lqrzdj4N7jPf6MoO2J+LkvoRoGsKeSMQT1YKcu7@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YyYkdrsDfOVCwqV3V4f230cLaXZPsF29PCHdIcVIc/9g13ASLlc FhPid/TmiqOKqWO2Wqz0+iEVqdgq14txn1/A0GyepFP5v6oOAUzPw2WHeMx/E9PFE66l9axhTWp SMA== X-Google-Smtp-Source: AGHT+IE1HTGR3TI9X6zOqkTWAEKc6gBXpUtOarCy+9x1KWCAC6ooDLaj2UmsdUb0iObIZHTMu5ML8Q== X-Received: by 2002:a05:6000:2501:b0:3a0:7a7c:2648 with SMTP id ffacd0b85a97d-3a35c824662mr129290f8f.27.1747321805046; Thu, 15 May 2025 08:10:05 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AVT/gBFLkj1N2YyA+hmBaQdCF1+OHSB0/StU/8ebzx9eU9rB9Q== Received: by 2002:a05:600c:1c93:b0:43b:cfb8:a5d7 with SMTP id 5b1f17b1804b1-442f860e122ls1479065e9.0.-pod-prod-06-eu; Thu, 15 May 2025 08:10:03 -0700 (PDT) X-Received: by 2002:a05:600c:3f0f:b0:43d:fa58:8378 with SMTP id 5b1f17b1804b1-442f9714e8amr28748265e9.33.1747321802774; Thu, 15 May 2025 08:10:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747321802; cv=none; d=google.com; s=arc-20240605; b=lZRpp6UGmRWOKYbkgvWA2zcvpiCpFvsXsz0VFoCoiRwyfInTT2MCwQhqpFQAJEwVsl SOXrs/oIIcuAd0kInFr2rrcXm3pZ7KpfFV5zKOPTTBmYrexPfohmSdWZVgHjJy6Uz2/A oJDBOfgned4QONAs5ksojvrL1utoFQePuzlxwHE7PeHtV9PaCKqjy8naULIcdm7S523g odVDfH4y41IZBjPW6VPGBBUy9eLV+0/meMoz5BJlL+73HzTs8WJIJfiUEaBMKGrqf7WM lCA5vqfObCS6JtU0Tgx5+l30/iKi+qzE5jhC7m4z728dUd+6SsoRgGfV4SzBSqgJSt6+ cz3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=4ovDwQ8IjwQ4o6N/R/75FS6UPpoVG7l9QkRN+ukGDQI=; fh=moz5sdgW2Mi7uSCrNdeA26iZlyx6ZqB4i1r4sTdrjgo=; b=CKZw832rRJcD+5hvo6jEp+d0sGVrJxjtPG6jxw9VgfLAiv1bGEY9QQK2puPNhe1T6z flL2AiiHq5bybOcOzKQG1hs5EQJXY/qtvC8AH1swBpyKpwGvKGlf96rtFoiShD4cta1l eWML7R503MvsLOyGf3rNcDJPN525Q/Zey3WNtTHHPR024K4POftmPAw6QxlUu14c0LxX U42CwxJvCVWEzgS3bntzcz32oG29Lc8XT0Gf0lCg4OPP/CrufcAHN/AKBJNDq9ciV2E4 TpcGVyA0Rmh7Ki7gZhDQw0KCorJkNB6wl231qyGFiLpbCovKxzVuwDTEIsBFY9XqRmt5 a8bw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=qk+ia3LP; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 5b1f17b1804b1-442d67d79efsor42254205e9.2.2025.05.15.08.10.02 for (Google Transport Security); Thu, 15 May 2025 08:10:02 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Gm-Gg: ASbGncs0x80lMK/9xtBTsOXRW/QALxcNu4PEkno0KJossLkGSRy2z/1RRhtRESj9n72 vNVqobswXj9vkG9LermRk/Rt3VRc2ZHCt1hwMT8dThNUJQKjjc573znkVGDsMCO4kRtuUPStsPM yZBZn4IAt232ayY1N3X6OidlD2VYRFUvpXZ9fUF++r5wX+YzHvFmHg9tY7YIt6F7D8YN+Sl42C8 cuTuB0ctFSt4LJuUv6fdNWnbY6jnUCUWBbUrzovGxnJ/aL9yG34Jh0FqDFTG9qGCq40xwOJ93NG LSlTH0PhUx+iETEU5BuMS1S8PmDSMUgWQ0Qc33nrWt5vHgP/QQ4A9eqYYk6fpzvwmkxswwyPwXd LobOKS/u1KwjFG2FXNgA8a1c907oumBZ5KybSOaRp+O4= X-Received: by 2002:a05:600c:8712:b0:440:94a2:95b8 with SMTP id 5b1f17b1804b1-442f96eb39cmr33745865e9.16.1747321800715; Thu, 15 May 2025 08:10:00 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.client.m3-hotspots.de ([46.189.28.43]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f39e853asm74793875e9.26.2025.05.15.08.09.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 08:10:00 -0700 (PDT) From: Dario Binacchi To: u-boot@lists.denx.de Cc: linux-amarula@amarulasolutions.com, Dario Binacchi , Fabio Estevam , Ilias Apalodimas , Marek Vasut , "NXP i.MX U-Boot Team" , Paul Geurts , Peng Fan , Quentin Schulz , Simon Glass , Stefano Babic , Tom Rini Subject: [PATCH v3 2/2] arm: imx: imx8m: soc: replace ifdef by IS_ENABLED() Date: Thu, 15 May 2025 17:09:52 +0200 Message-ID: <20250515150955.926708-2-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515150955.926708-1-dario.binacchi@amarulasolutions.com> References: <20250515150955.926708-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=qk+ia3LP; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Standardize on using the IS_ENABLED macro. Signed-off-by: Dario Binacchi Reviewed-by: Peng Fan --- Changes in v3: - Replaces all replaceable macros within the file arch/arm/mach-imx/imx8m/soc.c | 40 +++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 806adcf145fa..3cdb71a25284 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -38,7 +38,7 @@ DECLARE_GLOBAL_DATA_PTR; -#if defined(CONFIG_IMX_HAB) +#if IS_ENABLED(CONFIG_IMX_HAB) struct imx_fuse const imx_sec_config_fuse = { .bank = 1, .word = 3, @@ -52,7 +52,7 @@ struct imx_fuse const imx_field_return_fuse = { int timer_init(void) { -#ifdef CONFIG_XPL_BUILD +#if IS_ENABLED(CONFIG_XPL_BUILD) struct sctr_regs *sctr = (struct sctr_regs *)SYSCNT_CTRL_BASE_ADDR; unsigned long freq = readl(&sctr->cntfid0); @@ -110,7 +110,7 @@ void set_wdog_reset(struct wdog_regs *wdog) setbits_le16(&wdog->wcr, WDOG_WDT_MASK | WDOG_WDZST_MASK); } -#ifdef CONFIG_ARMV8_PSCI +#if IS_ENABLED(CONFIG_ARMV8_PSCI) #define PTE_MAP_NS PTE_BLOCK_NS #else #define PTE_MAP_NS 0 @@ -700,11 +700,11 @@ int arch_cpu_init(void) return 0; } -#if defined(CONFIG_IMX8MN) || defined(CONFIG_IMX8MP) +#if IS_ENABLED(CONFIG_IMX8MN) || IS_ENABLED(CONFIG_IMX8MP) struct rom_api *g_rom_api = (struct rom_api *)0x980; #endif -#if defined(CONFIG_IMX8M) +#if IS_ENABLED(CONFIG_IMX8M) #include int imx8m_detect_secondary_image_boot(void) { @@ -790,8 +790,8 @@ int boot_mode_getprisec(void) } #endif -#if defined(CONFIG_IMX8MN) || defined(CONFIG_IMX8MP) -#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION +#if IS_ENABLED(CONFIG_IMX8MN) || IS_ENABLED(CONFIG_IMX8MP) +#if IS_ENABLED(CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION) #define IMG_CNTN_SET1_OFFSET GENMASK(22, 19) unsigned long arch_spl_mmc_get_uboot_raw_sector(struct mmc *mmc, unsigned long raw_sect) @@ -834,7 +834,7 @@ bool is_usb_boot(void) return get_boot_device() == USB_BOOT; } -#ifdef CONFIG_OF_SYSTEM_SETUP +#if IS_ENABLED(CONFIG_OF_SYSTEM_SETUP) bool check_fdt_new_path(void *blob) { const char *soc_path = "/soc@0"; @@ -880,7 +880,7 @@ add_status: return 0; } -#ifdef CONFIG_IMX8MQ +#if IS_ENABLED(CONFIG_IMX8MQ) bool check_dcss_fused(void) { struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR; @@ -1026,7 +1026,7 @@ int disable_vpu_nodes(void *blob) return -EPERM; } -#ifdef CONFIG_IMX8MN_LOW_DRIVE_MODE +#if IS_ENABLED(CONFIG_IMX8MN_LOW_DRIVE_MODE) static int low_drive_gpu_freq(void *blob) { static const char *nodes_path_8mn[] = { @@ -1311,7 +1311,7 @@ int ft_system_setup(void *blob, struct bd_info *bd) "/cpus/cpu@3", }; -#ifdef CONFIG_IMX8MQ +#if IS_ENABLED(CONFIG_IMX8MQ) int i = 0; int rc; int nodeoff; @@ -1387,7 +1387,7 @@ usb_modify_speed: if (is_imx8md()) disable_cpu_nodes(blob, nodes_path, 2, 4); -#elif defined(CONFIG_IMX8MM) +#elif IS_ENABLED(CONFIG_IMX8MM) if (is_imx8mml() || is_imx8mmdl() || is_imx8mmsl()) disable_vpu_nodes(blob); @@ -1396,10 +1396,10 @@ usb_modify_speed: else if (is_imx8mms() || is_imx8mmsl()) disable_cpu_nodes(blob, nodes_path, 3, 4); -#elif defined(CONFIG_IMX8MN) +#elif IS_ENABLED(CONFIG_IMX8MN) if (is_imx8mnl() || is_imx8mndl() || is_imx8mnsl()) disable_gpu_nodes(blob); -#ifdef CONFIG_IMX8MN_LOW_DRIVE_MODE +#if IS_ENABLED(CONFIG_IMX8MN_LOW_DRIVE_MODE) else { int ldm_gpu = low_drive_gpu_freq(blob); @@ -1415,7 +1415,7 @@ usb_modify_speed: else if (is_imx8mns() || is_imx8mnsl() || is_imx8mnus()) disable_cpu_nodes(blob, nodes_path, 3, 4); -#elif defined(CONFIG_IMX8MP) +#elif IS_ENABLED(CONFIG_IMX8MP) if (is_imx8mpul()) { /* Disable GPU */ disable_gpu_nodes(blob); @@ -1471,7 +1471,7 @@ void reset_cpu(void) } #endif -#if defined(CONFIG_ARCH_MISC_INIT) +#if IS_ENABLED(CONFIG_ARCH_MISC_INIT) int arch_misc_init(void) { if (IS_ENABLED(CONFIG_FSL_CAAM)) { @@ -1487,8 +1487,8 @@ int arch_misc_init(void) } #endif -#if defined(CONFIG_XPL_BUILD) -#if defined(CONFIG_IMX8MQ) || defined(CONFIG_IMX8MM) || defined(CONFIG_IMX8MN) +#if IS_ENABLED(CONFIG_XPL_BUILD) +#if IS_ENABLED(CONFIG_IMX8MQ) || IS_ENABLED(CONFIG_IMX8MM) || IS_ENABLED(CONFIG_IMX8MN) bool serror_need_skip = true; void do_error(struct pt_regs *pt_regs) @@ -1523,7 +1523,7 @@ void do_error(struct pt_regs *pt_regs) #endif #endif -#if defined(CONFIG_IMX8MN) || defined(CONFIG_IMX8MP) +#if IS_ENABLED(CONFIG_IMX8MN) || IS_ENABLED(CONFIG_IMX8MP) enum env_location arch_env_get_location(enum env_operation op, int prio) { enum boot_device dev = get_boot_device(); @@ -1571,7 +1571,7 @@ enum env_location arch_env_get_location(enum env_operation op, int prio) #endif -#ifdef CONFIG_IMX_BOOTAUX +#if IS_ENABLED(CONFIG_IMX_BOOTAUX) const struct rproc_att hostmap[] = { /* aux core , host core, size */ { 0x00000000, 0x007e0000, 0x00020000 },