diff mbox series

[U-Boot] powerpc: Drop CONFIG_WALNUT and other related dead code

Message ID 20180121161642.20749-1-tuomas@tuxera.com
State Accepted
Delegated to: Tom Rini
Headers show
Series [U-Boot] powerpc: Drop CONFIG_WALNUT and other related dead code | expand

Commit Message

Tuomas Tynkkynen Jan. 21, 2018, 4:16 p.m. UTC 
CONFIG_WALNUT was dropped in June 2017 in:
commit 98f705c9cefdfd ("powerpc: remove 4xx support")

While at it, the related CONFIG_MACH_SPECIFIC and the have_of
and _machine variables are unused as well, so drop them too.

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
---
 arch/powerpc/include/asm/processor.h | 14 --------------
 cmd/elf.c                            |  6 +-----
 scripts/config_whitelist.txt         |  1 -
 3 files changed, 1 insertion(+), 20 deletions(-)

Comments

Tom Rini Jan. 28, 2018, 6:54 p.m. UTC | #1 
On Sun, Jan 21, 2018 at 06:16:42PM +0200, Tuomas Tynkkynen wrote:

> CONFIG_WALNUT was dropped in June 2017 in:
> commit 98f705c9cefdfd ("powerpc: remove 4xx support")
> 
> While at it, the related CONFIG_MACH_SPECIFIC and the have_of
> and _machine variables are unused as well, so drop them too.
> 
> Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h
index baf38f8441..57b11b8365 100644
--- a/arch/powerpc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
@@ -1206,11 +1206,6 @@  int fsl_qoriq_dsp_core_to_cluster(unsigned int core);
 #endif
 
 
-#ifndef CONFIG_MACH_SPECIFIC
-extern int _machine;
-extern int have_of;
-#endif /* CONFIG_MACH_SPECIFIC */
-
 /* what kind of prep workstation we are */
 extern int _prep_type;
 /*
@@ -1336,15 +1331,6 @@  int prt_83xx_rsr(void);
 
 #endif /* ndef ASSEMBLY*/
 
-#ifdef CONFIG_MACH_SPECIFIC
-#if defined(CONFIG_WALNUT)
-#define _machine _MACH_walnut
-#define have_of 0
-#else
-#error "Machine not defined correctly"
-#endif
-#endif /* CONFIG_MACH_SPECIFIC */
-
 #if defined(CONFIG_MPC85xx)
  #define EPAPR_MAGIC	(0x45504150)
 #else
diff --git a/cmd/elf.c b/cmd/elf.c
index 5745a389da..5b59fc6329 100644
--- a/cmd/elf.c
+++ b/cmd/elf.c
@@ -240,11 +240,7 @@  int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	 * from the VxWorks BSP header files.
 	 * This will vary from board to board
 	 */
-#if defined(CONFIG_WALNUT)
-	tmp = (char *)CONFIG_SYS_NVRAM_BASE_ADDR + 0x500;
-	eth_env_get_enetaddr("ethaddr", (uchar *)build_buf);
-	memcpy(tmp, &build_buf[3], 3);
-#elif defined(CONFIG_SYS_VXWORKS_MAC_PTR)
+#if defined(CONFIG_SYS_VXWORKS_MAC_PTR)
 	tmp = (char *)CONFIG_SYS_VXWORKS_MAC_PTR;
 	eth_env_get_enetaddr("ethaddr", (uchar *)build_buf);
 	memcpy(tmp, build_buf, 6);
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ec1b51f9b6..9f410dec26 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1271,7 +1271,6 @@  CONFIG_MACB3_PHY
 CONFIG_MACB_SEARCH_PHY
 CONFIG_MACH_DAVINCI_DA850_EVM
 CONFIG_MACH_OMAPL138_LCDK
-CONFIG_MACH_SPECIFIC
 CONFIG_MACH_TYPE
 CONFIG_MACH_TYPE_COMPAT_REV
 CONFIG_MACRESET_TIMEOUT