On 4/9/19 8:52 PM, Simon Goldschmidt wrote: > Remove outdated defines (not used any more, outdated due to DM > conversion) from various socfpga files in include/config. > > Signed-off-by: Simon Goldschmidt <[email protected]> > --- > > Changes in v2: > - added (this) patch with further cleanups to the socfpga board config > files > > include/configs/socfpga_arria10_socdk.h | 6 ------ > include/configs/socfpga_arria5_socdk.h | 2 -- > include/configs/socfpga_cyclone5_socdk.h | 2 -- > include/configs/socfpga_de0_nano_soc.h | 2 -- > include/configs/socfpga_de10_nano.h | 2 -- > include/configs/socfpga_de1_soc.h | 2 -- > include/configs/socfpga_is1.h | 2 -- > include/configs/socfpga_sockit.h | 2 -- > include/configs/socfpga_socrates.h | 2 -- > include/configs/socfpga_sr1500.h | 11 ----------- > include/configs/socfpga_vining_fpga.h | 9 --------- > 11 files changed, 42 deletions(-) > > diff --git a/include/configs/socfpga_arria10_socdk.h > b/include/configs/socfpga_arria10_socdk.h > index 0f116fbf2d..92630c5e6e 100644 > --- a/include/configs/socfpga_arria10_socdk.h > +++ b/include/configs/socfpga_arria10_socdk.h > @@ -19,12 +19,6 @@ > /* Memory configurations */ > #define PHYS_SDRAM_1_SIZE 0x40000000 > > -/* Ethernet on SoC (EMAC) */ > - > -/* > - * U-Boot environment configurations > - */ > - > /* > * Serial / UART configurations > */ > diff --git a/include/configs/socfpga_arria5_socdk.h > b/include/configs/socfpga_arria5_socdk.h > index 24fcdd8b5a..af6137aeb1 100644 > --- a/include/configs/socfpga_arria5_socdk.h > +++ b/include/configs/socfpga_arria5_socdk.h > @@ -14,8 +14,6 @@ > #define CONFIG_LOADADDR 0x01000000 > #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR > > -/* Ethernet on SoC (EMAC) */ > - > /* The rest of the configuration is shared */ > #include <configs/socfpga_common.h> > > diff --git a/include/configs/socfpga_cyclone5_socdk.h > b/include/configs/socfpga_cyclone5_socdk.h > index 18da8496ef..028db2a09e 100644 > --- a/include/configs/socfpga_cyclone5_socdk.h > +++ b/include/configs/socfpga_cyclone5_socdk.h > @@ -14,8 +14,6 @@ > #define CONFIG_LOADADDR 0x01000000 > #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR > > -/* Ethernet on SoC (EMAC) */ > - > /* The rest of the configuration is shared */ > #include <configs/socfpga_common.h> > > diff --git a/include/configs/socfpga_de0_nano_soc.h > b/include/configs/socfpga_de0_nano_soc.h > index d3224d5bd3..21108e3447 100644 > --- a/include/configs/socfpga_de0_nano_soc.h > +++ b/include/configs/socfpga_de0_nano_soc.h > @@ -14,8 +14,6 @@ > #define CONFIG_LOADADDR 0x01000000 > #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR > > -/* Ethernet on SoC (EMAC) */ > - > /* The rest of the configuration is shared */ > #include <configs/socfpga_common.h> > > diff --git a/include/configs/socfpga_de10_nano.h > b/include/configs/socfpga_de10_nano.h > index 2fcabff8af..d85f98fbd4 100644 > --- a/include/configs/socfpga_de10_nano.h > +++ b/include/configs/socfpga_de10_nano.h > @@ -14,8 +14,6 @@ > #define CONFIG_LOADADDR 0x01000000 > #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR > > -/* Ethernet on SoC (EMAC) */ > - > /* The rest of the configuration is shared */ > #include <configs/socfpga_common.h> > > diff --git a/include/configs/socfpga_de1_soc.h > b/include/configs/socfpga_de1_soc.h > index f37099c58f..9919d292dc 100644 > --- a/include/configs/socfpga_de1_soc.h > +++ b/include/configs/socfpga_de1_soc.h > @@ -14,8 +14,6 @@ > #define CONFIG_LOADADDR 0x01000000 > #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR > > -/* Ethernet on SoC (EMAC) */ > - > /* The rest of the configuration is shared */ > #include <configs/socfpga_common.h> > > diff --git a/include/configs/socfpga_is1.h b/include/configs/socfpga_is1.h > index c233c208a5..c4da5947f3 100644 > --- a/include/configs/socfpga_is1.h > +++ b/include/configs/socfpga_is1.h > @@ -19,8 +19,6 @@ > /* Ethernet on SoC (EMAC) */ > #if defined(CONFIG_CMD_NET) > #define CONFIG_ARP_TIMEOUT 500UL > - > -/* PHY */ > #endif > > /* The rest of the configuration is shared */ > diff --git a/include/configs/socfpga_sockit.h > b/include/configs/socfpga_sockit.h > index 3a7f354914..972999949a 100644 > --- a/include/configs/socfpga_sockit.h > +++ b/include/configs/socfpga_sockit.h > @@ -14,8 +14,6 @@ > #define CONFIG_LOADADDR 0x01000000 > #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR > > -/* Ethernet on SoC (EMAC) */ > - > /* The rest of the configuration is shared */ > #include <configs/socfpga_common.h> > > diff --git a/include/configs/socfpga_socrates.h > b/include/configs/socfpga_socrates.h > index f0d9347891..7faea150a9 100644 > --- a/include/configs/socfpga_socrates.h > +++ b/include/configs/socfpga_socrates.h > @@ -14,8 +14,6 @@ > #define CONFIG_LOADADDR 0x01000000 > #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR > > -/* Ethernet on SoC (EMAC) */ > - > /* The rest of the configuration is shared */ > #include <configs/socfpga_common.h> > > diff --git a/include/configs/socfpga_sr1500.h > b/include/configs/socfpga_sr1500.h > index b6a98611c0..3a8ccc3021 100644 > --- a/include/configs/socfpga_sr1500.h > +++ b/include/configs/socfpga_sr1500.h > @@ -19,8 +19,6 @@ > /* The PHY is autodetected, so no MII PHY address is needed here */ > #define PHY_ANEG_TIMEOUT 8000 > > -/* Environment */ > - > /* Enable SPI NOR flash reset, needed for SPI booting */ > #define CONFIG_SPI_N25Q256A_RESET > > @@ -36,15 +34,6 @@ > #define CONFIG_ENV_OFFSET 0x000e0000 > #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE) > > -/* > - * The QSPI NOR flash layout on SR1500: > - * > - * 0000.0000 - 0003.ffff: SPL (4 times) > - * 0004.0000 - 000d.ffff: U-Boot > - * 000e.0000 - 000e.ffff: env1 > - * 000f.0000 - 000f.ffff: env2 > - */ > - > /* The rest of the configuration is shared */ > #include <configs/socfpga_common.h> > > diff --git a/include/configs/socfpga_vining_fpga.h > b/include/configs/socfpga_vining_fpga.h > index 0e547a1295..29a92b9146 100644 > --- a/include/configs/socfpga_vining_fpga.h > +++ b/include/configs/socfpga_vining_fpga.h > @@ -16,18 +16,9 @@ > #define CONFIG_LOADADDR 0x01000000 > #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR > > -/* > - * Status LEDs: > - * 0 ... Top Green > - * 1 ... Top Red > - * 2 ... Bottom Green > - * 3 ... Bottom Red > - */ > - > /* Ethernet on SoC (EMAC) */ > #if defined(CONFIG_CMD_NET) > #define CONFIG_BOOTP_SEND_HOSTNAME > -/* PHY */ > #endif > > /* Extra Environment */ >
Acked-by: Marek Vasut <[email protected]> -- Best regards, Marek Vasut _______________________________________________ U-Boot mailing list [email protected] https://lists.denx.de/listinfo/u-boot
