diff options
author | Holger Brunck <holger.brunck@ch.abb.com> | 2019-07-09 09:30:29 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2019-08-12 09:12:38 +0200 |
commit | 7b472733d880ea7957537b566c0251ffdc5cb8d0 (patch) | |
tree | 13d77dacbf655da820897aefd682701c8e20b795 /board | |
parent | 1bd17b9f7b7688e96a0d496ef1b02e45d4e63703 (diff) |
powerpc/km: remove unmaintained target KMVECT1
Signed-off-by: Valentin Longchamp <valentin.longchamp@ch.abb.com>
Signed-off-by: Holger Brunck <holger.brunck@ch.abb.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'board')
-rw-r--r-- | board/keymile/common/ivm.c | 5 | ||||
-rw-r--r-- | board/keymile/km83xx/Kconfig | 19 | ||||
-rw-r--r-- | board/keymile/km83xx/MAINTAINERS | 1 | ||||
-rw-r--r-- | board/keymile/km83xx/km83xx.c | 81 |
4 files changed, 0 insertions, 106 deletions
diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c index 23bd21c4bc..d22f3fa75a 100644 --- a/board/keymile/common/ivm.c +++ b/board/keymile/common/ivm.c @@ -310,11 +310,6 @@ static int ivm_populate_env(unsigned char *buf, int len) /* if an offset is defined, add it */ process_mac(valbuf, page2, CONFIG_PIGGY_MAC_ADRESS_OFFSET, true); env_set((char *)"ethaddr", (char *)valbuf); -#ifdef CONFIG_KMVECT1 -/* KMVECT1 has two ethernet interfaces */ - process_mac(valbuf, page2, 1, true); - env_set((char *)"eth1addr", (char *)valbuf); -#endif #else /* KMTEGR1 has a special setup. eth0 has no connection to the outside and * gets an locally administred MAC address, eth1 is the debug interface and diff --git a/board/keymile/km83xx/Kconfig b/board/keymile/km83xx/Kconfig index 0a41be57f5..1011cc8b2c 100644 --- a/board/keymile/km83xx/Kconfig +++ b/board/keymile/km83xx/Kconfig @@ -38,25 +38,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy endif -if TARGET_KMVECT1 - -config SYS_BOARD - default "km83xx" - -config SYS_VENDOR - default "keymile" - -config SYS_CONFIG_NAME - default "kmvect1" - -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - select ARCH_MPC8309 - imply CMD_CRAMFS - imply FS_CRAMFS - -endif - if TARGET_KMTEGR1 config SYS_BOARD diff --git a/board/keymile/km83xx/MAINTAINERS b/board/keymile/km83xx/MAINTAINERS index 94e0d572e2..d2af983073 100644 --- a/board/keymile/km83xx/MAINTAINERS +++ b/board/keymile/km83xx/MAINTAINERS @@ -10,7 +10,6 @@ F: configs/kmopti2_defconfig F: configs/kmtepr2_defconfig F: include/configs/suvd3.h F: configs/kmtegr1_defconfig -F: configs/kmvect1_defconfig F: configs/suvd3_defconfig F: configs/tuge1_defconfig F: configs/tuxx1_defconfig diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c index 880ce67fa6..a693845383 100644 --- a/board/keymile/km83xx/km83xx.c +++ b/board/keymile/km83xx/km83xx.c @@ -124,19 +124,10 @@ static int piggy_present(void) return in_8(&base->bprth) & PIGGY_PRESENT; } -#if defined(CONFIG_KMVECT1) -int ethernet_present(void) -{ - /* ethernet port connected to simple switch without piggy */ - return 1; -} -#else int ethernet_present(void) { return piggy_present(); } -#endif - int board_early_init_r(void) { @@ -197,80 +188,8 @@ int misc_init_r(void) return 0; } -#if defined(CONFIG_KMVECT1) -#include <mv88e6352.h> -/* Marvell MV88E6122 switch configuration */ -static struct mv88e_sw_reg extsw_conf[] = { - /* port 1, FRONT_MDI, autoneg */ - { PORT(1), PORT_PHY, NO_SPEED_FOR }, - { PORT(1), PORT_CTRL, FORWARDING | EGRS_FLD_ALL }, - { PHY(1), PHY_1000_CTRL, NO_ADV }, - { PHY(1), PHY_SPEC_CTRL, AUTO_MDIX_EN }, - { PHY(1), PHY_CTRL, PHY_100_MBPS | AUTONEG_EN | AUTONEG_RST | - FULL_DUPLEX }, - /* port 2, unused */ - { PORT(2), PORT_CTRL, PORT_DIS }, - { PHY(2), PHY_CTRL, PHY_PWR_DOWN }, - { PHY(2), PHY_SPEC_CTRL, SPEC_PWR_DOWN }, - /* port 3, BP_MII (CPU), PHY mode, 100BASE */ - { PORT(3), PORT_CTRL, FORWARDING | EGRS_FLD_ALL }, - /* port 4, ESTAR to slot 11, SerDes, 1000BASE-X */ - { PORT(4), PORT_STATUS, NO_PHY_DETECT }, - { PORT(4), PORT_PHY, SPEED_1000_FOR }, - { PORT(4), PORT_CTRL, FORWARDING | EGRS_FLD_ALL }, - /* port 5, ESTAR to slot 13, SerDes, 1000BASE-X */ - { PORT(5), PORT_STATUS, NO_PHY_DETECT }, - { PORT(5), PORT_PHY, SPEED_1000_FOR }, - { PORT(5), PORT_CTRL, FORWARDING | EGRS_FLD_ALL }, - /* - * Errata Fix: 1.9V Output from Internal 1.8V Regulator, - * acc . MV-S300889-00D.pdf , clause 4.5 - */ - { PORT(5), 0x1A, 0xADB1 }, - /* port 6, unused, this port has no phy */ - { PORT(6), PORT_CTRL, PORT_DIS }, - /* - * Errata Fix: 1.9V Output from Internal 1.8V Regulator, - * acc . MV-S300889-00D.pdf , clause 4.5 - */ - { PORT(5), 0x1A, 0xADB1 }, -}; -#endif - int last_stage_init(void) { -#if defined(CONFIG_KMVECT1) - struct km_bec_fpga __iomem *base = - (struct km_bec_fpga __iomem *)CONFIG_SYS_KMBEC_FPGA_BASE; - u8 tmp_reg; - - /* Release mv88e6122 from reset */ - tmp_reg = in_8(&base->res1[0]) | 0x10; /* DIRECT3 register */ - out_8(&base->res1[0], tmp_reg); /* GP28 as output */ - tmp_reg = in_8(&base->gprt3) | 0x10; /* GP28 to high */ - out_8(&base->gprt3, tmp_reg); - - /* configure MV88E6122 switch */ - char *name = "UEC2"; - - if (miiphy_set_current_dev(name)) - return 0; - - mv88e_sw_program(name, CONFIG_KM_MVEXTSW_ADDR, extsw_conf, - ARRAY_SIZE(extsw_conf)); - - mv88e_sw_reset(name, CONFIG_KM_MVEXTSW_ADDR); - - if (piggy_present()) { - env_set("ethact", "UEC2"); - env_set("netdev", "eth1"); - puts("using PIGGY for network boot\n"); - } else { - env_set("netdev", "eth0"); - puts("using frontport for network boot\n"); - } -#endif - #if defined(CONFIG_TARGET_KMCOGE5NE) struct bfticu_iomap *base = (struct bfticu_iomap *)CONFIG_SYS_BFTIC3_BASE; |