net: Move e1000 driver to driver model and Kconfig

We cannot currently include any header files in the C files since common.h needs to be included first, and it is in the header file. Move it.

Signed-off-by Simon Glass <[email protected]>

Reviewed-by Bin Meng <[email protected]>

---

Since struct eth_device does not exist with CONFIG_DM_ETH defined, avoid using it in the driver unless necessary. Most of the time it is better to pass the private driver pointer anyway.

Also refactor the code so that code that the driver model implementation will share are available in functions that can be called. Add stubs where necessary.

Signed-off-by Simon Glass <[email protected]>

Update this driver to support driver model.

Signed-off-by Simon Glass <[email protected]>

---

Changes in v2: None

 drivers/net/e1000.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/net/e1000.h |   4 ++
 2 files changed, 141 insertions(+)

drivers/net/e1000.c +1 -0

index 11bf9ca..25d0b39 100644
@@ -30,6 +30,7 @@ tested on both gig copper and gig fiber boards
  */
 
 #include <common.h>
+#include <dm.h>
 #include <errno.h>
 #include <pci.h>
 #include "e1000.h"

drivers/net/e1000.c +7 -0

+ */
 DEFINE_ALIGN_BUFFER(struct e1000_tx_desc, tx_base, 16, E1000_BUFFER_ALIGN);
 DEFINE_ALIGN_BUFFER(struct e1000_rx_desc, rx_base, 16, E1000_BUFFER_ALIGN);
 DEFINE_ALIGN_BUFFER(unsigned char, packet, 4096, E1000_BUFFER_ALIGN);
 
 static int tx_tail;
 static int rx_tail, rx_last;
+#ifdef CONFIG_DM_ETH
+static int num_cards;  /* Number of E1000 devices seen so far */
+#endif
 
 static struct pci_device_id e1000_supported[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82542) },

@@ -5279,8 +5289,10 @@ void e1000_get_bus_type(struct e1000_hw *hw)
        }
 }
 
+#ifndef CONFIG_DM_ETH
 /* A list of all registered e1000 devices */
 static LIST_HEAD(e1000_hw_list);
+#endif
 
 static int e1000_init_one(struct e1000_hw *hw, int cardnum, pci_dev_t devno,
                          unsigned char enetaddr[6])

@@ -5367,6 +5379,7 @@ static void e1000_name(char *str, int cardnum)
        sprintf(str, "e1000#%u", cardnum);
 }
 
+#ifndef CONFIG_DM_ETH
 /**************************************************************************
 TRANSMIT - Transmit a frame
 ***************************************************************************/

drivers/net/e1000.c +17 -0

 #ifdef CONFIG_CMD_E1000
 static int do_e1000(cmd_tbl_t *cmdtp, int flag,
                int argc, char * const argv[])
 {
        unsigned char *mac = NULL;
+#ifdef CONFIG_DM_ETH
+       struct eth_pdata *plat;
+       struct udevice *dev;
+       char name[30];
+       int ret;
+#else
        struct e1000_hw *hw;
+#endif
+       int cardnum;
 
        if (argc < 3) {
                cmd_usage(cmdtp);

@@ -5494,9 +5516,18 @@ static int do_e1000(cmd_tbl_t *cmdtp, int flag,
 
        /* Make sure we can find the requested e1000 card */
        cardnum = simple_strtoul(argv[1], NULL, 10);
+#ifdef CONFIG_DM_ETH
+       e1000_name(name, cardnum);
+       ret = uclass_get_device_by_name(UCLASS_ETH, name, &dev);
+       if (!ret) {
+               plat = dev_get_platdata(dev);
+               mac = plat->enetaddr;
+       }
+#else
        hw = e1000_find_card(cardnum);
        if (hw)
                mac = hw->nic->enetaddr;
+#endif
        if (!mac) {
                printf("e1000: ERROR: No such device: e1000#%s\n", argv[1]);
                return 1;

drivers/net/e1000.c +59 -0

+
+       return _e1000_init(hw, plat->enetaddr);
+}
+
+static void e1000_eth_stop(struct udevice *dev)
+{
+       struct e1000_hw *hw = dev_get_priv(dev);
+
+       _e1000_disable(hw);
+}
+
+static int e1000_eth_send(struct udevice *dev, void *packet, int length)
+{
+       struct e1000_hw *hw = dev_get_priv(dev);
+       int ret;
+
+       ret = _e1000_transmit(hw, packet, length);
+
+       return ret ? 0 : -ETIMEDOUT;
+}
+
+static int e1000_eth_recv(struct udevice *dev, int flags, uchar **packetp)
+{
+       struct e1000_hw *hw = dev_get_priv(dev);
+       int len;
+
+       len = _e1000_poll(hw);
+       if (len)
+               *packetp = packet;
+
+       return len ? len : -EAGAIN;
+}
+
+static int e1000_free_pkt(struct udevice *dev, uchar *packet, int length)
+{
+       struct e1000_hw *hw = dev_get_priv(dev);
+
+       fill_rx(hw);
+
+       return 0;
+}
+
+static int e1000_eth_probe(struct udevice *dev)
+{
+       struct eth_pdata *plat = dev_get_platdata(dev);
+       struct e1000_hw *hw = dev_get_priv(dev);
+       int ret;
+
+       hw->name = dev->name;
+       ret = e1000_init_one(hw, trailing_strtol(dev->name), pci_get_bdf(dev),
+                            plat->enetaddr);
+       if (ret < 0) {
+               printf(pr_fmt("failed to initialize card: %d\n"), ret);
+               return ret;
+       }
+
+       return 0;
+}
+

drivers/net/e1000.c +31 -0

+       e1000_name(name, num_cards++);
+
+       return device_set_name(dev, name);
+}
+
+static const struct eth_ops e1000_eth_ops = {
+       .start  = e1000_eth_start,
+       .send   = e1000_eth_send,
+       .recv   = e1000_eth_recv,
+       .stop   = e1000_eth_stop,
+       .free_pkt = e1000_free_pkt,
+};
+
+static const struct udevice_id e1000_eth_ids[] = {
+       { .compatible = "realtek,e1000" },
+       { }
+};
+
+U_BOOT_DRIVER(eth_e1000) = {
+       .name   = "eth_e1000",
+       .id     = UCLASS_ETH,
+       .of_match = e1000_eth_ids,
+       .bind   = e1000_eth_bind,
+       .probe  = e1000_eth_probe,
+       .ops    = &e1000_eth_ops,
+       .priv_auto_alloc_size = sizeof(struct e1000_hw),
+       .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+};
+
+U_BOOT_PCI_DEVICE(eth_e1000, e1000_supported);
+#endif

drivers/net/e1000.h +0 -0

index bfacd4e..543459d 100644

drivers/net/e1000.h +2 -1

 #include <asm/io.h>
 #include <pci.h>
 

@@ -1073,7 +1075,9 @@ typedef enum {
 struct e1000_hw {
        const char *name;
        struct list_head list_node;
+#ifndef CONFIG_DM_ETH
        struct eth_device *nic;
+#endif
 #ifdef CONFIG_E1000_SPI
        struct spi_slave spi;
 #endif
--

2.5.0.rc2.392.g76e840b

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Hi Simon,

Quoted 4 lines · Simon Glass

Update this driver to support driver model.

Signed-off-by Simon Glass <[email protected]>

---

Acked-by Joe Hershberger <[email protected]>

...but a few nits below.

Quoted 20 lines

Changes in v2: None

 drivers/net/e1000.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/net/e1000.h |   4 ++
 2 files changed, 141 insertions(+)

drivers/net/e1000.c +1 -0

index 11bf9ca..25d0b39 100644
@@ -30,6 +30,7 @@ tested on both gig copper and gig fiber boards
  */
 
 #include <common.h>
+#include <dm.h>
 #include <errno.h>
 #include <pci.h>
 #include "e1000.h"

drivers/net/e1000.c tested on both gig copper and gig fiber boards · line 54

Quoted 7 lines

drivers/net/e1000.c +4 -0

@@ -47,12 +48,21 @@ tested on both gig copper and gig fiber boards
 /* Intel i210 needs the DMA descriptor rings aligned to 128b */
 #define E1000_BUFFER_ALIGN     128
 
+/*
+ * TODO(sjg at chromium.org): Even with driver model we share these buffers.
+ * Concurrent receiving on multiple active Ethernet devices will not work.
+ * Normally U-Boot does not support this anyway. To fix it in this driver,

It is true that we don't support this right now. Eventually we will, but I'm sure we will have to revisit every driver anyway, so this is fine for now.

drivers/net/e1000.c tested on both gig copper and gig fiber boards · line 55

Quoted 1 line

drivers/net/e1000.c +1 -0

+ * nove these buffers and the tx/rx pointers to struct e1000_hw.

move

Quoted 33 lines

drivers/net/e1000.c +7 -0

+ */
 DEFINE_ALIGN_BUFFER(struct e1000_tx_desc, tx_base, 16, E1000_BUFFER_ALIGN);
 DEFINE_ALIGN_BUFFER(struct e1000_rx_desc, rx_base, 16, E1000_BUFFER_ALIGN);
 DEFINE_ALIGN_BUFFER(unsigned char, packet, 4096, E1000_BUFFER_ALIGN);
 
 static int tx_tail;
 static int rx_tail, rx_last;
+#ifdef CONFIG_DM_ETH
+static int num_cards;  /* Number of E1000 devices seen so far */
+#endif
 
 static struct pci_device_id e1000_supported[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82542) },

@@ -5279,8 +5289,10 @@ void e1000_get_bus_type(struct e1000_hw *hw)
        }
 }
 
+#ifndef CONFIG_DM_ETH
 /* A list of all registered e1000 devices */
 static LIST_HEAD(e1000_hw_list);
+#endif
 
 static int e1000_init_one(struct e1000_hw *hw, int cardnum, pci_dev_t devno,
                          unsigned char enetaddr[6])

@@ -5367,6 +5379,7 @@ static void e1000_name(char *str, int cardnum)
        sprintf(str, "e1000#%u", cardnum);
 }
 
+#ifndef CONFIG_DM_ETH
 /**************************************************************************
 TRANSMIT - Transmit a frame
 ***************************************************************************/

drivers/net/e1000.c struct e1000_hw *e1000_find_card(unsigned int cardnum) · line 5495

Quoted 4 lines

drivers/net/e1000.c +1 -0

@@ -5479,13 +5492,22 @@ struct e1000_hw *e1000_find_card(unsigned int cardnum)
 
        return NULL;
 }
+#endif /* nCONFIG_DM_ETH */

Usually such a comment looks like this instead:

+#endif /* !CONFIG_DM_ETH */

but I don't care that much.

Quoted 42 lines

drivers/net/e1000.c +18 -0

 #ifdef CONFIG_CMD_E1000
 static int do_e1000(cmd_tbl_t *cmdtp, int flag,
                int argc, char * const argv[])
 {
        unsigned char *mac = NULL;
+#ifdef CONFIG_DM_ETH
+       struct eth_pdata *plat;
+       struct udevice *dev;
+       char name[30];
+       int ret;
+#else
        struct e1000_hw *hw;
+#endif
+       int cardnum;
 
        if (argc < 3) {
                cmd_usage(cmdtp);

@@ -5494,9 +5516,18 @@ static int do_e1000(cmd_tbl_t *cmdtp, int flag,
 
        /* Make sure we can find the requested e1000 card */
        cardnum = simple_strtoul(argv[1], NULL, 10);
+#ifdef CONFIG_DM_ETH
+       e1000_name(name, cardnum);
+       ret = uclass_get_device_by_name(UCLASS_ETH, name, &dev);
+       if (!ret) {
+               plat = dev_get_platdata(dev);
+               mac = plat->enetaddr;
+       }
+#else
        hw = e1000_find_card(cardnum);
        if (hw)
                mac = hw->nic->enetaddr;
+#endif
        if (!mac) {
                printf("e1000: ERROR: No such device: e1000#%s\n", argv[1]);
                return 1;

@@ -5531,3 +5562,109 @@ U_BOOT_CMD(
        "       - Manage the Intel E1000 PCI device"
 );
 #endif /* not CONFIG_CMD_E1000 */
+

drivers/net/e1000.c U_BOOT_CMD( · line 5570

Quoted 5 lines

drivers/net/e1000.c +5 -0

+#ifdef CONFIG_DM_ETH
+static int e1000_eth_start(struct udevice *dev)
+{
+       struct eth_pdata *plat = dev_get_platdata(dev);
+       struct e1000_hw *hw = dev_get_priv(dev);

Did you ever decide what to do with these type of accessors to add a little type safety?

Quoted 64 lines

drivers/net/e1000.c +63 -0

+
+       return _e1000_init(hw, plat->enetaddr);
+}
+
+static void e1000_eth_stop(struct udevice *dev)
+{
+       struct e1000_hw *hw = dev_get_priv(dev);
+
+       _e1000_disable(hw);
+}
+
+static int e1000_eth_send(struct udevice *dev, void *packet, int length)
+{
+       struct e1000_hw *hw = dev_get_priv(dev);
+       int ret;
+
+       ret = _e1000_transmit(hw, packet, length);
+
+       return ret ? 0 : -ETIMEDOUT;
+}
+
+static int e1000_eth_recv(struct udevice *dev, int flags, uchar **packetp)
+{
+       struct e1000_hw *hw = dev_get_priv(dev);
+       int len;
+
+       len = _e1000_poll(hw);
+       if (len)
+               *packetp = packet;
+
+       return len ? len : -EAGAIN;
+}
+
+static int e1000_free_pkt(struct udevice *dev, uchar *packet, int length)
+{
+       struct e1000_hw *hw = dev_get_priv(dev);
+
+       fill_rx(hw);
+
+       return 0;
+}
+
+static int e1000_eth_probe(struct udevice *dev)
+{
+       struct eth_pdata *plat = dev_get_platdata(dev);
+       struct e1000_hw *hw = dev_get_priv(dev);
+       int ret;
+
+       hw->name = dev->name;
+       ret = e1000_init_one(hw, trailing_strtol(dev->name), pci_get_bdf(dev),
+                            plat->enetaddr);
+       if (ret < 0) {
+               printf(pr_fmt("failed to initialize card: %d\n"), ret);
+               return ret;
+       }
+
+       return 0;
+}
+
+static int e1000_eth_bind(struct udevice *dev)
+{
+       char name[20];
+

drivers/net/e1000.c U_BOOT_CMD( · line 5639

Quoted 6 lines

drivers/net/e1000.c +6 -0

+       /*
+        * A simple way to number the devices. When device tree is used this
+        * is unnecessary, but when the device is just discovered on the PCI
+        * bus we need a name. We could instead have the uclass figure out
+        * which devices are different and number them.
+        */

I guess it depends if we expect to see this pattern in many drivers.

Quoted 39 lines

drivers/net/e1000.c +31 -0

+       e1000_name(name, num_cards++);
+
+       return device_set_name(dev, name);
+}
+
+static const struct eth_ops e1000_eth_ops = {
+       .start  = e1000_eth_start,
+       .send   = e1000_eth_send,
+       .recv   = e1000_eth_recv,
+       .stop   = e1000_eth_stop,
+       .free_pkt = e1000_free_pkt,
+};
+
+static const struct udevice_id e1000_eth_ids[] = {
+       { .compatible = "realtek,e1000" },
+       { }
+};
+
+U_BOOT_DRIVER(eth_e1000) = {
+       .name   = "eth_e1000",
+       .id     = UCLASS_ETH,
+       .of_match = e1000_eth_ids,
+       .bind   = e1000_eth_bind,
+       .probe  = e1000_eth_probe,
+       .ops    = &e1000_eth_ops,
+       .priv_auto_alloc_size = sizeof(struct e1000_hw),
+       .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+};
+
+U_BOOT_PCI_DEVICE(eth_e1000, e1000_supported);
+#endif

drivers/net/e1000.h +0 -0

index bfacd4e..543459d 100644
@@ -22,7 +22,9 @@
 #include <linux/list.h>
 #include <malloc.h>

drivers/net/e1000.h line 27

Quoted 4 lines

drivers/net/e1000.h +2 -0

 #include <net.h>
+#ifndef CONFIG_DM_ETH
 #include <netdev.h>
+#endif

Is there a need to not include this in the DM case? Or are you just trying to document what should be removed when !DM is purged? Typically I would not #ifdef an include.

Quoted 4 lines

drivers/net/e1000.h +0 -0

 #include <asm/io.h>
 #include <pci.h>
 

Quoted 11 lines

drivers/net/e1000.h +2 -1

@@ -1073,7 +1075,9 @@ typedef enum {
 struct e1000_hw {
        const char *name;
        struct list_head list_node;
+#ifndef CONFIG_DM_ETH
        struct eth_device *nic;
+#endif
 #ifdef CONFIG_E1000_SPI
        struct spi_slave spi;
 #endif
--

Quoted 1 line

2.5.0.rc2.392.g76e840b

Hi Joe,

Quoted 134 lines · Joe Hershberger

Hi Simon,

Quoted 4 lines · Simon Glass

Update this driver to support driver model.

Signed-off-by Simon Glass <[email protected]>

---

Acked-by Joe Hershberger <[email protected]>

...but a few nits below.

Quoted 20 lines

Changes in v2: None

 drivers/net/e1000.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/net/e1000.h |   4 ++
 2 files changed, 141 insertions(+)

drivers/net/e1000.c +1 -0

index 11bf9ca..25d0b39 100644
@@ -30,6 +30,7 @@ tested on both gig copper and gig fiber boards
  */
 
 #include <common.h>
+#include <dm.h>
 #include <errno.h>
 #include <pci.h>
 #include "e1000.h"

drivers/net/e1000.c tested on both gig copper and gig fiber boards · line 54

Quoted 7 lines

drivers/net/e1000.c +4 -0

@@ -47,12 +48,21 @@ tested on both gig copper and gig fiber boards
 /* Intel i210 needs the DMA descriptor rings aligned to 128b */
 #define E1000_BUFFER_ALIGN     128
 
+/*
+ * TODO(sjg at chromium.org): Even with driver model we share these buffers.
+ * Concurrent receiving on multiple active Ethernet devices will not work.
+ * Normally U-Boot does not support this anyway. To fix it in this driver,

It is true that we don't support this right now. Eventually we will, but I'm sure we will have to revisit every driver anyway, so this is fine for now.

drivers/net/e1000.c tested on both gig copper and gig fiber boards · line 55

Quoted 1 line

drivers/net/e1000.c +1 -0

+ * nove these buffers and the tx/rx pointers to struct e1000_hw.

move

Quoted 33 lines

drivers/net/e1000.c +7 -0

+ */
 DEFINE_ALIGN_BUFFER(struct e1000_tx_desc, tx_base, 16, E1000_BUFFER_ALIGN);
 DEFINE_ALIGN_BUFFER(struct e1000_rx_desc, rx_base, 16, E1000_BUFFER_ALIGN);
 DEFINE_ALIGN_BUFFER(unsigned char, packet, 4096, E1000_BUFFER_ALIGN);
 
 static int tx_tail;
 static int rx_tail, rx_last;
+#ifdef CONFIG_DM_ETH
+static int num_cards;  /* Number of E1000 devices seen so far */
+#endif
 
 static struct pci_device_id e1000_supported[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82542) },

@@ -5279,8 +5289,10 @@ void e1000_get_bus_type(struct e1000_hw *hw)
        }
 }
 
+#ifndef CONFIG_DM_ETH
 /* A list of all registered e1000 devices */
 static LIST_HEAD(e1000_hw_list);
+#endif
 
 static int e1000_init_one(struct e1000_hw *hw, int cardnum, pci_dev_t devno,
                          unsigned char enetaddr[6])

@@ -5367,6 +5379,7 @@ static void e1000_name(char *str, int cardnum)
        sprintf(str, "e1000#%u", cardnum);
 }
 
+#ifndef CONFIG_DM_ETH
 /**************************************************************************
 TRANSMIT - Transmit a frame
 ***************************************************************************/

drivers/net/e1000.c struct e1000_hw *e1000_find_card(unsigned int cardnum) · line 5495

Quoted 4 lines

drivers/net/e1000.c +1 -0

@@ -5479,13 +5492,22 @@ struct e1000_hw *e1000_find_card(unsigned int cardnum)
 
        return NULL;
 }
+#endif /* nCONFIG_DM_ETH */

Usually such a comment looks like this instead:

+#endif /* !CONFIG_DM_ETH */

but I don't care that much.

Quoted 42 lines

drivers/net/e1000.c +18 -0

 #ifdef CONFIG_CMD_E1000
 static int do_e1000(cmd_tbl_t *cmdtp, int flag,
                int argc, char * const argv[])
 {
        unsigned char *mac = NULL;
+#ifdef CONFIG_DM_ETH
+       struct eth_pdata *plat;
+       struct udevice *dev;
+       char name[30];
+       int ret;
+#else
        struct e1000_hw *hw;
+#endif
+       int cardnum;
 
        if (argc < 3) {
                cmd_usage(cmdtp);

@@ -5494,9 +5516,18 @@ static int do_e1000(cmd_tbl_t *cmdtp, int flag,
 
        /* Make sure we can find the requested e1000 card */
        cardnum = simple_strtoul(argv[1], NULL, 10);
+#ifdef CONFIG_DM_ETH
+       e1000_name(name, cardnum);
+       ret = uclass_get_device_by_name(UCLASS_ETH, name, &dev);
+       if (!ret) {
+               plat = dev_get_platdata(dev);
+               mac = plat->enetaddr;
+       }
+#else
        hw = e1000_find_card(cardnum);
        if (hw)
                mac = hw->nic->enetaddr;
+#endif
        if (!mac) {
                printf("e1000: ERROR: No such device: e1000#%s\n", argv[1]);
                return 1;

@@ -5531,3 +5562,109 @@ U_BOOT_CMD(
        "       - Manage the Intel E1000 PCI device"
 );
 #endif /* not CONFIG_CMD_E1000 */
+

Quoted 8 lines

drivers/net/e1000.c U_BOOT_CMD( · line 5570

Quoted 5 lines

drivers/net/e1000.c +5 -0

+#ifdef CONFIG_DM_ETH
+static int e1000_eth_start(struct udevice *dev)
+{
+       struct eth_pdata *plat = dev_get_platdata(dev);
+       struct e1000_hw *hw = dev_get_priv(dev);

Did you ever decide what to do with these type of accessors to add a little type safety?

Not really. I like your idea of asking people to add an accessor function for each driver. But I have not gone back to it.

Quoted 64 lines

Quoted 64 lines

drivers/net/e1000.c +63 -0

+
+       return _e1000_init(hw, plat->enetaddr);
+}
+
+static void e1000_eth_stop(struct udevice *dev)
+{
+       struct e1000_hw *hw = dev_get_priv(dev);
+
+       _e1000_disable(hw);
+}
+
+static int e1000_eth_send(struct udevice *dev, void *packet, int length)
+{
+       struct e1000_hw *hw = dev_get_priv(dev);
+       int ret;
+
+       ret = _e1000_transmit(hw, packet, length);
+
+       return ret ? 0 : -ETIMEDOUT;
+}
+
+static int e1000_eth_recv(struct udevice *dev, int flags, uchar **packetp)
+{
+       struct e1000_hw *hw = dev_get_priv(dev);
+       int len;
+
+       len = _e1000_poll(hw);
+       if (len)
+               *packetp = packet;
+
+       return len ? len : -EAGAIN;
+}
+
+static int e1000_free_pkt(struct udevice *dev, uchar *packet, int length)
+{
+       struct e1000_hw *hw = dev_get_priv(dev);
+
+       fill_rx(hw);
+
+       return 0;
+}
+
+static int e1000_eth_probe(struct udevice *dev)
+{
+       struct eth_pdata *plat = dev_get_platdata(dev);
+       struct e1000_hw *hw = dev_get_priv(dev);
+       int ret;
+
+       hw->name = dev->name;
+       ret = e1000_init_one(hw, trailing_strtol(dev->name), pci_get_bdf(dev),
+                            plat->enetaddr);
+       if (ret < 0) {
+               printf(pr_fmt("failed to initialize card: %d\n"), ret);
+               return ret;
+       }
+
+       return 0;
+}
+
+static int e1000_eth_bind(struct udevice *dev)
+{
+       char name[20];
+

Quoted 8 lines

drivers/net/e1000.c U_BOOT_CMD( · line 5639

Quoted 6 lines

drivers/net/e1000.c +6 -0

+       /*
+        * A simple way to number the devices. When device tree is used this
+        * is unnecessary, but when the device is just discovered on the PCI
+        * bus we need a name. We could instead have the uclass figure out
+        * which devices are different and number them.
+        */

I guess it depends if we expect to see this pattern in many drivers.

I suspect we may want to address this, but let's see.

Quoted 39 lines

Quoted 39 lines

drivers/net/e1000.c +31 -0

+       e1000_name(name, num_cards++);
+
+       return device_set_name(dev, name);
+}
+
+static const struct eth_ops e1000_eth_ops = {
+       .start  = e1000_eth_start,
+       .send   = e1000_eth_send,
+       .recv   = e1000_eth_recv,
+       .stop   = e1000_eth_stop,
+       .free_pkt = e1000_free_pkt,
+};
+
+static const struct udevice_id e1000_eth_ids[] = {
+       { .compatible = "realtek,e1000" },
+       { }
+};
+
+U_BOOT_DRIVER(eth_e1000) = {
+       .name   = "eth_e1000",
+       .id     = UCLASS_ETH,
+       .of_match = e1000_eth_ids,
+       .bind   = e1000_eth_bind,
+       .probe  = e1000_eth_probe,
+       .ops    = &e1000_eth_ops,
+       .priv_auto_alloc_size = sizeof(struct e1000_hw),
+       .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+};
+
+U_BOOT_PCI_DEVICE(eth_e1000, e1000_supported);
+#endif

drivers/net/e1000.h +0 -0

index bfacd4e..543459d 100644
@@ -22,7 +22,9 @@
 #include <linux/list.h>
 #include <malloc.h>

Quoted 8 lines

drivers/net/e1000.h line 27

Quoted 4 lines

drivers/net/e1000.h +2 -0

 #include <net.h>
+#ifndef CONFIG_DM_ETH
 #include <netdev.h>
+#endif

Is there a need to not include this in the DM case? Or are you just trying to document what should be removed when !DM is purged? Typically I would not #ifdef an include.

I gives a build error at present.

Quoted 14 lines

Quoted 13 lines

drivers/net/e1000.h +2 -1

 #include <asm/io.h>>>>  #include <pci.h>
 

@@ -1073,7 +1075,9 @@ typedef enum {
 struct e1000_hw {
        const char *name;
        struct list_head list_node;
+#ifndef CONFIG_DM_ETH
        struct eth_device *nic;
+#endif
 #ifdef CONFIG_E1000_SPI
        struct spi_slave spi;
 #endif
--

Quoted 1 line

2.5.0.rc2.392.g76e840b

Regards,
Simon

Hi Simon,

Quoted 22 lines · Simon Glass

Hi Joe,

Quoted 19 lines · Joe Hershberger

Hi Simon,

Quoted 4 lines · Simon Glass

Update this driver to support driver model.

Signed-off-by Simon Glass <[email protected]>

---

Acked-by Joe Hershberger <[email protected]>

...but a few nits below.

Quoted 7 lines

Changes in v2: None

 drivers/net/e1000.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/net/e1000.h |   4 ++
 2 files changed, 141 insertions(+)

Quoted 16 lines

Quoted 15 lines

drivers/net/e1000.h line 27

Quoted 11 lines

drivers/net/e1000.h +2 -0

index bfacd4e..543459d 100644
@@ -22,7 +22,9 @@
 #include <linux/list.h>
 #include <malloc.h>
 #include <net.h>
+#ifndef CONFIG_DM_ETH
 #include <netdev.h>
+#endif

Is there a need to not include this in the DM case? Or are you just trying to document what should be removed when !DM is purged? Typically I would not #ifdef an include.

Quoted 1 line

I gives a build error at present.

OK. I guess it would be good to know what the error is and if it's easily addressable.

Update this driver to support driver model.

Signed-off-by Simon Glass <[email protected]>

---

Changes in v2: None

 drivers/net/e1000.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/net/e1000.h |   4 ++
 2 files changed, 141 insertions(+)

drivers/net/e1000.c +111 -0

index 11bf9ca..25d0b39 100644
@@ -30,6 +30,7 @@ tested on both gig copper and gig fiber boards
  */
 
 #include <common.h>
+#include <dm.h>
 #include <errno.h>
 #include <pci.h>
 #include "e1000.h"

@@ -47,12 +48,21 @@ tested on both gig copper and gig fiber boards
 /* Intel i210 needs the DMA descriptor rings aligned to 128b */
 #define E1000_BUFFER_ALIGN     128
 
+/*
+ * TODO(sjg at chromium.org): Even with driver model we share these buffers.
+ * Concurrent receiving on multiple active Ethernet devices will not work.
+ * Normally U-Boot does not support this anyway. To fix it in this driver,
+ * nove these buffers and the tx/rx pointers to struct e1000_hw.
+ */
 DEFINE_ALIGN_BUFFER(struct e1000_tx_desc, tx_base, 16, E1000_BUFFER_ALIGN);
 DEFINE_ALIGN_BUFFER(struct e1000_rx_desc, rx_base, 16, E1000_BUFFER_ALIGN);
 DEFINE_ALIGN_BUFFER(unsigned char, packet, 4096, E1000_BUFFER_ALIGN);
 
 static int tx_tail;
 static int rx_tail, rx_last;
+#ifdef CONFIG_DM_ETH
+static int num_cards;  /* Number of E1000 devices seen so far */
+#endif
 
 static struct pci_device_id e1000_supported[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82542) },

@@ -5279,8 +5289,10 @@ void e1000_get_bus_type(struct e1000_hw *hw)
        }
 }
 
+#ifndef CONFIG_DM_ETH
 /* A list of all registered e1000 devices */
 static LIST_HEAD(e1000_hw_list);
+#endif
 
 static int e1000_init_one(struct e1000_hw *hw, int cardnum, pci_dev_t devno,
                          unsigned char enetaddr[6])

@@ -5367,6 +5379,7 @@ static void e1000_name(char *str, int cardnum)
        sprintf(str, "e1000#%u", cardnum);
 }
 
+#ifndef CONFIG_DM_ETH
 /**************************************************************************
 TRANSMIT - Transmit a frame
 ***************************************************************************/

@@ -5479,13 +5492,22 @@ struct e1000_hw *e1000_find_card(unsigned int cardnum)
 
        return NULL;
 }
+#endif /* nCONFIG_DM_ETH */
 
 #ifdef CONFIG_CMD_E1000
 static int do_e1000(cmd_tbl_t *cmdtp, int flag,
                int argc, char * const argv[])
 {
        unsigned char *mac = NULL;
+#ifdef CONFIG_DM_ETH
+       struct eth_pdata *plat;
+       struct udevice *dev;
+       char name[30];
+       int ret;
+#else
        struct e1000_hw *hw;
+#endif
+       int cardnum;
 
        if (argc < 3) {
                cmd_usage(cmdtp);

@@ -5494,9 +5516,18 @@ static int do_e1000(cmd_tbl_t *cmdtp, int flag,
 
        /* Make sure we can find the requested e1000 card */
        cardnum = simple_strtoul(argv[1], NULL, 10);
+#ifdef CONFIG_DM_ETH
+       e1000_name(name, cardnum);
+       ret = uclass_get_device_by_name(UCLASS_ETH, name, &dev);
+       if (!ret) {
+               plat = dev_get_platdata(dev);
+               mac = plat->enetaddr;
+       }
+#else
        hw = e1000_find_card(cardnum);
        if (hw)
                mac = hw->nic->enetaddr;
+#endif
        if (!mac) {
                printf("e1000: ERROR: No such device: e1000#%s\n", argv[1]);
                return 1;

@@ -5531,3 +5562,109 @@ U_BOOT_CMD(
        "       - Manage the Intel E1000 PCI device"
 );
 #endif /* not CONFIG_CMD_E1000 */
+
+#ifdef CONFIG_DM_ETH
+static int e1000_eth_start(struct udevice *dev)
+{
+       struct eth_pdata *plat = dev_get_platdata(dev);
+       struct e1000_hw *hw = dev_get_priv(dev);
+
+       return _e1000_init(hw, plat->enetaddr);
+}
+
+static void e1000_eth_stop(struct udevice *dev)
+{
+       struct e1000_hw *hw = dev_get_priv(dev);
+
+       _e1000_disable(hw);
+}
+
+static int e1000_eth_send(struct udevice *dev, void *packet, int length)
+{
+       struct e1000_hw *hw = dev_get_priv(dev);
+       int ret;
+
+       ret = _e1000_transmit(hw, packet, length);
+
+       return ret ? 0 : -ETIMEDOUT;
+}
+
+static int e1000_eth_recv(struct udevice *dev, int flags, uchar **packetp)
+{
+       struct e1000_hw *hw = dev_get_priv(dev);
+       int len;
+
+       len = _e1000_poll(hw);
+       if (len)
+               *packetp = packet;
+
+       return len ? len : -EAGAIN;
+}
+
+static int e1000_free_pkt(struct udevice *dev, uchar *packet, int length)
+{
+       struct e1000_hw *hw = dev_get_priv(dev);
+
+       fill_rx(hw);
+
+       return 0;
+}
+
+static int e1000_eth_probe(struct udevice *dev)
+{
+       struct eth_pdata *plat = dev_get_platdata(dev);
+       struct e1000_hw *hw = dev_get_priv(dev);
+       int ret;
+
+       hw->name = dev->name;
+       ret = e1000_init_one(hw, trailing_strtol(dev->name), pci_get_bdf(dev),
+                            plat->enetaddr);
+       if (ret < 0) {
+               printf(pr_fmt("failed to initialize card: %d\n"), ret);
+               return ret;
+       }
+
+       return 0;
+}
+
+static int e1000_eth_bind(struct udevice *dev)
+{
+       char name[20];
+
+       /*
+        * A simple way to number the devices. When device tree is used this
+        * is unnecessary, but when the device is just discovered on the PCI
+        * bus we need a name. We could instead have the uclass figure out
+        * which devices are different and number them.
+        */
+       e1000_name(name, num_cards++);
+
+       return device_set_name(dev, name);
+}
+

drivers/net/e1000.c +16 -0

+       { }
+};
+
+U_BOOT_DRIVER(eth_e1000) = {
+       .name   = "eth_e1000",
+       .id     = UCLASS_ETH,
+       .of_match = e1000_eth_ids,
+       .bind   = e1000_eth_bind,
+       .probe  = e1000_eth_probe,
+       .ops    = &e1000_eth_ops,
+       .priv_auto_alloc_size = sizeof(struct e1000_hw),
+       .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+};
+
+U_BOOT_PCI_DEVICE(eth_e1000, e1000_supported);
+#endif

drivers/net/e1000.h +2 -0

index bfacd4e..543459d 100644
@@ -22,7 +22,9 @@
 #include <linux/list.h>
 #include <malloc.h>
 #include <net.h>
+#ifndef CONFIG_DM_ETH
 #include <netdev.h>
+#endif
 #include <asm/io.h>
 #include <pci.h>
 

Add Kconfig options in preparation for moving boards to use Kconfig.

Signed-off-by Simon Glass <[email protected]>

---

Changes in v2:
- Move the Kconfig additions to a new patch

 drivers/net/Kconfig | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

drivers/net/Kconfig +20 -0

index ce76a02..fcc3d9b 100644
@@ -20,6 +20,45 @@ menuconfig NETDEVICES
 
 if NETDEVICES
 
+config E1000
+       bool "Intel PRO/1000 Gigabit Ethernet support"
+       help
+         This driver supports Intel(R) PRO/1000 gigabit ethernet family of
+         adapters.  For more information on how to identify your adapter, go
+         to the Adapter & Driver ID Guide at:
+
+         <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+
+config E1000_SPI_GENERIC
+       bool "Allow access to the Intel 8257x SPI bus"
+       depends on E1000
+       help
+         Allow generic access to the SPI bus on the Intel 8257x, for
+         example with the "sspi" command.
+
+config E1000_SPI
+       bool "Enable SPI bus utility code"
+       depends on E1000
+       help

drivers/net/Kconfig +8 -1

+config CMD_E1000
+       bool "Enable the e1000 command"
+       depends on E1000
+       help
+         This enables the 'e1000' management command for E1000 devices. When
+         used on devices with SPI support you can reprogram the EEPROM from
+         U-Boot.
+
 config ETH_SANDBOX
        depends on DM_ETH && SANDBOX
        default y
--

2.5.0.rc2.392.g76e840b

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

-----Original Message-----
From: Simon Glass [mailto:sjg at google.com] On Behalf Of Simon Glass
Sent: Tuesday, August 11, 2015 6:39 AM
To: U-Boot Mailing List
Cc: Bin Meng; Joe Hershberger; Simon Glass; Akshay Saraswat; Vikas Manocha; VishnuPatekar; Stefano Babic; Marek Vasut; Siarhei Siamashka; Nikita Kiryanov; Michal Simek; Chander Kashyap; Tom Warren; Chin-Liang See; Hans de Goede; Priyanka Jain; Pavel Machek; Codrin Ciubotariu; Michal Suchanek; Nitin Garg; Markus Niebel; Stephen Warren; Paul Kocialkowski; Przemyslaw Marczak; Lokesh Vutla; Aneesh Bansal; Tom Rini; Peng Fan; Allen Martin; Stefan Roese; Jens Lucius; Dinh Nguyen; Masahiro Yamada; York Sun; Otavio Salvador; Alison Wang; Chen-Yu Tsai; Wang Dongsheng
Subject: [PATCH v2 5/6] Tidy up some defconfig files

Several files are out of order. This means that when the moveconfig tool moves CONFIG options to Kconfig it generates a large diff. To avoid this, reorder the files first.

configs/e2220-1170_defconfig +1 -3

-CONFIG_SPL_DM=y
-CONFIG_TEGRA114_SPI=y
 CONFIG_SPI_FLASH=y
+CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
-CONFIG_USE_PRIVATE_LIBGCC=y

Signed-off-by Simon Glass <[email protected]>

---

Changes in v2:
- Add new patch to tidy up some defconfig files

 configs/Ainol_AW1_defconfig                  |  2 +-
 configs/Ampe_A76_defconfig                   |  2 +-
 configs/Chuwi_V7_CW0825_defconfig            |  2 +-
 configs/Et_q8_v1_6_defconfig                 |  2 +-
 configs/Hyundai_A7HD_defconfig               |  2 +-
 configs/Ippo_q8h_v1_2_a33_1024x600_defconfig |  2 +-
 configs/Ippo_q8h_v1_2_defconfig              |  2 +-
 configs/Ippo_q8h_v5_defconfig                |  2 +-
 configs/MSI_Primo73_defconfig                |  1 -
 configs/MSI_Primo81_defconfig                |  3 +-
 configs/Merrii_A80_Optimus_defconfig         |  1 -
 configs/Mini-X_defconfig                     |  2 +-
 configs/P3041DS_NAND_SECURE_BOOT_defconfig   |  2 +-
 configs/P5020DS_NAND_SECURE_BOOT_defconfig   |  2 +-
 configs/P5040DS_NAND_SECURE_BOOT_defconfig   |  2 +-
 configs/T1040D4RDB_NAND_defconfig            |  4 +--
 configs/T1040D4RDB_SDCARD_defconfig          |  4 +--
 configs/T1040D4RDB_SECURE_BOOT_defconfig     |  2 +-
 configs/T1040D4RDB_SPIFLASH_defconfig        |  4 +--
 configs/T1040D4RDB_defconfig                 |  2 +-
 configs/T1042D4RDB_NAND_defconfig            |  4 +--
 configs/T1042D4RDB_SDCARD_defconfig          |  4 +--
 configs/T1042D4RDB_SECURE_BOOT_defconfig     |  2 +-
 configs/T1042D4RDB_SPIFLASH_defconfig        |  4 +--
 configs/T1042D4RDB_defconfig                 |  2 +-
 configs/TZX-Q8-713B7_defconfig               |  2 +-
 configs/UTOO_P66_defconfig                   |  3 +-
 configs/Yones_Toptech_BD1078_defconfig       |  2 +-
 configs/am43xx_evm_defconfig                 |  2 +-
 configs/arndale_defconfig                    |  4 +--
 configs/ba10_tv_box_defconfig                |  2 +-
 configs/cgtqmx6qeval_defconfig               |  5 ++--
 configs/cm_fx6_defconfig                     |  7 ++---
 configs/dalmore_defconfig                    |  2 +-
 configs/db-88f6820-gp_defconfig              |  2 +-
 configs/e2220-1170_defconfig                 |  5 +---
 configs/efi-x86_defconfig                    |  9 +++---
 configs/forfun_q88db_defconfig               |  2 +-
 configs/ga10h_v1_1_defconfig                 |  2 +-
 configs/iNet_3F_defconfig                    |  2 +-
 configs/iNet_3W_defconfig                    |  2 +-
 configs/iNet_86VS_defconfig                  |  2 +-
 configs/jetson-tk1_defconfig                 |  2 +-
 configs/ls1021aqds_qspi_defconfig            |  4 +--
 configs/ls1021atwr_qspi_defconfig            |  4 +--
 configs/minnowmax_defconfig                  |  7 ++---
 configs/mx6ul_14x14_evk_defconfig            |  2 +-
 configs/nyan-big_defconfig                   |  2 +-
 configs/odroid-xu3_defconfig                 |  5 ++--
 configs/p2371-0000_defconfig                 |  4 +--
 configs/p2571_defconfig                      |  4 +--
 configs/peach-pi_defconfig                   | 28 +++++++++----------
 configs/peach-pit_defconfig                  | 28 +++++++++----------
 configs/sandbox_defconfig                    | 22 +++++++--------
 configs/smdk5250_defconfig                   | 18 ++++++------
 configs/smdk5420_defconfig                   |  5 ++--
 configs/snow_defconfig                       | 42 ++++++++++++++--------------
 configs/socfpga_arria5_defconfig             | 14 +++-------
 configs/socfpga_cyclone5_defconfig           | 15 +++-------
 configs/socfpga_socrates_defconfig           | 15 +++-------
 configs/spring_defconfig                     | 42 ++++++++++++++--------------
 configs/stv0991_defconfig                    |  2 +-
 configs/tqma6s_wru4_mmc_defconfig            |  4 +--
 configs/venice2_defconfig                    |  2 +-
 configs/xilinx_zynqmp_ep_defconfig           |  2 +-
 65 files changed, 175 insertions(+), 214 deletions(-)

configs/Ainol_AW1_defconfig +0 -0

index ff7abfa..7c41aa8 100644
@@ -11,7 +11,6 @@

CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:40000,le:87,ri:112 ,up:38,lo
CONFIG_VIDEO_LCD_POWER="PH8"
CONFIG_VIDEO_LCD_BL_EN="PH7"
CONFIG_VIDEO_LCD_BL_PWM="PB2"

configs/Ainol_AW1_defconfig +2 -1

-CONFIG_USB_MUSB_HOST=y
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-ainol-aw1"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set  CONFIG_SPL=y @@ -19,3
+18,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+CONFIG_USB_MUSB_HOST=y

configs/Ampe_A76_defconfig +0 -0

index 1d36919..dbc80cc 100644
@@ -10,7 +10,6 @@
 CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:45,ri:82,

up:22,lo:
CONFIG_VIDEO_LCD_POWER="AXP0-0"
CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
CONFIG_VIDEO_LCD_BL_PWM="PB2"

configs/Ampe_A76_defconfig +2 -1

-CONFIG_USB_MUSB_HOST=y
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-ampe-a76"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set  CONFIG_SPL=y @@ -18,3
+17,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+CONFIG_USB_MUSB_HOST=y

configs/Chuwi_V7_CW0825_defconfig +2 -1

index 4011351..3bd3d01 100644
@@ -10,7 +10,6 @@ CONFIG_VIDEO_LCD_POWER="PH8"
 CONFIG_VIDEO_LCD_BL_EN="PH7"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_VIDEO_LCD_PANEL_HITACHI_TX18D42VM=y
-CONFIG_USB_MUSB_HOST=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-chuwi-v7-cw0825"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set  CONFIG_SPL=y @@ -21,3
+20,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 CONFIG_VIDEO_LCD_SPI_CS="PA0"
 CONFIG_VIDEO_LCD_SPI_SCLK="PA1"
 CONFIG_VIDEO_LCD_SPI_MOSI="PA2"
+CONFIG_USB_MUSB_HOST=y

configs/Et_q8_v1_6_defconfig +0 -0

index ca8db19..65b8e1a 100644
@@ -11,7 +11,6 @@ CONFIG_VIDEO_LCD_DCLK_PHASE=0

CONFIG_VIDEO_LCD_POWER="PH7"
CONFIG_VIDEO_LCD_BL_EN="PH6"
CONFIG_VIDEO_LCD_BL_PWM="PH0"

configs/Et_q8_v1_6_defconfig +2 -1

-CONFIG_USB_MUSB_HOST=y
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-et-q8-v1.6"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set  CONFIG_SPL=y @@ -21,3
+20,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
 # CONFIG_CMD_FPGA is not set
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
+CONFIG_USB_MUSB_HOST=y

(quoted diff) +0 -0

b/configs/Hyundai_A7HD_defconfig index 065a3f9..9ef06a7 100644

configs/Hyundai_A7HD_defconfig +0 -0

@@ -12,7 +12,6 @@ CONFIG_VIDEO_LCD_BL_EN="PH9"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
 # CONFIG_VIDEO_LCD_BL_PWM_ACTIVE_LOW is not set

CONFIG_VIDEO_LCD_PANEL_LVDS=y -CONFIG_USB_MUSB_HOST=y CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-hyundai-a7hd"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL=y @@ -20,3
+19,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set

configs/Hyundai_A7HD_defconfig +1 -0

+CONFIG_USB_MUSB_HOST=y

configs/Ippo_q8h_v1_2_a33_1024x600_defconfig +0 -0

index 213de5a..40ccf8f 100644
@@ -12,7 +12,6 @@ CONFIG_VIDEO_LCD_DCLK_PHASE=0

CONFIG_VIDEO_LCD_POWER="PH7"
CONFIG_VIDEO_LCD_BL_EN="PH6"
CONFIG_VIDEO_LCD_BL_PWM="PH0"

configs/Ippo_q8h_v1_2_a33_1024x600_defconfig +2 -1

-CONFIG_USB_MUSB_HOST=y
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ippo-q8h-v1.2"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set  CONFIG_SPL=y @@ -22,3
+21,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
 # CONFIG_CMD_FPGA is not set
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
+CONFIG_USB_MUSB_HOST=y

(quoted diff) +0 -0

b/configs/Ippo_q8h_v1_2_defconfig index ff5ec30..5b49c44 100644

configs/Ippo_q8h_v1_2_defconfig +0 -0

@@ -12,7 +12,6 @@ CONFIG_VIDEO_LCD_DCLK_PHASE=0

CONFIG_VIDEO_LCD_POWER="PH7"
CONFIG_VIDEO_LCD_BL_EN="PH6"
CONFIG_VIDEO_LCD_BL_PWM="PH0"

configs/Ippo_q8h_v1_2_defconfig +2 -1

-CONFIG_USB_MUSB_HOST=y
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-ippo-q8h-v1.2"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set  CONFIG_SPL=y @@ -22,3
+21,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
 # CONFIG_CMD_FPGA is not set
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
+CONFIG_USB_MUSB_HOST=y

configs/Ippo_q8h_v5_defconfig +0 -0

index b67206c..5316860 100644
@@ -12,7 +12,6 @@ CONFIG_VIDEO_LCD_DCLK_PHASE=0

CONFIG_VIDEO_LCD_POWER="PH7"
CONFIG_VIDEO_LCD_BL_EN="PH6"
CONFIG_VIDEO_LCD_BL_PWM="PH0"

configs/Ippo_q8h_v5_defconfig +2 -1

-CONFIG_USB_MUSB_HOST=y
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-ippo-q8h-v5"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set  CONFIG_SPL=y @@ -22,3
+21,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
 # CONFIG_CMD_FPGA is not set
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
+CONFIG_USB_MUSB_HOST=y

configs/MSI_Primo73_defconfig +0 -0

index 7e83536..a60ce34 100644
@@ -7,7 +7,6 @@ CONFIG_VIDEO_LCD_DCLK_PHASE=0

CONFIG_VIDEO_LCD_POWER="PH8"
CONFIG_VIDEO_LCD_BL_EN="PH7"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
-# CONFIG_USB_KEYBOARD is not set
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-primo73"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL=y diff --git
a/configs/MSI_Primo81_defconfig b/configs/MSI_Primo81_defconfig index b089e97..3b8e043 100644

configs/MSI_Primo81_defconfig +0 -0

@@ -10,8 +10,6 @@

CONFIG_VIDEO_LCD_MODE="x:768,y:1024,depth:18,pclk_khz:66000,le:56,ri:60 ,up:30,lo
CONFIG_VIDEO_LCD_BL_EN="PA25" CONFIG_VIDEO_LCD_BL_PWM="PH13" CONFIG_VIDEO_LCD_PANEL_MIPI_4_LANE_513_MBPS_VIA_SSD2828=y

configs/MSI_Primo81_defconfig +2 -2

-CONFIG_USB_MUSB_HOST=y
-# CONFIG_USB_KEYBOARD is not set
 CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31s-primo81"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set  CONFIG_SPL=y @@ -25,3
+23,4 @@ CONFIG_VIDEO_LCD_SPI_CS="PH9"
 CONFIG_VIDEO_LCD_SPI_SCLK="PH10"
 CONFIG_VIDEO_LCD_SPI_MOSI="PH11"
 CONFIG_VIDEO_LCD_SPI_MISO="PH12"
+CONFIG_USB_MUSB_HOST=y

configs/Merrii_A80_Optimus_defconfig +0 -1

index 8587bc8..53e023a 100644
@@ -6,7 +6,6 @@ CONFIG_DRAM_ZQ=123
 CONFIG_SYS_CLK_FREQ=1008000000
 CONFIG_MMC0_CD_PIN="PH18"
 # CONFIG_VIDEO is not set
-# CONFIG_USB_KEYBOARD is not set
 CONFIG_DEFAULT_DEVICE_TREE="sun9i-a80-optimus"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set  # CONFIG_CMD_IMLS is

not set diff --git a/configs/Mini-X_defconfig b/configs/Mini-X_defconfig index 00b6c63..52ee3cd 100644

configs/Mini-X_defconfig +2 -1

@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN4I=y
+CONFIG_USB0_VBUS_PIN="PB9"
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mini-xplus"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set  CONFIG_SPL=y @@ -10,4
+11,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_HOST=y
-CONFIG_USB0_VBUS_PIN="PB9"

configs/P3041DS_NAND_SECURE_BOOT_defconfig +0 -1

index 2f18bc1..89c51a7 100644
@@ -1,5 +1,5 @@
-

CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SECURE_BOOT,SYS_TE XT_BASE=0xFFF40000"
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P3041DS=y
+CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SECURE_BOOT,SYS_T EXT_BASE=0xFFF40000"
CONFIG_SPI_FLASH=y

configs/P5020DS_NAND_SECURE_BOOT_defconfig +0 -1

index 98cdd35..39e1538 100644
@@ -1,5 +1,5 @@
-

CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SECURE_BOOT,SYS_TE XT_BASE=0xFFF40000"
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P5020DS=y
+CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SECURE_BOOT,SYS_T EXT_BASE=0xFFF40000"
CONFIG_SPI_FLASH=y

configs/P5040DS_NAND_SECURE_BOOT_defconfig +0 -1

index a6cc7c4..3d0bea4 100644
@@ -1,5 +1,5 @@
-

CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SECURE_BOOT,SYS_TE XT_BASE=0xFFF40000"
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P5040DS=y
+CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SECURE_BOOT,SYS_T EXT_BASE=0xFFF40000"
CONFIG_SPI_FLASH=y

configs/T1040D4RDB_NAND_defconfig +0 -2

index 3051f0c..9d58a81 100644
@@ -1,6 +1,6 @@
-CONFIG_SPL=y
-

CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_ FSL_PBL,NAND,T104XD4RDB,SYS_FSL_DDR4"
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y

configs/T1040D4RDB_NAND_defconfig +2 -0

+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL

_FSL_PBL,NAND,T104XD4RDB,SYS_FSL_DDR4"
CONFIG_SPI_FLASH=y

configs/T1040D4RDB_SDCARD_defconfig +0 -2

index 6c10c50..928a4cf 100644
@@ -1,6 +1,6 @@
-CONFIG_SPL=y
-

CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_ FSL_PBL,SDCARD,T104XD4RDB,SYS_FSL_DDR4"
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y

configs/T1040D4RDB_SDCARD_defconfig +2 -0

+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL

_FSL_PBL,SDCARD,T104XD4RDB,SYS_FSL_DDR4"
CONFIG_SPI_FLASH=y

configs/T1040D4RDB_SECURE_BOOT_defconfig +0 -1

index f779126..206b844 100644
@@ -1,5 +1,5 @@
-

CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,T104XD4RDB,SYS_FS L_DDR4,SECURE_BOOT"
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y
+CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,T104XD4RDB,SYS_F SL_DDR4,SECURE_BOOT"
CONFIG_SPI_FLASH=y

configs/T1040D4RDB_SPIFLASH_defconfig +0 -2

index 6614e34..d3fd142 100644
@@ -1,6 +1,6 @@
-CONFIG_SPL=y
-

CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_ FSL_PBL,SPIFLASH,T104XD4RDB,SYS_FSL_DDR4"
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y

configs/T1040D4RDB_SPIFLASH_defconfig +2 -0

+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL

_FSL_PBL,SPIFLASH,T104XD4RDB,SYS_FSL_DDR4"
CONFIG_SPI_FLASH=y

configs/T1040D4RDB_defconfig +0 -1

index ce0cfa3..cad713f 100644
@@ -1,5 +1,5 @@
-

CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,T104XD4RDB,SYS_FS L_DDR4"
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y
+CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,T104XD4RDB,SYS_F SL_DDR4"
CONFIG_SPI_FLASH=y

configs/T1042D4RDB_NAND_defconfig +0 -2

index fa4c250..1ae46df 100644
@@ -1,6 +1,6 @@
-CONFIG_SPL=y
-

CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_ FSL_PBL,NAND,T104XD4RDB,SYS_FSL_DDR4"
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y

configs/T1042D4RDB_NAND_defconfig +2 -0

+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL

_FSL_PBL,NAND,T104XD4RDB,SYS_FSL_DDR4"
CONFIG_SPI_FLASH=y

configs/T1042D4RDB_SDCARD_defconfig +0 -2

index 12644d6..72c840b 100644
@@ -1,6 +1,6 @@
-CONFIG_SPL=y
-

CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_ FSL_PBL,SDCARD,T104XD4RDB,SYS_FSL_DDR4"
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y

configs/T1042D4RDB_SDCARD_defconfig +2 -0

+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL

_FSL_PBL,SDCARD,T104XD4RDB,SYS_FSL_DDR4"
CONFIG_SPI_FLASH=y

configs/T1042D4RDB_SECURE_BOOT_defconfig +0 -1

index e806591..8610c6a 100644
@@ -1,5 +1,5 @@
-

CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,T104XD4RDB,SYS_FS L_DDR4,SECURE_BOOT"
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y
+CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,T104XD4RDB,SYS_F SL_DDR4,SECURE_BOOT"
CONFIG_SPI_FLASH=y

configs/T1042D4RDB_SPIFLASH_defconfig +0 -2

index 2504499..1ff088d 100644
@@ -1,6 +1,6 @@
-CONFIG_SPL=y
-

CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_ FSL_PBL,SPIFLASH,T104XD4RDB,SYS_FSL_DDR4"
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y

configs/T1042D4RDB_SPIFLASH_defconfig +2 -0

+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL

_FSL_PBL,SPIFLASH,T104XD4RDB,SYS_FSL_DDR4"
CONFIG_SPI_FLASH=y

configs/T1042D4RDB_defconfig +0 -1

index 3df7496..2f62171 100644
@@ -1,5 +1,5 @@
-

CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,T104XD4RDB,SYS_FS L_DDR4"
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y
+CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,T104XD4RDB,SYS_F SL_DDR4"
CONFIG_SPI_FLASH=y

configs/TZX-Q8-713B7_defconfig +0 -0

index 3508834..cb83ca1 100644
@@ -10,7 +10,6 @@
 CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:87,ri:40,

up:31,lo:
CONFIG_VIDEO_LCD_POWER="AXP0-0"
CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
CONFIG_VIDEO_LCD_BL_PWM="PB2"

configs/TZX-Q8-713B7_defconfig +2 -1

-CONFIG_USB_MUSB_HOST=y
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-tzx-q8-713b7"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set  CONFIG_SPL=y @@ -18,3
+17,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+CONFIG_USB_MUSB_HOST=y

configs/UTOO_P66_defconfig index renamed from configs/UTOO_P66_defconfig +0 -0

0266299..3421220 100644

configs/UTOO_P66_defconfig +2 -2

@@ -15,7 +15,6 @@ CONFIG_VIDEO_LCD_RESET="PG11"
 CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_VIDEO_LCD_TL059WV5C0=y
-CONFIG_USB_MUSB_HOST=y
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-utoo-p66"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set  CONFIG_SPL=y @@ -23,4
+22,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
+CONFIG_USB_MUSB_HOST=y

configs/Yones_Toptech_BD1078_defconfig +0 -0

index 27f2e2b..e26816c 100644
@@ -16,7 +16,6 @@ CONFIG_VIDEO_LCD_BL_EN="PH7"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
 # CONFIG_VIDEO_LCD_BL_PWM_ACTIVE_LOW is not set

CONFIG_VIDEO_LCD_PANEL_LVDS=y -CONFIG_USB_MUSB_HOST=y CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-yones-toptech-bd1078"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL=y @@ -24,3
+23,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set

configs/Yones_Toptech_BD1078_defconfig +1 -0

+CONFIG_USB_MUSB_HOST=y

configs/am43xx_evm_defconfig +0 -0

index 65efa9d..f84f57d 100644
@@ -5,5 +5,5 @@

CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set

configs/am43xx_evm_defconfig +1 -1

-CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_BAR=y

configs/arndale_defconfig index renamed from configs/arndale_defconfig +0 -0

ebac9ad..0814030 100644

configs/arndale_defconfig +2 -0

@@ -6,6 +6,8 @@ CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_SOUND=y
+CONFIG_DM_I2C=y
+CONFIG_DM_I2C_COMPAT=y
 CONFIG_SOUND=y
 CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y

@@ -13,5 +15,3 @@ CONFIG_SOUND_MAX98095=y

CONFIG_SOUND_WM8994=y CONFIG_USB=y CONFIG_DM_USB=y - CONFIG_DM_I2C=y -CONFIG_DM_I2C_COMPAT=y diff --git a/configs/ba10_tv_box_defconfig b/configs/ba10_tv_box_defconfig index 5b5fc12..0c517cd 100644

configs/ba10_tv_box_defconfig +1 -0

@@ -3,6 +3,7 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN4I=y
 CONFIG_DRAM_CLK=384
 CONFIG_DRAM_EMR1=4
+CONFIG_USB0_VBUS_PIN="PB9"
 CONFIG_USB2_VBUS_PIN="PH12"
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-ba10-tvbox"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set @@ -13,4 +14,3 @@

CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC"
# CONFIG_CMD_FPGA is not set CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_HOST=y

configs/ba10_tv_box_defconfig +0 -1

-CONFIG_USB0_VBUS_PIN="PB9"

configs/cgtqmx6qeval_defconfig +0 -0

index 6fd29a0..b719cba 100644
@@ -1,9 +1,8 @@
 CONFIG_ARM=y
 CONFIG_TARGET_CGTQMX6EVAL=y
 

CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/congatec/cgtqmx6eval/i mximage.cfg,MX6Q"

configs/cgtqmx6qeval_defconfig +2 -3

-CONFIG_CMD_NET=y
-CONFIG_DM=y
-CONFIG_DM_THERMAL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_DM=y
+CONFIG_DM_THERMAL=y

configs/cm_fx6_defconfig index renamed from configs/cm_fx6_defconfig +0 -0

2aba359..a6bcee6 100644

configs/cm_fx6_defconfig +0 -0

@@ -8,6 +8,9 @@

CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx- common/spl_sd.cfg,MX6QDL,SPL"
# CONFIG_CMD_LOADB is not set
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_FLASH is not set

configs/cm_fx6_defconfig +3 -0

+CONFIG_CMD_SF=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_USB=y
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y

@@ -21,12 +24,8 @@ CONFIG_SPI_FLASH_SPANSION=y

CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_SST=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_CMD_SF=y -CONFIG_CMD_I2C=y CONFIG_USB=y -CONFIG_CMD_USB=y CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_MX6=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y

configs/dalmore_defconfig index renamed from configs/dalmore_defconfig +0 -0

2d80247..a3775eb 100644

configs/dalmore_defconfig +1 -1

@@ -10,8 +10,8 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra114-dalmore"
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
-CONFIG_TEGRA114_SPI=y
 CONFIG_SPI_FLASH=y
+CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/db-88f6820- renamed from configs/db-88f6820-gp_defconfig +0 -0

gp_defconfig index 0ff6706..e22f5f7 100644

configs/db-88f6820-gp_defconfig +1 -1

@@ -1,6 +1,6 @@
-CONFIG_SPL=y
 CONFIG_ARM=y
 CONFIG_TARGET_DB_88F6820_GP=y
+CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set

configs/e2220-1170_defconfig +1 -4

index 455e789..a27a597 100644
@@ -1,7 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TEGRA=y
 CONFIG_TEGRA210=y
-CONFIG_TARGET_E2220_1170=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra210-e2220-1170"
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set

@@ -9,9 +8,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-e2220-1170"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SPL_DM=y
-CONFIG_TEGRA114_SPI=y
 CONFIG_SPI_FLASH=y
+CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
-CONFIG_USE_PRIVATE_LIBGCC=y

configs/efi-x86_defconfig index renamed from configs/efi-x86_defconfig +0 -0

1aa0655..904b564 100644

configs/efi-x86_defconfig +4 -5

@@ -1,16 +1,15 @@
 CONFIG_X86=y
 CONFIG_VENDOR_EFI=y
+CONFIG_DEFAULT_DEVICE_TREE="efi"
 CONFIG_TARGET_EFI=y
 CONFIG_TSC_CALIBRATION_BYPASS=y
+# CONFIG_CMD_BOOTM is not set
+# CONFIG_CMD_NET is not set
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_DM_PCI=y
-CONFIG_DEFAULT_DEVICE_TREE="efi"
-CONFIG_EFI=y
-CONFIG_EFI_APP=y
 CONFIG_DEBUG_UART=y
 CONFIG_DEBUG_EFI_CONSOLE=y
 CONFIG_DEBUG_UART_BASE=0
 CONFIG_DEBUG_UART_CLOCK=0
-# CONFIG_CMD_NET is not set
-# CONFIG_CMD_BOOTM is not set
+CONFIG_EFI=y

configs/forfun_q88db_defconfig +0 -0

index 6fff725..868b847 100644
@@ -9,7 +9,6 @@
 CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:87,ri:40,

up:31,lo:
CONFIG_VIDEO_LCD_POWER="AXP0-0"
CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
CONFIG_VIDEO_LCD_BL_PWM="PB2"

configs/forfun_q88db_defconfig +2 -1

-CONFIG_USB_MUSB_HOST=y
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-forfun-q88db"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set  CONFIG_SPL=y @@ -17,3
+16,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+CONFIG_USB_MUSB_HOST=y

configs/ga10h_v1_1_defconfig +2 -1

index 098284d..417a89c 100644
@@ -14,7 +14,6 @@ CONFIG_VIDEO_LCD_POWER="PH7"
 CONFIG_VIDEO_LCD_BL_EN="PH6"
 CONFIG_VIDEO_LCD_BL_PWM="PH0"
 CONFIG_VIDEO_LCD_PANEL_LVDS=y
-CONFIG_USB_MUSB_HOST=y
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ga10h-v1.1"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set  CONFIG_SPL=y @@ -25,3
+24,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_MUSB_HOST=y

configs/iNet_3F_defconfig index renamed from configs/iNet_3F_defconfig +0 -0

22d0caf..211cb86 100644

configs/iNet_3F_defconfig +2 -1

@@ -11,7 +11,6 @@ CONFIG_VIDEO_LCD_POWER="PH8"
 CONFIG_VIDEO_LCD_BL_EN="PH7"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_VIDEO_LCD_PANEL_LVDS=y
-CONFIG_USB_MUSB_HOST=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet-3f"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set  CONFIG_SPL=y @@ -19,3
+18,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+CONFIG_USB_MUSB_HOST=y

configs/iNet_3W_defconfig index renamed from configs/iNet_3W_defconfig +0 -0

c296c0c..35f08e5 100644

configs/iNet_3W_defconfig +0 -0

@@ -11,7 +11,6 @@

CONFIG_VIDEO_LCD_MODE="x:1024,y:768,depth:24,pclk_khz:65000,le:159,ri:1 60,up:22,
CONFIG_VIDEO_LCD_POWER="PH8"
CONFIG_VIDEO_LCD_BL_EN="PH7"
CONFIG_VIDEO_LCD_BL_PWM="PB2"

configs/iNet_3W_defconfig +2 -1

-CONFIG_USB_MUSB_HOST=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet-3w"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set  CONFIG_SPL=y @@ -19,3
+18,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+CONFIG_USB_MUSB_HOST=y

configs/iNet_86VS_defconfig index renamed from configs/iNet_86VS_defconfig +0 -0

33162d1..015d1a6 100644

configs/iNet_86VS_defconfig +0 -0

@@ -9,7 +9,6 @@

CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:45,ri:209 ,up:22,lo
CONFIG_VIDEO_LCD_POWER="AXP0-0" CONFIG_VIDEO_LCD_BL_EN="AXP0-1" CONFIG_VIDEO_LCD_BL_PWM="PB2"

configs/iNet_86VS_defconfig +2 -1

-CONFIG_USB_MUSB_HOST=y
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-inet-86vs"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set  CONFIG_SPL=y @@ -17,3
+16,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+CONFIG_USB_MUSB_HOST=y

configs/jetson-tk1_defconfig index renamed from configs/jetson-tk1_defconfig +0 -0

44c7a8e..9c044af 100644

configs/jetson-tk1_defconfig +1 -1

@@ -10,8 +10,8 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra124-jetson-tk1"
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
-CONFIG_TEGRA114_SPI=y
 CONFIG_SPI_FLASH=y
+CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/ls1021aqds_qspi_defconfig +2 -2

index 6a1f711..171c245 100644
@@ -1,10 +1,10 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021AQDS=y
+CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds"
 CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds"
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
-CONFIG_DM_SPI=y
 CONFIG_SPI_FLASH=y
+CONFIG_DM_SPI=y

configs/ls1021atwr_qspi_defconfig +2 -2

index 420cfe7..6c35918 100644
@@ -1,10 +1,10 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021ATWR=y
+CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr"
 CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr"
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
-CONFIG_DM_SPI=y
 CONFIG_SPI_FLASH=y
+CONFIG_DM_SPI=y

configs/minnowmax_defconfig +3 -4

index a67597d..7febc8b 100644
@@ -18,13 +18,12 @@ CONFIG_OF_CONTROL=y
 CONFIG_CPU=y
 CONFIG_DM_PCI=y
 CONFIG_SPI_FLASH=y
+CONFIG_DEBUG_UART=y
+CONFIG_DEBUG_UART_BASE=0x3f8
+CONFIG_DEBUG_UART_CLOCK=1843200
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
 CONFIG_DM_RTC=y
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_SYS_VSNPRINTF=y
-CONFIG_DEBUG_UART=y
-CONFIG_DEBUG_UART_NS16550=y
-CONFIG_DEBUG_UART_BASE=0x3f8
-CONFIG_DEBUG_UART_CLOCK=1843200

configs/mx6ul_14x14_evk_defconfig +0 -1

index b6eefaf..29159a1 100644
@@ -1,4 +1,4 @@
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-

common/spl_sd.cfg,MX6UL"
CONFIG_ARM=y CONFIG_TARGET_MX6UL_14X14_EVK=y CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx- common/spl_sd.cfg,MX6UL"

configs/nyan-big_defconfig index renamed from configs/nyan-big_defconfig +0 -0

ccf656b..2b26841 100644

configs/nyan-big_defconfig +1 -1

@@ -10,12 +10,12 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra124-nyan-big"
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
-CONFIG_TEGRA114_SPI=y
 CONFIG_SPI_FLASH=y
 CONFIG_CMD_CROS_EC=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
 CONFIG_CROS_EC_KEYB=y
+CONFIG_TEGRA114_SPI=y
 CONFIG_DISPLAY_PORT=y
 CONFIG_VIDEO_TEGRA124=y
 CONFIG_USB=y

configs/odroid-xu3_defconfig index renamed from configs/odroid-xu3_defconfig +0 -0

155ce39..6061a7d 100644

configs/odroid-xu3_defconfig +0 -0

@@ -5,11 +5,10 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5422-

odroidxu3"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_CMD_IMLS is
not set # CONFIG_CMD_SETEXPR is not set -CONFIG_USB=y - CONFIG_DM_USB=y -CONFIG_CMD_NET=y CONFIG_DM_I2C=y CONFIG_DM_I2C_COMPAT=y CONFIG_DM_PMIC=y CONFIG_DM_REGULATOR=y CONFIG_VIDEO_BRIDGE=y

configs/odroid-xu3_defconfig +2 -0

+CONFIG_USB=y
+CONFIG_DM_USB=y

configs/p2371-0000_defconfig +1 -3

index cd7d21f..6545d5d 100644
@@ -9,9 +9,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-0000"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SPL_DM=y
-CONFIG_TEGRA114_SPI=y
 CONFIG_SPI_FLASH=y
+CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
-CONFIG_USE_PRIVATE_LIBGCC=y

configs/p2571_defconfig index renamed from configs/p2571_defconfig +0 -0

5fd2a54..391a3e7 100644

configs/p2571_defconfig +1 -3

@@ -9,9 +9,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2571"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SPL_DM=y
-CONFIG_TEGRA114_SPI=y
 CONFIG_SPI_FLASH=y
+CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
-CONFIG_USE_PRIVATE_LIBGCC=y

configs/peach-pi_defconfig index renamed from configs/peach-pi_defconfig +0 -0

86d5a0b..94ba3f8 100644

configs/peach-pi_defconfig +14 -14

@@ -5,29 +5,29 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5800-peach-pi"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_PMIC=y
+CONFIG_CMD_REGULATOR=y
 CONFIG_SPI_FLASH=y
 CONFIG_CMD_CROS_EC=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
 CONFIG_CROS_EC_KEYB=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
-CONFIG_I2C_MUX=y
+CONFIG_DM_I2C=y
+CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_TUNNEL=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_ARB_GPIO_CHALLENGE=y
+CONFIG_DM_PMIC=y
+CONFIG_PMIC_TPS65090=y
+CONFIG_DM_REGULATOR=y
+CONFIG_REGULATOR_TPS65090=y
+CONFIG_VIDEO_BRIDGE=y
+CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
 CONFIG_SOUND=y
 CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y
 CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_WM8994=y
-CONFIG_DM_I2C=y
-CONFIG_DM_PMIC=y
-CONFIG_DM_REGULATOR=y
-CONFIG_PMIC_TPS65090=y
-CONFIG_REGULATOR_TPS65090=y
-CONFIG_DM_I2C_COMPAT=y
-CONFIG_I2C_ARB_GPIO_CHALLENGE=y
-CONFIG_CMD_PMIC=y
-CONFIG_CMD_REGULATOR=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_ERRNO_STR=y
-CONFIG_VIDEO_BRIDGE=y
-CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y

configs/peach-pit_defconfig index renamed from configs/peach-pit_defconfig +0 -0

8fe423e..229b712 100644

configs/peach-pit_defconfig +14 -14

@@ -5,29 +5,29 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5420-peach-pit"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_PMIC=y
+CONFIG_CMD_REGULATOR=y
 CONFIG_SPI_FLASH=y
 CONFIG_CMD_CROS_EC=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
 CONFIG_CROS_EC_KEYB=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
-CONFIG_I2C_MUX=y
+CONFIG_DM_I2C=y
+CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_TUNNEL=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_ARB_GPIO_CHALLENGE=y
+CONFIG_DM_PMIC=y
+CONFIG_PMIC_TPS65090=y
+CONFIG_DM_REGULATOR=y
+CONFIG_REGULATOR_TPS65090=y
+CONFIG_VIDEO_BRIDGE=y
+CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
 CONFIG_SOUND=y
 CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y
 CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_WM8994=y
-CONFIG_DM_I2C=y
-CONFIG_DM_PMIC=y
-CONFIG_DM_REGULATOR=y
-CONFIG_PMIC_TPS65090=y
-CONFIG_REGULATOR_TPS65090=y
-CONFIG_DM_I2C_COMPAT=y
-CONFIG_I2C_ARB_GPIO_CHALLENGE=y
-CONFIG_CMD_PMIC=y
-CONFIG_CMD_REGULATOR=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_ERRNO_STR=y
-CONFIG_VIDEO_BRIDGE=y
-CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y

configs/sandbox_defconfig index renamed from configs/sandbox_defconfig +0 -0

874a26b..85ff95d 100644

configs/sandbox_defconfig +11 -11

@@ -13,16 +13,22 @@ CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_HOSTFILE=y
+CONFIG_CLK=y
+CONFIG_REGMAP=y
+CONFIG_SYSCON=y
+CONFIG_DEVRES=y
 CONFIG_DM_PCI=y
 CONFIG_PCI_SANDBOX=y
-CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SANDBOX=y
+CONFIG_SPI_FLASH=y
 CONFIG_CMD_CROS_EC=y
-CONFIG_CMD_DHRYSTONE=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SANDBOX=y
+CONFIG_RESET=y
 CONFIG_DM_ETH=y
 CONFIG_CROS_EC_KEYB=y
+CONFIG_LED=y
+CONFIG_LED_GPIO=y
 CONFIG_SANDBOX_SERIAL=y
 CONFIG_TPM_TIS_SANDBOX=y
 CONFIG_SYS_I2C_SANDBOX=y

@@ -32,25 +38,19 @@ CONFIG_DM_PMIC=y
 CONFIG_DM_PMIC_SANDBOX=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_SANDBOX=y
+CONFIG_RAM=y
 CONFIG_SOUND=y
 CONFIG_SOUND_SANDBOX=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EMUL=y
 CONFIG_USB_STORAGE=y
+CONFIG_DM_MMC=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_VSNPRINTF=y
+CONFIG_CMD_DHRYSTONE=y
 CONFIG_ERRNO_STR=y
 CONFIG_UNIT_TEST=y
 CONFIG_UT_TIME=y
 CONFIG_UT_DM=y
 CONFIG_UT_ENV=y
-CONFIG_CLK=y
-CONFIG_RESET=y
-CONFIG_RAM=y
-CONFIG_DM_MMC=y
-CONFIG_LED=y
-CONFIG_LED_GPIO=y
-CONFIG_SYSCON=y
-CONFIG_REGMAP=y
-CONFIG_DEVRES=y

configs/smdk5250_defconfig index renamed from configs/smdk5250_defconfig +0 -0

b061e47..ebd823f 100644

configs/smdk5250_defconfig +9 -0

@@ -6,7 +6,16 @@ CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_SOUND=y
+CONFIG_CMD_PMIC=y
+CONFIG_CMD_REGULATOR=y
 CONFIG_SPI_FLASH=y
+CONFIG_DM_I2C=y
+CONFIG_DM_I2C_COMPAT=y
+CONFIG_DM_PMIC=y
+CONFIG_DM_PMIC_MAX77686=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_MAX77686=y
+CONFIG_VIDEO_BRIDGE=y
 CONFIG_SOUND=y
 CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y

@@ -14,13 +23,4 @@ CONFIG_SOUND_MAX98095=y

CONFIG_SOUND_WM8994=y CONFIG_USB=y CONFIG_DM_USB=y - CONFIG_DM_I2C=y -CONFIG_DM_I2C_COMPAT=y -CONFIG_DM_PMIC=y - CONFIG_DM_REGULATOR=y -CONFIG_CMD_PMIC=y - CONFIG_CMD_REGULATOR=y CONFIG_ERRNO_STR=y - CONFIG_DM_PMIC_MAX77686=y -CONFIG_DM_REGULATOR_MAX77686=y - CONFIG_VIDEO_BRIDGE=y diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig index 1561f6a..cb6c62e 100644

configs/smdk5420_defconfig +2 -3

@@ -6,11 +6,10 @@ CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
-CONFIG_CMD_NET=y
 CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y
 CONFIG_VIDEO_BRIDGE=y
+CONFIG_USB=y
+CONFIG_DM_USB=y

configs/snow_defconfig index renamed from configs/snow_defconfig +0 -0

a7d9e7a..3466d96 100644

configs/snow_defconfig +21 -21

@@ -6,38 +6,38 @@ CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_SOUND=y
+CONFIG_CMD_PMIC=y
+CONFIG_CMD_REGULATOR=y
 CONFIG_SPI_FLASH=y
 CONFIG_CMD_CROS_EC=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_I2C=y
 CONFIG_CROS_EC_KEYB=y
-CONFIG_SOUND=y
-CONFIG_I2S=y
-CONFIG_I2S_SAMSUNG=y
-CONFIG_SOUND_MAX98095=y
-CONFIG_SOUND_WM8994=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
-CONFIG_DM_I2C=y
-CONFIG_DM_PMIC=y
-CONFIG_DM_REGULATOR=y
-CONFIG_PMIC_TPS65090=y
-CONFIG_REGULATOR_TPS65090=y
-CONFIG_DM_I2C_COMPAT=y
-CONFIG_I2C_ARB_GPIO_CHALLENGE=y
-CONFIG_I2C_MUX=y
-CONFIG_CMD_PMIC=y
-CONFIG_CMD_REGULATOR=y
-CONFIG_ERRNO_STR=y
-CONFIG_DM_PMIC_MAX77686=y
-CONFIG_DM_REGULATOR_MAX77686=y
 CONFIG_DEBUG_UART=y
 CONFIG_DEBUG_UART_S5P=y
-CONFIG_DEBUG_UART_CLOCK=100000000
 CONFIG_DEBUG_UART_BASE=0x12c30000
+CONFIG_DEBUG_UART_CLOCK=100000000
+CONFIG_DM_I2C=y
+CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_LDO=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_ARB_GPIO_CHALLENGE=y
+CONFIG_DM_PMIC=y
+CONFIG_DM_PMIC_MAX77686=y
 CONFIG_PMIC_S5M8767=y
+CONFIG_PMIC_TPS65090=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_MAX77686=y
 CONFIG_REGULATOR_S5M8767=y
+CONFIG_REGULATOR_TPS65090=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
 CONFIG_VIDEO_BRIDGE_NXP_PTN3460=y
+CONFIG_SOUND=y
+CONFIG_I2S=y
+CONFIG_I2S_SAMSUNG=y
+CONFIG_SOUND_MAX98095=y
+CONFIG_SOUND_WM8994=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_ERRNO_STR=y

configs/socfpga_arria5_defconfig +4 -10

index 4d1cd21..79cdbfc 100644
@@ -1,19 +1,13 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_TARGET_SOCFPGA_ARRIA5=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"
 CONFIG_SPL=y
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_STACK_R_ADDR=0x00800000
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_OF_CONTROL=y
-CONFIG_SPI_FLASH=y
 CONFIG_SPL_DM=y
-CONFIG_SPL_MMC_SUPPORT=y
-CONFIG_DM_SEQ_ALIAS=y
-CONFIG_SPL_SIMPLE_BUS=y
-CONFIG_DM_SPI=y
-CONFIG_DM_SPI_FLASH=y
-CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_SPL_STACK_R=y
-CONFIG_SPL_STACK_R_ADDR=0x00800000
-CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_SPI_FLASH=y

configs/socfpga_cyclone5_defconfig +4 -11

index ae3a1de..939009a 100644
@@ -1,22 +1,15 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_TARGET_SOCFPGA_CYCLONE5=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
 CONFIG_SPL=y
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_STACK_R_ADDR=0x00800000
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_OF_CONTROL=y
+CONFIG_SPL_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
-CONFIG_SPL_DM=y
-CONFIG_SPL_MMC_SUPPORT=y
-CONFIG_DM_SEQ_ALIAS=y
-CONFIG_SPL_SIMPLE_BUS=y
-CONFIG_DM_SPI=y
-CONFIG_DM_SPI_FLASH=y
-CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_SPL_STACK_R=y
-CONFIG_SPL_STACK_R_ADDR=0x00800000
-CONFIG_SYS_MALLOC_F_LEN=0x2000

configs/socfpga_socrates_defconfig +4 -11

index 71d4711..b3181a1 100644
@@ -1,22 +1,15 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_TARGET_SOCFPGA_CYCLONE5=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"
 CONFIG_SPL=y
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_STACK_R_ADDR=0x00800000
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_OF_CONTROL=y
+CONFIG_SPL_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
-CONFIG_SPL_DM=y
-CONFIG_SPL_MMC_SUPPORT=y
-CONFIG_DM_SEQ_ALIAS=y
-CONFIG_SPL_SIMPLE_BUS=y
-CONFIG_DM_SPI=y
-CONFIG_DM_SPI_FLASH=y
-CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_SPL_STACK_R=y
-CONFIG_SPL_STACK_R_ADDR=0x00800000
-CONFIG_SYS_MALLOC_F_LEN=0x2000

configs/spring_defconfig index renamed from configs/spring_defconfig +0 -0

a3abb35..8e8ec44 100644

configs/spring_defconfig +21 -21

@@ -6,37 +6,37 @@ CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_SOUND=y
+CONFIG_CMD_PMIC=y
+CONFIG_CMD_REGULATOR=y
 CONFIG_SPI_FLASH=y
 CONFIG_CMD_CROS_EC=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_I2C=y
 CONFIG_CROS_EC_KEYB=y
-CONFIG_SOUND=y
-CONFIG_I2S=y
-CONFIG_I2S_SAMSUNG=y
-CONFIG_SOUND_MAX98095=y
-CONFIG_SOUND_WM8994=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
-CONFIG_DM_I2C=y
-CONFIG_DM_PMIC=y
-CONFIG_DM_REGULATOR=y
-CONFIG_PMIC_TPS65090=y
-CONFIG_REGULATOR_TPS65090=y
-CONFIG_DM_I2C_COMPAT=y
-CONFIG_I2C_ARB_GPIO_CHALLENGE=y
-CONFIG_I2C_MUX=y
-CONFIG_CMD_PMIC=y
-CONFIG_CMD_REGULATOR=y
-CONFIG_ERRNO_STR=y
-CONFIG_DM_PMIC_MAX77686=y
-CONFIG_DM_REGULATOR_MAX77686=y
 CONFIG_DEBUG_UART=y
 CONFIG_DEBUG_UART_S5P=y
-CONFIG_DEBUG_UART_CLOCK=100000000
 CONFIG_DEBUG_UART_BASE=0x12c30000
+CONFIG_DEBUG_UART_CLOCK=100000000
+CONFIG_DM_I2C=y
+CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_LDO=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_ARB_GPIO_CHALLENGE=y
+CONFIG_DM_PMIC=y
+CONFIG_DM_PMIC_MAX77686=y
 CONFIG_PMIC_S5M8767=y
+CONFIG_PMIC_TPS65090=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_MAX77686=y
 CONFIG_REGULATOR_S5M8767=y
+CONFIG_REGULATOR_TPS65090=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
+CONFIG_SOUND=y
+CONFIG_I2S=y
+CONFIG_I2S_SAMSUNG=y
+CONFIG_SOUND_MAX98095=y
+CONFIG_SOUND_WM8994=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_ERRNO_STR=y

configs/stv0991_defconfig index renamed from configs/stv0991_defconfig +0 -0

3bdb1fc..fbc31f8 100644

configs/stv0991_defconfig +1 -1

@@ -9,6 +9,6 @@ CONFIG_AUTOBOOT_STOP_STR=" "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_OF_CONTROL=y
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
-CONFIG_OF_CONTROL=y

configs/tqma6s_wru4_mmc_defconfig +0 -2

index 66ac0b1..c9a304d 100644
@@ -3,11 +3,9 @@ CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TQMA6=y
 CONFIG_TQMA6S=y
 CONFIG_WRU4=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Enter password in %d seconds to stop

autoboot\n"
CONFIG_AUTOBOOT_ENCRYPTION=y

CONFIG_AUTOBOOT_STOP_STR_SHA256="36a9e7f1c95b82ffb99743e0c5c4ce9 5d83c9a430aac59f84ef3cbfab6145068"

configs/tqma6s_wru4_mmc_defconfig +1 -1

-CONFIG_PCA9551_LED=y
 CONFIG_SPI_FLASH=y
+CONFIG_PCA9551_LED=y

configs/venice2_defconfig index renamed from configs/venice2_defconfig +0 -0

a4735f6..2d56930 100644

configs/venice2_defconfig +1 -1

@@ -10,8 +10,8 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra124-venice2"
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
-CONFIG_TEGRA114_SPI=y
 CONFIG_SPI_FLASH=y
+CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/xilinx_zynqmp_ep_defconfig +1 -2

index fda44ea..9b2853f 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_ZYNQMP=y
+CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-ep"
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_IMLS is not set

@@ -15,4 +16,3 @@ CONFIG_DEFAULT_DEVICE_TREE="zynqmp-ep"
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_TIME=y
 CONFIG_CMD_TIMER=y
-CONFIG_SYS_TEXT_BASE=0x8000000
--

2.5.0.rc2.392.g76e840b