diff --git a/arch/arm/mach-owl/Makefile b/arch/arm/mach-owl/Makefile
index 0b181c62d6c..f3a69ebf15c 100644
--- a/arch/arm/mach-owl/Makefile
+++ b/arch/arm/mach-owl/Makefile
@@ -1,4 +1,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 
 obj-y += soc.o
-obj-y += sysmap-s900.o
+obj-$(CONFIG_ARM64) += sysmap-owl.o
diff --git a/arch/arm/mach-owl/sysmap-s900.c b/arch/arm/mach-owl/sysmap-owl.c
similarity index 83%
rename from arch/arm/mach-owl/sysmap-s900.c
rename to arch/arm/mach-owl/sysmap-owl.c
index f78b639740e..81f6ca2e491 100644
--- a/arch/arm/mach-owl/sysmap-s900.c
+++ b/arch/arm/mach-owl/sysmap-owl.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Actions Semi S900 Memory map
+ * Memory map for Actions Semi Owl series SoCs.
  *
  * Copyright (C) 2015 Actions Semi Co., Ltd.
  * Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
@@ -9,7 +9,7 @@
 #include <common.h>
 #include <asm/armv8/mmu.h>
 
-static struct mm_region s900_mem_map[] = {
+static struct mm_region owl_mem_map[] = {
 	{
 		.virt = 0x0UL, /* DDR */
 		.phys = 0x0UL, /* DDR */
@@ -29,4 +29,4 @@ static struct mm_region s900_mem_map[] = {
 	}
 };
 
-struct mm_region *mem_map = s900_mem_map;
+struct mm_region *mem_map = owl_mem_map;