configs: kirkwood: Move RTC_MV to DM and Kconfig

Now that there is DM support in the RTC_MV driver update board configs
to use it.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Stefan Roese <sr@denx.de>
lime2-spi
Chris Packham 6 years ago committed by Stefan Roese
parent 70222a6beb
commit b8ce90a8df
  1. 2
      configs/SBx81LIFKW_defconfig
  2. 5
      configs/dns325_defconfig
  3. 5
      configs/dreamplug_defconfig
  4. 5
      configs/ds109_defconfig
  5. 5
      configs/goflexhome_defconfig
  6. 5
      configs/guruplug_defconfig
  7. 5
      configs/nas220_defconfig
  8. 5
      configs/sheevaplug_defconfig
  9. 5
      include/configs/SBx81LIFKW.h
  10. 7
      include/configs/dns325.h
  11. 4
      include/configs/dreamplug.h
  12. 4
      include/configs/ds109.h
  13. 7
      include/configs/goflexhome.h
  14. 4
      include/configs/guruplug.h
  15. 7
      include/configs/nas220.h
  16. 4
      include/configs/sheevaplug.h

@ -35,5 +35,7 @@ CONFIG_MV88E61XX_SWITCH=y
CONFIG_MV88E61XX_CPU_PORT=10 CONFIG_MV88E61XX_CPU_PORT=10
CONFIG_MV88E61XX_PHY_PORTS=0x003 CONFIG_MV88E61XX_PHY_PORTS=0x003
CONFIG_MV88E61XX_FIXED_PORTS=0x300 CONFIG_MV88E61XX_FIXED_PORTS=0x300
CONFIG_DM_RTC=y
CONFIG_RTC_MV=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_KIRKWOOD_SPI=y CONFIG_KIRKWOOD_SPI=y

@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_DNS325=y CONFIG_TARGET_DNS325=y
CONFIG_IDENT_STRING="\nD-Link DNS-325" CONFIG_IDENT_STRING="\nD-Link DNS-325"
CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dns325" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dns325"
# CONFIG_SYS_MALLOC_F is not set
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_CONSOLE_MUX=y CONFIG_CONSOLE_MUX=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
@ -16,7 +17,6 @@ CONFIG_CMD_USB=y
CONFIG_CMD_DHCP=y CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y CONFIG_CMD_MII=y
CONFIG_CMD_PING=y CONFIG_CMD_PING=y
CONFIG_CMD_DATE=y
CONFIG_CMD_EXT2=y CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y CONFIG_CMD_FAT=y
CONFIG_CMD_JFFS2=y CONFIG_CMD_JFFS2=y
@ -26,10 +26,13 @@ CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y CONFIG_ISO_PARTITION=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_IS_IN_NAND=y
CONFIG_DM=y
CONFIG_MVSATA_IDE=y CONFIG_MVSATA_IDE=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_MVGBE=y CONFIG_MVGBE=y
CONFIG_DM_RTC=y
CONFIG_RTC_MV=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y

@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_DREAMPLUG=y CONFIG_TARGET_DREAMPLUG=y
CONFIG_IDENT_STRING="\nMarvell-DreamPlug" CONFIG_IDENT_STRING="\nMarvell-DreamPlug"
CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dreamplug" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dreamplug"
# CONFIG_SYS_MALLOC_F is not set
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
@ -15,19 +16,21 @@ CONFIG_CMD_USB=y
CONFIG_CMD_DHCP=y CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y CONFIG_CMD_MII=y
CONFIG_CMD_PING=y CONFIG_CMD_PING=y
CONFIG_CMD_DATE=y
CONFIG_CMD_EXT2=y CONFIG_CMD_EXT2=y
CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4=y
CONFIG_CMD_FAT=y CONFIG_CMD_FAT=y
CONFIG_ISO_PARTITION=y CONFIG_ISO_PARTITION=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_DM=y
CONFIG_MVSATA_IDE=y CONFIG_MVSATA_IDE=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_MVGBE=y CONFIG_MVGBE=y
CONFIG_DM_RTC=y
CONFIG_RTC_MV=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_KIRKWOOD_SPI=y CONFIG_KIRKWOOD_SPI=y

@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_DS109=y CONFIG_TARGET_DS109=y
CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ds109" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ds109"
# CONFIG_SYS_MALLOC_F is not set
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
CONFIG_CMD_IDE=y CONFIG_CMD_IDE=y
@ -12,11 +13,11 @@ CONFIG_CMD_USB=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_DHCP=y CONFIG_CMD_DHCP=y
CONFIG_CMD_PING=y CONFIG_CMD_PING=y
CONFIG_CMD_DATE=y
CONFIG_CMD_FAT=y CONFIG_CMD_FAT=y
CONFIG_ISO_PARTITION=y CONFIG_ISO_PARTITION=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_DM=y
CONFIG_MVSATA_IDE=y CONFIG_MVSATA_IDE=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y
CONFIG_SYS_I2C_MVTWSI=y CONFIG_SYS_I2C_MVTWSI=y
@ -26,6 +27,8 @@ CONFIG_SPI_FLASH_BAR=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_MVGBE=y CONFIG_MVGBE=y
CONFIG_DM_RTC=y
CONFIG_RTC_MV=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_KIRKWOOD_SPI=y CONFIG_KIRKWOOD_SPI=y

@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_GOFLEXHOME=y CONFIG_TARGET_GOFLEXHOME=y
CONFIG_IDENT_STRING="\nSeagate GoFlex Home" CONFIG_IDENT_STRING="\nSeagate GoFlex Home"
CONFIG_DEFAULT_DEVICE_TREE="kirkwood-goflexnet" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-goflexnet"
# CONFIG_SYS_MALLOC_F is not set
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_CONSOLE_MUX=y CONFIG_CONSOLE_MUX=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
@ -16,7 +17,6 @@ CONFIG_CMD_USB=y
CONFIG_CMD_DHCP=y CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y CONFIG_CMD_MII=y
CONFIG_CMD_PING=y CONFIG_CMD_PING=y
CONFIG_CMD_DATE=y
CONFIG_CMD_EXT2=y CONFIG_CMD_EXT2=y
CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4=y
CONFIG_CMD_FAT=y CONFIG_CMD_FAT=y
@ -27,10 +27,13 @@ CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y CONFIG_ISO_PARTITION=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_IS_IN_NAND=y
CONFIG_DM=y
CONFIG_MVSATA_IDE=y CONFIG_MVSATA_IDE=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_MVGBE=y CONFIG_MVGBE=y
CONFIG_DM_RTC=y
CONFIG_RTC_MV=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y

@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_GURUPLUG=y CONFIG_TARGET_GURUPLUG=y
CONFIG_IDENT_STRING="\nMarvell-GuruPlug" CONFIG_IDENT_STRING="\nMarvell-GuruPlug"
CONFIG_DEFAULT_DEVICE_TREE="kirkwood-guruplug-server-plus" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-guruplug-server-plus"
# CONFIG_SYS_MALLOC_F is not set
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
@ -16,7 +17,6 @@ CONFIG_CMD_USB=y
CONFIG_CMD_DHCP=y CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y CONFIG_CMD_MII=y
CONFIG_CMD_PING=y CONFIG_CMD_PING=y
CONFIG_CMD_DATE=y
CONFIG_CMD_EXT2=y CONFIG_CMD_EXT2=y
CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4=y
CONFIG_CMD_FAT=y CONFIG_CMD_FAT=y
@ -27,10 +27,13 @@ CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y CONFIG_ISO_PARTITION=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_IS_IN_NAND=y
CONFIG_DM=y
CONFIG_MVSATA_IDE=y CONFIG_MVSATA_IDE=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_MVGBE=y CONFIG_MVGBE=y
CONFIG_DM_RTC=y
CONFIG_RTC_MV=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y

@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_NAS220=y CONFIG_TARGET_NAS220=y
CONFIG_IDENT_STRING="\nNAS 220" CONFIG_IDENT_STRING="\nNAS 220"
CONFIG_DEFAULT_DEVICE_TREE="kirkwood-blackarmor-nas220" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-blackarmor-nas220"
# CONFIG_SYS_MALLOC_F is not set
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
@ -16,7 +17,6 @@ CONFIG_CMD_USB=y
CONFIG_CMD_DHCP=y CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y CONFIG_CMD_MII=y
CONFIG_CMD_PING=y CONFIG_CMD_PING=y
CONFIG_CMD_DATE=y
CONFIG_CMD_EXT2=y CONFIG_CMD_EXT2=y
CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4=y
CONFIG_CMD_FAT=y CONFIG_CMD_FAT=y
@ -27,10 +27,13 @@ CONFIG_EFI_PARTITION=y
# CONFIG_PARTITION_UUIDS is not set # CONFIG_PARTITION_UUIDS is not set
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_IS_IN_NAND=y
CONFIG_DM=y
CONFIG_MVSATA_IDE=y CONFIG_MVSATA_IDE=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_MVGBE=y CONFIG_MVGBE=y
CONFIG_DM_RTC=y
CONFIG_RTC_MV=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y

@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_SHEEVAPLUG=y CONFIG_TARGET_SHEEVAPLUG=y
CONFIG_IDENT_STRING="\nMarvell-Sheevaplug" CONFIG_IDENT_STRING="\nMarvell-Sheevaplug"
CONFIG_DEFAULT_DEVICE_TREE="kirkwood-sheevaplug" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-sheevaplug"
# CONFIG_SYS_MALLOC_F is not set
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
@ -18,7 +19,6 @@ CONFIG_CMD_USB=y
CONFIG_CMD_DHCP=y CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y CONFIG_CMD_MII=y
CONFIG_CMD_PING=y CONFIG_CMD_PING=y
CONFIG_CMD_DATE=y
CONFIG_CMD_EXT2=y CONFIG_CMD_EXT2=y
CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4=y
CONFIG_CMD_FAT=y CONFIG_CMD_FAT=y
@ -29,9 +29,12 @@ CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y CONFIG_ISO_PARTITION=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_IS_IN_NAND=y
CONFIG_DM=y
CONFIG_MVSATA_IDE=y CONFIG_MVSATA_IDE=y
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_MVGBE=y CONFIG_MVGBE=y
CONFIG_DM_RTC=y
CONFIG_RTC_MV=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y

@ -109,11 +109,6 @@
#define CONFIG_ENV_OVERWRITE /* ethaddr can be reprogrammed */ #define CONFIG_ENV_OVERWRITE /* ethaddr can be reprogrammed */
#endif /* CONFIG_CMD_NET */ #endif /* CONFIG_CMD_NET */
/*
* Time settings
*/
#define CONFIG_RTC_MV
#define CONFIG_SYS_LOAD_ADDR 0x1000000 /* default location for tftp and bootm */ #define CONFIG_SYS_LOAD_ADDR 0x1000000 /* default location for tftp and bootm */
#endif /* _CONFIG_SBX81LIFKW_H */ #endif /* _CONFIG_SBX81LIFKW_H */

@ -55,13 +55,6 @@
#endif #endif
/* /*
* RTC driver configuration
*/
#ifdef CONFIG_CMD_DATE
#define CONFIG_RTC_MV
#endif
/*
* Enable GPI0 support * Enable GPI0 support
*/ */
#define CONFIG_KIRKWOOD_GPIO #define CONFIG_KIRKWOOD_GPIO

@ -27,10 +27,6 @@
*/ */
#include "mv-plug-common.h" #include "mv-plug-common.h"
#ifdef CONFIG_CMD_DATE
#define CONFIG_RTC_MV
#endif /* CONFIG_CMD_DATE */
/* /*
* Environment variables configurations * Environment variables configurations
*/ */

@ -30,10 +30,6 @@
*/ */
#include "mv-plug-common.h" #include "mv-plug-common.h"
#ifdef CONFIG_CMD_DATE
#define CONFIG_RTC_MV
#endif /* CONFIG_CMD_DATE */
/* /*
* Environment variables configurations * Environment variables configurations
*/ */

@ -93,11 +93,4 @@
#define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET #define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET
#endif /*CONFIG_MVSATA_IDE*/ #endif /*CONFIG_MVSATA_IDE*/
/*
* * RTC driver configuration
* */
#ifdef CONFIG_CMD_DATE
#define CONFIG_RTC_MV
#endif /* CONFIG_CMD_DATE */
#endif /* _CONFIG_GOFLEXHOME_H */ #endif /* _CONFIG_GOFLEXHOME_H */

@ -25,10 +25,6 @@
*/ */
#include "mv-plug-common.h" #include "mv-plug-common.h"
#ifdef CONFIG_CMD_DATE
#define CONFIG_RTC_MV
#endif /* CONFIG_CMD_DATE */
/* /*
* Environment variables configurations * Environment variables configurations
*/ */

@ -107,13 +107,6 @@
* EFI partition * EFI partition
*/ */
/*
* Date Time
*/
#ifdef CONFIG_CMD_DATE
#define CONFIG_RTC_MV
#endif /* CONFIG_CMD_DATE */
#define CONFIG_KIRKWOOD_GPIO #define CONFIG_KIRKWOOD_GPIO
#endif /* _CONFIG_NAS220_H */ #endif /* _CONFIG_NAS220_H */

@ -29,10 +29,6 @@
*/ */
#include "mv-plug-common.h" #include "mv-plug-common.h"
#ifdef CONFIG_CMD_DATE
#define CONFIG_RTC_MV
#endif /* CONFIG_CMD_DATE */
/* /*
* Environment variables configurations * Environment variables configurations
*/ */

Loading…
Cancel
Save