| Message ID | 20170928091255.5oledjd7tcud55wa@flea |
|---|---|
| State | Changes Requested |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,GIT,PULL,v2] u-boot-sunxi/master | expand |
On Thu, Sep 28, 2017 at 11:12:55AM +0200, Maxime Ripard wrote: > Hi Tom, > > Here is the second version of the pull request sent yesterday. It > shouldn't show the config warnings anymore. > > Thanks! > Maxime > > The following changes since commit 6e9b109aa9bcdd094e77da9fb03de8b44da8eb9d: > > Merge git://git.denx.de/u-boot-usb (2017-09-27 09:39:48 -0400) > > are available in the git repository at: > > git://git.denx.de/u-boot-sunxi master > > for you to fetch changes up to 6a191c5ef1294de8c09a3c4539b76a3d9fa60036: > > sunxi: usb_phy: invert the USB phy_ctl condition (2017-09-28 10:44:12 +0200) > OK, there's still some problems. As a rule, you should at least run 'make tests' before posting and that shows: +make O=/home/trini/work/u-boot/u-boot/build-sandbox -s -j8 ../drivers/core/read.c: In function ‘dev_read_addr_ptr’: ../drivers/core/read.c:64:44: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] return (addr == FDT_ADDR_T_NONE) ? NULL : (void *)addr; ^ ../lib/uuid.c: In function ‘gen_rand_uuid’: ../lib/uuid.c:246:2: warning: implicit declaration of function ‘clrsetbits_be16’ [-Wimplicit-function-declaration] clrsetbits_be16(&uuid.time_hi_and_version, ^ ../lib/uuid.c:250:2: warning: implicit declaration of function ‘clrsetbits_8’ [-Wimplicit-function-declaration] clrsetbits_8(&uuid.clock_seq_hi_and_reserved, ^ lib/built-in.o: In function `gen_rand_uuid': /home/trini/work/u-boot/u-boot/build-sandbox/../lib/uuid.c:246: undefined reference to `clrsetbits_be16' /home/trini/work/u-boot/u-boot/build-sandbox/../lib/uuid.c:250: undefined reference to `clrsetbits_8' collect2: error: ld returned 1 exit status make[2]: *** [u-boot] Error 1 make[1]: *** [sub-make] Error 2 Next, it's a good idea to hook your own github up to travis-ci and make sure that the build there completes for everything (note that it won't fail on warnings). Thanks!
Hi, On Thu, Sep 28, 2017 at 01:02:58PM +0000, Tom Rini wrote: > On Thu, Sep 28, 2017 at 11:12:55AM +0200, Maxime Ripard wrote: > > > Hi Tom, > > > > Here is the second version of the pull request sent yesterday. It > > shouldn't show the config warnings anymore. > > > > Thanks! > > Maxime > > > > The following changes since commit 6e9b109aa9bcdd094e77da9fb03de8b44da8eb9d: > > > > Merge git://git.denx.de/u-boot-usb (2017-09-27 09:39:48 -0400) > > > > are available in the git repository at: > > > > git://git.denx.de/u-boot-sunxi master > > > > for you to fetch changes up to 6a191c5ef1294de8c09a3c4539b76a3d9fa60036: > > > > sunxi: usb_phy: invert the USB phy_ctl condition (2017-09-28 10:44:12 +0200) > > > > OK, there's still some problems. As a rule, you should at least run > 'make tests' before posting and that shows: > +make O=/home/trini/work/u-boot/u-boot/build-sandbox -s -j8 > ../drivers/core/read.c: In function ‘dev_read_addr_ptr’: > ../drivers/core/read.c:64:44: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] > return (addr == FDT_ADDR_T_NONE) ? NULL : (void *)addr; This one is in the current master. > ../lib/uuid.c: In function ‘gen_rand_uuid’: > ../lib/uuid.c:246:2: warning: implicit declaration of function ‘clrsetbits_be16’ [-Wimplicit-function-declaration] > clrsetbits_be16(&uuid.time_hi_and_version, > ^ > ../lib/uuid.c:250:2: warning: implicit declaration of function ‘clrsetbits_8’ [-Wimplicit-function-declaration] > clrsetbits_8(&uuid.clock_seq_hi_and_reserved, > ^ > lib/built-in.o: In function `gen_rand_uuid': > /home/trini/work/u-boot/u-boot/build-sandbox/../lib/uuid.c:246: undefined reference to `clrsetbits_be16' > /home/trini/work/u-boot/u-boot/build-sandbox/../lib/uuid.c:250: undefined reference to `clrsetbits_8' > collect2: error: ld returned 1 exit status > make[2]: *** [u-boot] Error 1 > make[1]: *** [sub-make] Error 2 And these two are only seen on the sandbox, since arch/sandbox doesn't define the clrsetbits. How am I supposed to fix that? > Next, it's a good idea to hook your own github up to travis-ci and make > sure that the build there completes for everything (note that it won't > fail on warnings). Thanks! Ok, will do. Thanks! Maxime
On Fri, Sep 29, 2017 at 02:37:55PM +0200, Maxime Ripard wrote: > Hi, > > On Thu, Sep 28, 2017 at 01:02:58PM +0000, Tom Rini wrote: > > On Thu, Sep 28, 2017 at 11:12:55AM +0200, Maxime Ripard wrote: > > > > > Hi Tom, > > > > > > Here is the second version of the pull request sent yesterday. It > > > shouldn't show the config warnings anymore. > > > > > > Thanks! > > > Maxime > > > > > > The following changes since commit 6e9b109aa9bcdd094e77da9fb03de8b44da8eb9d: > > > > > > Merge git://git.denx.de/u-boot-usb (2017-09-27 09:39:48 -0400) > > > > > > are available in the git repository at: > > > > > > git://git.denx.de/u-boot-sunxi master > > > > > > for you to fetch changes up to 6a191c5ef1294de8c09a3c4539b76a3d9fa60036: > > > > > > sunxi: usb_phy: invert the USB phy_ctl condition (2017-09-28 10:44:12 +0200) > > > > > > > OK, there's still some problems. As a rule, you should at least run > > 'make tests' before posting and that shows: > > +make O=/home/trini/work/u-boot/u-boot/build-sandbox -s -j8 > > ../drivers/core/read.c: In function ‘dev_read_addr_ptr’: > > ../drivers/core/read.c:64:44: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] > > return (addr == FDT_ADDR_T_NONE) ? NULL : (void *)addr; > > This one is in the current master. > > > ../lib/uuid.c: In function ‘gen_rand_uuid’: > > ../lib/uuid.c:246:2: warning: implicit declaration of function ‘clrsetbits_be16’ [-Wimplicit-function-declaration] > > clrsetbits_be16(&uuid.time_hi_and_version, > > ^ > > ../lib/uuid.c:250:2: warning: implicit declaration of function ‘clrsetbits_8’ [-Wimplicit-function-declaration] > > clrsetbits_8(&uuid.clock_seq_hi_and_reserved, > > ^ > > lib/built-in.o: In function `gen_rand_uuid': > > /home/trini/work/u-boot/u-boot/build-sandbox/../lib/uuid.c:246: undefined reference to `clrsetbits_be16' > > /home/trini/work/u-boot/u-boot/build-sandbox/../lib/uuid.c:250: undefined reference to `clrsetbits_8' > > collect2: error: ld returned 1 exit status > > make[2]: *** [u-boot] Error 1 > > make[1]: *** [sub-make] Error 2 > > And these two are only seen on the sandbox, since arch/sandbox doesn't > define the clrsetbits. How am I supposed to fix that? We can't bring in patches that break other architectures. In this case, it doesn't look too bad to grab the macros from ARM and slightly adapt, so I'll post a patch in a moment you can grab.
Hi Tom, On Fri, Sep 29, 2017 at 12:52:47PM +0000, Tom Rini wrote: > On Fri, Sep 29, 2017 at 02:37:55PM +0200, Maxime Ripard wrote: > > Hi, > > > > On Thu, Sep 28, 2017 at 01:02:58PM +0000, Tom Rini wrote: > > > On Thu, Sep 28, 2017 at 11:12:55AM +0200, Maxime Ripard wrote: > > > > > > > Hi Tom, > > > > > > > > Here is the second version of the pull request sent yesterday. It > > > > shouldn't show the config warnings anymore. > > > > > > > > Thanks! > > > > Maxime > > > > > > > > The following changes since commit 6e9b109aa9bcdd094e77da9fb03de8b44da8eb9d: > > > > > > > > Merge git://git.denx.de/u-boot-usb (2017-09-27 09:39:48 -0400) > > > > > > > > are available in the git repository at: > > > > > > > > git://git.denx.de/u-boot-sunxi master > > > > > > > > for you to fetch changes up to 6a191c5ef1294de8c09a3c4539b76a3d9fa60036: > > > > > > > > sunxi: usb_phy: invert the USB phy_ctl condition (2017-09-28 10:44:12 +0200) > > > > > > > > > > OK, there's still some problems. As a rule, you should at least run > > > 'make tests' before posting and that shows: > > > +make O=/home/trini/work/u-boot/u-boot/build-sandbox -s -j8 > > > ../drivers/core/read.c: In function ‘dev_read_addr_ptr’: > > > ../drivers/core/read.c:64:44: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] > > > return (addr == FDT_ADDR_T_NONE) ? NULL : (void *)addr; > > > > This one is in the current master. > > > > > ../lib/uuid.c: In function ‘gen_rand_uuid’: > > > ../lib/uuid.c:246:2: warning: implicit declaration of function ‘clrsetbits_be16’ [-Wimplicit-function-declaration] > > > clrsetbits_be16(&uuid.time_hi_and_version, > > > ^ > > > ../lib/uuid.c:250:2: warning: implicit declaration of function ‘clrsetbits_8’ [-Wimplicit-function-declaration] > > > clrsetbits_8(&uuid.clock_seq_hi_and_reserved, > > > ^ > > > lib/built-in.o: In function `gen_rand_uuid': > > > /home/trini/work/u-boot/u-boot/build-sandbox/../lib/uuid.c:246: undefined reference to `clrsetbits_be16' > > > /home/trini/work/u-boot/u-boot/build-sandbox/../lib/uuid.c:250: undefined reference to `clrsetbits_8' > > > collect2: error: ld returned 1 exit status > > > make[2]: *** [u-boot] Error 1 > > > make[1]: *** [sub-make] Error 2 > > > > And these two are only seen on the sandbox, since arch/sandbox doesn't > > define the clrsetbits. How am I supposed to fix that? > > We can't bring in patches that break other architectures. In this case, > it doesn't look too bad to grab the macros from ARM and slightly adapt, > so I'll post a patch in a moment you can grab. So I've set up travis-ci, and just built that branch with a couple of fixes and the patch for the sandbox io accessors I sent a bit earlier. It has passed, so I guess we're good to go. Do you want me to pick up the sandbox patch and send you the PR, or do you want to apply it yourself? Sorry for the mess... Maxime
On Mon, Oct 02, 2017 at 10:44:31PM +0200, Maxime Ripard wrote: > Hi Tom, > > On Fri, Sep 29, 2017 at 12:52:47PM +0000, Tom Rini wrote: > > On Fri, Sep 29, 2017 at 02:37:55PM +0200, Maxime Ripard wrote: > > > Hi, > > > > > > On Thu, Sep 28, 2017 at 01:02:58PM +0000, Tom Rini wrote: > > > > On Thu, Sep 28, 2017 at 11:12:55AM +0200, Maxime Ripard wrote: > > > > > > > > > Hi Tom, > > > > > > > > > > Here is the second version of the pull request sent yesterday. It > > > > > shouldn't show the config warnings anymore. > > > > > > > > > > Thanks! > > > > > Maxime > > > > > > > > > > The following changes since commit 6e9b109aa9bcdd094e77da9fb03de8b44da8eb9d: > > > > > > > > > > Merge git://git.denx.de/u-boot-usb (2017-09-27 09:39:48 -0400) > > > > > > > > > > are available in the git repository at: > > > > > > > > > > git://git.denx.de/u-boot-sunxi master > > > > > > > > > > for you to fetch changes up to 6a191c5ef1294de8c09a3c4539b76a3d9fa60036: > > > > > > > > > > sunxi: usb_phy: invert the USB phy_ctl condition (2017-09-28 10:44:12 +0200) > > > > > > > > > > > > > OK, there's still some problems. As a rule, you should at least run > > > > 'make tests' before posting and that shows: > > > > +make O=/home/trini/work/u-boot/u-boot/build-sandbox -s -j8 > > > > ../drivers/core/read.c: In function ‘dev_read_addr_ptr’: > > > > ../drivers/core/read.c:64:44: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] > > > > return (addr == FDT_ADDR_T_NONE) ? NULL : (void *)addr; > > > > > > This one is in the current master. > > > > > > > ../lib/uuid.c: In function ‘gen_rand_uuid’: > > > > ../lib/uuid.c:246:2: warning: implicit declaration of function ‘clrsetbits_be16’ [-Wimplicit-function-declaration] > > > > clrsetbits_be16(&uuid.time_hi_and_version, > > > > ^ > > > > ../lib/uuid.c:250:2: warning: implicit declaration of function ‘clrsetbits_8’ [-Wimplicit-function-declaration] > > > > clrsetbits_8(&uuid.clock_seq_hi_and_reserved, > > > > ^ > > > > lib/built-in.o: In function `gen_rand_uuid': > > > > /home/trini/work/u-boot/u-boot/build-sandbox/../lib/uuid.c:246: undefined reference to `clrsetbits_be16' > > > > /home/trini/work/u-boot/u-boot/build-sandbox/../lib/uuid.c:250: undefined reference to `clrsetbits_8' > > > > collect2: error: ld returned 1 exit status > > > > make[2]: *** [u-boot] Error 1 > > > > make[1]: *** [sub-make] Error 2 > > > > > > And these two are only seen on the sandbox, since arch/sandbox doesn't > > > define the clrsetbits. How am I supposed to fix that? > > > > We can't bring in patches that break other architectures. In this case, > > it doesn't look too bad to grab the macros from ARM and slightly adapt, > > so I'll post a patch in a moment you can grab. > > So I've set up travis-ci, and just built that branch with a couple of > fixes and the patch for the sandbox io accessors I sent a bit earlier. > > It has passed, so I guess we're good to go. > > Do you want me to pick up the sandbox patch and send you the PR, or do > you want to apply it yourself? > > Sorry for the mess... No worries. Go ahead and grab the patch and send the new PR, thanks!
Hi Tom, Here is the second version of the pull request sent yesterday. It shouldn't show the config warnings anymore. Thanks! Maxime The following changes since commit 6e9b109aa9bcdd094e77da9fb03de8b44da8eb9d: Merge git://git.denx.de/u-boot-usb (2017-09-27 09:39:48 -0400) are available in the git repository at: git://git.denx.de/u-boot-sunxi master for you to fetch changes up to 6a191c5ef1294de8c09a3c4539b76a3d9fa60036: sunxi: usb_phy: invert the USB phy_ctl condition (2017-09-28 10:44:12 +0200) ---------------------------------------------------------------- Chen-Yu Tsai (2): sunxi: rename Bananapi M3 dts file name sunxi: Enable eMMC on Cubietruck Plus Icenowy Zheng (1): sunxi: defaultly enable SPL for Lichee Pi Zero Jagan Teki (1): sun7i: a20: Add Bananapi M1 Plus support Maxime Ripard (21): usb: gadget: Move USBNET_DEVADDR option out of g_dnl usb: gadget: Document USBNET_DEVADDR usb: gadget: Move USBNET_HOST_ADDR to Kconfig usb: gadget: Convert USB_ETHER to Kconfig usb: gadget: usb_ether: Move the interfaces to Kconfig usb: gadget: Make g_dnl USB settings common usb: gadget: usb_ether: Move settings to common sunxi: provide default USB gadget setup sunxi: imply USB_GADGET cmd: fastboot: Rework fastboot dependency musb: sunxi: switch to the device model sunxi: Register usb_ether sunxi: Imply USB_ETHER sunxi: sina33: Sync the device tree with the kernel cmd: Move CONFIG_RANDOM_UUID to Kconfig sunxi: Enable CMD_GPT by default arm: sunxi: Move spl_boot_device in a separate function sunxi: Use sunxi_get_boot_device sunxi: Remove the MMC index hack sunxi: Fix USB_GADGET implication sunxi: usb_phy: invert the USB phy_ctl condition Stefan Mavrodiev (1): sunxi: Add support for A20-OLinuXino-MICRO-eMMC arch/arm/Kconfig | 4 +- arch/arm/dts/Makefile | 4 +- arch/arm/dts/axp223.dtsi | 58 +++ arch/arm/dts/axp22x.dtsi | 10 + arch/arm/dts/sun7i-a20-bananapi-m1-plus.dts | 91 +++- arch/arm/dts/sun7i-a20-olinuxino-micro-emmc.dts | 70 +++ arch/arm/dts/sun8i-a23-a33.dtsi | 446 +++++++++---------- arch/arm/dts/sun8i-a33-sinlinx-sina33.dts | 43 ++ arch/arm/dts/sun8i-a33.dtsi | 477 +++++++++++++++++---- ...ovoip-bpi-m3.dts => sun8i-a83t-bananapi-m3.dts} | 0 arch/arm/include/asm/arch-sunxi/spl.h | 2 + arch/arm/include/asm/arch-sunxi/usb_phy.h | 7 - arch/arm/mach-sunxi/board.c | 11 +- arch/arm/mach-sunxi/usb_phy.c | 14 +- board/samsung/common/gadget.c | 4 +- board/siemens/common/factoryset.c | 4 +- board/sunxi/MAINTAINERS | 5 + board/sunxi/board.c | 29 +- cmd/Kconfig | 7 + cmd/fastboot/Kconfig | 6 + configs/A13-OLinuXino_defconfig | 5 - configs/A20-OLinuXino-Lime2-eMMC_defconfig | 6 - configs/A20-OLinuXino-Lime2_defconfig | 5 - configs/A20-OLinuXino_MICRO-eMMC_defconfig | 27 ++ configs/CHIP_defconfig | 5 - configs/CHIP_pro_defconfig | 5 - configs/Cubietruck_defconfig | 5 - configs/Cubietruck_plus_defconfig | 1 + configs/LicheePi_Zero_defconfig | 4 + configs/Nintendo_NES_Classic_Edition_defconfig | 5 - configs/Sinlinx_SinA33_defconfig | 6 - configs/Sinovoip_BPI_M3_defconfig | 2 +- configs/am335x_baltos_defconfig | 8 +- configs/am335x_boneblack_defconfig | 10 +- configs/am335x_boneblack_vboot_defconfig | 9 +- configs/am335x_evm_defconfig | 9 +- configs/am335x_evm_nor_defconfig | 9 +- configs/am335x_evm_norboot_defconfig | 10 +- configs/am335x_evm_spiboot_defconfig | 9 +- configs/am335x_evm_usbspl_defconfig | 9 +- configs/am335x_hs_evm_defconfig | 7 +- configs/am43xx_evm_defconfig | 6 +- configs/am43xx_evm_ethboot_defconfig | 6 +- configs/am43xx_evm_qspiboot_defconfig | 6 +- configs/am43xx_evm_usbhost_boot_defconfig | 6 +- configs/am43xx_hs_evm_defconfig | 6 +- configs/am57xx_evm_defconfig | 8 +- configs/am57xx_evm_nodt_defconfig | 9 +- configs/am57xx_hs_evm_defconfig | 8 +- configs/apalis-tk1_defconfig | 6 +- configs/apalis_imx6_defconfig | 6 +- configs/apalis_imx6_nospl_com_defconfig | 6 +- configs/apalis_imx6_nospl_it_defconfig | 6 +- configs/apalis_t30_defconfig | 6 +- configs/bananapi_m1_plus_defconfig | 24 ++ configs/bcm11130_defconfig | 6 +- configs/bcm11130_nand_defconfig | 6 +- configs/bcm23550_w1d_defconfig | 9 +- configs/bcm28155_ap_defconfig | 9 +- configs/bcm28155_w1d_defconfig | 6 +- configs/beaver_defconfig | 6 +- configs/birdland_bav335a_defconfig | 9 +- configs/birdland_bav335b_defconfig | 9 +- configs/cei-tk1-som_defconfig | 6 +- configs/cgtqmx6eval_defconfig | 9 +- configs/chromebit_mickey_defconfig | 7 +- configs/chromebook_jerry_defconfig | 7 +- configs/chromebook_minnie_defconfig | 7 +- configs/colibri_imx6_defconfig | 6 +- configs/colibri_imx6_nospl_defconfig | 6 +- configs/colibri_imx7_defconfig | 6 +- configs/colibri_t20_defconfig | 6 +- configs/colibri_t30_defconfig | 6 +- configs/colibri_vf_defconfig | 6 +- configs/corvus_defconfig | 6 +- configs/dalmore_defconfig | 6 +- configs/dms-ba16-1g_defconfig | 6 +- configs/dms-ba16_defconfig | 6 +- configs/dra7xx_evm_defconfig | 8 +- configs/dra7xx_hs_evm_defconfig | 8 +- configs/draco_defconfig | 7 +- configs/e2220-1170_defconfig | 6 +- configs/edison_defconfig | 6 +- configs/etamin_defconfig | 7 +- configs/evb-rk3036_defconfig | 7 +- configs/evb-rk3229_defconfig | 7 +- configs/evb-rk3288_defconfig | 7 +- configs/evb-rk3328_defconfig | 6 +- configs/evb-rv1108_defconfig | 1 + configs/fennec-rk3288_defconfig | 7 +- configs/firefly-rk3288_defconfig | 7 +- configs/gwventana_emmc_defconfig | 8 +- configs/gwventana_gw5904_defconfig | 8 +- configs/gwventana_nand_defconfig | 8 +- configs/jetson-tk1_defconfig | 6 +- configs/kc1_defconfig | 9 +- configs/kylin-rk3036_defconfig | 7 +- configs/ma5d4evk_defconfig | 7 +- configs/miqi-rk3288_defconfig | 7 +- configs/mx6qsabrelite_defconfig | 11 +- configs/mx6sabreauto_defconfig | 6 +- configs/mx6sabresd_defconfig | 6 +- configs/mx7dsabresd_defconfig | 6 +- configs/mx7dsabresd_secure_defconfig | 6 +- configs/nitrogen6dl2g_defconfig | 11 +- configs/nitrogen6dl_defconfig | 11 +- configs/nitrogen6q2g_defconfig | 11 +- configs/nitrogen6q_defconfig | 11 +- configs/nitrogen6s1g_defconfig | 11 +- configs/nitrogen6s_defconfig | 11 +- configs/novena_defconfig | 2 + configs/nyan-big_defconfig | 6 +- configs/odroid-xu3_defconfig | 6 +- configs/odroid_defconfig | 6 +- configs/omap3_beagle_defconfig | 10 +- configs/omap3_evm_defconfig | 7 +- configs/omap3_logic_defconfig | 9 +- configs/omap5_uevm_defconfig | 6 +- configs/opos6uldev_defconfig | 6 +- configs/origen_defconfig | 6 +- configs/p2371-0000_defconfig | 6 +- configs/p2371-2180_defconfig | 6 +- configs/p2571_defconfig | 6 +- configs/parrot_r16_defconfig | 6 - configs/pcm051_rev1_defconfig | 1 + configs/pcm051_rev3_defconfig | 1 + configs/phycore-rk3288_defconfig | 7 +- configs/pico-imx6ul_defconfig | 6 +- configs/pico-imx7d_defconfig | 6 +- configs/popmetal-rk3288_defconfig | 7 +- configs/pxm2_defconfig | 8 +- configs/rastaban_defconfig | 8 +- configs/rock2_defconfig | 7 +- configs/rock_defconfig | 1 + configs/rut_defconfig | 7 +- configs/s5p_goni_defconfig | 6 +- configs/s5pc210_universal_defconfig | 6 +- configs/sama5d2_ptc_nandflash_defconfig | 2 + configs/sama5d2_ptc_spiflash_defconfig | 2 + configs/sansa_fuze_plus_defconfig | 2 + configs/smartweb_defconfig | 6 +- configs/sniper_defconfig | 9 +- configs/socfpga_arria5_defconfig | 6 +- configs/socfpga_cyclone5_defconfig | 6 +- configs/socfpga_de0_nano_soc_defconfig | 6 +- configs/socfpga_de10_nano_defconfig | 6 +- configs/socfpga_mcvevk_defconfig | 6 +- configs/socfpga_sockit_defconfig | 6 +- configs/socfpga_socrates_defconfig | 6 +- configs/socfpga_vining_fpga_defconfig | 6 +- configs/taurus_defconfig | 6 +- configs/tbs2910_defconfig | 6 +- configs/thuban_defconfig | 7 +- configs/tinker-rk3288_defconfig | 7 +- configs/topic_miami_defconfig | 6 +- configs/topic_miamilite_defconfig | 6 +- configs/topic_miamiplus_defconfig | 6 +- configs/trats2_defconfig | 6 +- configs/trats_defconfig | 6 +- configs/venice2_defconfig | 6 +- configs/vinco_defconfig | 2 + configs/warp7_defconfig | 9 +- configs/warp7_secure_defconfig | 9 +- configs/warp_defconfig | 6 +- configs/xfi3_defconfig | 2 + configs/xilinx_zynqmp_ep_defconfig | 6 +- configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 6 +- configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 6 +- configs/xilinx_zynqmp_zcu102_revA_defconfig | 6 +- configs/xilinx_zynqmp_zcu102_revB_defconfig | 6 +- configs/zynq_microzed_defconfig | 6 +- configs/zynq_picozed_defconfig | 6 +- configs/zynq_z_turn_defconfig | 6 +- configs/zynq_zc702_defconfig | 6 +- configs/zynq_zc706_defconfig | 6 +- configs/zynq_zed_defconfig | 6 +- configs/zynq_zybo_defconfig | 6 +- doc/README.android-fastboot | 8 +- drivers/usb/gadget/Kconfig | 79 +++- drivers/usb/gadget/ether.c | 16 +- drivers/usb/gadget/g_dnl.c | 12 +- drivers/usb/musb-new/sunxi.c | 56 ++- include/configs/am335x_evm.h | 6 - include/configs/am3517_evm.h | 5 - include/configs/am43xx_evm.h | 6 +- include/configs/am57xx_evm.h | 1 - include/configs/baltos.h | 6 - include/configs/dra7xx_evm.h | 1 - include/configs/edison.h | 1 - include/configs/gw_ventana.h | 2 - include/configs/h2200.h | 2 - include/configs/ma5d4evk.h | 3 - include/configs/nitrogen6x.h | 2 - include/configs/novena.h | 2 - include/configs/odroid.h | 1 - include/configs/odroid_xu3.h | 2 +- include/configs/omap3_beagle.h | 1 - include/configs/omap3_evm.h | 1 - include/configs/omap3_logic.h | 1 - include/configs/pcm051.h | 5 - include/configs/rockchip-common.h | 2 - include/configs/sama5d2_ptc.h | 3 - include/configs/sansa_fuze_plus.h | 2 - include/configs/siemens-am33x-common.h | 6 - include/configs/sunxi-common.h | 30 +- include/configs/tao3530.h | 2 - include/configs/trats.h | 1 - include/configs/trats2.h | 1 - include/configs/vinco.h | 4 - include/configs/warp7.h | 4 - include/configs/xfi3.h | 2 - include/configs/xilinx_zynqmp.h | 1 - include/dt-bindings/clock/sun8i-a23-a33-ccu.h | 127 ++++++ include/dt-bindings/reset/sun8i-a23-a33-ccu.h | 87 ++++ scripts/config_whitelist.txt | 6 - 215 files changed, 1778 insertions(+), 1067 deletions(-) create mode 100644 arch/arm/dts/axp223.dtsi create mode 100644 arch/arm/dts/sun7i-a20-olinuxino-micro-emmc.dts rename arch/arm/dts/{sun8i-a83t-sinovoip-bpi-m3.dts => sun8i-a83t-bananapi-m3.dts} (100%) create mode 100644 configs/A20-OLinuXino_MICRO-eMMC_defconfig create mode 100644 configs/bananapi_m1_plus_defconfig create mode 100644 include/dt-bindings/clock/sun8i-a23-a33-ccu.h create mode 100644 include/dt-bindings/reset/sun8i-a23-a33-ccu.h