GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 06:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

arm: mvebu: Move mvebu-common into mach-mvebu

Browse source 
Now that the mach-mvebu directory exists and is used by Armada XP we can
move the mvebu-common files into this directory as well.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Kevin Smith <kevin.smith@elecsyscorp.com>
Tested-by: Dirk Eibach <dirk.eibach@gdsys.cc>
This commit is contained in:
Stefan Roese 2015-04-25 06:29:46 +02:00 • committed by Luka Perkov
parent 8cb7872230
commit d078765640
15 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/Makefile
View file

@ -86,8 +86,8 @@ libs-y += arch/arm/imx-common/
endif
endif
ifneq (,$(filter $(SOC), mvebu kirkwood))
libs-y += arch/arm/mvebu-common/
ifneq (,$(filter $(SOC), kirkwood))
libs-y += arch/arm/mach-mvebu/
endif
# deprecated

17
arch/arm/mach-mvebu/Makefile
View file

@ -1,9 +1,24 @@
#
# Copyright (C) 2014 Stefan Roese <sr@denx.de>
# Copyright (C) 2014-2015 Stefan Roese <sr@denx.de>
#
# SPDX-License-Identifier: GPL-2.0+
#
ifdef CONFIG_KIRKWOOD
obj-y = dram.o
obj-y += gpio.o
obj-y += timer.o
else
obj-y = cpu.o
obj-y += dram.o
obj-y += gpio.o
obj-y += mbus.o
obj-y += timer.o
obj-$(CONFIG_SPL_BUILD) += spl.o
obj-$(CONFIG_SPL_BUILD) += lowlevel_spl.o
obj-y += serdes/
endif

0
arch/arm/mvebu-common/dram.c → arch/arm/mach-mvebu/dram.c
View file

0
arch/arm/mvebu-common/gpio.c → arch/arm/mach-mvebu/gpio.c
View file

0
arch/arm/mvebu-common/mbus.c → arch/arm/mach-mvebu/mbus.c
View file

0
arch/arm/mvebu-common/serdes/Makefile → arch/arm/mach-mvebu/serdes/Makefile
View file

0
arch/arm/mvebu-common/serdes/board_env_spec.h → arch/arm/mach-mvebu/serdes/board_env_spec.h
View file

0
arch/arm/mvebu-common/serdes/high_speed_env_lib.c → arch/arm/mach-mvebu/serdes/high_speed_env_lib.c
View file

0
arch/arm/mvebu-common/serdes/high_speed_env_spec.c → arch/arm/mach-mvebu/serdes/high_speed_env_spec.c
View file

0
arch/arm/mvebu-common/serdes/high_speed_env_spec.h → arch/arm/mach-mvebu/serdes/high_speed_env_spec.h
View file

0
arch/arm/mvebu-common/timer.c → arch/arm/mach-mvebu/timer.c
View file

0
arch/arm/mvebu-common/u-boot-spl.lds → arch/arm/mach-mvebu/u-boot-spl.lds
View file

2
board/maxbcm/maxbcm.c
View file

@ -12,7 +12,7 @@
#include <linux/mbus.h>
#include "../drivers/ddr/mvebu/ddr3_hw_training.h"
#include "../arch/arm/mvebu-common/serdes/high_speed_env_spec.h"
#include "../arch/arm/mach-mvebu/serdes/high_speed_env_spec.h"
DECLARE_GLOBAL_DATA_PTR;

2
include/configs/db-mv784mp-gp.h
View file

@ -100,7 +100,7 @@
#define CONFIG_SPL_LIBGENERIC_SUPPORT
#define CONFIG_SPL_SERIAL_SUPPORT
#define CONFIG_SPL_I2C_SUPPORT
#define CONFIG_SPL_LDSCRIPT "arch/arm/mvebu-common/u-boot-spl.lds"
#define CONFIG_SPL_LDSCRIPT "arch/arm/mach-mvebu/u-boot-spl.lds"
/* SPL related SPI defines */
#define CONFIG_SPL_SPI_SUPPORT

2
include/configs/maxbcm.h
View file

@ -100,7 +100,7 @@
#define CONFIG_SPL_LIBGENERIC_SUPPORT
#define CONFIG_SPL_SERIAL_SUPPORT
#define CONFIG_SPL_I2C_SUPPORT
#define CONFIG_SPL_LDSCRIPT "arch/arm/mvebu-common/u-boot-spl.lds"
#define CONFIG_SPL_LDSCRIPT "arch/arm/mach-mvebu/u-boot-spl.lds"
/* SPL related SPI defines */
#define CONFIG_SPL_SPI_SUPPORT