diff options
author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-11-10 06:14:28 -0500 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-11-13 05:08:13 -0500 |
commit | 4386e1fbcdacfbbc97a856f9e73b178bd5f6a3e1 (patch) | |
tree | 53760c89ab4af428043b4bb821b7a010730f64d0 /arch/arm/mach-at91 | |
parent | b75d47b4772c199225a351f3b8543e6e16b9c08b (diff) |
ARM: at91: remove unused CONFIG_ARCH_AT91SAM9G45 option
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>
Diffstat (limited to 'arch/arm/mach-at91')
-rw-r--r-- | arch/arm/mach-at91/Makefile.boot | 6 | ||||
-rw-r--r-- | arch/arm/mach-at91/board.h | 4 |
2 files changed, 0 insertions, 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 @@ | |||
3 | # PARAMS_PHYS must be within 4MB of ZRELADDR | 3 | # PARAMS_PHYS must be within 4MB of ZRELADDR |
4 | # INITRD_PHYS must be in RAM | 4 | # INITRD_PHYS must be in RAM |
5 | 5 | ||
6 | ifeq ($(CONFIG_ARCH_AT91SAM9G45),y) | ||
7 | zreladdr-y += 0x70008000 | ||
8 | params_phys-y := 0x70000100 | ||
9 | initrd_phys-y := 0x70410000 | ||
10 | else | ||
11 | zreladdr-y += 0x20008000 | 6 | zreladdr-y += 0x20008000 |
12 | params_phys-y := 0x20000100 | 7 | params_phys-y := 0x20000100 |
13 | initrd_phys-y := 0x20410000 | 8 | initrd_phys-y := 0x20410000 |
14 | 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); | |||
56 | extern void __init at91_add_device_nand(struct atmel_nand_data *data); | 56 | extern void __init at91_add_device_nand(struct atmel_nand_data *data); |
57 | 57 | ||
58 | /* I2C*/ | 58 | /* I2C*/ |
59 | #if defined(CONFIG_ARCH_AT91SAM9G45) | ||
60 | extern void __init at91_add_device_i2c(short i2c_id, struct i2c_board_info *devices, int nr_devices); | ||
61 | #else | ||
62 | extern void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices); | 59 | extern void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices); |
63 | #endif | ||
64 | 60 | ||
65 | /* SPI */ | 61 | /* SPI */ |
66 | extern void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices); | 62 | extern void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices); |