leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: at91: collect SoC sources into mach-at91

Browse Source 
This commit moves source files as follows:

  arch/arm/cpu/arm920t/at91/*   -> arch/arm/mach-at91/arm920t/*
  arch/arm/cpu/arm926ejs/at91/* -> arch/arm/mach-at91/arm926ejs/*
  arch/arm/cpu/armv7/at91/*     -> arch/arm/mach-at91/armv7/*
  arch/arm/cpu/at91-common/*    -> arch/arm/mach-at91/*

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Andreas Bießmann <andreas.devel@googlemail.co>
This commit is contained in:
Masahiro Yamada 2015-02-20 17:04:03 +09:00 committed by Tom Rini
parent 01f1445630
commit 620118403e
48 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MAINTAINERS
View File

@ -76,8 +76,7 @@ ARM ATMEL AT91
M: Andreas Bießmann <andreas.devel@googlemail.com>
S: Maintained
T: git git://git.denx.de/u-boot-atmel.git
F: arch/arm/cpu/armv7/at91/
F: arch/arm/cpu/at91-common/
F: arch/arm/mach-at91/
F: arch/arm/include/asm/arch-at91/
ARM FREESCALE IMX

1
arch/arm/Makefile
View File

@ -4,6 +4,7 @@
# Machine directory name. This list is sorted alphanumerically
# by CONFIG_* macro name.
machine-$(CONFIG_ARCH_AT91) += at91
machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))

1
arch/arm/cpu/Makefile
View File

@ -1,4 +1,3 @@
obj-$(CONFIG_AT91FAMILY) += at91-common/
obj-$(CONFIG_TEGRA20) += tegra20-common/
obj-$(CONFIG_TEGRA30) += tegra30-common/
obj-$(CONFIG_TEGRA114) += tegra114-common/

1
arch/arm/cpu/arm920t/Makefile
View File

@ -11,7 +11,6 @@ obj-y += cpu.o
obj-$(CONFIG_USE_IRQ) += interrupts.o
obj-$(if $(filter a320,$(SOC)),y) += a320/
obj-$(CONFIG_AT91FAMILY) += at91/
obj-$(CONFIG_EP93XX) += ep93xx/
obj-$(CONFIG_IMX) += imx/
obj-$(CONFIG_KS8695) += ks8695/

1
arch/arm/cpu/arm926ejs/Makefile
View File

@ -15,7 +15,6 @@ endif
endif
obj-$(CONFIG_ARMADA100) += armada100/
obj-$(CONFIG_AT91FAMILY) += at91/
obj-$(CONFIG_ARCH_DAVINCI) += davinci/
obj-$(CONFIG_KIRKWOOD) += kirkwood/
obj-$(if $(filter lpc32xx,$(SOC)),y) += lpc32xx/

2
arch/arm/cpu/arm926ejs/at91/config.mk
View File

@ -1,2 +0,0 @@
PF_CPPFLAGS_TUNE := $(call cc-option,-mtune=arm926ejs,)
PLATFORM_CPPFLAGS += $(PF_CPPFLAGS_TUNE)

1
arch/arm/cpu/armv7/Makefile
View File

@ -40,7 +40,6 @@ endif
obj-$(if $(filter am33xx,$(SOC)),y) += am33xx/
obj-$(if $(filter armada-xp,$(SOC)),y) += armada-xp/
obj-$(CONFIG_AT91FAMILY) += at91/
obj-$(if $(filter bcm281xx,$(SOC)),y) += bcm281xx/
obj-$(if $(filter bcmcygnus,$(SOC)),y) += bcmcygnus/
obj-$(if $(filter bcmnsp,$(SOC)),y) += bcmnsp/

8
arch/arm/cpu/armv7/at91/config.mk
View File

@ -1,8 +0,0 @@
#
# Copyright (C) 2014, Andreas Bießmann <andreas.devel@googlemail.com>
#
# SPDX-License-Identifier: GPL-2.0+
#
ifndef CONFIG_SPL_BUILD
ALL-y += u-boot.img
endif

14
arch/arm/cpu/at91-common/Makefile → arch/arm/mach-at91/Makefile
View File

@ -1,13 +1,3 @@
#
# (C) Copyright 2000-2008
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
#
# (C) Copyright 2013 Atmel Corporation
# Bo Shen <voice.shen@atmel.com>
#
# SPDX-License-Identifier: GPL-2.0+
#
obj-$(CONFIG_AT91_WANTS_COMMON_PHY) += phy.o
ifneq ($(CONFIG_SPL_BUILD),)
obj-$(CONFIG_AT91SAM9G20) += sdram.o spl_at91.o
@ -16,3 +6,7 @@ obj-$(CONFIG_SAMA5D3) += mpddrc.o spl_atmel.o
obj-$(CONFIG_SAMA5D4) += mpddrc.o spl_atmel.o
obj-y += spl.o
endif
obj-$(CONFIG_CPU_ARM920T) += arm920t/
obj-$(CONFIG_CPU_ARM926EJS) += arm926ejs/
obj-$(CONFIG_CPU_V7) += armv7/

0
arch/arm/cpu/arm920t/at91/Makefile → arch/arm/mach-at91/arm920t/Makefile
View File

0
arch/arm/cpu/arm920t/at91/at91rm9200_devices.c → arch/arm/mach-at91/arm920t/at91rm9200_devices.c
View File

0
arch/arm/cpu/arm920t/at91/clock.c → arch/arm/mach-at91/arm920t/clock.c
View File

0
arch/arm/cpu/arm920t/at91/cpu.c → arch/arm/mach-at91/arm920t/cpu.c
View File

0
arch/arm/cpu/arm920t/at91/lowlevel_init.S → arch/arm/mach-at91/arm920t/lowlevel_init.S
View File

0
arch/arm/cpu/arm920t/at91/reset.c → arch/arm/mach-at91/arm920t/reset.c
View File

0
arch/arm/cpu/arm920t/at91/timer.c → arch/arm/mach-at91/arm920t/timer.c
View File

0
arch/arm/cpu/arm926ejs/at91/Makefile → arch/arm/mach-at91/arm926ejs/Makefile
View File

0
arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c → arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c
View File

0
arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c → arch/arm/mach-at91/arm926ejs/at91sam9261_devices.c
View File

0
arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c → arch/arm/mach-at91/arm926ejs/at91sam9263_devices.c
View File

0
arch/arm/cpu/arm926ejs/at91/at91sam9m10g45_devices.c → arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c
View File

0
arch/arm/cpu/arm926ejs/at91/at91sam9n12_devices.c → arch/arm/mach-at91/arm926ejs/at91sam9n12_devices.c
View File

0
arch/arm/cpu/arm926ejs/at91/at91sam9rl_devices.c → arch/arm/mach-at91/arm926ejs/at91sam9rl_devices.c
View File

0
arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c → arch/arm/mach-at91/arm926ejs/at91sam9x5_devices.c
View File

0
arch/arm/cpu/arm926ejs/at91/clock.c → arch/arm/mach-at91/arm926ejs/clock.c
View File

0
arch/arm/cpu/arm926ejs/at91/cpu.c → arch/arm/mach-at91/arm926ejs/cpu.c
View File

0
arch/arm/cpu/arm926ejs/at91/eflash.c → arch/arm/mach-at91/arm926ejs/eflash.c
View File

0
arch/arm/cpu/arm926ejs/at91/led.c → arch/arm/mach-at91/arm926ejs/led.c
View File

0
arch/arm/cpu/arm926ejs/at91/lowlevel_init.S → arch/arm/mach-at91/arm926ejs/lowlevel_init.S
View File

0
arch/arm/cpu/arm926ejs/at91/reset.c → arch/arm/mach-at91/arm926ejs/reset.c
View File

0
arch/arm/cpu/arm926ejs/at91/timer.c → arch/arm/mach-at91/arm926ejs/timer.c
View File

0
arch/arm/cpu/armv7/at91/Makefile → arch/arm/mach-at91/armv7/Makefile
View File

0
arch/arm/cpu/armv7/at91/clock.c → arch/arm/mach-at91/armv7/clock.c
View File

0
arch/arm/cpu/armv7/at91/cpu.c → arch/arm/mach-at91/armv7/cpu.c
View File

0
arch/arm/cpu/armv7/at91/reset.c → arch/arm/mach-at91/armv7/reset.c
View File

0
arch/arm/cpu/armv7/at91/sama5d3_devices.c → arch/arm/mach-at91/armv7/sama5d3_devices.c
View File

0
arch/arm/cpu/armv7/at91/sama5d4_devices.c → arch/arm/mach-at91/armv7/sama5d4_devices.c
View File

0
arch/arm/cpu/armv7/at91/timer.c → arch/arm/mach-at91/armv7/timer.c
View File

9
arch/arm/mach-at91/config.mk Normal file
View File

@ -0,0 +1,9 @@
ifeq ($(CONFIG_CPU_ARM926EJS),y)
PLATFORM_CPPFLAGS += $(call cc-option,-mtune=arm926ejs,)
endif
ifeq ($(CONFIG_CPU_V7),y)
ifndef CONFIG_SPL_BUILD
ALL-y += u-boot.img
endif
endif

0
arch/arm/cpu/at91-common/mpddrc.c → arch/arm/mach-at91/mpddrc.c
View File

0
arch/arm/cpu/at91-common/phy.c → arch/arm/mach-at91/phy.c
View File

0
arch/arm/cpu/at91-common/sdram.c → arch/arm/mach-at91/sdram.c
View File

0
arch/arm/cpu/at91-common/spl.c → arch/arm/mach-at91/spl.c
View File

0
arch/arm/cpu/at91-common/spl_at91.c → arch/arm/mach-at91/spl_at91.c
View File

0
arch/arm/cpu/at91-common/spl_atmel.c → arch/arm/mach-at91/spl_atmel.c
View File

0
arch/arm/cpu/at91-common/u-boot-spl.lds → arch/arm/mach-at91/u-boot-spl.lds
View File

2
include/configs/sama5d3_xplained.h
View File

@ -227,7 +227,7 @@
#define CONFIG_SYS_MONITOR_LEN (512 << 10)
#ifdef CONFIG_SYS_USE_MMC
#define CONFIG_SPL_LDSCRIPT arch/arm/cpu/at91-common/u-boot-spl.lds
#define CONFIG_SPL_LDSCRIPT arch/arm/mach-at91/u-boot-spl.lds
#define CONFIG_SPL_MMC_SUPPORT
#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x400
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x200

2
include/configs/sama5d3xek.h
View File

@ -274,7 +274,7 @@
#define CONFIG_SYS_MONITOR_LEN (512 << 10)
#ifdef CONFIG_SYS_USE_MMC
#define CONFIG_SPL_LDSCRIPT arch/arm/cpu/at91-common/u-boot-spl.lds
#define CONFIG_SPL_LDSCRIPT arch/arm/mach-at91/u-boot-spl.lds
#define CONFIG_SPL_MMC_SUPPORT
#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x400
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x200