Hi Tom, I'm still actively supporting this board, and will do the rebase and DM conversion.
I'm not sure about the process from here. Will I need to submit the patches like for a new board again? Thanks, Tony Dinh On Sat, May 22, 2021 at 5:48 AM Tom Rini <tr...@konsulko.com> wrote: > These boards have not been converted to CONFIG_DM_USB by the deadline > and is also missing conversion to CONFIG_DM. Remove it > > Cc: Gerald Kerma <drea...@doukki.net> > Cc: Tony Dinh <mibo...@gmail.com> > Cc: Luka Perkov <luka.per...@sartura.hr> > Signed-off-by: Tom Rini <tr...@konsulko.com> > --- > arch/arm/mach-kirkwood/Kconfig | 4 - > board/zyxel/nsa310s/Kconfig | 18 ----- > board/zyxel/nsa310s/MAINTAINERS | 8 -- > board/zyxel/nsa310s/Makefile | 7 -- > board/zyxel/nsa310s/kwbimage.cfg | 41 ---------- > board/zyxel/nsa310s/nsa310s.c | 135 ------------------------------- > board/zyxel/nsa310s/nsa310s.h | 46 ----------- > configs/nsa310s_defconfig | 46 ----------- > include/configs/nsa310s.h | 59 -------------- > 9 files changed, 364 deletions(-) > delete mode 100644 board/zyxel/nsa310s/Kconfig > delete mode 100644 board/zyxel/nsa310s/MAINTAINERS > delete mode 100644 board/zyxel/nsa310s/Makefile > delete mode 100644 board/zyxel/nsa310s/kwbimage.cfg > delete mode 100644 board/zyxel/nsa310s/nsa310s.c > delete mode 100644 board/zyxel/nsa310s/nsa310s.h > delete mode 100644 configs/nsa310s_defconfig > delete mode 100644 include/configs/nsa310s.h > > diff --git a/arch/arm/mach-kirkwood/Kconfig > b/arch/arm/mach-kirkwood/Kconfig > index cb4e9f29ef6d..8e343a5dd4ad 100644 > --- a/arch/arm/mach-kirkwood/Kconfig > +++ b/arch/arm/mach-kirkwood/Kconfig > @@ -53,9 +53,6 @@ config TARGET_GOFLEXHOME > config TARGET_NAS220 > bool "BlackArmor NAS220" > > -config TARGET_NSA310S > - bool "Zyxel NSA310S" > - > config TARGET_SBx81LIFKW > bool "Allied Telesis SBx81GS24/SBx81GT40/SBx81XS6/SBx81XS16" > > @@ -83,7 +80,6 @@ source "board/raidsonic/ib62x0/Kconfig" > source "board/Seagate/dockstar/Kconfig" > source "board/Seagate/goflexhome/Kconfig" > source "board/Seagate/nas220/Kconfig" > -source "board/zyxel/nsa310s/Kconfig" > source "board/alliedtelesis/SBx81LIFKW/Kconfig" > source "board/alliedtelesis/SBx81LIFXCAT/Kconfig" > > diff --git a/board/zyxel/nsa310s/Kconfig b/board/zyxel/nsa310s/Kconfig > deleted file mode 100644 > index 801d6966eac2..000000000000 > --- a/board/zyxel/nsa310s/Kconfig > +++ /dev/null > @@ -1,18 +0,0 @@ > -# SPDX-License-Identifier: GPL-2.0+ > -# > -# Copyright (C) 2015 > -# Gerald Kerma <drea...@doukki.net> > -# Tony Dinh <mibo...@gmail.com> > - > -if TARGET_NSA310S > - > -config SYS_BOARD > - default "nsa310s" > - > -config SYS_VENDOR > - default "zyxel" > - > -config SYS_CONFIG_NAME > - default "nsa310s" > - > -endif > diff --git a/board/zyxel/nsa310s/MAINTAINERS > b/board/zyxel/nsa310s/MAINTAINERS > deleted file mode 100644 > index d153758c218c..000000000000 > --- a/board/zyxel/nsa310s/MAINTAINERS > +++ /dev/null > @@ -1,8 +0,0 @@ > -NSA310S BOARD > -M: Gerald Kerma <drea...@doukki.net> > -M: Tony Dinh <mibo...@gmail.com> > -M: Luka Perkov <luka.per...@sartura.hr> > -S: Maintained > -F: board/zyxel/nsa310s/ > -F: include/configs/nsa310s.h > -F: configs/nsa310s_defconfig > diff --git a/board/zyxel/nsa310s/Makefile b/board/zyxel/nsa310s/Makefile > deleted file mode 100644 > index 2131e28db3a7..000000000000 > --- a/board/zyxel/nsa310s/Makefile > +++ /dev/null > @@ -1,7 +0,0 @@ > -# SPDX-License-Identifier: GPL-2.0+ > -# > -# Copyright (C) 2015 > -# Gerald Kerma <drea...@doukki.net> > -# Tony Dinh <mibo...@gmail.com> > - > -obj-y := nsa310s.o > diff --git a/board/zyxel/nsa310s/kwbimage.cfg > b/board/zyxel/nsa310s/kwbimage.cfg > deleted file mode 100644 > index 9ebdeab94d08..000000000000 > --- a/board/zyxel/nsa310s/kwbimage.cfg > +++ /dev/null > @@ -1,41 +0,0 @@ > -# SPDX-License-Identifier: GPL-2.0+ > -# > -# Copyright (C) 2015 > -# Gerald Kerma <drea...@doukki.net> > -# Tony Dinh <mibo...@gmail.com> > -# Refer to doc/README.kwbimage for more details about how-to > -# configure and create kirkwood boot images. > -# > - > -# Boot Media configurations > -BOOT_FROM nand > -NAND_ECC_MODE default > -NAND_PAGE_SIZE 0x0800 > - > -# Configure RGMII-0 interface pad voltage to 1.8V > -DATA 0xFFD100e0 0x1b1b1b9b > - > -DATA 0xFFD01400 0x43010c30 > -DATA 0xFFD01404 0x39543000 > -DATA 0xFFD01408 0x22125451 > -DATA 0xFFD0140C 0x00000833 > -DATA 0xFFD01410 0x0000000C > -DATA 0xFFD01414 0x00000000 > -DATA 0xFFD01418 0x00000000 > -DATA 0xFFD0141C 0x00000652 > -DATA 0xFFD01420 0x00000004 > -DATA 0xFFD01424 0x0000F17F > -DATA 0xFFD01428 0x00085520 > -DATA 0xFFD0147c 0x00008552 > -DATA 0xFFD01504 0x0FFFFFF1 > -DATA 0xFFD01508 0x10000000 > -DATA 0xFFD0150C 0x00000000 > -DATA 0xFFD01514 0x00000000 > -DATA 0xFFD0151C 0x00000000 > -DATA 0xFFD01494 0x00010000 > -DATA 0xFFD01498 0x00000000 > -DATA 0xFFD0149C 0x0000E403 > -DATA 0xFFD01480 0x00000001 > -DATA 0xFFD20134 0x66666666 > -DATA 0xFFD20138 0x66666666 > -DATA 0x0 0x0 > diff --git a/board/zyxel/nsa310s/nsa310s.c b/board/zyxel/nsa310s/nsa310s.c > deleted file mode 100644 > index cd4a7723b120..000000000000 > --- a/board/zyxel/nsa310s/nsa310s.c > +++ /dev/null > @@ -1,135 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0+ > -/* > - * Copyright (C) 2015 > - * Gerald Kerma <drea...@doukki.net> > - * Tony Dinh <mibo...@gmail.com> > - */ > - > -#include <common.h> > -#include <init.h> > -#include <miiphy.h> > -#include <net.h> > -#include <asm/arch/cpu.h> > -#include <asm/arch/soc.h> > -#include <asm/arch/mpp.h> > -#include <asm/global_data.h> > -#include <asm/io.h> > -#include "nsa310s.h" > - > -DECLARE_GLOBAL_DATA_PTR; > - > -int board_early_init_f(void) > -{ > - /* > - * default gpio configuration > - * There are maximum 64 gpios controlled through 2 sets of > registers > - * the below configuration configures mainly initial LED status > - */ > - mvebu_config_gpio(NSA310S_VAL_LOW, NSA310S_VAL_HIGH, > - NSA310S_OE_LOW, NSA310S_OE_HIGH); > - > - /* (all LEDs & power off active high) */ > - /* Multi-Purpose Pins Functionality configuration */ > - static const u32 kwmpp_config[] = { > - MPP0_NF_IO2, > - MPP1_NF_IO3, > - MPP2_NF_IO4, > - MPP3_NF_IO5, > - MPP4_NF_IO6, > - MPP5_NF_IO7, > - MPP6_SYSRST_OUTn, > - MPP7_GPO, > - MPP8_TW_SDA, > - MPP9_TW_SCK, > - MPP10_UART0_TXD, > - MPP11_UART0_RXD, > - MPP12_GPO, > - MPP13_GPIO, > - MPP14_GPIO, > - MPP15_GPIO, > - MPP16_GPIO, > - MPP17_GPIO, > - MPP18_NF_IO0, > - MPP19_NF_IO1, > - MPP20_GPIO, > - MPP21_GPIO, > - MPP22_GPIO, > - MPP23_GPIO, > - MPP24_GPIO, > - MPP25_GPIO, > - MPP26_GPIO, > - MPP27_GPIO, > - MPP28_GPIO, > - MPP29_GPIO, > - MPP30_GPIO, > - MPP31_GPIO, > - MPP32_GPIO, > - MPP33_GPIO, > - MPP34_GPIO, > - MPP35_GPIO, > - 0 > - }; > - kirkwood_mpp_conf(kwmpp_config, NULL); > - return 0; > -} > - > -int board_init(void) > -{ > - /* address of boot parameters */ > - gd->bd->bi_boot_params = mvebu_sdram_bar(0) + 0x100; > - > - return 0; > -} > - > -#ifdef CONFIG_RESET_PHY_R > -void reset_phy(void) > -{ > - u16 reg; > - u16 phyaddr; > - char *name = "egiga0"; > - > - if (miiphy_set_current_dev(name)) > - return; > - > - /* read PHY dev address */ > - if (miiphy_read(name, 0xee, 0xee, (u16 *) &phyaddr)) { > - printf("could not read PHY dev address\n"); > - return; > - } > - > - /* set RGMII delay */ > - miiphy_write(name, phyaddr, MV88E1318_PGADR_REG, > MV88E1318_MAC_CTRL_PG); > - miiphy_read(name, phyaddr, MV88E1318_MAC_CTRL_REG, ®); > - reg |= (MV88E1318_RGMII_RX_CTRL | MV88E1318_RGMII_TX_CTRL); > - miiphy_write(name, phyaddr, MV88E1318_MAC_CTRL_REG, reg); > - miiphy_write(name, phyaddr, MV88E1318_PGADR_REG, 0); > - > - /* reset PHY */ > - if (miiphy_reset(name, phyaddr)) > - return; > - > - /* > - * ZyXEL NSA310S uses the 88E1310S Alaska (interface identical to > 88E1318) > - * and has an MCU attached to the LED[2] via tristate interrupt > - */ > - > - /* switch to LED register page */ > - miiphy_write(name, phyaddr, MV88E1318_PGADR_REG, MV88E1318_LED_PG); > - /* read out LED polarity register */ > - miiphy_read(name, phyaddr, MV88E1318_LED_POL_REG, ®); > - /* clear 4, set 5 - LED2 low, tri-state */ > - reg &= ~(MV88E1318_LED2_4); > - reg |= (MV88E1318_LED2_5); > - /* write back LED polarity register */ > - miiphy_write(name, phyaddr, MV88E1318_LED_POL_REG, reg); > - /* jump back to page 0, per the PHY chip documenation. */ > - miiphy_write(name, phyaddr, MV88E1318_PGADR_REG, 0); > - > - /* set PHY back to auto-negotiation mode */ > - miiphy_write(name, phyaddr, 0x4, 0x1e1); > - miiphy_write(name, phyaddr, 0x9, 0x300); > - /* downshift */ > - miiphy_write(name, phyaddr, 0x10, 0x3860); > - miiphy_write(name, phyaddr, 0x0, 0x9140); > -} > -#endif /* CONFIG_RESET_PHY_R */ > diff --git a/board/zyxel/nsa310s/nsa310s.h b/board/zyxel/nsa310s/nsa310s.h > deleted file mode 100644 > index d8bd9a586fe2..000000000000 > --- a/board/zyxel/nsa310s/nsa310s.h > +++ /dev/null > @@ -1,46 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0+ */ > -/* > - * Copyright (C) 2015 > - * Gerald Kerma <drea...@doukki.net> > - * Tony Dinh <mibo...@gmail.com> > - */ > - > -#ifndef __NSA310S_H > -#define __NSA310S_H > - > -/* low GPIO's */ > -#define HDD1_GREEN_LED (1 << 16) > -#define HDD1_RED_LED (1 << 13) > -#define USB_GREEN_LED (1 << 15) > -#define USB_POWER (1 << 21) > -#define SYS_GREEN_LED (1 << 28) > -#define SYS_ORANGE_LED (1 << 29) > - > -#define COPY_GREEN_LED (1 << 22) > -#define COPY_RED_LED (1 << 23) > - > -#define PIN_USB_GREEN_LED 15 > -#define PIN_USB_POWER 21 > - > -#define NSA310S_OE_LOW (~(0)) > -#define NSA310S_VAL_LOW (SYS_GREEN_LED | USB_POWER) > - > -/* high GPIO's */ > -#define HDD2_GREEN_LED (1 << 2) > -#define HDD2_POWER (1 << 1) > - > -#define NSA310S_OE_HIGH (~(0)) > -#define NSA310S_VAL_HIGH (HDD2_POWER) > - > -/* PHY related */ > -#define MV88E1318_PGADR_REG 22 > -#define MV88E1318_MAC_CTRL_PG 2 > -#define MV88E1318_MAC_CTRL_REG 21 > -#define MV88E1318_RGMII_TX_CTRL (1 << 4) > -#define MV88E1318_RGMII_RX_CTRL (1 << 5) > -#define MV88E1318_LED_PG 3 > -#define MV88E1318_LED_POL_REG 17 > -#define MV88E1318_LED2_4 (1 << 4) > -#define MV88E1318_LED2_5 (1 << 5) > - > -#endif /* __NSA310S_H */ > diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig > deleted file mode 100644 > index e4cf1c470e05..000000000000 > --- a/configs/nsa310s_defconfig > +++ /dev/null > @@ -1,46 +0,0 @@ > -CONFIG_ARM=y > -CONFIG_SYS_DCACHE_OFF=y > -CONFIG_ARCH_CPU_INIT=y > -CONFIG_ARCH_KIRKWOOD=y > -CONFIG_SYS_TEXT_BASE=0x600000 > -CONFIG_NR_DRAM_BANKS=2 > -CONFIG_TARGET_NSA310S=y > -CONFIG_ENV_SIZE=0x20000 > -CONFIG_ENV_OFFSET=0xE0000 > -CONFIG_BOOTDELAY=3 > -CONFIG_USE_PREBOOT=y > -# CONFIG_DISPLAY_BOARDINFO is not set > -CONFIG_HUSH_PARSER=y > -CONFIG_SYS_PROMPT="nsa310s => " > -CONFIG_CMD_BOOTZ=y > -# CONFIG_CMD_FLASH is not set > -CONFIG_CMD_IDE=y > -CONFIG_CMD_NAND=y > -CONFIG_CMD_USB=y > -# CONFIG_CMD_SETEXPR is not set > -CONFIG_CMD_DHCP=y > -CONFIG_CMD_MII=y > -CONFIG_CMD_PING=y > -CONFIG_CMD_EXT2=y > -CONFIG_CMD_FAT=y > -CONFIG_CMD_JFFS2=y > -CONFIG_CMD_MTDPARTS=y > -CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0 > (uboot),0x20000@0xe0000(uboot_env),0x100000@0x100000 > (second_stage_uboot),-@0x200000(root)" > -CONFIG_CMD_UBI=y > -CONFIG_ISO_PARTITION=y > -CONFIG_ENV_OVERWRITE=y > -CONFIG_ENV_IS_IN_NAND=y > -CONFIG_SYS_RELOC_GD_ENV_ADDR=y > -CONFIG_NETCONSOLE=y > -# CONFIG_MMC is not set > -CONFIG_MTD=y > -CONFIG_MTD_RAW_NAND=y > -CONFIG_MVGBE=y > -CONFIG_MII=y > -CONFIG_SYS_NS16550=y > -CONFIG_USB=y > -CONFIG_USB_EHCI_HCD=y > -CONFIG_USB_STORAGE=y > -CONFIG_LZMA=y > -CONFIG_BZIP2=y > -CONFIG_OF_LIBFDT=y > diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h > deleted file mode 100644 > index e38c65a48583..000000000000 > --- a/include/configs/nsa310s.h > +++ /dev/null > @@ -1,59 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0+ */ > -/* > - * Copyright (C) 2015 > - * Gerald Kerma <drea...@doukki.net> > - * Tony Dinh <mibo...@gmail.com> > - * Luka Perkov <luka.per...@sartura.hr> > - */ > - > -#ifndef _CONFIG_NSA310S_H > -#define _CONFIG_NSA310S_H > - > -/* high level configuration options */ > -#define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */ > -#define CONFIG_KW88F6192 1 /* SOC Name */ > -#define CONFIG_KW88F6702 1 /* SOC Name */ > -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ > - > -#include "mv-common.h" > - > -/* environment variables configuration */ > - > -/* default environment variables */ > -#define CONFIG_BOOTCOMMAND \ > - "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \ > - "ubi part root; " \ > - "ubifsmount ubi:rootfs; " \ > - "ubifsload 0x800000 ${kernel}; " \ > - "ubifsload 0x700000 ${fdt}; " \ > - "ubifsumount; " \ > - "fdt addr 0x700000; fdt resize; fdt chosen; " \ > - "bootz 0x800000 - 0x700000" > - > -#define CONFIG_EXTRA_ENV_SETTINGS \ > - "console=console=ttyS0,115200\0" \ > - "mtdids=nand0=orion_nand\0" \ > - "mtdparts="CONFIG_MTDPARTS_DEFAULT \ > - "kernel=/boot/zImage\0" \ > - "fdt=/boot/nsa310s.dtb\0" \ > - "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0" > - > -/* Ethernet driver configuration */ > -#ifdef CONFIG_CMD_NET > -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ > -#define CONFIG_PHY_BASE_ADR 1 > -#define CONFIG_RESET_PHY_R > -#endif /* CONFIG_CMD_NET */ > - > -/* SATA driver configuration */ > -#ifdef CONFIG_IDE > -#define __io > -#define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET > -#endif /* CONFIG_IDE */ > - > -/* RTC driver configuration */ > -#ifdef CONFIG_CMD_DATE > -#define CONFIG_RTC_MV > -#endif /* CONFIG_CMD_DATE */ > - > -#endif /* _CONFIG_NSA310S_H */ > -- > 2.17.1 > >