diff options
author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-12-15 23:26:06 +0900 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2015-01-05 12:08:50 -0500 |
commit | 5d2a5ef712914fe1c3edfcde78134dc4dc83f461 (patch) | |
tree | cbef611c664ab229fff50bd5947f563a4cc3a139 /board | |
parent | a2ee47d5f6d010e92e956a8fa9b62fe220d61bf6 (diff) |
mpc8xx: remove FPS{850, 860}L, NSCU, SM850, TK885D, virtlab2 support
These boards are still non-generic boards.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board')
-rw-r--r-- | board/tqc/tqm8xx/Kconfig | 78 | ||||
-rw-r--r-- | board/tqc/tqm8xx/MAINTAINERS | 16 | ||||
-rw-r--r-- | board/tqc/tqm8xx/tqm8xx.c | 58 |
3 files changed, 1 insertions, 151 deletions
diff --git a/board/tqc/tqm8xx/Kconfig b/board/tqc/tqm8xx/Kconfig index 926a37afc53..857fedb8bec 100644 --- a/board/tqc/tqm8xx/Kconfig +++ b/board/tqc/tqm8xx/Kconfig @@ -1,68 +1,3 @@ -if TARGET_FPS850L - -config SYS_BOARD - default "tqm8xx" - -config SYS_VENDOR - default "tqc" - -config SYS_CONFIG_NAME - default "FPS850L" - -endif - -if TARGET_FPS860L - -config SYS_BOARD - default "tqm8xx" - -config SYS_VENDOR - default "tqc" - -config SYS_CONFIG_NAME - default "FPS860L" - -endif - -if TARGET_NSCU - -config SYS_BOARD - default "tqm8xx" - -config SYS_VENDOR - default "tqc" - -config SYS_CONFIG_NAME - default "NSCU" - -endif - -if TARGET_SM850 - -config SYS_BOARD - default "tqm8xx" - -config SYS_VENDOR - default "tqc" - -config SYS_CONFIG_NAME - default "SM850" - -endif - -if TARGET_TK885D - -config SYS_BOARD - default "tqm8xx" - -config SYS_VENDOR - default "tqc" - -config SYS_CONFIG_NAME - default "TK885D" - -endif - if TARGET_TQM823L config SYS_BOARD @@ -218,16 +153,3 @@ config SYS_CONFIG_NAME default "TQM885D" endif - -if TARGET_VIRTLAB2 - -config SYS_BOARD - default "tqm8xx" - -config SYS_VENDOR - default "tqc" - -config SYS_CONFIG_NAME - default "virtlab2" - -endif diff --git a/board/tqc/tqm8xx/MAINTAINERS b/board/tqc/tqm8xx/MAINTAINERS index fe4a2120292..f3ddc6a5304 100644 --- a/board/tqc/tqm8xx/MAINTAINERS +++ b/board/tqc/tqm8xx/MAINTAINERS @@ -2,12 +2,6 @@ TQM8XX BOARD M: Wolfgang Denk <wd@denx.de> S: Maintained F: board/tqc/tqm8xx/ -F: include/configs/FPS850L.h -F: configs/FPS850L_defconfig -F: include/configs/FPS860L.h -F: configs/FPS860L_defconfig -F: include/configs/SM850.h -F: configs/SM850_defconfig F: include/configs/TQM823L.h F: configs/TQM823L_defconfig F: configs/TQM823L_LCD_defconfig @@ -34,14 +28,4 @@ F: configs/TQM866M_defconfig F: include/configs/TQM885D.h F: configs/TQM885D_defconfig F: configs/TTTech_defconfig -F: include/configs/virtlab2.h -F: configs/virtlab2_defconfig F: configs/wtk_defconfig - -NSCU BOARD -#M: - -S: Maintained -F: include/configs/NSCU.h -F: configs/NSCU_defconfig -F: include/configs/TK885D.h -F: configs/TK885D_defconfig diff --git a/board/tqc/tqm8xx/tqm8xx.c b/board/tqc/tqm8xx/tqm8xx.c index 3b5230abc0d..6d17830575f 100644 --- a/board/tqc/tqm8xx/tqm8xx.c +++ b/board/tqc/tqm8xx/tqm8xx.c @@ -118,9 +118,7 @@ int checkboard (void) break; putc (buf[i]); } -#ifdef CONFIG_VIRTLAB2 - puts (" (Virtlab2)"); -#endif + putc ('\n'); return (0); @@ -512,14 +510,6 @@ int misc_init_r (void) immap->im_ioport.iop_padat &= ~0x0001; /* turn it off */ # endif -#ifdef CONFIG_NSCU - /* wake up ethernet module */ - immap->im_ioport.iop_pcpar &= ~0x0004; /* GPIO pin */ - immap->im_ioport.iop_pcdir |= 0x0004; /* output */ - immap->im_ioport.iop_pcso &= ~0x0004; /* for clarity */ - immap->im_ioport.iop_pcdat |= 0x0004; /* enable */ -#endif /* CONFIG_NSCU */ - return (0); } #endif /* CONFIG_MISC_INIT_R */ @@ -682,49 +672,3 @@ int ft_board_setup(void *blob, bd_t *bd) return 0; } #endif /* defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) */ - -/* ---------------------------------------------------------------------------- */ -/* TK885D specific initializaion */ -/* ---------------------------------------------------------------------------- */ -#ifdef CONFIG_TK885D -#include <miiphy.h> -int last_stage_init(void) -{ - const unsigned char phy[] = {CONFIG_FEC1_PHY, CONFIG_FEC2_PHY}; - unsigned short reg; - int ret, i = 100; - char *s; - - mii_init(); - /* Without this delay 0xff is read from the UART buffer later in - * abortboot() and autoboot is aborted */ - udelay(10000); - while (tstc() && i--) - (void)getc(); - - /* Check if auto-negotiation is prohibited */ - s = getenv("phy_auto_nego"); - - if (!s || !strcmp(s, "on")) - /* Nothing to do - autonegotiation by default */ - return 0; - - for (i = 0; i < 2; i++) { - ret = miiphy_read("FEC", phy[i], MII_BMCR, ®); - if (ret) { - printf("Cannot read BMCR on PHY %d\n", phy[i]); - return 0; - } - /* Auto-negotiation off, hard set full duplex, 100Mbps */ - ret = miiphy_write("FEC", phy[i], - MII_BMCR, (reg | BMCR_SPEED100 | - BMCR_FULLDPLX) & ~BMCR_ANENABLE); - if (ret) { - printf("Cannot write BMCR on PHY %d\n", phy[i]); - return 0; - } - } - - return 0; -} -#endif |