diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2010-09-22 01:55:59 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2010-10-07 13:55:55 -0400 |
commit | 67dd8995fd60bab890b9c3c4cd3e9f00d5811c25 (patch) | |
tree | 0632a5ceee260372ae1acd361ab63daa22c1fe45 | |
parent | cb655d0f3d57c23db51b981648e452988c0223f9 (diff) |
AT91: at91sam9m10g45ek: use the right machine id
Today the board use 2 machines id AT91SAM9G45EKES and AT91SAM9M10G45EK
now will use only AT91SAM9M10G45EK.
The other boards revision will be specified via system_rev.
for 9g45ekes, m10g45ekes and m10g45ek boards and revisions
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Patrice Vilchez <patrice.vilchez@atmel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
-rw-r--r-- | arch/arm/mach-at91/Kconfig | 4 | ||||
-rw-r--r-- | arch/arm/mach-at91/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/board-sam9m10g45ek.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 939bccd70569..7b6ae6d274b4 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig | |||
@@ -383,8 +383,8 @@ if ARCH_AT91SAM9G45 | |||
383 | 383 | ||
384 | comment "AT91SAM9G45 Board Type" | 384 | comment "AT91SAM9G45 Board Type" |
385 | 385 | ||
386 | config MACH_AT91SAM9G45EKES | 386 | config MACH_AT91SAM9M10G45EK |
387 | bool "Atmel AT91SAM9G45-EKES Evaluation Kit" | 387 | bool "Atmel AT91SAM9M10G45-EK Evaluation Kits" |
388 | select HAVE_NAND_ATMEL_BUSWIDTH_16 | 388 | select HAVE_NAND_ATMEL_BUSWIDTH_16 |
389 | help | 389 | help |
390 | Select this if you are using Atmel's AT91SAM9G45-EKES Evaluation Kit. | 390 | Select this if you are using Atmel's AT91SAM9G45-EKES Evaluation Kit. |
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index ca2ac003f41f..585ede048966 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile | |||
@@ -70,7 +70,7 @@ obj-$(CONFIG_MACH_PORTUXG20) += board-stamp9g20.o | |||
70 | obj-$(CONFIG_MACH_SNAPPER_9260) += board-snapper9260.o | 70 | obj-$(CONFIG_MACH_SNAPPER_9260) += board-snapper9260.o |
71 | 71 | ||
72 | # AT91SAM9G45 board-specific support | 72 | # AT91SAM9G45 board-specific support |
73 | obj-$(CONFIG_MACH_AT91SAM9G45EKES) += board-sam9m10g45ek.o | 73 | obj-$(CONFIG_MACH_AT91SAM9M10G45EK) += board-sam9m10g45ek.o |
74 | 74 | ||
75 | # AT91CAP9 board-specific support | 75 | # AT91CAP9 board-specific support |
76 | obj-$(CONFIG_MACH_AT91CAP9ADK) += board-cap9adk.o | 76 | obj-$(CONFIG_MACH_AT91CAP9ADK) += board-cap9adk.o |
diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c index ee800595594d..f9bf45e65cb2 100644 --- a/arch/arm/mach-at91/board-sam9m10g45ek.c +++ b/arch/arm/mach-at91/board-sam9m10g45ek.c | |||
@@ -399,7 +399,7 @@ static void __init ek_board_init(void) | |||
399 | at91_pwm_leds(ek_pwm_led, ARRAY_SIZE(ek_pwm_led)); | 399 | at91_pwm_leds(ek_pwm_led, ARRAY_SIZE(ek_pwm_led)); |
400 | } | 400 | } |
401 | 401 | ||
402 | MACHINE_START(AT91SAM9G45EKES, "Atmel AT91SAM9G45-EKES") | 402 | MACHINE_START(AT91SAM9M10G45EK, "Atmel AT91SAM9M10G45-EK") |
403 | /* Maintainer: Atmel */ | 403 | /* Maintainer: Atmel */ |
404 | .phys_io = AT91_BASE_SYS, | 404 | .phys_io = AT91_BASE_SYS, |
405 | .io_pg_offst = (AT91_VA_BASE_SYS >> 18) & 0xfffc, | 405 | .io_pg_offst = (AT91_VA_BASE_SYS >> 18) & 0xfffc, |