From patchwork Wed Jun 27 10:47:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 935392 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EYSpEMjY"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41G04H6MHbz9s29 for ; Wed, 27 Jun 2018 20:47:59 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 43DAFC21D8E; Wed, 27 Jun 2018 10:47:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 13859C21C2C; Wed, 27 Jun 2018 10:47:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A2032C21C2C; Wed, 27 Jun 2018 10:47:50 +0000 (UTC) Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by lists.denx.de (Postfix) with ESMTPS id 0A314C21C29 for ; Wed, 27 Jun 2018 10:47:50 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id a22-v6so785174pfo.12 for ; Wed, 27 Jun 2018 03:47:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=0v6ClonWIlYZM5+jozAUckeOz/QXdKy04ila3u/33OU=; b=EYSpEMjY8dihY+vK9pwAVoC2dAWA9Y/+UACE0romuxJYZ7lIZeZXKscitECYorY3HQ +YozVP/dLeq2d4EllZA96WSbnpM813aD+P5pmaq8M5uCR2wcZ+L8po3KQw/XyiuhpySi 34SOCbdRFIyyEJa2prZBn+wnVOAYKHDIx6ziz6hLNHTPDQEvsAaJDQRrApivn1aGFmPP 8MynjTr/PHy5AiyuWifKwJPwQ+aQ+Y4hBM8FrRCrQMDIUTSe2BBEy8Bnoevk5iZ+o2VT 33cNrN5B+Mp5BMv3I55mip/rK7bArbPZti+boN5HYo5CSBttywEVhUdafAoXySV0axF3 2z9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=0v6ClonWIlYZM5+jozAUckeOz/QXdKy04ila3u/33OU=; b=PuCeupHzuIYB5aXve+v57LHBiV3PirQKvqhnbCuwoIDpS47AOT4em9ljQGG36gPCp5 uxeL1LOacE7qTVOZzaaq0xOXVdKS0pJocv25MIbraMQac2nWhhOwL/haThRbuVNdcCag AAtUiU7Ec3Ws/14BUK20drgVSI/OrR3LVVa6pUuZTkDIXysWuTy9uE67ofTHfDKB+s5k lsy+DRqgfKt/gzXjdymyCThz3htp5wEZjgegklFpcKxuQGuu17mc8NGBihUboYLdytm0 lCkCsMTQLZJwZKhE253V3eybGpV8I/3Secy/EYT7D3p3M3osmYD+/cyt+d6EYULxWsyo iMBw== X-Gm-Message-State: APt69E3b7apmTMmn7QRvk906rE0AXmy1XPb5BUleNqS4/FiwuSU3jcfB TQErI3/DQg+dwJnM+arQ+gp9DBP2 X-Google-Smtp-Source: AAOMgpdSk7Lkv+JjtpmAN5rHpdmx3mlfyhsx8ED5dLl8xrqGAy1VKAmicAN+cTZKEUWGbBRzFKiGKg== X-Received: by 2002:a62:e310:: with SMTP id g16-v6mr5339776pfh.25.1530096468111; Wed, 27 Jun 2018 03:47:48 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id y15-v6sm5990661pfm.136.2018.06.27.03.47.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Jun 2018 03:47:46 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Wed, 27 Jun 2018 22:47:35 +1200 Message-Id: <20180627104736.27232-1-judge.packham@gmail.com> X-Mailer: git-send-email 2.18.0 Cc: Prafulla Wadaskar , Walter Schweizer , Siddarth Gore , Jason Cooper , Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH 1/2] configs: move RTC_MV config from mv-plug-common.h to boards X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" To aid in migrating CONFIG_RTC_MV to Kconfig move the definition of it from mv-plug-common.h to the board config headers that nest it. Signed-off-by: Chris Packham --- include/configs/dreamplug.h | 4 ++++ include/configs/ds109.h | 4 ++++ include/configs/guruplug.h | 4 ++++ include/configs/mv-plug-common.h | 7 ------- include/configs/sheevaplug.h | 4 ++++ 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 1c94bf9fa1bf..742232d2d660 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -27,6 +27,10 @@ */ #include "mv-plug-common.h" +#ifdef CONFIG_CMD_DATE +#define CONFIG_RTC_MV +#endif /* CONFIG_CMD_DATE */ + /* * Environment variables configurations */ diff --git a/include/configs/ds109.h b/include/configs/ds109.h index c06f0058deb5..f8d663714239 100644 --- a/include/configs/ds109.h +++ b/include/configs/ds109.h @@ -30,6 +30,10 @@ */ #include "mv-plug-common.h" +#ifdef CONFIG_CMD_DATE +#define CONFIG_RTC_MV +#endif /* CONFIG_CMD_DATE */ + /* * Environment variables configurations */ diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index 04b7e944a461..27096fbb20f3 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -27,6 +27,10 @@ */ #include "mv-plug-common.h" +#ifdef CONFIG_CMD_DATE +#define CONFIG_RTC_MV +#endif /* CONFIG_CMD_DATE */ + /* * Environment variables configurations */ diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h index 81c07a889a36..f424e2cc6c52 100644 --- a/include/configs/mv-plug-common.h +++ b/include/configs/mv-plug-common.h @@ -22,11 +22,4 @@ */ #include "mv-common.h" -/* - * RTC driver configuration - */ -#ifdef CONFIG_CMD_DATE -#define CONFIG_RTC_MV -#endif /* CONFIG_CMD_DATE */ - #endif /* _CONFIG_MARVELL_PLUG_H */ diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index dc6375841ed8..bf684babebf3 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -31,6 +31,10 @@ */ #include "mv-plug-common.h" +#ifdef CONFIG_CMD_DATE +#define CONFIG_RTC_MV +#endif /* CONFIG_CMD_DATE */ + /* * Environment variables configurations */ From patchwork Wed Jun 27 10:47:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 935393 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bOjWrDqN"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41G0542HK1z9s1B for ; Wed, 27 Jun 2018 20:48:40 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id B3AF5C21DB6; Wed, 27 Jun 2018 10:48:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, KHOP_BIG_TO_CC, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E0CF3C21DD7; Wed, 27 Jun 2018 10:48:13 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2C7FBC21DF9; Wed, 27 Jun 2018 10:48:00 +0000 (UTC) Received: from mail-pg0-f52.google.com (mail-pg0-f52.google.com [74.125.83.52]) by lists.denx.de (Postfix) with ESMTPS id B8E9FC21DD7 for ; Wed, 27 Jun 2018 10:47:55 +0000 (UTC) Received: by mail-pg0-f52.google.com with SMTP id a14-v6so745483pgw.10 for ; Wed, 27 Jun 2018 03:47:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YAl5dbwaeam9x/Li8of+xZ5otjf3qXhGSjwIwd7sm1k=; b=bOjWrDqNsT56iKltc5rBOcHbP+JKoKld2p2Pe05bNRZp5c5GPtUxiK3NcIAkTfdTNZ 3RlqcXZDrkb3JC/XOVNm3cbtUmLIFXEvpQRDUiaYsSm/S6nueHiXP7I4+hnjkH5AkVU4 bJfQmQBlMVG52pyeo7qf7PE+9WjnYq9s1hP5BSgDh3LDloeTw+n0TKs6xwcMK077/7sm PR81iNCKnCzdrtwXKxjTgTb6b5w+niKcu5wdbt3/XLNc3rEupY//JE6kVJqICGmerCN0 tVbhFQRq6bcLGPh2XFDWLGok20+Qo2elWUgXwN+GPrMbJBsUCZl+J0D886gW8SRu9Wzw 9Wqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YAl5dbwaeam9x/Li8of+xZ5otjf3qXhGSjwIwd7sm1k=; b=RGrB5ZxhC0rZXyX/6cYQeApfM7ppFfsyV9XF/75OVEjpgQPF6leRdZKq5I2QL8N22l I6GJXA0P2NVN0BW1ZDQpfewvtjfTsCKb6yy/WlpjXit0W/V7UUrVtklp8ooiJjzJ6OU0 72GI1MkRecrkQSZHG6tAalR56SZKLECwZ8/I2emv5XR0iD6PFMpM0qluRdkSCZ6iyLS7 iMBx61a+jNAihMIVD1EN8Fzkzekef/F+fsF957MNl4+OXGRD0ZosiG8JZgVG0hpbBZmn yjt+juhLVFKggu3U63OIVx5VaD3FNqYK2s1kEiF9CHh1UJn6cEeM6NruVNK53yuLk8wO XOhw== X-Gm-Message-State: APt69E2YvYsA4PlqECq/mrZNHPBe5N0dgGsF49nQM7xa+t+zYRCvc58+ YVh25iIcHHmiAnY1IFoJwejqO68B X-Google-Smtp-Source: ADUXVKIpqNslMBiHbg+hpUUJTvVsv6WaDKQh170yRJgVs7uyBAVToWdXKaTxSm0HomPx7a5tQ1nb1Q== X-Received: by 2002:a63:af49:: with SMTP id s9-v6mr4787962pgo.49.1530096473887; Wed, 27 Jun 2018 03:47:53 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id y15-v6sm5990661pfm.136.2018.06.27.03.47.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Jun 2018 03:47:53 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Wed, 27 Jun 2018 22:47:36 +1200 Message-Id: <20180627104736.27232-2-judge.packham@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180627104736.27232-1-judge.packham@gmail.com> References: <20180627104736.27232-1-judge.packham@gmail.com> Cc: Prafulla Wadaskar , Luka Perkov , Evgeni Dobrev , Suriyan Ramasami , Chris Packham , Siddarth Gore , Jason Cooper , Stefan Roese , Chris Packham , Walter Schweizer Subject: [U-Boot] [PATCH 2/2] configs: kirkwood: Move RTC_MV to DM and Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Now that there is DM support in the RTC_MV driver update board configs to use it. Signed-off-by: Chris Packham --- I haven't removed this from the whitelist because the nsa310s board lacks device-tree support. Once that board is converted the non-DM code can be removed from RTC_MV and the whitelist updated. configs/SBx81LIFKW_defconfig | 2 ++ configs/dns325_defconfig | 5 ++++- configs/dreamplug_defconfig | 5 ++++- configs/ds109_defconfig | 5 ++++- configs/goflexhome_defconfig | 5 ++++- configs/guruplug_defconfig | 5 ++++- configs/nas220_defconfig | 5 ++++- configs/sheevaplug_defconfig | 7 +++++-- include/configs/SBx81LIFKW.h | 5 ----- include/configs/dns325.h | 7 ------- include/configs/dreamplug.h | 4 ---- include/configs/ds109.h | 4 ---- include/configs/goflexhome.h | 7 ------- include/configs/guruplug.h | 4 ---- include/configs/nas220.h | 7 ------- include/configs/sheevaplug.h | 4 ---- 16 files changed, 31 insertions(+), 50 deletions(-) diff --git a/configs/SBx81LIFKW_defconfig b/configs/SBx81LIFKW_defconfig index 348f861a143b..c786120e7fd4 100644 --- a/configs/SBx81LIFKW_defconfig +++ b/configs/SBx81LIFKW_defconfig @@ -35,5 +35,7 @@ CONFIG_MV88E61XX_SWITCH=y CONFIG_MV88E61XX_CPU_PORT=10 CONFIG_MV88E61XX_PHY_PORTS=0x003 CONFIG_MV88E61XX_FIXED_PORTS=0x300 +CONFIG_DM_RTC=y +CONFIG_RTC_MV=y CONFIG_SPI=y CONFIG_KIRKWOOD_SPI=y diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig index f0ed20992887..d77f7766ee92 100644 --- a/configs/dns325_defconfig +++ b/configs/dns325_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_DNS325=y CONFIG_IDENT_STRING="\nD-Link DNS-325" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dns325" +# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_CONSOLE_MUX=y # CONFIG_DISPLAY_BOARDINFO is not set @@ -16,7 +17,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_JFFS2=y @@ -26,10 +26,13 @@ CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_DM=y CONFIG_MVSATA_IDE=y # CONFIG_MMC is not set CONFIG_NETDEVICES=y CONFIG_MVGBE=y +CONFIG_DM_RTC=y +CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig index 8090c9a37793..d7428ae9cd9e 100644 --- a/configs/dreamplug_defconfig +++ b/configs/dreamplug_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_DREAMPLUG=y CONFIG_IDENT_STRING="\nMarvell-DreamPlug" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dreamplug" +# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y @@ -15,19 +16,21 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_DM=y CONFIG_MVSATA_IDE=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_NETDEVICES=y CONFIG_MVGBE=y +CONFIG_DM_RTC=y +CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_KIRKWOOD_SPI=y diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig index c9207433b374..5c107eb2a822 100644 --- a/configs/ds109_defconfig +++ b/configs/ds109_defconfig @@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_DS109=y CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ds109" +# CONFIG_SYS_MALLOC_F is not set CONFIG_HUSH_PARSER=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_IDE=y @@ -12,11 +13,11 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y -CONFIG_CMD_DATE=y CONFIG_CMD_FAT=y CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_DM=y CONFIG_MVSATA_IDE=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y @@ -24,6 +25,8 @@ CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_NETDEVICES=y CONFIG_MVGBE=y +CONFIG_DM_RTC=y +CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_KIRKWOOD_SPI=y diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig index c0894c05ea4b..41d896a72504 100644 --- a/configs/goflexhome_defconfig +++ b/configs/goflexhome_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_GOFLEXHOME=y CONFIG_IDENT_STRING="\nSeagate GoFlex Home" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-goflexnet" +# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_CONSOLE_MUX=y # CONFIG_DISPLAY_BOARDINFO is not set @@ -16,7 +17,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y @@ -27,10 +27,13 @@ CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_DM=y CONFIG_MVSATA_IDE=y # CONFIG_MMC is not set CONFIG_NETDEVICES=y CONFIG_MVGBE=y +CONFIG_DM_RTC=y +CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig index da3895d4db9a..d77922e2a7d9 100644 --- a/configs/guruplug_defconfig +++ b/configs/guruplug_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_GURUPLUG=y CONFIG_IDENT_STRING="\nMarvell-GuruPlug" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-guruplug-server-plus" +# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y @@ -16,7 +17,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y @@ -27,10 +27,13 @@ CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_DM=y CONFIG_MVSATA_IDE=y # CONFIG_MMC is not set CONFIG_NETDEVICES=y CONFIG_MVGBE=y +CONFIG_DM_RTC=y +CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig index ddf5689bf474..4ae69fe71aae 100644 --- a/configs/nas220_defconfig +++ b/configs/nas220_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_NAS220=y CONFIG_IDENT_STRING="\nNAS 220" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-blackarmor-nas220" +# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y @@ -16,7 +17,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y @@ -27,10 +27,13 @@ CONFIG_EFI_PARTITION=y # CONFIG_PARTITION_UUIDS is not set CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_DM=y CONFIG_MVSATA_IDE=y # CONFIG_MMC is not set CONFIG_NETDEVICES=y CONFIG_MVGBE=y +CONFIG_DM_RTC=y +CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index d77d198f1867..b965ff442a84 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -1,9 +1,11 @@ CONFIG_ARM=y +CONFIG_SYS_THUMB_BUILD=y CONFIG_KIRKWOOD=y CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_SHEEVAPLUG=y CONFIG_IDENT_STRING="\nMarvell-Sheevaplug" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-sheevaplug" +# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y @@ -17,7 +19,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y @@ -28,12 +29,14 @@ CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_DM=y CONFIG_MVSATA_IDE=y CONFIG_NETDEVICES=y CONFIG_MVGBE=y +CONFIG_DM_RTC=y +CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LZMA=y -CONFIG_SYS_THUMB_BUILD=y diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h index bcc2c201d222..24712662d433 100644 --- a/include/configs/SBx81LIFKW.h +++ b/include/configs/SBx81LIFKW.h @@ -109,11 +109,6 @@ #define CONFIG_ENV_OVERWRITE /* ethaddr can be reprogrammed */ #endif /* CONFIG_CMD_NET */ -/* - * Time settings - */ -#define CONFIG_RTC_MV - #define CONFIG_SYS_LOAD_ADDR 0x1000000 /* default location for tftp and bootm */ #endif /* _CONFIG_SBX81LIFKW_H */ diff --git a/include/configs/dns325.h b/include/configs/dns325.h index dec71038bf21..c00981a8ef3d 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -56,13 +56,6 @@ #define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET #endif -/* - * RTC driver configuration - */ -#ifdef CONFIG_CMD_DATE -#define CONFIG_RTC_MV -#endif - /* * Enable GPI0 support */ diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 742232d2d660..1c94bf9fa1bf 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -27,10 +27,6 @@ */ #include "mv-plug-common.h" -#ifdef CONFIG_CMD_DATE -#define CONFIG_RTC_MV -#endif /* CONFIG_CMD_DATE */ - /* * Environment variables configurations */ diff --git a/include/configs/ds109.h b/include/configs/ds109.h index f8d663714239..c06f0058deb5 100644 --- a/include/configs/ds109.h +++ b/include/configs/ds109.h @@ -30,10 +30,6 @@ */ #include "mv-plug-common.h" -#ifdef CONFIG_CMD_DATE -#define CONFIG_RTC_MV -#endif /* CONFIG_CMD_DATE */ - /* * Environment variables configurations */ diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index 8b05e0a53d71..93ed1237be97 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -96,11 +96,4 @@ #define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET #endif /*CONFIG_MVSATA_IDE*/ -/* - * * RTC driver configuration - * */ -#ifdef CONFIG_CMD_DATE -#define CONFIG_RTC_MV -#endif /* CONFIG_CMD_DATE */ - #endif /* _CONFIG_GOFLEXHOME_H */ diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index 27096fbb20f3..04b7e944a461 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -27,10 +27,6 @@ */ #include "mv-plug-common.h" -#ifdef CONFIG_CMD_DATE -#define CONFIG_RTC_MV -#endif /* CONFIG_CMD_DATE */ - /* * Environment variables configurations */ diff --git a/include/configs/nas220.h b/include/configs/nas220.h index b9449a4a40f9..185d3313e280 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -109,13 +109,6 @@ * EFI partition */ -/* - * Date Time - */ -#ifdef CONFIG_CMD_DATE -#define CONFIG_RTC_MV -#endif /* CONFIG_CMD_DATE */ - #define CONFIG_KIRKWOOD_GPIO #endif /* _CONFIG_NAS220_H */ diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index bf684babebf3..dc6375841ed8 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -31,10 +31,6 @@ */ #include "mv-plug-common.h" -#ifdef CONFIG_CMD_DATE -#define CONFIG_RTC_MV -#endif /* CONFIG_CMD_DATE */ - /* * Environment variables configurations */