From 4386e1fbcdacfbbc97a856f9e73b178bd5f6a3e1 Mon Sep 17 00:00:00 2001 From: Nicolas Ferre Date: Mon, 10 Nov 2014 12:14:28 +0100 Subject: [PATCH] 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 Signed-off-by: Nicolas Ferre Acked-by: Boris Brezillon --- 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); -- 2.11.0