Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67dd8995 authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Nicolas Ferre
Browse files

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: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Patrice Vilchez <patrice.vilchez@atmel.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent cb655d0f

arch/arm/mach-at91/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -383,8 +383,8 @@ if ARCH_AT91SAM9G45 


comment "AT91SAM9G45 Board Type"



config MACH_AT91SAM9G45EKES

	bool "Atmel AT91SAM9G45-EKES Evaluation Kit"

config MACH_AT91SAM9M10G45EK

	bool "Atmel AT91SAM9M10G45-EK Evaluation Kits"

	select HAVE_NAND_ATMEL_BUSWIDTH_16

	help

	  Select this if you are using Atmel's AT91SAM9G45-EKES Evaluation Kit.

arch/arm/mach-at91/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ obj-$(CONFIG_MACH_PORTUXG20) += board-stamp9g20.o 
obj-$(CONFIG_MACH_SNAPPER_9260)	+= board-snapper9260.o



# AT91SAM9G45 board-specific support

obj-$(CONFIG_MACH_AT91SAM9G45EKES) += board-sam9m10g45ek.o

obj-$(CONFIG_MACH_AT91SAM9M10G45EK) += board-sam9m10g45ek.o



# AT91CAP9 board-specific support

obj-$(CONFIG_MACH_AT91CAP9ADK)	+= board-cap9adk.o

arch/arm/mach-at91/board-sam9m10g45ek.c

+1 −1
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ static void __init ek_board_init(void) 
	at91_pwm_leds(ek_pwm_led, ARRAY_SIZE(ek_pwm_led));

}



MACHINE_START(AT91SAM9G45EKES, "Atmel AT91SAM9G45-EKES")

MACHINE_START(AT91SAM9M10G45EK, "Atmel AT91SAM9M10G45-EK")

	/* Maintainer: Atmel */

	.phys_io	= AT91_BASE_SYS,

	.io_pg_offst	= (AT91_VA_BASE_SYS >> 18) & 0xfffc,