public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
From: boris.brezillon@free-electrons.com (Boris Brezillon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: at91: remove unused CONFIG_ARCH_AT91SAM9G45 option
Date: Thu, 13 Nov 2014 10:37:09 +0100	[thread overview]
Message-ID: <20141113103709.35b053ad@bbrezillon> (raw)
In-Reply-To: <1415871190-32244-1-git-send-email-nicolas.ferre@atmel.com>

On Thu, 13 Nov 2014 10:33:10 +0100
Nicolas Ferre <nicolas.ferre@atmel.com> wrote:

> The CONFIG_ARCH_AT91SAM9G45 config option was removed by ("ARM: at91: remove
> at91sam9g45/9m10 legacy board support") so cleanup the use of it.
> 
> Reported-by: Paul Bolle <pebolle@tiscali.nl>
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>

> ---
>  arch/arm/mach-at91/Makefile.boot | 6 ------
>  arch/arm/mach-at91/board.h       | 4 ----
>  2 files changed, 10 deletions(-)
> 
> diff --git a/arch/arm/mach-at91/Makefile.boot b/arch/arm/mach-at91/Makefile.boot
> index 5309f9b6aabc..29ed0fa374ca 100644
> --- a/arch/arm/mach-at91/Makefile.boot
> +++ b/arch/arm/mach-at91/Makefile.boot
> @@ -3,12 +3,6 @@
>  #   PARAMS_PHYS must be within 4MB of ZRELADDR
>  #   INITRD_PHYS must be in RAM
>  
> -ifeq ($(CONFIG_ARCH_AT91SAM9G45),y)
> -   zreladdr-y	+= 0x70008000
> -params_phys-y	:= 0x70000100
> -initrd_phys-y	:= 0x70410000
> -else
>     zreladdr-y	+= 0x20008000
>  params_phys-y	:= 0x20000100
>  initrd_phys-y	:= 0x20410000
> -endif
> diff --git a/arch/arm/mach-at91/board.h b/arch/arm/mach-at91/board.h
> index 836e9a537e0c..d268ec3781dd 100644
> --- a/arch/arm/mach-at91/board.h
> +++ b/arch/arm/mach-at91/board.h
> @@ -56,11 +56,7 @@ extern void __init at91_add_device_usbh_ehci(struct at91_usbh_data *data);
>  extern void __init at91_add_device_nand(struct atmel_nand_data *data);
>  
>   /* I2C*/
> -#if defined(CONFIG_ARCH_AT91SAM9G45)
> -extern void __init at91_add_device_i2c(short i2c_id, struct i2c_board_info *devices, int nr_devices);
> -#else
>  extern void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices);
> -#endif
>  
>   /* SPI */
>  extern void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices);



-- 
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

      reply	other threads:[~2014-11-13  9:37 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-10 11:05 ARM: at91: CONFIG_ARCH_AT91SAM9G45 Paul Bolle
2014-11-13  9:33 ` [PATCH] ARM: at91: remove unused CONFIG_ARCH_AT91SAM9G45 option Nicolas Ferre
2014-11-13  9:37   ` Boris Brezillon [this message]

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=20141113103709.35b053ad@bbrezillon \
    --to=boris.brezillon@free-electrons.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox