arch/arm/include/asm/spl.h requires all SoCs to have arch/arm/include/asm/arch-*/spl.h. But many of them just define BOOT_DEVICE_* macros. Those macros are used in the "switch (boot_device) { ... }" statement in common/spl/spl.c. So they should not be archtecture specific, but be described as a simpile enumeration. This commit merges most of arch/arm/include/asm/arch-*/spl.h into arch/arm/include/asm/spl.h. With a little more effort, arch-zynq/spl.h and arch-socfpga/spl.h will be merged, while I am not sure about OMAP and Exynos. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Tom Rini <trini@ti.com> Cc: Michal Simek <michal.simek@xilinx.com> Cc: Andreas Bießmann <andreas.devel@googlemail.com> Cc: Stephen Warren <swarren@nvidia.com> Cc: Tom Warren <twarren@nvidia.com> CC: Stefano Babic <sbabic@denx.de> CC: Minkyu Kang <mk7.kang@samsung.com> Cc: Dinh Nguyen <dinguyen@altera.com> Acked-by: Andreas Bießmann <andreas.devel@googlemail.com> Acked-by: Michal Simek <monstr@monstr.eu> Acked-by: Stefano Babic <sbabic@denx.de> Acked-by: Stephen Warren <swarren@nvidia.com> Acked-by: Tim Harvey <tharvey@gateworks.com> Tested-by: Bo Shen <voice.shen@atmel.com> [on sama5d3xek board for at91 part] Acked-by: Stephen Warren <swarren@nvidia.com> Tested-by: Stefano Babic <sbabic@denx.de> [applying Tim's i.MX6 patches] Acked-by: Tom Rini <trini@ti.com>master
parent
3a56482590
commit
9f2ec3f543
@ -1,24 +0,0 @@ |
||||
/*
|
||||
* Copyright (C) 2013 Atmel Corporation |
||||
* Bo Shen <voice.shen@atmel.com> |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
|
||||
#ifndef _ASM_ARCH_SPL_H_ |
||||
#define _ASM_ARCH_SPL_H_ |
||||
|
||||
enum { |
||||
BOOT_DEVICE_NONE, |
||||
#ifdef CONFIG_SYS_USE_MMC |
||||
BOOT_DEVICE_MMC1, |
||||
BOOT_DEVICE_MMC2, |
||||
BOOT_DEVICE_MMC2_2, |
||||
#elif CONFIG_SYS_USE_NANDFLASH |
||||
BOOT_DEVICE_NAND, |
||||
#elif CONFIG_SYS_USE_SERIALFLASH |
||||
BOOT_DEVICE_SPI, |
||||
#endif |
||||
}; |
||||
|
||||
#endif |
@ -1,16 +0,0 @@ |
||||
/*
|
||||
* (C) Copyright 2012 |
||||
* Texas Instruments, <www.ti.com> |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
#ifndef _ASM_ARCH_SPL_H_ |
||||
#define _ASM_ARCH_SPL_H_ |
||||
|
||||
#define BOOT_DEVICE_NAND 1 |
||||
#define BOOT_DEVICE_SPI 2 |
||||
#define BOOT_DEVICE_MMC1 3 |
||||
#define BOOT_DEVICE_MMC2 4 /* dummy */ |
||||
#define BOOT_DEVICE_MMC2_2 5 /* dummy */ |
||||
|
||||
#endif |
@ -1,22 +0,0 @@ |
||||
/*
|
||||
* (C) Copyright 2012 |
||||
* Texas Instruments, <www.ti.com> |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
#ifndef _ASM_ARCH_SPL_H_ |
||||
#define _ASM_ARCH_SPL_H_ |
||||
|
||||
#define BOOT_DEVICE_NONE 0 |
||||
#define BOOT_DEVICE_XIP 1 |
||||
#define BOOT_DEVICE_XIPWAIT 2 |
||||
#define BOOT_DEVICE_NAND 3 |
||||
#define BOOT_DEVICE_ONENAND 4 |
||||
#define BOOT_DEVICE_MMC1 5 |
||||
#define BOOT_DEVICE_MMC2 6 |
||||
#define BOOT_DEVICE_MMC2_2 7 |
||||
#define BOOT_DEVICE_NOR 8 |
||||
#define BOOT_DEVICE_I2C 9 |
||||
#define BOOT_DEVICE_SPI 10 |
||||
|
||||
#endif |
@ -1,13 +0,0 @@ |
||||
/*
|
||||
* Copyright (C) 2013 Marek Vasut <marex@denx.de> |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
|
||||
#ifndef __ASM_ARCH_SPL_H__ |
||||
#define __ASM_ARCH_SPL_H__ |
||||
|
||||
#define BOOT_DEVICE_NONE 0 |
||||
#define BOOT_DEVICE_NAND 1 |
||||
|
||||
#endif /* __ASM_ARCH_SPL_H__ */ |
@ -1,22 +0,0 @@ |
||||
/*
|
||||
* Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. |
||||
* |
||||
* This program is free software; you can redistribute it and/or modify it |
||||
* under the terms and conditions of the GNU General Public License, |
||||
* version 2, as published by the Free Software Foundation. |
||||
* |
||||
* This program is distributed in the hope it will be useful, but WITHOUT |
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
||||
* more details. |
||||
* |
||||
* You should have received a copy of the GNU General Public License |
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/ |
||||
|
||||
#ifndef _ASM_ARCH_SPL_H_ |
||||
#define _ASM_ARCH_SPL_H_ |
||||
|
||||
#define BOOT_DEVICE_RAM 1 |
||||
|
||||
#endif |
@ -1,13 +0,0 @@ |
||||
/*
|
||||
* (C) Copyright 2010-2013 |
||||
* NVIDIA Corporation <www.nvidia.com> |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
|
||||
#ifndef _ASM_ARCH_SPL_H_ |
||||
#define _ASM_ARCH_SPL_H_ |
||||
|
||||
#define BOOT_DEVICE_RAM 1 |
||||
|
||||
#endif /* _ASM_ARCH_SPL_H_ */ |
@ -1,12 +0,0 @@ |
||||
/*
|
||||
* (C) Copyright 2012 |
||||
* NVIDIA Corporation <www.nvidia.com> |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
#ifndef _ASM_ARCH_SPL_H_ |
||||
#define _ASM_ARCH_SPL_H_ |
||||
|
||||
#define BOOT_DEVICE_RAM 1 |
||||
|
||||
#endif |
@ -1,12 +0,0 @@ |
||||
/*
|
||||
* (C) Copyright 2012 |
||||
* NVIDIA Corporation <www.nvidia.com> |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
#ifndef _ASM_ARCH_SPL_H_ |
||||
#define _ASM_ARCH_SPL_H_ |
||||
|
||||
#define BOOT_DEVICE_RAM 1 |
||||
|
||||
#endif |
Loading…
Reference in new issue