Commit 8996975ff8422e07f43eb8b3b0c7ed8c2b35442f
Committed by
Tom Rini
Tom Rini
1 parent
662282203a
Exists in
smarc_8mq_lf_v2020.04
and in
17 other branches
powerpc: Drop CONFIG_WALNUT and other related dead code
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>
Showing 3 changed files with 1 additions and 20 deletions Side-by-side Diff
arch/powerpc/include/asm/processor.h
| ... | ... | @@ -1206,11 +1206,6 @@ |
| 1206 | 1206 | #endif |
| 1207 | 1207 | |
| 1208 | 1208 | |
| 1209 | -#ifndef CONFIG_MACH_SPECIFIC | |
| 1210 | -extern int _machine; | |
| 1211 | -extern int have_of; | |
| 1212 | -#endif /* CONFIG_MACH_SPECIFIC */ | |
| 1213 | - | |
| 1214 | 1209 | /* what kind of prep workstation we are */ |
| 1215 | 1210 | extern int _prep_type; |
| 1216 | 1211 | /* |
| ... | ... | @@ -1335,15 +1330,6 @@ |
| 1335 | 1330 | int prt_83xx_rsr(void); |
| 1336 | 1331 | |
| 1337 | 1332 | #endif /* ndef ASSEMBLY*/ |
| 1338 | - | |
| 1339 | -#ifdef CONFIG_MACH_SPECIFIC | |
| 1340 | -#if defined(CONFIG_WALNUT) | |
| 1341 | -#define _machine _MACH_walnut | |
| 1342 | -#define have_of 0 | |
| 1343 | -#else | |
| 1344 | -#error "Machine not defined correctly" | |
| 1345 | -#endif | |
| 1346 | -#endif /* CONFIG_MACH_SPECIFIC */ | |
| 1347 | 1333 | |
| 1348 | 1334 | #if defined(CONFIG_MPC85xx) |
| 1349 | 1335 | #define EPAPR_MAGIC (0x45504150) |
cmd/elf.c
| ... | ... | @@ -240,11 +240,7 @@ |
| 240 | 240 | * from the VxWorks BSP header files. |
| 241 | 241 | * This will vary from board to board |
| 242 | 242 | */ |
| 243 | -#if defined(CONFIG_WALNUT) | |
| 244 | - tmp = (char *)CONFIG_SYS_NVRAM_BASE_ADDR + 0x500; | |
| 245 | - eth_env_get_enetaddr("ethaddr", (uchar *)build_buf); | |
| 246 | - memcpy(tmp, &build_buf[3], 3); | |
| 247 | -#elif defined(CONFIG_SYS_VXWORKS_MAC_PTR) | |
| 243 | +#if defined(CONFIG_SYS_VXWORKS_MAC_PTR) | |
| 248 | 244 | tmp = (char *)CONFIG_SYS_VXWORKS_MAC_PTR; |
| 249 | 245 | eth_env_get_enetaddr("ethaddr", (uchar *)build_buf); |
| 250 | 246 | memcpy(tmp, build_buf, 6); |
scripts/config_whitelist.txt