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

Commit 2b019a43 authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Nicolas Ferre
Browse files

ARM: at91: merge all SOC_AT91SAM9xxx 



Only use SOC_AT91SAM9 for all the at91sam9 SoCs. It removes all the empty
at91sam9xxx.c SoC files. It also removes the useless at91_init_soc affectation
procedure and its "init" function pointer.
Only the SoC detection and display are kept for the at91sam9:
at91_soc_is_enabled() and at91_boot_soc.map_io() function calls are also
removed.

It enables HAVE_AT91_SMD and HAVE_AT91_UTMI for all the sam9 SoCs but this only
represents 96 bytes of uncompressed kernel code.

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
[nicolas.ferre@atmel.com: different organization of the patches]
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 7d7ffd7b

arch/arm/configs/at91_dt_defconfig

+1 −9
Original line number Diff line number Diff line
@@ -15,15 +15,7 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_AT91=y

CONFIG_SOC_AT91RM9200=y

CONFIG_SOC_AT91SAM9260=y

CONFIG_SOC_AT91SAM9261=y

CONFIG_SOC_AT91SAM9263=y

CONFIG_SOC_AT91SAM9RL=y

CONFIG_SOC_AT91SAM9G45=y

CONFIG_SOC_AT91SAM9X5=y

CONFIG_SOC_AT91SAM9N12=y

CONFIG_MACH_AT91RM9200_DT=y

CONFIG_MACH_AT91SAM9_DT=y

CONFIG_SOC_AT91SAM9=y

CONFIG_AT91_TIMER_HZ=128

CONFIG_AEABI=y

CONFIG_UACCESS_WITH_MEMCPY=y

arch/arm/mach-at91/Kconfig

+26 −66
Original line number Diff line number Diff line
@@ -16,15 +16,6 @@ config HAVE_AT91_SMD 
config HAVE_AT91_H32MX

	bool



config SOC_AT91SAM9

	bool

	select ATMEL_AIC_IRQ

	select COMMON_CLK_AT91

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select MEMORY

	select ATMEL_SDRAMC



config SOC_SAMA5

	bool

	select ATMEL_AIC5_IRQ
@@ -92,67 +83,36 @@ config SOC_AT91RM9200 
	select GENERIC_CLOCKEVENTS

	select HAVE_AT91_USB_CLK



config SOC_AT91SAM9260

	bool "AT91SAM9260, AT91SAM9XE or AT91SAM9G20"

	select SOC_AT91SAM9

	select HAVE_AT91_USB_CLK

	help

	  Select this if you are using one of Atmel's AT91SAM9260, AT91SAM9XE

	  or AT91SAM9G20 SoC.



config SOC_AT91SAM9261

	bool "AT91SAM9261 or AT91SAM9G10"

	select HAVE_FB_ATMEL

	select SOC_AT91SAM9

	select HAVE_AT91_USB_CLK

	help

	  Select this if you are using one of Atmel's AT91SAM9261 or AT91SAM9G10 SoC.



config SOC_AT91SAM9263

	bool "AT91SAM9263"

	select HAVE_FB_ATMEL

	select SOC_AT91SAM9

	select HAVE_AT91_USB_CLK



config SOC_AT91SAM9RL

	bool "AT91SAM9RL"

	select HAVE_FB_ATMEL

	select SOC_AT91SAM9

	select HAVE_AT91_UTMI



config SOC_AT91SAM9G45

	bool "AT91SAM9G45 or AT91SAM9M10 families"

	select HAVE_FB_ATMEL

	select SOC_AT91SAM9

	select HAVE_AT91_UTMI

	select HAVE_AT91_USB_CLK

	help

	  Select this if you are using one of Atmel's AT91SAM9G45 family SoC.

	  This support covers AT91SAM9G45, AT91SAM9G46, AT91SAM9M10 and AT91SAM9M11.



config SOC_AT91SAM9X5

	bool "AT91SAM9x5 family"

	select HAVE_FB_ATMEL

	select SOC_AT91SAM9

	select HAVE_AT91_UTMI

config SOC_AT91SAM9

	bool "AT91SAM9"

	select ATMEL_AIC_IRQ

	select ATMEL_SDRAMC

	select COMMON_CLK_AT91

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select HAVE_AT91_SMD

	select HAVE_AT91_USB_CLK

	help

	  Select this if you are using one of Atmel's AT91SAM9x5 family SoC.

	  This means that your SAM9 name finishes with a '5' (except if it is

	  AT91SAM9G45!).

	  This support covers AT91SAM9G15, AT91SAM9G25, AT91SAM9X25, AT91SAM9G35

	  and AT91SAM9X35.



config SOC_AT91SAM9N12

	bool "AT91SAM9N12 family"

	select HAVE_AT91_UTMI

	select HAVE_FB_ATMEL

	select SOC_AT91SAM9

	select HAVE_AT91_USB_CLK

	select MEMORY

	help

	  Select this if you are using Atmel's AT91SAM9N12 SoC.



# ----------------------------------------------------------

	  Select this if you are using one of those Atmel SoC:

	    AT91SAM9260

	    AT91SAM9261

	    AT91SAM9263

	    AT91SAM9G15

	    AT91SAM9G20

	    AT91SAM9G25

	    AT91SAM9G35

	    AT91SAM9G45

	    AT91SAM9G46

	    AT91SAM9M10

	    AT91SAM9M11

	    AT91SAM9N12

	    AT91SAM9RL

	    AT91SAM9X25

	    AT91SAM9X35

	    AT91SAM9XE

endif # SOC_SAM_V4_V5



comment "AT91 Feature Selections"

arch/arm/mach-at91/Makefile

+0 −7
Original line number Diff line number Diff line
@@ -8,13 +8,6 @@ obj-$(CONFIG_SOC_AT91SAM9) += sam9_smc.o 


# CPU-specific support

obj-$(CONFIG_SOC_AT91RM9200)	+= at91rm9200.o at91rm9200_time.o

obj-$(CONFIG_SOC_AT91SAM9260)	+= at91sam9260.o

obj-$(CONFIG_SOC_AT91SAM9261)	+= at91sam9261.o

obj-$(CONFIG_SOC_AT91SAM9263)	+= at91sam9263.o

obj-$(CONFIG_SOC_AT91SAM9G45)	+= at91sam9g45.o

obj-$(CONFIG_SOC_AT91SAM9N12)	+= at91sam9n12.o

obj-$(CONFIG_SOC_AT91SAM9X5)	+= at91sam9x5.o

obj-$(CONFIG_SOC_AT91SAM9RL)	+= at91sam9rl.o

obj-$(CONFIG_SOC_SAMA5D3)	+= sama5d3.o

obj-$(CONFIG_SOC_SAMA5D4)	+= sama5d4.o

arch/arm/mach-at91/at91sam9260.c

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-at91/at91sam9260.c

 *

 *  Copyright (C) 2006 SAN People

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 */



#include <asm/system_misc.h>

#include <mach/cpu.h>

#include <mach/at91_dbgu.h>

#include <mach/hardware.h>



#include "soc.h"

#include "generic.h"



/* --------------------------------------------------------------------

 *  AT91SAM9260 processor initialization

 * -------------------------------------------------------------------- */



AT91_SOC_START(at91sam9260)

AT91_SOC_END

arch/arm/mach-at91/at91sam9261.c

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-at91/at91sam9261.c

 *

 *  Copyright (C) 2005 SAN People

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 */



#include <asm/system_misc.h>

#include <mach/cpu.h>

#include <mach/hardware.h>



#include "soc.h"

#include "generic.h"



/* --------------------------------------------------------------------

 *  AT91SAM9261 processor initialization

 * -------------------------------------------------------------------- */



AT91_SOC_START(at91sam9261)

AT91_SOC_END