From: Reinhard Meyer <u-boot@emk-elektronik.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PULL] Pull request u-boot-atmel.git next
Date: Tue, 17 May 2011 17:34:43 +0200 [thread overview]
Message-ID: <4DD29593.6080301@emk-elektronik.de> (raw)
In-Reply-To: <4DD25783.7080509@aribaud.net>
Hello Albert,
> Yes, it is even trivial; but I expect pull request to be from 'master' branches, which contain patches accepted by the custodian for the upcoming version, not from 'next' branches, which are a waiting queue for patches that will only go into the next merge window -- as per <http://www.denx.de/wiki/view/U-Boot/CustodianGitTrees#Tips_for_maintaining_custodian_t>
OK, I changed the branch names accordingsly, you can now pull from u-boot-atmel.git master:
The following changes since commit 2e73808ee97d75400881d1fe144b062f427cfcb9:
Clint Adams (1):
Enable multiple fs options for Marvell SoC family on OpenRD boards
are available in the git repository at:
git://git.denx.de/u-boot-atmel.git master
Andreas Bie??mann (19):
avr32: rename memory-map.h -> hardware.h
avr32: fixup definitions to ATMEL_BASE_xxx
avr32: fix linking
avr32/config.mk: simplify PLATFORM_RELFLAGS
avr32: use single linker script
atngw100: fix "#define XXXX 1"
atstk1002: fix "#define XXXX 1"
atstk1003: fix "#define XXXX 1"
atstk1004: fix "#define XXXX 1"
atstk1006: fix "#define XXXX 1"
favr-32-ezkit: fix "#define XXXX 1"
hammerhead: fix "#define XXXX 1"
mimc200: fix "#define XXXX 1"
atngw100: move CONFIG_SYS_TEXT_BASE to header
atstk100x: move CONFIG_SYS_TEXT_BASE to header
favr-32-ezkit: move CONFIG_SYS_TEXT_BASE to header
mimc200: move CONFIG_SYS_TEXT_BASE to header
hammerhead: move CONFIG_SYS_TEXT_BASE to header
avr32: add ATAG_BOARDINFO
Daniel Gorsulowski (3):
at91: fixed at91sam9263 system file
at91: reworked support for meesc board
at91: reworked support for otc570 board
Jens Scharsig (2):
at91rm9200: fix lowlevel_init() SMRDATA size
remove __attribute__ ((packed)) in at91 headers
Reinhard Meyer (15):
AT91: rework at91sam9260.h
AT91: rework at91sam9261.h
AT91: rework at91sam9263.h
AT91: rework at91sam9g45.h
AT91: cleanup hardware.h, remove memory-map.h
AT91: fix related arch-at91 header files
AT91: fix related at91 system/driver files
AT91: fix related at91 driver files
ATMEL: fix related common atmel driver files
AT91: cleanup at91sam9260_matrix.h to struct SoC access
AT91: change includes from asm/arch/io.h to asm/io.h
ATMEL: fix dataflash (dirty) this file should be converted to struct SoC access
AT91: remove LEGACY from at91_rstc.h
AT91: fix at91sam_wdt.c to reworked header files
AT91: fix timer.c - remove reset_timer()
Ryan Mallon (1):
Add support for Bluewater Systems Snapper 9260 and 9G20 modules
arch/arm/cpu/arm920t/at91/lowlevel_init.S | 8 +-
arch/arm/cpu/arm926ejs/at91/Makefile | 1 +
arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c | 47 +---
arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c | 55 ++---
arch/arm/cpu/arm926ejs/at91/clock.c | 8 +-
arch/arm/cpu/arm926ejs/at91/cpu.c | 11 +-
arch/arm/cpu/arm926ejs/at91/eflash.c | 16 +-
arch/arm/cpu/arm926ejs/at91/led.c | 2 +-
arch/arm/cpu/arm926ejs/at91/reset.c | 4 +-
arch/arm/cpu/arm926ejs/at91/timer.c | 37 ++--
arch/arm/include/asm/arch-at91/at91_common.h | 3 +-
arch/arm/include/asm/arch-at91/at91_mc.h | 10 +-
arch/arm/include/asm/arch-at91/at91_pio.h | 19 +--
arch/arm/include/asm/arch-at91/at91_rstc.h | 25 --
arch/arm/include/asm/arch-at91/at91_st.h | 2 +-
arch/arm/include/asm/arch-at91/at91_tc.h | 4 +-
arch/arm/include/asm/arch-at91/at91sam9260.h | 252 ++++++++++---------
.../arm/include/asm/arch-at91/at91sam9260_matrix.h | 102 ++++-----
arch/arm/include/asm/arch-at91/at91sam9261.h | 187 ++++++++-------
arch/arm/include/asm/arch-at91/at91sam9263.h | 218 ++++++++---------
arch/arm/include/asm/arch-at91/at91sam9g45.h | 225 ++++++++---------
arch/arm/include/asm/arch-at91/gpio.h | 18 +-
arch/arm/include/asm/arch-at91/hardware.h | 96 +++-----
arch/arm/include/asm/arch-at91/io.h | 43 ----
arch/arm/include/asm/arch-at91/memory-map.h | 36 ---
arch/avr32/config.mk | 6 +-
arch/avr32/cpu/at32ap700x/clk.c | 2 +-
arch/avr32/cpu/at32ap700x/portmux.c | 2 +-
arch/avr32/cpu/at32ap700x/sm.h | 4 +-
arch/avr32/cpu/cpu.c | 2 +-
arch/avr32/cpu/hsdramc.c | 2 +-
arch/avr32/cpu/hsdramc1.h | 4 +-
arch/avr32/cpu/hsmc3.h | 4 +-
arch/avr32/cpu/interrupts.c | 4 +-
arch/avr32/cpu/portmux-gpio.c | 2 +-
arch/avr32/cpu/portmux-pio.c | 2 +-
.../atmel/atstk1000 => arch/avr32/cpu}/u-boot.lds | 0
arch/avr32/include/asm/arch-at32ap700x/gpio.h | 12 +-
.../arch-at32ap700x/{memory-map.h => hardware.h} | 76 +++---
arch/avr32/include/asm/arch-at32ap700x/portmux.h | 10 +-
arch/avr32/include/asm/hmatrix-common.h | 2 +-
arch/avr32/include/asm/setup.h | 8 +
arch/avr32/lib/bootm.c | 11 +
board/atmel/atngw100/atngw100.c | 4 +-
board/atmel/atngw100/config.mk | 3 -
board/atmel/atngw100/u-boot.lds | 72 ------
board/atmel/atstk1000/atstk1000.c | 4 +-
board/atmel/atstk1000/config.mk | 3 -
board/earthlcd/favr-32-ezkit/config.mk | 3 -
board/earthlcd/favr-32-ezkit/favr-32-ezkit.c | 3 +-
board/earthlcd/favr-32-ezkit/u-boot.lds | 70 -----
board/esd/otc570/config.mk | 1 -
board/esd/otc570/otc570.c | 106 +++++----
board/mimc/mimc200/config.mk | 3 -
board/mimc/mimc200/mimc200.c | 4 +-
board/mimc/mimc200/u-boot.lds | 72 ------
board/miromico/hammerhead/config.mk | 3 -
board/miromico/hammerhead/hammerhead.c | 5 +-
board/miromico/hammerhead/u-boot.lds | 72 ------
boards.cfg | 8 +-
drivers/gpio/at91_gpio.c | 54 +++--
drivers/mmc/atmel_mci.c | 2 +-
drivers/mmc/atmel_mci.h | 4 +-
drivers/mmc/gen_atmel_mci.c | 2 +-
drivers/net/macb.c | 14 +-
drivers/rtc/at91sam9_rtt.c | 14 +-
drivers/serial/atmel_usart.c | 28 +--
drivers/spi/atmel_dataflash_spi.c | 94 +++++---
drivers/spi/atmel_spi.c | 16 +-
drivers/usb/host/ohci-at91.c | 18 +-
drivers/watchdog/at91sam9_wdt.c | 6 +-
include/configs/atngw100.h | 61 +++---
include/configs/atstk1002.h | 57 ++---
include/configs/atstk1003.h | 51 ++--
include/configs/atstk1004.h | 51 ++--
include/configs/atstk1006.h | 57 ++---
include/configs/favr-32-ezkit.h | 55 ++--
include/configs/hammerhead.h | 52 ++--
include/configs/mimc200.h | 63 +++---
include/configs/otc570.h | 265 +++++++++++---------
include/dataflash.h | 1 -
81 files changed, 1287 insertions(+), 1696 deletions(-)
delete mode 100644 arch/arm/include/asm/arch-at91/io.h
delete mode 100644 arch/arm/include/asm/arch-at91/memory-map.h
rename {board/atmel/atstk1000 => arch/avr32/cpu}/u-boot.lds (100%)
rename arch/avr32/include/asm/arch-at32ap700x/{memory-map.h => hardware.h} (53%)
delete mode 100644 board/atmel/atngw100/config.mk
delete mode 100644 board/atmel/atngw100/u-boot.lds
delete mode 100644 board/atmel/atstk1000/config.mk
delete mode 100644 board/earthlcd/favr-32-ezkit/config.mk
delete mode 100644 board/earthlcd/favr-32-ezkit/u-boot.lds
delete mode 100644 board/esd/otc570/config.mk
delete mode 100644 board/mimc/mimc200/config.mk
delete mode 100644 board/mimc/mimc200/u-boot.lds
delete mode 100644 board/miromico/hammerhead/config.mk
delete mode 100644 board/miromico/hammerhead/u-boot.lds
Best Regards,
Reinhard
next prev parent reply other threads:[~2011-05-17 15:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-13 8:46 [U-Boot] [PULL] Pull request u-boot-atmel.git next Reinhard Meyer
2011-05-16 11:20 ` Albert ARIBAUD
2011-05-16 19:30 ` Reinhard Meyer
2011-05-17 11:09 ` Albert ARIBAUD
2011-05-17 15:34 ` Reinhard Meyer [this message]
2011-05-17 15:52 ` Albert ARIBAUD
2011-05-17 16:44 ` Reinhard Meyer
2011-05-18 6:03 ` Albert ARIBAUD
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4DD29593.6080301@emk-elektronik.de \
--to=u-boot@emk-elektronik.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.