| Message ID | 1416227720-25629-1-git-send-email-andreas.devel@googlemail.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Mon, Nov 17, 2014 at 01:35:20PM +0100, Andreas Bießmann wrote: > Hi Tom, > > please pull u-boot-atmel/master into u-boot/master. > > Sorry for the huge patch-list. I accidentally pulled in u-boot-arm/master > someday and pushed it. Unfortunately the pushed tree couldn't be deleted for > good reasons. I'm so sorry for the mess. > > The following changes since commit 2086e388d56cbb0e3737a6276f04f00f74bf6723: > > Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx (2014-11-14 16:39:32 -0500) > > are available in the git repository at: > > > git://git.denx.de/u-boot-atmel.git master OK, this is a mess and just git pulling made things messier still. I took your branch into a new branch locally, rebased and now have: f196044 ARM: atmel: add sama5d4 xplained ultra board support 927b901 ARM: atmel: add sama5d4ek board support cabf61c net: macb: enable GMAC IP without GE feature support 7df4486 mtd: atmel_nand: runtime to build gf table for pmecc 5b15fd9 arm, spl, at91: add spl support for the corvus board 237e3793 arm, at91, spl: add spl support for the taurus board 5abc00d arm, spl, at91: add at91sam9260 and at91sam9g45 spl support 667af36 spl, mtd, nand, atmel_nand: invert device ready pin logic 4dfd360 spl, nand, atmel_nand: add erase one block function c1ec406 mtd: atmel_nand: add missing include 0c3117b spl, nand: add option to boot raw u-boot.bin image only bd1bb3c arm, at91: add missing ddr2 cr register MPDDRC_CR_EBISHARE define 7dd5891 arm, at91: compile mpddrc ram init code also for AT91SAM9M10G45 341f548 arm, at91, mpddrc: fix typo in ddr2_init() 50921cd arm, at91: add spi dataflash support for the taurus board f11dea4 spi, atmel: move CONFIG_SYS_SPI_WRITE_TOUT into common header c001486 arm, at91: generate boot.bin file for all atmel SoC da79fa4 ARM: atmel: spl: make css field configurable a5f35d6 ARM: atmel: spl: make initialization more stable 59158ba ARM: at91 series: convert to generic board b2eff08 net: macb: write mac address when initialization As what I've taken into master and build tested and pushed. I think you'll just need to git reset --hard and git push -f your tree to get it back to a happy state. Thanks!
Hi Tom, please pull u-boot-atmel/master into u-boot/master. Sorry for the huge patch-list. I accidentally pulled in u-boot-arm/master someday and pushed it. Unfortunately the pushed tree couldn't be deleted for good reasons. I'm so sorry for the mess. The following changes since commit 2086e388d56cbb0e3737a6276f04f00f74bf6723: Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx (2014-11-14 16:39:32 -0500) are available in the git repository at: git://git.denx.de/u-boot-atmel.git master for you to fetch changes up to 6531b11f41b6bfebc0b44e4e375a2daa4de92326: ARM: atmel: add sama5d4 xplained ultra board support (2014-11-17 13:13:19 +0100) ---------------------------------------------------------------- Anatolij Gustschin (1): arm: imx6: fix typos in CCM_ANALOG_PLL_VIDEO_DENOM register name Andreas Bießmann (4): Merge branch 'master' of git://git.denx.de/u-boot tools/kwbimage.c: fix build on darwin Merge branch 'master' of git://git.denx.de/u-boot Merge branch 'master' of git://git.denx.de/u-boot Bo Shen (7): net: macb: write mac address when initialization ARM: at91 series: convert to generic board ARM: atmel: spl: make initialization more stable ARM: atmel: spl: make css field configurable net: macb: enable GMAC IP without GE feature support ARM: atmel: add sama5d4ek board support ARM: atmel: add sama5d4 xplained ultra board support Chen-Yu Tsai (1): ARM: sunxi: Fix Ippo-q8h-v5 defconfig filename Christian Gmeiner (3): ot1200: add feature pads ot1200: add support for usdhc4 ot1200: rework card detect for eMMC Dirk Eibach (1): ppc: Fix ppc4xx CONFIG_SYS_GENERIC_BOARD Fabio Estevam (2): mx6sabresd: Add Seiko WVGA panel support novena: Add MAINTAINERS file Gerald Kerma (1): ARM: kwimage: fix v0 format Hans de Goede (13): usb: Remove unnecessary portnr lookup from usb_new_device usb: Do not power-cycle usb devices on init usb: ehci: Do not disable an already disabled periodic schedule usb: ehci: Move interrupt packet length check to create_int_queue usb: ehci: Move cache invalidation to poll_int_queue usb: Make pollable int support available outside of ehci-hcd.c usb: kbd: Remove unused usb_kbd_generic_poll function usb: kbd: Fix memleak on usb_kbd_deregister() stdio: Fix memleak on stdio_deregister usb: kbd: Cache pipe, interval and packetsize usb: kbd: Add (optional) support for using an interrupt queue for polling dm: sunxi: Request card detect gpio dm: sunxi: Request USB vbus gpio Heiko Schocher (14): arm, imx, spi: detect spi flash again on aristainetos board arm, at91: generate boot.bin file for all atmel SoC spi, atmel: move CONFIG_SYS_SPI_WRITE_TOUT into common header arm, at91: add spi dataflash support for the taurus board arm, at91, mpddrc: fix typo in ddr2_init() arm, at91: compile mpddrc ram init code also for AT91SAM9M10G45 arm, at91: add missing ddr2 cr register MPDDRC_CR_EBISHARE define spl, nand: add option to boot raw u-boot.bin image only mtd: atmel_nand: add missing include spl, nand, atmel_nand: add erase one block function spl, mtd, nand, atmel_nand: invert device ready pin logic arm, spl, at91: add at91sam9260 and at91sam9g45 spl support arm, at91, spl: add spl support for the taurus board arm, spl, at91: add spl support for the corvus board Ian Campbell (7): sunxi: kconfig: Add top-level ARCH_SUNXI sunxi: kconfig: Rename TARGET_SUN[45678]I to MACH_SUN[45678]I. sunxi: Kconfig: Make SPL_FEL a toplevel Kconfig option sunxi: Use CONFIG_MACH_SUN?I from Kconfig instead of CONFIG_SUN?I sunxi: Drop FEL variants of defconfigs. sunxi: kconfig: Introduce CONFIG_TARGET_<BOARD> sunxi: kconfig: Add %_felconfig rule to enable FEL build of sunxi platforms. Igor Grinberg (1): MAINTAINERS: fix Pantelis Antoniou email address Jeroen Hofstee (4): board: wandboard: add usb storage i2c: use __weak arm926ejs: cache: use __weak serial: add prototypes for init functions Josh Wu (1): mtd: atmel_nand: runtime to build gf table for pmecc Marek Vasut (3): ARM: mx6: Add support for Kosagi Novena mtd: nand: mxs: Add ECC geometry for 2048b/112b NAND arm: mxs: Define bootscript env variable on m28evk Markus Niebel (2): tqma6: fix sf detection tqma6: fix typo in header guard define Masahiro Yamada (13): arm: debug: import debug files from Linux 3.16 arm: debug: replace license blocks with SPDX arm: debug: add Kconfig entries for lowlevel debug arm: debug: adjust for U-Boot Remove unused files ppc/arm: remove remainders of dead boards in Kconfig Remove the CREDITS file sparc: Use nicer prompt for board select menu sparc: move CONFIG_{LEON, LEON2, LEON3} to Kconfig sparc: merge arch/sparc/cpu/*/config.mk to arch/sparc/config.mk sparc: merge CONFIG_SYS_CPU and CONFIG_SYS_VENDOR defines sparc: move CONFIG_SYS_TEXT_BASE to Kconfig kbuild: do not hide clang warnings during build with W=1 Nikita Kiryanov (2): arm: mx6: cm_fx6: change issd gpio order arm: mx6: cm_fx6: detect 1GB DRAM correctly on solo Nikolay Dimitrov (1): novena: Fix ethernet PHY reset sequence Nobuhiro Iwamatsu (19): arm: rmobile: r8a7790: Update initialize L2 cache arm: rmobile: lager: Fix change of the CPU frequency arm: rmobile: lager: Add external RAM boot arm: rmobile: koelsch: Add external RAM boot arm: rmobile: alt: Add external RAM boot arm: rmobile: lager: Remove RAM address initialization arm: rmobile: koelsch: Remove RAM address initialization arm: rmobile: alt: Remove RAM address initialization arm: rmobile: alt: Fix typo of SCIF id arm: rmobile: alt: Add support USB and USB commands arm: rmobile: alt: Add VFAT filesystem support serial: sh: Add support R8A7793 net: sh-eth: Add support R8A7793 serial: sh: r8a7794: Add support external clock net: sh-eth: Remove definition of RX_DESC_SIZE and TX_DESC_SIZE net: sh-eth: Use memalign instead of orignal memroy alignment function net: sh-eth: Add cache writeback control after setting bit of DMA descriptor usb: ehci: rmobile: Add support R8A7793 usb: ehci: rmobile: Collect up address data Paul Kocialkowski (1): twl4030: VMMC2 3.2V enable on MMC init Przemyslaw Marczak (3): exynos4/4x12: cpu: add extra gpio base addresses exynos4/4x12: gpio: use gpio extra base addresses odroid: adjust gpio calls to dm gpio api Simon Glass (6): dm: sunxi: dts: Add sun7i device tree files dm: sunxi: Add a new config for an FDT-based pcDuino3 dm: sunxi: Add pinmux functions which take a bank parameter dm: sunxi: Make sure that GPIOs are requested dm: sunxi: Modify the GPIO driver to support driver model dm: sunxi: Add support for serial using driver model Soeren Moch (1): arm: arch-mx6: typo fixes in crm_regs.h Stefan Roese (1): tools/kwbimage: Fix compilation warning Vagrant Cascadian (1): Fix cosmetic issues in mkimage manpage Ye.Li (9): imximage: Fix the bootdata.size calculation imx: gpt: Add High frequency clock source support for GPT imx: mx6sl: Add perclk_clk_sel bit define in CCM imx: mx6: Change the get_ipg_per_clk for OSC 24Mhz source imx: mx6sl: Set the preclk clock source to OSC 24Mhz imx: mx6: Enable high frequency clock source for GPT imx: mx6sl: Add IOMUX setting for USDHC1-3 imx: mx6slevk: Add support for USDHC1 and USDHC3 slots imx: mx6 sabreauto: Add board support for USB EHCI Yehuda Yitschak (1): gic: fixed compilation error in GICv2 wait for interrupt macro README | 4 + arch/arm/Kconfig | 12 + arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c | 22 ++ arch/arm/cpu/arm926ejs/at91/clock.c | 60 ++++ arch/arm/cpu/armv7/at91/Makefile | 1 + arch/arm/cpu/armv7/at91/clock.c | 29 ++ arch/arm/cpu/armv7/at91/config.mk | 4 +- arch/arm/cpu/armv7/at91/sama5d4_devices.c | 30 ++ arch/arm/cpu/armv7/at91/timer.c | 3 +- arch/arm/cpu/at91-common/Makefile | 7 +- arch/arm/cpu/at91-common/mpddrc.c | 13 +- arch/arm/cpu/at91-common/sdram.c | 77 +++++ arch/arm/cpu/at91-common/spl.c | 89 +----- arch/arm/cpu/at91-common/spl_at91.c | 124 ++++++++ arch/arm/cpu/at91-common/spl_atmel.c | 80 +++++ arch/arm/include/asm/arch-at91/at91_common.h | 6 + arch/arm/include/asm/arch-at91/at91_pmc.h | 9 +- arch/arm/include/asm/arch-at91/at91sam9260.h | 1 + .../arm/include/asm/arch-at91/at91sam9260_matrix.h | 5 + arch/arm/include/asm/arch-at91/at91sam9_sdramc.h | 22 +- arch/arm/include/asm/arch-at91/atmel_mpddrc.h | 1 + arch/arm/include/asm/arch-at91/clk.h | 48 ++- arch/arm/include/asm/arch-at91/hardware.h | 2 + arch/arm/include/asm/arch-at91/sama5d4.h | 206 +++++++++++++ board/atmel/sama5d4_xplained/Kconfig | 18 ++ board/atmel/sama5d4_xplained/MAINTAINERS | 8 + board/atmel/sama5d4_xplained/Makefile | 8 + board/atmel/sama5d4_xplained/sama5d4_xplained.c | 319 ++++++++++++++++++++ board/atmel/sama5d4ek/Kconfig | 18 ++ board/atmel/sama5d4ek/MAINTAINERS | 8 + board/atmel/sama5d4ek/Makefile | 8 + board/atmel/sama5d4ek/sama5d4ek.c | 317 +++++++++++++++++++ board/siemens/corvus/board.c | 109 ++++++- board/siemens/taurus/taurus.c | 100 +++++- common/spl/spl.c | 15 +- common/spl/spl_nand.c | 13 + configs/corvus_defconfig | 5 +- configs/sama5d4_xplained_mmc_defconfig | 3 + configs/sama5d4_xplained_nandflash_defconfig | 3 + configs/sama5d4_xplained_spiflash_defconfig | 3 + configs/sama5d4ek_mmc_defconfig | 3 + configs/sama5d4ek_nandflash_defconfig | 3 + configs/sama5d4ek_spiflash_defconfig | 3 + configs/taurus_defconfig | 5 +- drivers/mtd/nand/atmel_nand.c | 115 ++++++- drivers/mtd/nand/atmel_nand_ecc.h | 4 + drivers/net/macb.c | 17 +- drivers/spi/atmel_spi.h | 4 + include/configs/afeb9260.h | 1 - include/configs/at91rm9200ek.h | 2 + include/configs/at91sam9260ek.h | 3 +- include/configs/at91sam9261ek.h | 3 +- include/configs/at91sam9263ek.h | 1 - include/configs/at91sam9rlek.h | 1 - include/configs/corvus.h | 54 +++- include/configs/ethernut5.h | 1 - include/configs/meesc.h | 1 - include/configs/otc570.h | 1 - include/configs/pm9261.h | 1 - include/configs/pm9263.h | 1 - include/configs/sama5d4_xplained.h | 216 +++++++++++++ include/configs/sama5d4ek.h | 214 +++++++++++++ include/configs/sbc35_a9g20.h | 1 - include/configs/taurus.h | 62 +++- include/configs/tny_a9260.h | 1 - include/configs/usb_a9263.h | 1 - include/nand.h | 1 + include/spl.h | 1 + scripts/Makefile.spl | 4 + 69 files changed, 2377 insertions(+), 158 deletions(-) create mode 100644 arch/arm/cpu/armv7/at91/sama5d4_devices.c create mode 100644 arch/arm/cpu/at91-common/sdram.c create mode 100644 arch/arm/cpu/at91-common/spl_at91.c create mode 100644 arch/arm/cpu/at91-common/spl_atmel.c create mode 100644 arch/arm/include/asm/arch-at91/sama5d4.h create mode 100644 board/atmel/sama5d4_xplained/Kconfig create mode 100644 board/atmel/sama5d4_xplained/MAINTAINERS create mode 100644 board/atmel/sama5d4_xplained/Makefile create mode 100644 board/atmel/sama5d4_xplained/sama5d4_xplained.c create mode 100644 board/atmel/sama5d4ek/Kconfig create mode 100644 board/atmel/sama5d4ek/MAINTAINERS create mode 100644 board/atmel/sama5d4ek/Makefile create mode 100644 board/atmel/sama5d4ek/sama5d4ek.c create mode 100644 configs/sama5d4_xplained_mmc_defconfig create mode 100644 configs/sama5d4_xplained_nandflash_defconfig create mode 100644 configs/sama5d4_xplained_spiflash_defconfig create mode 100644 configs/sama5d4ek_mmc_defconfig create mode 100644 configs/sama5d4ek_nandflash_defconfig create mode 100644 configs/sama5d4ek_spiflash_defconfig create mode 100644 include/configs/sama5d4_xplained.h create mode 100644 include/configs/sama5d4ek.h