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

Commit 438ff3f3 authored by Haavard Skinnemoen's avatar Haavard Skinnemoen
Browse files

[AVR32] Add support for AT32AP7001 and AT32AP7002 



These are derivatives of the AT32AP7000 chip, which means that most of
the code stays the same. Rename a few files, functions, definitions
and config symbols to reflect that they apply to all AP700x chips, and
exclude some platform devices from chips where they aren't present.

Signed-off-by: default avatarHaavard Skinnemoen <hskinnemoen@atmel.com>
parent 281ef58c

arch/avr32/Kconfig

+17 −4
Original line number Diff line number Diff line
@@ -84,13 +84,26 @@ config PLATFORM_AT32AP 
	select MMU

	select PERFORMANCE_COUNTERS



config CPU_AT32AP700X

	bool

	select PLATFORM_AT32AP



choice

	prompt "AVR32 CPU type"

	default CPU_AT32AP7000



config CPU_AT32AP7000

	bool "AT32AP7000"

	select PLATFORM_AT32AP

	select CPU_AT32AP700X



config CPU_AT32AP7001

	bool "AT32AP7001"

	select CPU_AT32AP700X



config CPU_AT32AP7002

	bool "AT32AP7002"

	select CPU_AT32AP700X



endchoice



#
@@ -126,15 +139,15 @@ source "arch/avr32/mach-at32ap/Kconfig" 


config LOAD_ADDRESS

	hex

	default 0x10000000 if LOADER_U_BOOT=y && CPU_AT32AP7000=y

	default 0x10000000 if LOADER_U_BOOT=y && CPU_AT32AP700X=y



config ENTRY_ADDRESS

	hex

	default 0x90000000 if LOADER_U_BOOT=y && CPU_AT32AP7000=y

	default 0x90000000 if LOADER_U_BOOT=y && CPU_AT32AP700X=y



config PHYS_OFFSET

	hex

	default 0x10000000 if CPU_AT32AP7000=y

	default 0x10000000 if CPU_AT32AP700X=y



source "kernel/Kconfig.preempt"

arch/avr32/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ KBUILD_AFLAGS += -mrelax -mno-pic 
CFLAGS_MODULE	+= -mno-relax

LDFLAGS_vmlinux	+= --relax



cpuflags-$(CONFIG_CPU_AT32AP7000)	+= -mcpu=ap7000

cpuflags-$(CONFIG_PLATFORM_AT32AP)	+= -march=ap



KBUILD_CFLAGS	+= $(cpuflags-y)

KBUILD_AFLAGS	+= $(cpuflags-y)

arch/avr32/boards/atngw100/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <asm/io.h>

#include <asm/setup.h>



#include <asm/arch/at32ap7000.h>

#include <asm/arch/at32ap700x.h>

#include <asm/arch/board.h>

#include <asm/arch/init.h>

#include <asm/arch/portmux.h>

arch/avr32/configs/atngw100_defconfig

+6 −3
Original line number Diff line number Diff line
@@ -111,7 +111,10 @@ CONFIG_SUBARCH_AVR32B=y 
CONFIG_MMU=y

CONFIG_PERFORMANCE_COUNTERS=y

CONFIG_PLATFORM_AT32AP=y

CONFIG_CPU_AT32AP700X=y

CONFIG_CPU_AT32AP7000=y

# CONFIG_CPU_AT32AP7001 is not set

# CONFIG_CPU_AT32AP7002 is not set

# CONFIG_BOARD_ATSTK1000 is not set

CONFIG_BOARD_ATNGW100=y

CONFIG_LOADER_U_BOOT=y
@@ -119,9 +122,9 @@ CONFIG_LOADER_U_BOOT=y 
#

# Atmel AVR32 AP options

#

# CONFIG_AP7000_32_BIT_SMC is not set

CONFIG_AP7000_16_BIT_SMC=y

# CONFIG_AP7000_8_BIT_SMC is not set

# CONFIG_AP700X_32_BIT_SMC is not set

CONFIG_AP700X_16_BIT_SMC=y

# CONFIG_AP700X_8_BIT_SMC is not set

CONFIG_LOAD_ADDRESS=0x10000000

CONFIG_ENTRY_ADDRESS=0x90000000

CONFIG_PHYS_OFFSET=0x10000000

arch/avr32/configs/atstk1002_defconfig

+5 −3
Original line number Diff line number Diff line
@@ -114,6 +114,8 @@ CONFIG_MMU=y 
CONFIG_PERFORMANCE_COUNTERS=y

CONFIG_PLATFORM_AT32AP=y

CONFIG_CPU_AT32AP7000=y

# CONFIG_CPU_AT32AP7001 is not set

# CONFIG_CPU_AT32AP7002 is not set

CONFIG_BOARD_ATSTK1002=y

CONFIG_BOARD_ATSTK1000=y

# CONFIG_BOARD_ATNGW100 is not set
@@ -122,9 +124,9 @@ CONFIG_LOADER_U_BOOT=y 
#

# Atmel AVR32 AP options

#

# CONFIG_AP7000_32_BIT_SMC is not set

CONFIG_AP7000_16_BIT_SMC=y

# CONFIG_AP7000_8_BIT_SMC is not set

# CONFIG_AP700X_32_BIT_SMC is not set

CONFIG_AP700X_16_BIT_SMC=y

# CONFIG_AP700X_8_BIT_SMC is not set

CONFIG_LOAD_ADDRESS=0x10000000

CONFIG_ENTRY_ADDRESS=0x90000000

CONFIG_PHYS_OFFSET=0x10000000