From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH v2 03/34] ARM: rename __arm_mem_scratch to arm_mem_scratch
Date: Wed, 17 May 2023 11:03:09 +0200 [thread overview]
Message-ID: <20230517090340.3954615-4-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20230517090340.3954615-1-s.hauer@pengutronix.de>
There are different arm_mem_* macros/functions and only one of them
has leading underscores. Remove them for consistency.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/include/asm/barebox-arm.h | 4 ++--
arch/arm/mach-imx/atf.c | 6 +++---
arch/arm/mach-imx/xload-common.c | 2 +-
include/mach/rockchip/bootrom.h | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/include/asm/barebox-arm.h b/arch/arm/include/asm/barebox-arm.h
index 3a0c3d7d40..f446044be6 100644
--- a/arch/arm/include/asm/barebox-arm.h
+++ b/arch/arm/include/asm/barebox-arm.h
@@ -71,11 +71,11 @@ static inline void arm_fixup_vectors(void)
void *barebox_arm_boot_dtb(void);
-#define __arm_mem_scratch(endmem) ((endmem) - SZ_32K)
+#define arm_mem_scratch(endmem) ((endmem) - SZ_32K)
static inline const void *arm_mem_scratch_get(void)
{
- return (const void *)__arm_mem_scratch(arm_mem_endmem_get());
+ return (const void *)arm_mem_scratch(arm_mem_endmem_get());
}
#define arm_mem_stack_top(endmem) ((endmem) - SZ_64K - OPTEE_SIZE)
diff --git a/arch/arm/mach-imx/atf.c b/arch/arm/mach-imx/atf.c
index 92820d9392..c5e6817aad 100644
--- a/arch/arm/mach-imx/atf.c
+++ b/arch/arm/mach-imx/atf.c
@@ -137,7 +137,7 @@ __noreturn void imx8mm_load_and_start_image_via_tfa(void)
void *endmem = (void *)MX8M_DDR_CSD1_BASE_ADDR +
imx8m_barebox_earlymem_size(32);
- imx8m_save_bootrom_log(__arm_mem_scratch(endmem));
+ imx8m_save_bootrom_log(arm_mem_scratch(endmem));
imx8mm_load_bl33(bl33);
if (IS_ENABLED(CONFIG_FIRMWARE_IMX8MM_OPTEE))
@@ -185,7 +185,7 @@ __noreturn void imx8mp_load_and_start_image_via_tfa(void)
void *endmem = (void *)MX8M_DDR_CSD1_BASE_ADDR +
imx8m_barebox_earlymem_size(32);
- imx8m_save_bootrom_log(__arm_mem_scratch(endmem));
+ imx8m_save_bootrom_log(arm_mem_scratch(endmem));
imx8mp_load_bl33(bl33);
if (IS_ENABLED(CONFIG_FIRMWARE_IMX8MP_OPTEE))
@@ -234,7 +234,7 @@ __noreturn void imx8mn_load_and_start_image_via_tfa(void)
void *endmem = (void *)MX8M_DDR_CSD1_BASE_ADDR +
imx8m_barebox_earlymem_size(16);
- imx8m_save_bootrom_log(__arm_mem_scratch(endmem));
+ imx8m_save_bootrom_log(arm_mem_scratch(endmem));
imx8mn_load_bl33(bl33);
if (IS_ENABLED(CONFIG_FIRMWARE_IMX8MN_OPTEE))
diff --git a/arch/arm/mach-imx/xload-common.c b/arch/arm/mach-imx/xload-common.c
index 0d3e6be1b1..03eb2ef109 100644
--- a/arch/arm/mach-imx/xload-common.c
+++ b/arch/arm/mach-imx/xload-common.c
@@ -26,7 +26,7 @@ struct imx_scratch_space *__imx8m_scratch_space(int ddr_buswidth)
ulong endmem = MX8M_DDR_CSD1_BASE_ADDR +
imx8m_barebox_earlymem_size(ddr_buswidth);
- return (void *)__arm_mem_scratch(endmem);
+ return (void *)arm_mem_scratch(endmem);
}
#define HDR_SIZE 512
diff --git a/include/mach/rockchip/bootrom.h b/include/mach/rockchip/bootrom.h
index 96eb147ae4..5b999fc606 100644
--- a/include/mach/rockchip/bootrom.h
+++ b/include/mach/rockchip/bootrom.h
@@ -15,7 +15,7 @@ static inline void rockchip_store_bootrom_iram(ulong membase,
ulong memsize,
const void *iram)
{
- void *dst = (void *)__arm_mem_scratch(membase + memsize);
+ void *dst = (void *)arm_mem_scratch(membase + memsize);
memcpy(dst, iram, sizeof(struct rockchip_scratch_space));
}
--
2.39.2
next prev parent reply other threads:[~2023-05-17 9:05 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-17 9:03 [PATCH v2 00/34] ARM: MMU rework Sascha Hauer
2023-05-17 9:03 ` [PATCH v2 01/34] ARM: remove unused membase argument Sascha Hauer
2023-05-17 12:45 ` Ahmad Fatoum
2023-05-17 9:03 ` [PATCH v2 02/34] ARM: remove unused define Sascha Hauer
2023-05-17 12:45 ` Ahmad Fatoum
2023-05-17 9:03 ` Sascha Hauer [this message]
2023-05-17 12:46 ` [PATCH v2 03/34] ARM: rename __arm_mem_scratch to arm_mem_scratch Ahmad Fatoum
2023-05-17 9:03 ` [PATCH v2 04/34] ARM: put scratch mem area below OP-TEE Sascha Hauer
2023-05-17 12:48 ` Ahmad Fatoum
2023-05-17 13:14 ` Sascha Hauer
2023-05-17 15:50 ` Ahmad Fatoum
2023-05-17 9:03 ` [PATCH v2 05/34] ARM: add arm_mem_optee() Sascha Hauer
2023-05-17 12:53 ` Ahmad Fatoum
2023-05-17 9:03 ` [PATCH v2 06/34] ARM: make arm_mem_scratch() a static inline function Sascha Hauer
2023-05-17 12:53 ` Ahmad Fatoum
2023-05-17 9:03 ` [PATCH v2 07/34] ARM: define stack base consistently Sascha Hauer
2023-05-17 12:55 ` Ahmad Fatoum
2023-05-17 9:03 ` [PATCH v2 08/34] ARM: move arm_mem_scratch_get() lower for consistency Sascha Hauer
2023-05-17 12:57 ` Ahmad Fatoum
2023-05-17 9:03 ` [PATCH v2 09/34] ARM: drop cache function initialization Sascha Hauer
2023-05-17 9:03 ` [PATCH v2 10/34] ARM: Add _32 suffix to aarch32 specific filenames Sascha Hauer
2023-05-17 9:03 ` [PATCH v2 11/34] ARM: cpu.c: remove unused include Sascha Hauer
2023-05-17 9:03 ` [PATCH v2 12/34] ARM: mmu-common.c: use common mmu include Sascha Hauer
2023-05-17 9:03 ` [PATCH v2 13/34] ARM: mmu32: rename mmu.h to mmu_32.h Sascha Hauer
2023-05-17 9:03 ` [PATCH v2 14/34] ARM: mmu: implement MAP_FAULT Sascha Hauer
2023-05-17 9:03 ` [PATCH v2 15/34] ARM: mmu64: Use arch_remap_range where possible Sascha Hauer
2023-05-17 9:03 ` [PATCH v2 16/34] ARM: mmu32: implement zero_page_*() Sascha Hauer
2023-05-17 9:03 ` [PATCH v2 17/34] ARM: i.MX: Drop HAB workaround Sascha Hauer
2023-05-17 13:01 ` Ahmad Fatoum
2023-05-17 9:03 ` [PATCH v2 18/34] ARM: Move early MMU after malloc initialization Sascha Hauer
2023-05-17 9:03 ` [PATCH v2 19/34] ARM: mmu: move dma_sync_single_for_device to extra file Sascha Hauer
2023-05-17 9:03 ` [PATCH v2 20/34] ARM: mmu: merge mmu-early_xx.c into mmu_xx.c Sascha Hauer
2023-05-17 9:03 ` [PATCH v2 21/34] ARM: mmu: alloc 64k for early page tables Sascha Hauer
2023-05-17 13:03 ` Ahmad Fatoum
2023-05-17 9:03 ` [PATCH v2 22/34] ARM: mmu32: create alloc_pte() Sascha Hauer
2023-05-17 13:07 ` Ahmad Fatoum
2023-05-17 9:03 ` [PATCH v2 23/34] ARM: mmu64: " Sascha Hauer
2023-05-17 13:15 ` Ahmad Fatoum
2023-05-17 13:17 ` Ahmad Fatoum
2023-05-17 9:03 ` [PATCH v2 24/34] ARM: mmu: drop ttb argument Sascha Hauer
2023-05-17 13:23 ` Ahmad Fatoum
2023-05-17 9:03 ` [PATCH v2 25/34] ARM: mmu: always do MMU initialization early when MMU is enabled Sascha Hauer
2023-05-17 13:29 ` Ahmad Fatoum
2023-05-17 9:03 ` [PATCH v2 26/34] ARM: mmu32: Assume MMU is on Sascha Hauer
2023-05-17 13:36 ` Ahmad Fatoum
2023-05-17 9:03 ` [PATCH v2 27/34] ARM: mmu32: Fix pmd_flags_to_pte() for ARMv4/5/6 Sascha Hauer
2023-05-17 13:39 ` Ahmad Fatoum
2023-05-17 9:03 ` [PATCH v2 28/34] ARM: mmu32: Add pte_flags_to_pmd() Sascha Hauer
2023-05-17 13:43 ` Ahmad Fatoum
2023-05-17 14:44 ` Sascha Hauer
2023-05-17 9:03 ` [PATCH v2 29/34] ARM: mmu32: add get_pte_flags, get_pmd_flags Sascha Hauer
2023-05-17 13:46 ` Ahmad Fatoum
2023-05-17 9:03 ` [PATCH v2 30/34] ARM: mmu32: move functions into c file Sascha Hauer
2023-05-17 13:48 ` Ahmad Fatoum
2023-05-17 9:03 ` [PATCH v2 31/34] ARM: mmu32: read TTB value from register Sascha Hauer
2023-05-17 13:58 ` Ahmad Fatoum
2023-05-17 14:39 ` Sascha Hauer
2023-05-19 6:53 ` Ahmad Fatoum
2023-05-19 7:44 ` Sascha Hauer
2023-05-19 7:52 ` Ahmad Fatoum
2023-05-17 9:03 ` [PATCH v2 32/34] ARM: mmu32: Use pages for early MMU setup Sascha Hauer
2023-05-17 14:21 ` Ahmad Fatoum
2023-05-22 8:14 ` Sascha Hauer
2023-05-17 9:03 ` [PATCH v2 33/34] ARM: mmu32: Skip reserved ranges during initialization Sascha Hauer
2023-05-17 14:43 ` Ahmad Fatoum
2023-05-17 14:55 ` Sascha Hauer
2023-05-17 15:56 ` Ahmad Fatoum
2023-05-17 9:03 ` [PATCH v2 34/34] ARM: mmu64: Use two level pagetables in early code Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230517090340.3954615-4-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox