From c25c4fd0104e8a6695783e41f896ce5f288a6a70 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 15 Aug 2017 22:52:44 +0200 Subject: [PATCH] board/spear/common: move code to arch/arm/cpu/arm926ejs/spear/ The code in board/spear/common/ is not board-specific but SoC-specific. Therefore, boards from other vendors than "spear" may want to re-use this code, which is currently difficult with the code being placed in board/spear/common/. Since this code really is SoC-specific, this commit moves it to arch/arm/cpu/arm926ejs/spear/, with the rest of the SPEAr related code. Signed-off-by: Thomas Petazzoni --- arch/arm/cpu/arm926ejs/spear/Makefile | 2 ++ .../arm/cpu/arm926ejs/spear}/spr_lowlevel_init.S | 0 .../arm/cpu/arm926ejs/spear}/spr_misc.c | 0 board/spear/common/Makefile | 14 -------------- 4 files changed, 2 insertions(+), 14 deletions(-) rename {board/spear/common => arch/arm/cpu/arm926ejs/spear}/spr_lowlevel_init.S (100%) rename {board/spear/common => arch/arm/cpu/arm926ejs/spear}/spr_misc.c (100%) delete mode 100644 board/spear/common/Makefile diff --git a/arch/arm/cpu/arm926ejs/spear/Makefile b/arch/arm/cpu/arm926ejs/spear/Makefile index 7b15d4ef7e..3992401590 100644 --- a/arch/arm/cpu/arm926ejs/spear/Makefile +++ b/arch/arm/cpu/arm926ejs/spear/Makefile @@ -16,6 +16,8 @@ obj-$(CONFIG_DDR_MT47H64M16) += spr600_mt47h64m16_3_333_cl5_psync.o obj-$(CONFIG_DDR_MT47H32M16) += spr600_mt47h32m16_333_cl5_psync.o obj-$(CONFIG_DDR_MT47H32M16) += spr600_mt47h32m16_37e_166_cl4_sync.o obj-$(CONFIG_DDR_MT47H128M8) += spr600_mt47h128m8_3_266_cl5_async.o +else +obj-y += spr_misc.o spr_lowlevel_init.o endif extra-$(CONFIG_SPL_BUILD) := start.o diff --git a/board/spear/common/spr_lowlevel_init.S b/arch/arm/cpu/arm926ejs/spear/spr_lowlevel_init.S similarity index 100% rename from board/spear/common/spr_lowlevel_init.S rename to arch/arm/cpu/arm926ejs/spear/spr_lowlevel_init.S diff --git a/board/spear/common/spr_misc.c b/arch/arm/cpu/arm926ejs/spear/spr_misc.c similarity index 100% rename from board/spear/common/spr_misc.c rename to arch/arm/cpu/arm926ejs/spear/spr_misc.c diff --git a/board/spear/common/Makefile b/board/spear/common/Makefile deleted file mode 100644 index b0ba320481..0000000000 --- a/board/spear/common/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# -# (C) Copyright 2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -ifdef CONFIG_SPL_BUILD -# necessary to create built-in.o -obj- := __dummy__.o -else -obj-y := spr_misc.o -obj-y += spr_lowlevel_init.o -endif -- 2.39.5