diff --git a/src/flash/nor/tcl.c b/src/flash/nor/tcl.c
index 7a402b0e7..93c4d2846 100644
--- a/src/flash/nor/tcl.c
+++ b/src/flash/nor/tcl.c
@@ -486,11 +486,7 @@ COMMAND_HANDLER(handle_flash_fill_command)
 	if (CMD_ARGC != 3)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
-#if BUILD_TARGET64
-	COMMAND_PARSE_NUMBER(u64, CMD_ARGV[0], address);
-#else
-	COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], address);
-#endif
+	COMMAND_PARSE_ADDRESS(CMD_ARGV[0], address);
 	COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], pattern);
 	COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], count);