Hi Tom,
Please pull u-boot-sunxi/master into master for a number of bugfixes and a sync of the sunxi dts files with the upstream kernel.
Note this pull-req also includes the patch for setting CONFIG_CMD_NET and CONFIG_CMD_SETEXPR to y by default, I know that is still being discussed, but this patch is necessary to fix build-failures on a number of boards which did not get CONFIG_CMD_NET and CONFIG_CMD_SETEXPR set to y by the initial patches introducing CONFIG_CMD_NET and CONFIG_CMD_SETEXPR, and the bulk of the patch is removing CONFIG_CMD_NET and CONFIG_CMD_SETEXPR from all the sunxi defconfigs, which is something which will need to be done anyways no matter how we end up solving this.
The following changes since commit d8abb46b37fadff0349adb376df6d3ecd09ee7d1:
board/BuR/common: fix netconsole (2015-06-02 12:58:51 -0400)
are available in the git repository at:
http://git.denx.de/u-boot-sunxi.git master
for you to fetch changes up to 277af820b5207d43473869da2c86412d2b51d461:
sunxi: Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default (2015-06-05 21:09:14 +0200)
---------------------------------------------------------------- Hans de Goede (8): sunxi: mmc: Enable pull-up on card-detect gpio pin sunxi: usb_phy: Swap check for disconnect threshold sunxi: Add new Mele_A1000G_quad defconfig sunxi: gpio: Add "allwinner,sun8i-a33-pinctrl" sunxi: Sync dts files with the linux kernel sunxi: Rename Astar_MID756 to Et_q8_v1_6 to match kernel dts name sunxi: Add a proper dts file for the ga10h a33 based tablet sunxi: Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default
arch/arm/cpu/armv7/sunxi/usb_phy.c | 6 +- arch/arm/dts/Makefile | 5 +- arch/arm/dts/sun4i-a10-a1000.dts | 11 +- arch/arm/dts/sun4i-a10-ba10-tvbox.dts | 11 +- arch/arm/dts/sun4i-a10-chuwi-v7-cw0825.dts | 5 - arch/arm/dts/sun4i-a10-cubieboard.dts | 14 +- arch/arm/dts/sun4i-a10-gemei-g9.dts | 5 - arch/arm/dts/sun4i-a10-hackberry.dts | 11 +- arch/arm/dts/sun4i-a10-hyundai-a7hd.dts | 5 - arch/arm/dts/sun4i-a10-inet97fv2.dts | 5 - arch/arm/dts/sun4i-a10-jesurun-q5.dts | 11 +- arch/arm/dts/sun4i-a10-marsboard.dts | 12 +- arch/arm/dts/sun4i-a10-mini-xplus.dts | 9 +- arch/arm/dts/sun4i-a10-mk802.dts | 5 - arch/arm/dts/sun4i-a10-mk802ii.dts | 5 - arch/arm/dts/sun4i-a10-olinuxino-lime.dts | 9 +- arch/arm/dts/sun4i-a10-pcduino.dts | 9 +- arch/arm/dts/sun4i-a10.dtsi | 146 +++-- arch/arm/dts/sun5i-a10s-auxtek-t004.dts | 5 - arch/arm/dts/sun5i-a10s-mk802.dts | 5 - arch/arm/dts/sun5i-a10s-olinuxino-micro.dts | 9 +- arch/arm/dts/sun5i-a10s-r7-tv-dongle.dts | 5 - arch/arm/dts/sun5i-a10s.dtsi | 43 +- arch/arm/dts/sun5i-a13-hsg-h702.dts | 5 - arch/arm/dts/sun5i-a13-olinuxino-micro.dts | 5 - arch/arm/dts/sun5i-a13-olinuxino.dts | 5 - arch/arm/dts/sun5i-a13-utoo-p66.dts | 27 +- arch/arm/dts/sun5i-a13.dtsi | 36 +- arch/arm/dts/sun5i.dtsi | 74 ++- arch/arm/dts/sun6i-a31-app4-evb1.dts | 5 - arch/arm/dts/sun6i-a31-colombus.dts | 5 - arch/arm/dts/sun6i-a31-hummingbird.dts | 5 - arch/arm/dts/sun6i-a31-i7.dts | 5 - arch/arm/dts/sun6i-a31-m9.dts | 5 - arch/arm/dts/sun6i-a31-mele-a1000g-quad.dts | 149 +++++ arch/arm/dts/sun6i-a31.dtsi | 57 +- arch/arm/dts/sun6i-a31s-cs908.dts | 5 - arch/arm/dts/sun6i-a31s.dtsi | 5 - arch/arm/dts/sun7i-a20-bananapi.dts | 11 +- arch/arm/dts/sun7i-a20-bananapro.dts | 17 +- arch/arm/dts/sun7i-a20-cubieboard2.dts | 7 +- arch/arm/dts/sun7i-a20-cubietruck.dts | 7 +- arch/arm/dts/sun7i-a20-hummingbird.dts | 10 +- arch/arm/dts/sun7i-a20-i12-tvbox.dts | 7 +- arch/arm/dts/sun7i-a20-m3.dts | 7 +- arch/arm/dts/sun7i-a20-mk808c.dts | 111 +++- arch/arm/dts/sun7i-a20-olinuxino-lime.dts | 5 - arch/arm/dts/sun7i-a20-olinuxino-lime2.dts | 5 - arch/arm/dts/sun7i-a20-olinuxino-micro.dts | 11 +- arch/arm/dts/sun7i-a20-orangepi-mini.dts | 7 +- arch/arm/dts/sun7i-a20-orangepi.dts | 7 +- arch/arm/dts/sun7i-a20-pcduino3-nano.dts | 7 +- arch/arm/dts/sun7i-a20-pcduino3.dts | 7 +- arch/arm/dts/sun7i-a20-wexler-tab7200.dts | 5 - arch/arm/dts/sun7i-a20.dtsi | 210 ++++--- arch/arm/dts/sun8i-a23-a33.dtsi | 626 +++++++++++++++++++++ arch/arm/dts/sun8i-a23-evb.dts | 134 +++++ arch/arm/dts/sun8i-a23-ippo-q8h-v1.2.dts | 5 - arch/arm/dts/sun8i-a23-ippo-q8h-v5.dts | 5 - arch/arm/dts/sun8i-a23.dtsi | 579 +------------------ arch/arm/dts/sun8i-a33-astar-mid756.dts | 29 - arch/arm/dts/sun8i-a33-et-q8-v1.6.dts | 88 +++ arch/arm/dts/sun8i-a33-ga10h-v1.1.dts | 125 ++++ .../dts/sun8i-a33-ippo-q8h-v1.2-lcd1024x600.dts | 2 +- arch/arm/dts/sun8i-a33.dtsi | 89 +++ arch/arm/dts/sun9i-a80-optimus.dts | 5 - arch/arm/dts/sun9i-a80.dtsi | 13 +- arch/arm/dts/sunxi-common-regulators.dtsi | 5 - board/sunxi/Kconfig | 6 + board/sunxi/MAINTAINERS | 11 +- configs/A10-OLinuXino-Lime_defconfig | 2 - configs/A10s-OLinuXino-M_defconfig | 2 - configs/A13-OLinuXinoM_defconfig | 2 - configs/A13-OLinuXino_defconfig | 2 - configs/A20-OLinuXino-Lime2_defconfig | 2 - configs/A20-OLinuXino-Lime_defconfig | 2 - configs/A20-OLinuXino_MICRO_defconfig | 2 - configs/Ainol_AW1_defconfig | 2 - configs/Ampe_A76_defconfig | 2 - configs/Auxtek-T004_defconfig | 2 - configs/Bananapi_defconfig | 2 - configs/Bananapro_defconfig | 2 - configs/CSQ_CS908_defconfig | 2 - configs/Chuwi_V7_CW0825_defconfig | 2 - configs/Colombus_defconfig | 2 - configs/Cubieboard2_defconfig | 2 - configs/Cubieboard_defconfig | 2 - configs/Cubietruck_defconfig | 2 - ...Astar_MID756_defconfig => Et_q8_v1_6_defconfig} | 4 +- configs/Hummingbird_A31_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/Linksprite_pcDuino3_Nano_defconfig | 2 - configs/Linksprite_pcDuino3_defconfig | 2 - configs/Linksprite_pcDuino_defconfig | 2 - configs/MK808C_defconfig | 2 - configs/MSI_Primo73_defconfig | 2 - configs/MSI_Primo81_defconfig | 2 - configs/Marsboard_A10_defconfig | 2 - configs/Mele_A1000G_quad_defconfig | 24 + configs/Mele_A1000_defconfig | 2 - configs/Mele_I7_defconfig | 2 - configs/Mele_M3_defconfig | 2 - configs/Mele_M5_defconfig | 2 - configs/Mele_M9_defconfig | 12 +- configs/Mini-X_defconfig | 2 - configs/Orangepi_defconfig | 2 - configs/Orangepi_mini_defconfig | 2 - configs/TZX-Q8-713B7_defconfig | 2 - configs/UTOO_P66_defconfig | 2 - configs/Wexler_TAB7200_defconfig | 2 - configs/Wits_Pro_A20_DKT_defconfig | 2 - configs/Yones_Toptech_BD1078_defconfig | 2 - configs/ba10_tv_box_defconfig | 2 - configs/forfun_q88db_defconfig | 2 - configs/ga10h_v1_1_defconfig | 4 +- configs/i12-tvbox_defconfig | 2 - configs/iNet_3F_defconfig | 2 - configs/iNet_3W_defconfig | 2 - configs/iNet_86VS_defconfig | 2 - configs/jesurun_q5_defconfig | 2 - configs/mixtile_loftq_defconfig | 2 - configs/mk802_a10s_defconfig | 2 - configs/mk802_defconfig | 2 - configs/mk802ii_defconfig | 2 - configs/r7-tv-dongle_defconfig | 2 - configs/sunxi_Gemei_G9_defconfig | 2 - drivers/gpio/sunxi_gpio.c | 1 + drivers/mmc/sunxi_mmc.c | 4 +- 131 files changed, 1837 insertions(+), 1229 deletions(-) create mode 100644 arch/arm/dts/sun6i-a31-mele-a1000g-quad.dts create mode 100644 arch/arm/dts/sun8i-a23-a33.dtsi create mode 100644 arch/arm/dts/sun8i-a23-evb.dts delete mode 100644 arch/arm/dts/sun8i-a33-astar-mid756.dts create mode 100644 arch/arm/dts/sun8i-a33-et-q8-v1.6.dts create mode 100644 arch/arm/dts/sun8i-a33-ga10h-v1.1.dts create mode 100644 arch/arm/dts/sun8i-a33.dtsi rename configs/{Astar_MID756_defconfig => Et_q8_v1_6_defconfig} (86%) create mode 100644 configs/Mele_A1000G_quad_defconfig
Regards,
Hans