gdsys: Post ppc4xx removal cleanup

The ppc4xx architecture was removed, and with it several old gdsys 44x
boards, but some "debris" from these purged boards was left over.

This patch removes these remnants (mostly entries in Makefiles, some now
superfluous data structures and some now obsolete config variables from
the whitelist).

Signed-off-by: Mario Six <mario.six@gdsys.cc>

diff --git a/board/gdsys/common/Makefile b/board/gdsys/common/Makefile
index 9090933e345f79bb824a1161350cac11a2837d82..ff8d6f4966543f1f83c41e1928a33c6fdfe1d582 100644 (file)
--- a/board/gdsys/common/Makefile
+++ b/board/gdsys/common/Makefile
@@ -5,10 +5,6 @@
 
 obj-$(CONFIG_SYS_FPGA_COMMON) += fpga.o
 obj-$(CONFIG_CMD_IOLOOP) += cmd_ioloop.o
-obj-$(CONFIG_IO) += miiphybb.o
-obj-$(CONFIG_IO64) += miiphybb.o
-obj-$(CONFIG_IOCON) += osd.o mclink.o dp501.o phy.o ch7301.o
-obj-$(CONFIG_DLVISION_10G) += osd.o dp501.o
 obj-$(CONFIG_CONTROLCENTERD) += dp501.o
 obj-$(CONFIG_TARGET_HRCON) += osd.o mclink.o dp501.o phy.o ioep-fpga.o fanctrl.o
 obj-$(CONFIG_TARGET_STRIDER) += mclink.o dp501.o phy.o ioep-fpga.o adv7611.o ch7301.o

diff --git a/board/gdsys/common/miiphybb.c b/board/gdsys/common/miiphybb.c
deleted file mode 100644 (file)
index 042835d..0000000
--- a/board/gdsys/common/miiphybb.c
+++ /dev/null
@@ -1,127 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2010
- * Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
- */
-
-#include <common.h>
-#include <miiphy.h>
-
-#include <asm/io.h>
-
-struct io_bb_pinset {
-       int mdio;
-       int mdc;
-};
-
-static int io_bb_mii_init(struct bb_miiphy_bus *bus)
-{
-       return 0;
-}
-
-static int io_bb_mdio_active(struct bb_miiphy_bus *bus)
-{
-       struct io_bb_pinset *pins = bus->priv;
-
-       out_be32((void *)GPIO0_TCR,
-               in_be32((void *)GPIO0_TCR) | pins->mdio);
-
-       return 0;
-}
-
-static int io_bb_mdio_tristate(struct bb_miiphy_bus *bus)
-{
-       struct io_bb_pinset *pins = bus->priv;
-
-       out_be32((void *)GPIO0_TCR,
-               in_be32((void *)GPIO0_TCR) & ~pins->mdio);
-
-       return 0;
-}
-
-static int io_bb_set_mdio(struct bb_miiphy_bus *bus, int v)
-{
-       struct io_bb_pinset *pins = bus->priv;
-
-       if (v)
-               out_be32((void *)GPIO0_OR,
-                       in_be32((void *)GPIO0_OR) | pins->mdio);
-       else
-               out_be32((void *)GPIO0_OR,
-                       in_be32((void *)GPIO0_OR) & ~pins->mdio);
-
-       return 0;
-}
-
-static int io_bb_get_mdio(struct bb_miiphy_bus *bus, int *v)
-{
-       struct io_bb_pinset *pins = bus->priv;
-
-       *v = ((in_be32((void *)GPIO0_IR) & pins->mdio) != 0);
-
-       return 0;
-}
-
-static int io_bb_set_mdc(struct bb_miiphy_bus *bus, int v)
-{
-       struct io_bb_pinset *pins = bus->priv;
-
-       if (v)
-               out_be32((void *)GPIO0_OR,
-                       in_be32((void *)GPIO0_OR) | pins->mdc);
-       else
-               out_be32((void *)GPIO0_OR,
-                       in_be32((void *)GPIO0_OR) & ~pins->mdc);
-
-       return 0;
-}
-
-static int io_bb_delay(struct bb_miiphy_bus *bus)
-{
-       udelay(1);
-
-       return 0;
-}
-
-struct io_bb_pinset io_bb_pinsets[] = {
-       {
-               .mdio = CONFIG_SYS_MDIO_PIN,
-               .mdc = CONFIG_SYS_MDC_PIN,
-       },
-#ifdef CONFIG_SYS_GBIT_MII1_BUSNAME
-       {
-               .mdio = CONFIG_SYS_MDIO1_PIN,
-               .mdc = CONFIG_SYS_MDC1_PIN,
-       },
-#endif
-};
-
-struct bb_miiphy_bus bb_miiphy_buses[] = {
-       {
-               .name = CONFIG_SYS_GBIT_MII_BUSNAME,
-               .init = io_bb_mii_init,
-               .mdio_active = io_bb_mdio_active,
-               .mdio_tristate = io_bb_mdio_tristate,
-               .set_mdio = io_bb_set_mdio,
-               .get_mdio = io_bb_get_mdio,
-               .set_mdc = io_bb_set_mdc,
-               .delay = io_bb_delay,
-               .priv = &io_bb_pinsets[0],
-       },
-#ifdef CONFIG_SYS_GBIT_MII1_BUSNAME
-       {
-               .name = CONFIG_SYS_GBIT_MII1_BUSNAME,
-               .init = io_bb_mii_init,
-               .mdio_active = io_bb_mdio_active,
-               .mdio_tristate = io_bb_mdio_tristate,
-               .set_mdio = io_bb_set_mdio,
-               .get_mdio = io_bb_get_mdio,
-               .set_mdc = io_bb_set_mdc,
-               .delay = io_bb_delay,
-               .priv = &io_bb_pinsets[1],
-       },
-#endif
-};
-
-int bb_miiphy_buses_num = sizeof(bb_miiphy_buses) /
-                         sizeof(bb_miiphy_buses[0]);

diff --git a/include/gdsys_fpga.h b/include/gdsys_fpga.h
index e9fb4b88b5eaa2c0d6b7bb21b0a55a7ef66706c0..eae670126229698365598c8f339b9e559198f145 100644 (file)
--- a/include/gdsys_fpga.h
+++ b/include/gdsys_fpga.h
@@ -86,81 +86,6 @@ struct ihs_fpga {
 };
 #endif
 
-#ifdef CONFIG_IO
-struct ihs_fpga {
-       u16 reflection_low;     /* 0x0000 */
-       u16 versions;           /* 0x0002 */
-       u16 fpga_features;      /* 0x0004 */
-       u16 fpga_version;       /* 0x0006 */
-       u16 reserved_0[5];      /* 0x0008 */
-       u16 quad_serdes_reset;  /* 0x0012 */
-       u16 reserved_1[8181];   /* 0x0014 */
-       u16 reflection_high;    /* 0x3ffe */
-};
-#endif
-
-#ifdef CONFIG_IO64
-struct ihs_fpga_channel {
-       u16 status_int;
-       u16 config_int;
-       u16 switch_connect_config;
-       u16 tx_destination;
-};
-
-struct ihs_fpga_hicb {
-       u16 status_int;
-       u16 config_int;
-};
-
-struct ihs_fpga {
-       u16 reflection_low;     /* 0x0000 */
-       u16 versions;           /* 0x0002 */
-       u16 fpga_features;      /* 0x0004 */
-       u16 fpga_version;       /* 0x0006 */
-       u16 reserved_0[5];      /* 0x0008 */
-       u16 quad_serdes_reset;  /* 0x0012 */
-       u16 reserved_1[502];    /* 0x0014 */
-       struct ihs_fpga_channel ch[32];         /* 0x0400 */
-       struct ihs_fpga_channel hicb_ch[32];    /* 0x0500 */
-       u16 reserved_2[7487];   /* 0x0580 */
-       u16 reflection_high;    /* 0x3ffe */
-};
-#endif
-
-#ifdef CONFIG_IOCON
-struct ihs_fpga {
-       u16 reflection_low;     /* 0x0000 */
-       u16 versions;           /* 0x0002 */
-       u16 fpga_version;       /* 0x0004 */
-       u16 fpga_features;      /* 0x0006 */
-       u16 reserved_0[1];      /* 0x0008 */
-       u16 top_interrupt;      /* 0x000a */
-       u16 reserved_1[4];      /* 0x000c */
-       struct ihs_gpio gpio;   /* 0x0014 */
-       u16 mpc3w_control;      /* 0x001a */
-       u16 reserved_2[2];      /* 0x001c */
-       struct ihs_io_ep ep;    /* 0x0020 */
-       u16 reserved_3[9];      /* 0x002e */
-       struct ihs_i2c i2c0;    /* 0x0040 */
-       u16 reserved_4[10];     /* 0x004c */
-       u16 mc_int;             /* 0x0060 */
-       u16 mc_int_en;          /* 0x0062 */
-       u16 mc_status;          /* 0x0064 */
-       u16 mc_control;         /* 0x0066 */
-       u16 mc_tx_data;         /* 0x0068 */
-       u16 mc_tx_address;      /* 0x006a */
-       u16 mc_tx_cmd;          /* 0x006c */
-       u16 mc_res;             /* 0x006e */
-       u16 mc_rx_cmd_status;   /* 0x0070 */
-       u16 mc_rx_data;         /* 0x0072 */
-       u16 reserved_5[69];     /* 0x0074 */
-       u16 reflection_high;    /* 0x00fe */
-       struct ihs_osd osd0;    /* 0x0100 */
-       u16 reserved_6[889];    /* 0x010e */
-       u16 videomem0[2048];    /* 0x0800 */
-};
-#endif
-
 #if defined(CONFIG_TARGET_HRCON) || defined(CONFIG_STRIDER_CON_DP)
 struct ihs_fpga {
        u16 reflection_low;     /* 0x0000 */
@@ -270,25 +195,4 @@ struct ihs_fpga {
 };
 #endif
 
-#ifdef CONFIG_DLVISION_10G
-struct ihs_fpga {
-       u16 reflection_low;     /* 0x0000 */
-       u16 versions;           /* 0x0002 */
-       u16 fpga_version;       /* 0x0004 */
-       u16 fpga_features;      /* 0x0006 */
-       u16 reserved_0[10];     /* 0x0008 */
-       u16 extended_interrupt; /* 0x001c */
-       u16 reserved_1[29];     /* 0x001e */
-       u16 mpc3w_control;      /* 0x0058 */
-       u16 reserved_2[3];      /* 0x005a */
-       struct ihs_i2c i2c0;    /* 0x0060 */
-       u16 reserved_3[2];      /* 0x006c */
-       struct ihs_i2c i2c1;    /* 0x0070 */
-       u16 reserved_4[194];    /* 0x007c */
-       struct ihs_osd osd0;    /* 0x0200 */
-       u16 reserved_5[761];    /* 0x020e */
-       u16 videomem0[2048];    /* 0x0800 */
-};
-#endif
-
 #endif