<resend with proper Cc-s added> Hi Tom,
Please pull u-boot-sunxi/master into master, highlights: 1) Preliminary A31 (sun6i) and A23 (sun8i) support, preliminary because we lack SPL support for now, so Allwinner's boot0 + boot1 loaders must be used to bootstrap 2) Support for the secondary mmc slot found on some boards, including booting from the eMMC on the Mele-M3. 3) Support for booting old linux-sunxi kernels on sun4i and sun5i through CONFIG_OLD_SUNXI_KERNEL_COMPAT Kconfig option (sun7i is wip) The following changes since commit 5b3ee386fde82a1ba42ff09b95247842c9a1585e: kbuild: clear VENDOR variable to fix build error on tcsh (2014-10-23 16:35:12 -0400) are available in the git repository at: http://git.denx.de/u-boot-sunxi.git for you to fetch changes up to accc9e446be6c3bd129315a0c5830bddccfa16da: sunxi: Add CONFIG_OLD_SUNXI_KERNEL_COMPAT Kconfig option (2014-10-24 09:37:26 +0200) ---------------------------------------------------------------- Chen-Yu Tsai (16): ARM: sunxi: Use macro values for setting UART GPIO pull-ups ARM: sunxi: Fix build break when CONFIG_USB_EHCI is not defined ARM: sun6i: Add clock support ARM: sun6i: Define UART0 pins for A31 ARM: sun6i: Add Colombus board defconfig ARM: sunxi: Fix build break when CONFIG_MMC is not defined ARM: sunxi: Move watchdog register definitions to separate file ARM: sunxi: Add sun6i/sun8i timer block register definition ARM: sunxi: Fix reset command on sun6i/sun8i ARM: sunxi: Add sun8i (A23) UART0 pin mux support ARM: sunxi: Add support for uart0 on port F (mmc0) mmc: sunxi: Add support for sun8i (A23) ARM: sunxi: Add basic A23 support ARM: sunxi: Allow specifying module in prcm apb0 init function ARM: sunxi: Add support for using R_UART as console ARM: sunxi: Add Ippo-q8h-v5 A23 tablet board defconfig Hans de Goede (13): sunxi: Add support for the Mele M3 board ARM: sunxi-mmc: Add mmc support for sun6i / A31 sunxi: Add mmc card-detect functionality sunxi: Turn MMC_SUNXI_SLOT_EXTRA into a proper Kconfig option sunxi: When we've both mmc0 and mmc2, detect from which one we're booting sunxi: Use PG3 - PG8 as io-pins for mmc1 sunxi: Enable second sdcard slot found on some boards sunxi: Kconfig: Unify sunxi Kconfig code sunxi: Add CONFIG_MACH_TYPE defines to sun4i, sun5i and sun7i ARM: sunxi: Add support for R_PIO gpio banks sunxi: Add clock_get_pll5p() function sunxi: dram: Use clock_get_pll5p to calculate mbus, rather then hardcoding sunxi: Add CONFIG_OLD_SUNXI_KERNEL_COMPAT Kconfig option Iain Paton (1): sun7i: Add support for Olimex A20-OLinuXino-LIME2 Ian Campbell (1): sunxi: Increase command line buffer size (CONFIG_SYS_CBSIZE) Maxime Ripard (2): ARM: sun6i: Setup the A31 UART0 muxing ARM: sunxi: Add basic A31 support Oliver Schinagl (2): ARM: sun6i: Add base address for the new controllers in A31 ARM: sun6i: Add support for the power reset control module found on the A31 Wills Wang (1): mmc: sunxi: add SDHC support for sun6i/sun7i/sun8i arch/arm/Kconfig | 6 + arch/arm/cpu/armv7/sunxi/Makefile | 4 + arch/arm/cpu/armv7/sunxi/board.c | 38 +++- arch/arm/cpu/armv7/sunxi/clock_sun4i.c | 11 ++ arch/arm/cpu/armv7/sunxi/clock_sun6i.c | 76 ++++++++ arch/arm/cpu/armv7/sunxi/cpu_info.c | 4 + arch/arm/cpu/armv7/sunxi/dram.c | 36 ++-- arch/arm/cpu/armv7/sunxi/prcm.c | 35 ++++ arch/arm/include/asm/arch-sunxi/clock.h | 5 + arch/arm/include/asm/arch-sunxi/clock_sun4i.h | 3 + arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 205 ++++++++++++++++++++++ arch/arm/include/asm/arch-sunxi/cpu.h | 10 ++ arch/arm/include/asm/arch-sunxi/gpio.h | 45 ++++- arch/arm/include/asm/arch-sunxi/mmc.h | 7 +- arch/arm/include/asm/arch-sunxi/prcm.h | 238 ++++++++++++++++++++++++++ arch/arm/include/asm/arch-sunxi/timer.h | 23 +-- arch/arm/include/asm/arch-sunxi/watchdog.h | 44 +++++ board/sunxi/Kconfig | 68 +++++--- board/sunxi/MAINTAINERS | 17 ++ board/sunxi/Makefile | 2 + board/sunxi/board.c | 38 +++- board/sunxi/dram_a20_olinuxino_l2.c | 31 ++++ configs/A10s-OLinuXino-M_defconfig | 3 + configs/A20-OLinuXino-Lime2_defconfig | 5 + configs/A20-OLinuXino_MICRO_defconfig | 3 + configs/Colombus_defconfig | 4 + configs/Ippo_q8h_defconfig | 4 + configs/Mele_M3_defconfig | 7 + drivers/mmc/sunxi_mmc.c | 42 ++++- include/configs/sun4i.h | 1 + include/configs/sun5i.h | 1 + include/configs/sun6i.h | 26 +++ include/configs/sun7i.h | 1 + include/configs/sun8i.h | 23 +++ include/configs/sunxi-common.h | 24 ++- 35 files changed, 1010 insertions(+), 80 deletions(-) create mode 100644 arch/arm/cpu/armv7/sunxi/clock_sun6i.c create mode 100644 arch/arm/cpu/armv7/sunxi/prcm.c create mode 100644 arch/arm/include/asm/arch-sunxi/clock_sun6i.h create mode 100644 arch/arm/include/asm/arch-sunxi/prcm.h create mode 100644 arch/arm/include/asm/arch-sunxi/watchdog.h create mode 100644 board/sunxi/dram_a20_olinuxino_l2.c create mode 100644 configs/A20-OLinuXino-Lime2_defconfig create mode 100644 configs/Colombus_defconfig create mode 100644 configs/Ippo_q8h_defconfig create mode 100644 configs/Mele_M3_defconfig create mode 100644 include/configs/sun6i.h create mode 100644 include/configs/sun8i.h Regards, Hans _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
