Merge git://git.denx.de/u-boot-sunxi

diff --combined configs/colibri_vf_defconfig
index 49315d0638ed2bc9ac02d742529558ff353b94d7,c0d664ec2fcd6f6aa961f7ff1aa0d2305e1ad0d0..d3547db14f79e8cb2394a7eb15bc38d07164f013
--- 1/configs/colibri_vf_defconfig
--- 2/configs/colibri_vf_defconfig
+++ b/configs/colibri_vf_defconfig
@@@ -6,7 -6,6 +6,7 @@@ CONFIG_TARGET_COLIBRI_VF=
  CONFIG_DEFAULT_DEVICE_TREE="vf610-colibri"
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,IMX_NAND"
  CONFIG_BOOTDELAY=1
 +CONFIG_LOGLEVEL=3
  CONFIG_VERSION_VARIABLE=y
  # CONFIG_DISPLAY_BOARDINFO is not set
  CONFIG_ARCH_MISC_INIT=y
@@@ -54,11 -53,11 +54,11 @@@ CONFIG_DM_USB=
  CONFIG_USB_EHCI_HCD=y
  CONFIG_USB_STORAGE=y
  CONFIG_USB_GADGET=y
+ CONFIG_USB_GADGET_MANUFACTURER="Toradex"
+ CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
+ CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
  CONFIG_CI_UDC=y
  CONFIG_USB_GADGET_DOWNLOAD=y
- CONFIG_G_DNL_MANUFACTURER="Toradex"
- CONFIG_G_DNL_VENDOR_NUM=0x1b67
- CONFIG_G_DNL_PRODUCT_NUM=0x4000
  CONFIG_VIDEO_FSL_DCU_FB=y
  CONFIG_SYS_CONSOLE_FG_COL=0x00
  CONFIG_OF_LIBFDT_OVERLAY=y

diff --combined drivers/usb/gadget/ether.c
index 2e0ff452d85f511917e680d1b108821651fd6dbe,dbb578258f96ed202121b8cbb282efe99e034bdf..a80486e91f1a7ba4a79d2ff58b94f2f956192515
--- 1/drivers/usb/gadget/ether.c
--- 2/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@@ -273,8 -273,8 +273,8 @@@ static inline int BITRATE(struct usb_ga
   * static ushort idProduct;
   */
  
- #if defined(CONFIG_USBNET_MANUFACTURER)
- static char *iManufacturer = CONFIG_USBNET_MANUFACTURER;
+ #if defined(CONFIG_USB_GADGET_MANUFACTURER)
+ static char *iManufacturer = CONFIG_USB_GADGET_MANUFACTURER;
  #else
  static char *iManufacturer = "U-Boot";
  #endif
@@@ -1059,7 -1059,7 +1059,7 @@@ static int eth_set_config(struct eth_de
                        && dev->config
                        && dev->tx_qlen != 0) {
                /* tx fifo is full, but we can't clear it...*/
 -              error("can't change configurations");
 +              pr_err("can't change configurations");
                return -ESPIPE;
        }
        eth_reset_config(dev);
@@@ -1233,7 -1233,7 +1233,7 @@@ static void rndis_command_complete(stru
        /* received RNDIS command from USB_CDC_SEND_ENCAPSULATED_COMMAND */
        status = rndis_msg_parser(dev->rndis_config, (u8 *) req->buf);
        if (status < 0)
 -              error("%s: rndis parse error %d", __func__, status);
 +              pr_err("%s: rndis parse error %d", __func__, status);
  }
  
  #endif        /* RNDIS */
@@@ -1554,7 -1554,7 +1554,7 @@@ static int rx_submit(struct eth_dev *de
        retval = usb_ep_queue(dev->out_ep, req, gfp_flags);
  
        if (retval)
 -              error("rx submit --> %d", retval);
 +              pr_err("rx submit --> %d", retval);
  
        return retval;
  }
@@@ -1624,7 -1624,7 +1624,7 @@@ static int alloc_requests(struct eth_de
  fail2:
        usb_ep_free_request(dev->in_ep, dev->tx_req);
  fail1:
 -      error("can't alloc requests");
 +      pr_err("can't alloc requests");
        return -1;
  }
  
@@@ -2060,7 -2060,7 +2060,7 @@@ static int eth_bind(struct usb_gadget *
                 * anything less functional on CDC-capable hardware,
                 * so we fail in this case.
                 */
 -              error("controller '%s' not recognized",
 +              pr_err("controller '%s' not recognized",
                        gadget->name);
                return -ENODEV;
        }
@@@ -2073,11 -2073,11 +2073,11 @@@
         * to choose the right configuration otherwise.
         */
        if (rndis) {
- #if defined(CONFIG_USB_RNDIS_VENDOR_ID) && defined(CONFIG_USB_RNDIS_PRODUCT_ID)
+ #if defined(CONFIG_USB_GADGET_VENDOR_NUM) && defined(CONFIG_USB_GADGET_PRODUCT_NUM)
                device_desc.idVendor =
-                       __constant_cpu_to_le16(CONFIG_USB_RNDIS_VENDOR_ID);
+                       __constant_cpu_to_le16(CONFIG_USB_GADGET_VENDOR_NUM);
                device_desc.idProduct =
-                       __constant_cpu_to_le16(CONFIG_USB_RNDIS_PRODUCT_ID);
+                       __constant_cpu_to_le16(CONFIG_USB_GADGET_PRODUCT_NUM);
  #else
                device_desc.idVendor =
                        __constant_cpu_to_le16(RNDIS_VENDOR_NUM);
@@@ -2092,9 -2092,9 +2092,9 @@@
         * supporting one submode of the "SAFE" variant of MDLM.)
         */
        } else {
- #if defined(CONFIG_USB_CDC_VENDOR_ID) && defined(CONFIG_USB_CDC_PRODUCT_ID)
-               device_desc.idVendor = cpu_to_le16(CONFIG_USB_CDC_VENDOR_ID);
-               device_desc.idProduct = cpu_to_le16(CONFIG_USB_CDC_PRODUCT_ID);
+ #if defined(CONFIG_USB_GADGET_VENDOR_NUM) && defined(CONFIG_USB_GADGET_PRODUCT_NUM)
+               device_desc.idVendor = cpu_to_le16(CONFIG_USB_GADGET_VENDOR_NUM);
+               device_desc.idProduct = cpu_to_le16(CONFIG_USB_GADGET_PRODUCT_NUM);
  #else
                if (!cdc) {
                        device_desc.idVendor =
@@@ -2121,7 -2121,7 +2121,7 @@@
        in_ep = usb_ep_autoconfig(gadget, &fs_source_desc);
        if (!in_ep) {
  autoconf_fail:
 -              error("can't autoconfigure on %s\n",
 +              pr_err("can't autoconfigure on %s\n",
                        gadget->name);
                return -ENODEV;
        }
@@@ -2142,7 -2142,7 +2142,7 @@@
                if (status_ep) {
                        status_ep->driver_data = status_ep;     /* claim */
                } else if (rndis) {
 -                      error("can't run RNDIS on %s", gadget->name);
 +                      pr_err("can't run RNDIS on %s", gadget->name);
                        return -ENODEV;
  #ifdef CONFIG_USB_ETH_CDC
                } else if (cdc) {
@@@ -2244,7 -2244,7 +2244,7 @@@
        if (rndis) {
                status = rndis_init();
                if (status < 0) {
 -                      error("can't init RNDIS, %d", status);
 +                      pr_err("can't init RNDIS, %d", status);
                        goto fail;
                }
        }
@@@ -2335,7 -2335,7 +2335,7 @@@ fail0
        return 0;
  
  fail:
 -      error("%s failed, status = %d", __func__, status);
 +      pr_err("%s failed, status = %d", __func__, status);
        eth_unbind(gadget);
        return status;
  }
@@@ -2350,7 -2350,7 +2350,7 @@@ int dm_usb_init(struct eth_dev *e_dev
  
        ret = uclass_first_device(UCLASS_USB_DEV_GENERIC, &dev);
        if (!dev || ret) {
 -              error("No USB device found\n");
 +              pr_err("No USB device found\n");
                return -ENODEV;
        }
  
@@@ -2369,7 -2369,7 +2369,7 @@@ static int _usb_eth_init(struct ether_p
  
  #ifdef CONFIG_DM_USB
        if (dm_usb_init(dev)) {
 -              error("USB ether not found\n");
 +              pr_err("USB ether not found\n");
                return -ENODEV;
        }
  #else
@@@ -2393,11 -2393,11 +2393,11 @@@
                        sizeof(host_addr));
  
        if (!is_eth_addr_valid(dev_addr)) {
 -              error("Need valid 'usbnet_devaddr' to be set");
 +              pr_err("Need valid 'usbnet_devaddr' to be set");
                goto fail;
        }
        if (!is_eth_addr_valid(host_addr)) {
 -              error("Need valid 'usbnet_hostaddr' to be set");
 +              pr_err("Need valid 'usbnet_hostaddr' to be set");
                goto fail;
        }
  
@@@ -2427,7 -2427,7 +2427,7 @@@
        while (!dev->network_started) {
                /* Handle control-c and timeouts */
                if (ctrlc() || (get_timer(ts) > timeout)) {
 -                      error("The remote end did not respond in time.");
 +                      pr_err("The remote end did not respond in time.");
                        goto fail;
                }
                usb_gadget_handle_interrupts(0);
@@@ -2456,7 -2456,7 +2456,7 @@@ static int _usb_eth_send(struct ether_p
                rndis_pkt = malloc(length +
                                        sizeof(struct rndis_packet_msg_type));
                if (!rndis_pkt) {
 -                      error("No memory to alloc RNDIS packet");
 +                      pr_err("No memory to alloc RNDIS packet");
                        goto drop;
                }
                rndis_add_hdr(rndis_pkt, length);
@@@ -2574,7 -2574,7 +2574,7 @@@ static int usb_eth_recv(struct eth_devi
  
        ret = _usb_eth_recv(priv);
        if (ret) {
 -              error("error packet receive\n");
 +              pr_err("error packet receive\n");
                return ret;
        }
  
@@@ -2585,7 -2585,7 +2585,7 @@@
                net_process_received_packet(net_rx_packets[0],
                                            dev->rx_req->length);
        } else {
 -              error("dev->rx_req invalid");
 +              pr_err("dev->rx_req invalid");
        }
        packet_received = 0;
        rx_submit(dev, dev->rx_req, 0);
@@@ -2641,7 -2641,7 +2641,7 @@@ static int usb_eth_recv(struct udevice 
  
        ret = _usb_eth_recv(priv);
        if (ret) {
 -              error("error packet receive\n");
 +              pr_err("error packet receive\n");
                return ret;
        }
  
@@@ -2650,7 -2650,7 +2650,7 @@@
                        *packetp = (uchar *)net_rx_packets[0];
                        return ethdev->rx_req->length;
                } else {
 -                      error("dev->rx_req invalid");
 +                      pr_err("dev->rx_req invalid");
                        return -EFAULT;
                }
        }
@@@ -2706,13 -2706,13 +2706,13 @@@ int usb_ether_init(void
  
        ret = uclass_first_device(UCLASS_USB_DEV_GENERIC, &usb_dev);
        if (!usb_dev || ret) {
 -              error("No USB device found\n");
 +              pr_err("No USB device found\n");
                return ret;
        }
  
        ret = device_bind_driver(usb_dev, "usb_ether", "usb_ether", &dev);
        if (!dev || ret) {
 -              error("usb - not able to bind usb_ether device\n");
 +              pr_err("usb - not able to bind usb_ether device\n");
                return ret;
        }