From c904a0b762aedccf603ce492687450efb0e8924c Mon Sep 17 00:00:00 2001
From: Holger Brunck <holger.brunck@hitachi-powergrids.com>
Date: Thu, 29 Oct 2020 13:54:54 +0100
Subject: [PATCH] km/ppc: use Kconfig for MEMTEST configuration

Also change back SYS_MEMTEST_END to 0x00f00000. 0xe00000 was wrong and
introduced due to the global Kconfig migration of this option in u-boot.

CC: Heiko Schocher <hs@denx.de>
CC: Tom Rini <trini@konsulko.com>
Signed-off-by: Holger Brunck <holger.brunck@hitachi-powergrids.com>
---
 board/keymile/km83xx/Kconfig  | 6 ++++++
 board/keymile/km83xx/km83xx.c | 8 ++------
 include/configs/kmcoge5ne.h   | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/board/keymile/km83xx/Kconfig b/board/keymile/km83xx/Kconfig
index bbafabdcb2..8247ae39d3 100644
--- a/board/keymile/km83xx/Kconfig
+++ b/board/keymile/km83xx/Kconfig
@@ -15,6 +15,12 @@ config KM_ENABLE_FULL_DM_DTS_SUPPORT
 	select PHYLIB
 endmenu
 
+config SYS_MEMTEST_START
+	default 0x00100000
+
+config SYS_MEMTEST_END
+	default 0x00f00000
+
 if TARGET_KMETER1
 
 config SYS_BOARD
diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c
index 9eb000cca4..a984165e24 100644
--- a/board/keymile/km83xx/km83xx.c
+++ b/board/keymile/km83xx/km83xx.c
@@ -236,12 +236,8 @@ void post_word_store(ulong value)
 
 int arch_memory_test_prepare(u32 *vstart, u32 *size, phys_addr_t *phys_offset)
 {
-	/*
-	 * These match CONFIG_SYS_MEMTEST_START and
-	 * (CONFIG_SYS_MEMTEST_END - CONFIG_SYS_MEMTEST_START)
-	 */
-	*vstart = 0x00100000;
-	*size = 0xe00000;
+	*vstart = CONFIG_SYS_MEMTEST_START;
+	*size = CONFIG_SYS_MEMTEST_END - CONFIG_SYS_MEMTEST_START;
 	debug("arch_memory_test_prepare 0x%08X 0x%08X\n", *vstart, *size);
 
 	return 0;
diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h
index 4d01f236c3..cdfb280aee 100644
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -51,7 +51,7 @@
 /* enable POST tests */
 #define CONFIG_POST (CONFIG_SYS_POST_MEMORY|CONFIG_SYS_POST_MEM_REGIONS)
 #define CONFIG_POST_EXTERNAL_WORD_FUNCS /* use own functions, not generic */
-#define CPM_POST_WORD_ADDR  0x00f00000
+#define CPM_POST_WORD_ADDR  CONFIG_SYS_MEMTEST_END
 #define CONFIG_TESTPIN_REG  gprt3	/* for kmcoge5ne */
 #define CONFIG_TESTPIN_MASK 0x20	/* for kmcoge5ne */
 
-- 
2.39.5