mbox

[U-Boot,PULL] u-boot-atmel/master -> u-boot-arm/master

Message ID 1377183883-4910-1-git-send-email-andreas.devel@googlemail.com
State Accepted
Delegated to: Albert ARIBAUD
Headers show

Pull-request

git://git.denx.de/u-boot-atmel.git master

Message

Andreas Bießmann Aug. 22, 2013, 3:04 p.m. UTC 
Dear Albert Aribaud,

The following changes since commit 9ed887caecb9ecb0c68773a1870d143b9f28d3da:

  Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' (2013-08-17 18:24:13 +0200)

are available in the git repository at:


  git://git.denx.de/u-boot-atmel.git master

for you to fetch changes up to bc6958988726977b4089da1b13f6467e8e28efd2:

  arm: atmel: cpux9k2: board update and enhancement (2013-08-22 16:52:40 +0200)

----------------------------------------------------------------
Bo Shen (10):
      net: macb: fix the following building warning
      arm: atmel: add gmac support for sama5d3xek board
      arm: atmel: add nand trimffs subcommand for at91sam9n12 and at91sam9x5
      arm: sama5d3: fix smc cs related registers offset
      arm: sama5d3: remove unused define
      arm: atmel: sama5d3: fix typo error for CONFIG_ENV_IS_NOWHERE
      arm: atmel: remove the config.mk file
      gpio: atmel: fix code to use pointer for pio port
      gpio: atmel: add gpio common API support
      gpio: atmel: add copyright and remove error header info

Jens Scharsig (BuS Elektronik) (1):
      arm: atmel: cpux9k2: board update and enhancement

Wu, Josh (5):
      ARM: at91: atmel_nand: pmecc driver will select the galois table by sector size
      ARM: at91: sama5d3: remove unused definition about PMECC alpha table offset
      linux/compat.h: move dev_err, dev_info and dev_dbg from usb driver to compat.h
      mtd: atmel_nand: alloc memory instead of use static array for pmecc data
      ARM: at91: atmel_nand: add code to check the ONFI parameter ECC requirement

 arch/arm/cpu/armv7/at91/sama5d3_devices.c    |   24 +++
 arch/arm/include/asm/arch-at91/at91_common.h |    1 +
 arch/arm/include/asm/arch-at91/at91sam9x5.h  |    6 +
 arch/arm/include/asm/arch-at91/sama5d3.h     |    2 -
 arch/arm/include/asm/arch-at91/sama5d3_smc.h |    2 +-
 board/atmel/at91sam9m10g45ek/config.mk       |    1 -
 board/atmel/at91sam9x5ek/config.mk           |    1 -
 board/atmel/sama5d3xek/sama5d3xek.c          |   20 ++
 doc/README.atmel_pmecc                       |   14 --
 drivers/gpio/at91_gpio.c                     |  295 ++++++++++++++++----------
 drivers/mtd/nand/atmel_nand.c                |  198 ++++++++++++++++-
 drivers/net/macb.c                           |   12 +-
 drivers/usb/musb-new/linux-compat.h          |   16 --
 include/configs/at91sam9m10g45ek.h           |    2 +
 include/configs/at91sam9n12ek.h              |    3 +
 include/configs/at91sam9x5ek.h               |    5 +-
 include/configs/eb_cpux9k2.h                 |   62 +++---
 include/configs/sama5d3xek.h                 |   10 +-
 include/linux/compat.h                       |    8 +
 19 files changed, 486 insertions(+), 196 deletions(-)
 delete mode 100644 board/atmel/at91sam9m10g45ek/config.mk
 delete mode 100644 board/atmel/at91sam9x5ek/config.mk

Comments

Bo Shen Sept. 3, 2013, 2:54 a.m. UTC | #1 
Hi Albert Aribaud,

On 08/22/2013 11:04 PM, Andreas Bießmann wrote:
> Dear Albert Aribaud,
>
> The following changes since commit 9ed887caecb9ecb0c68773a1870d143b9f28d3da:
>
>    Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' (2013-08-17 18:24:13 +0200)
>
> are available in the git repository at:
>
>
>    git://git.denx.de/u-boot-atmel.git master
>
> for you to fetch changes up to bc6958988726977b4089da1b13f6467e8e28efd2:
>
>    arm: atmel: cpux9k2: board update and enhancement (2013-08-22 16:52:40 +0200)

Just a reminder.

I see the u-boot-2013.10-rc2 is out, however this pull request is not dealt.

Best Regards,
Bo Shen
Andreas Bießmann Sept. 4, 2013, 9:40 a.m. UTC | #2 
Hi Albert,

can you please wait applying this? I have another 2-3 patches for this
release.

Best regards

Andreas Bießmann

On 08/22/2013 05:04 PM, Andreas Bießmann wrote:
> Dear Albert Aribaud,
> 
> The following changes since commit 9ed887caecb9ecb0c68773a1870d143b9f28d3da:
> 
>   Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' (2013-08-17 18:24:13 +0200)
> 
> are available in the git repository at:
> 
> 
>   git://git.denx.de/u-boot-atmel.git master
> 
> for you to fetch changes up to bc6958988726977b4089da1b13f6467e8e28efd2:
> 
>   arm: atmel: cpux9k2: board update and enhancement (2013-08-22 16:52:40 +0200)
> 
> ----------------------------------------------------------------
> Bo Shen (10):
>       net: macb: fix the following building warning
>       arm: atmel: add gmac support for sama5d3xek board
>       arm: atmel: add nand trimffs subcommand for at91sam9n12 and at91sam9x5
>       arm: sama5d3: fix smc cs related registers offset
>       arm: sama5d3: remove unused define
>       arm: atmel: sama5d3: fix typo error for CONFIG_ENV_IS_NOWHERE
>       arm: atmel: remove the config.mk file
>       gpio: atmel: fix code to use pointer for pio port
>       gpio: atmel: add gpio common API support
>       gpio: atmel: add copyright and remove error header info
> 
> Jens Scharsig (BuS Elektronik) (1):
>       arm: atmel: cpux9k2: board update and enhancement
> 
> Wu, Josh (5):
>       ARM: at91: atmel_nand: pmecc driver will select the galois table by sector size
>       ARM: at91: sama5d3: remove unused definition about PMECC alpha table offset
>       linux/compat.h: move dev_err, dev_info and dev_dbg from usb driver to compat.h
>       mtd: atmel_nand: alloc memory instead of use static array for pmecc data
>       ARM: at91: atmel_nand: add code to check the ONFI parameter ECC requirement
> 
>  arch/arm/cpu/armv7/at91/sama5d3_devices.c    |   24 +++
>  arch/arm/include/asm/arch-at91/at91_common.h |    1 +
>  arch/arm/include/asm/arch-at91/at91sam9x5.h  |    6 +
>  arch/arm/include/asm/arch-at91/sama5d3.h     |    2 -
>  arch/arm/include/asm/arch-at91/sama5d3_smc.h |    2 +-
>  board/atmel/at91sam9m10g45ek/config.mk       |    1 -
>  board/atmel/at91sam9x5ek/config.mk           |    1 -
>  board/atmel/sama5d3xek/sama5d3xek.c          |   20 ++
>  doc/README.atmel_pmecc                       |   14 --
>  drivers/gpio/at91_gpio.c                     |  295 ++++++++++++++++----------
>  drivers/mtd/nand/atmel_nand.c                |  198 ++++++++++++++++-
>  drivers/net/macb.c                           |   12 +-
>  drivers/usb/musb-new/linux-compat.h          |   16 --
>  include/configs/at91sam9m10g45ek.h           |    2 +
>  include/configs/at91sam9n12ek.h              |    3 +
>  include/configs/at91sam9x5ek.h               |    5 +-
>  include/configs/eb_cpux9k2.h                 |   62 +++---
>  include/configs/sama5d3xek.h                 |   10 +-
>  include/linux/compat.h                       |    8 +
>  19 files changed, 486 insertions(+), 196 deletions(-)
>  delete mode 100644 board/atmel/at91sam9m10g45ek/config.mk
>  delete mode 100644 board/atmel/at91sam9x5ek/config.mk
>
Albert ARIBAUD Sept. 4, 2013, 10:30 a.m. UTC | #3 
Hi Andreas,

On Thu, 22 Aug 2013 17:04:43 +0200, Andreas Bießmann
<andreas.devel@googlemail.com> wrote:

> Dear Albert Aribaud,
> 
> The following changes since commit 9ed887caecb9ecb0c68773a1870d143b9f28d3da:
> 
>   Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' (2013-08-17 18:24:13 +0200)
> 
> are available in the git repository at:
> 
> 
>   git://git.denx.de/u-boot-atmel.git master
> 
> for you to fetch changes up to bc6958988726977b4089da1b13f6467e8e28efd2:
> 
>   arm: atmel: cpux9k2: board update and enhancement (2013-08-22 16:52:40 +0200)
> 
> ----------------------------------------------------------------
> Bo Shen (10):
>       net: macb: fix the following building warning
>       arm: atmel: add gmac support for sama5d3xek board
>       arm: atmel: add nand trimffs subcommand for at91sam9n12 and at91sam9x5
>       arm: sama5d3: fix smc cs related registers offset
>       arm: sama5d3: remove unused define
>       arm: atmel: sama5d3: fix typo error for CONFIG_ENV_IS_NOWHERE
>       arm: atmel: remove the config.mk file
>       gpio: atmel: fix code to use pointer for pio port
>       gpio: atmel: add gpio common API support
>       gpio: atmel: add copyright and remove error header info
> 
> Jens Scharsig (BuS Elektronik) (1):
>       arm: atmel: cpux9k2: board update and enhancement
> 
> Wu, Josh (5):
>       ARM: at91: atmel_nand: pmecc driver will select the galois table by sector size
>       ARM: at91: sama5d3: remove unused definition about PMECC alpha table offset
>       linux/compat.h: move dev_err, dev_info and dev_dbg from usb driver to compat.h
>       mtd: atmel_nand: alloc memory instead of use static array for pmecc data
>       ARM: at91: atmel_nand: add code to check the ONFI parameter ECC requirement
> 
>  arch/arm/cpu/armv7/at91/sama5d3_devices.c    |   24 +++
>  arch/arm/include/asm/arch-at91/at91_common.h |    1 +
>  arch/arm/include/asm/arch-at91/at91sam9x5.h  |    6 +
>  arch/arm/include/asm/arch-at91/sama5d3.h     |    2 -
>  arch/arm/include/asm/arch-at91/sama5d3_smc.h |    2 +-
>  board/atmel/at91sam9m10g45ek/config.mk       |    1 -
>  board/atmel/at91sam9x5ek/config.mk           |    1 -
>  board/atmel/sama5d3xek/sama5d3xek.c          |   20 ++
>  doc/README.atmel_pmecc                       |   14 --
>  drivers/gpio/at91_gpio.c                     |  295 ++++++++++++++++----------
>  drivers/mtd/nand/atmel_nand.c                |  198 ++++++++++++++++-
>  drivers/net/macb.c                           |   12 +-
>  drivers/usb/musb-new/linux-compat.h          |   16 --
>  include/configs/at91sam9m10g45ek.h           |    2 +
>  include/configs/at91sam9n12ek.h              |    3 +
>  include/configs/at91sam9x5ek.h               |    5 +-
>  include/configs/eb_cpux9k2.h                 |   62 +++---
>  include/configs/sama5d3xek.h                 |   10 +-
>  include/linux/compat.h                       |    8 +
>  19 files changed, 486 insertions(+), 196 deletions(-)
>  delete mode 100644 board/atmel/at91sam9m10g45ek/config.mk
>  delete mode 100644 board/atmel/at91sam9x5ek/config.mk

Applied to u-boot-arm/master, thanks!

Amicalement,
Albert ARIBAUD Sept. 4, 2013, 11:10 a.m. UTC | #4 
Hi Andreas,

On Wed, 04 Sep 2013 11:40:16 +0200, "Andreas Bießmann"
<andreas.devel@googlemail.com> wrote:

> Hi Albert,
> 
> can you please wait applying this? I have another 2-3 patches for this
> release.

Argh! I've pushed it already. Just give me a new PR for these 2-3
patches, I'll take it in today.

> Best regards
> 
> Andreas Bießmann

Amicalement,
Andreas Bießmann Sept. 4, 2013, 11:49 a.m. UTC | #5 
Hi Albert,

On 09/04/2013 01:10 PM, Albert ARIBAUD wrote:
> Hi Andreas,
> 
> On Wed, 04 Sep 2013 11:40:16 +0200, "Andreas Bießmann"
> <andreas.devel@googlemail.com> wrote:
> 
>> Hi Albert,
>>
>> can you please wait applying this? I have another 2-3 patches for this
>> release.
> 
> Argh! I've pushed it already. Just give me a new PR for these 2-3
> patches, I'll take it in today.

no problem, I'll send it the next few hours (just test building)

Best regards

Andreas Bießmann