Skip to contentSkip to conversation

spl: consolidate arch/arm/include/asm/arch-*/spl.h

PATCH New Masahiro Yamada 4 participants 5 messages Apr 23, 2014 – Jun 6, 2014

Subsystems (3)
Arm (32-bit) Tegra architecture support Arm/Microchip (AT91) SoC support
lore
Share & tools
lore

Masahiro Yamada

author
#0 lore raw

PATCH v2 1/1 spl: consolidate arch/arm/include/asm/arch-*/spl.h

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 <[email protected]>
Cc Tom Rini <[email protected]>
Cc Michal Simek <[email protected]>
Cc Andreas Bie?mann <[email protected]>
Cc Stephen Warren <[email protected]>
Cc Tom Warren <[email protected]>
CC Stefano Babic <[email protected]>
CC Minkyu Kang <[email protected]>
Cc Dinh Nguyen <[email protected]>
Acked-by Andreas Bie?mann <[email protected]>
Acked-by Michal Simek <[email protected]>
Acked-by Stefano Babic <[email protected]>
Acked-by Stephen Warren <[email protected]>
Acked-by Tim Harvey <[email protected]>
Tested-by Bo Shen <[email protected]> [on sama5d3xek board for at91 part]

---

Changes in v2:
- Add BOOT_DEVICE_SATA (request from Tim Harvey)
- Add "|| defined(CONFIG_EXYNOS4210)"
Most exynos boards define CONFIG_EXYNOS4 or CONFIG_EXYNOS5. But there is one exception: smdkv310.
This board defines neither CONFIG_EXYNOS4 nor CONFIG_EXYNOS5. For this board, "if defined(CONFIG_EXYNOS4210)" should be checked.

 arch/arm/cpu/arm720t/tegra-common/spl.c  |  2 +-
 arch/arm/include/asm/arch-at91/spl.h     | 24 ------------------------
 arch/arm/include/asm/arch-davinci/spl.h  | 16 ----------------
 arch/arm/include/asm/arch-mx35/spl.h     | 22 ----------------------
 arch/arm/include/asm/arch-mx5/spl.h      | 13 -------------
 arch/arm/include/asm/arch-tegra114/spl.h | 22 ----------------------
 arch/arm/include/asm/arch-tegra124/spl.h | 13 -------------
 arch/arm/include/asm/arch-tegra20/spl.h  | 12 ------------
 arch/arm/include/asm/arch-tegra30/spl.h  | 12 ------------
 arch/arm/include/asm/spl.h               | 20 ++++++++++++++++++++
 board/denx/m53evk/m53evk.c               |  2 +-
 11 files changed, 22 insertions(+), 136 deletions(-)
 delete mode 100644 arch/arm/include/asm/arch-at91/spl.h
 delete mode 100644 arch/arm/include/asm/arch-davinci/spl.h
 delete mode 100644 arch/arm/include/asm/arch-mx35/spl.h
 delete mode 100644 arch/arm/include/asm/arch-mx5/spl.h
 delete mode 100644 arch/arm/include/asm/arch-tegra114/spl.h
 delete mode 100644 arch/arm/include/asm/arch-tegra124/spl.h
 delete mode 100644 arch/arm/include/asm/arch-tegra20/spl.h
 delete mode 100644 arch/arm/include/asm/arch-tegra30/spl.h
arch/arm/cpu/arm720t/tegra-common/spl.c +1 -1
index 5171a8f..8147806 100644
@@ -14,7 +14,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/tegra.h>
 #include <asm/arch-tegra/board.h>
-#include <asm/arch/spl.h>
+#include <asm/spl.h>
 #include "cpu.h"
 
 void spl_board_init(void)
arch/arm/include/asm/arch-at91/spl.h deleted +0 -24
deleted file mode 100644
index d8a87da..0000000
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2013 Atmel Corporation
- *		      Bo Shen <[email protected]>
- *
- * 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
arch/arm/include/asm/arch-davinci/spl.h deleted +0 -16
deleted file mode 100644
index 5afe0d4..0000000
@@ -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
arch/arm/include/asm/arch-mx35/spl.h deleted +0 -22
deleted file mode 100644
index d0efec2..0000000
@@ -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
arch/arm/include/asm/arch-mx5/spl.h deleted +0 -13
deleted file mode 100644
index 20c6cae..0000000
@@ -1,13 +0,0 @@
-/*
- * Copyright (C) 2013 Marek Vasut <[email protected]>
- *
- * 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__ */
arch/arm/include/asm/arch-tegra114/spl.h deleted +0 -22
deleted file mode 100644
index ebb16fe..0000000
@@ -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
arch/arm/include/asm/arch-tegra124/spl.h deleted +0 -13
deleted file mode 100644
index e266395..0000000
@@ -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_ */
arch/arm/include/asm/arch-tegra20/spl.h deleted +0 -12
deleted file mode 100644
index 8953b00..0000000
@@ -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
arch/arm/include/asm/arch-tegra30/spl.h deleted +0 -12
deleted file mode 100644
index 8953b00..0000000
@@ -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
arch/arm/include/asm/spl.h +20 -0
index 90e5a9d..18a319d 100644
@@ -7,9 +7,29 @@
 #ifndef	_ASM_SPL_H_
 #define	_ASM_SPL_H_
 
+#if defined(CONFIG_OMAP) || defined(CONFIG_SOCFPGA) || defined(CONFIG_ZYNQ) \
+	|| defined(CONFIG_EXYNOS4) || defined(CONFIG_EXYNOS5) \
+	|| defined(CONFIG_EXYNOS4210)
 /* Platform-specific defines */
 #include <asm/arch/spl.h>
 
+#else
+enum {
+	BOOT_DEVICE_RAM,
+	BOOT_DEVICE_MMC1,
+	BOOT_DEVICE_MMC2,
+	BOOT_DEVICE_MMC2_2,
+	BOOT_DEVICE_NAND,
+	BOOT_DEVICE_ONENAND,
+	BOOT_DEVICE_NOR,
+	BOOT_DEVICE_UART,
+	BOOT_DEVICE_SPI,
+	BOOT_DEVICE_SATA,
+	BOOT_DEVICE_I2C,
+	BOOT_DEVICE_NONE
+};
+#endif
+
 /* Linker symbols. */
 extern char __bss_start[], __bss_end[];
board/denx/m53evk/m53evk.c +1 -1
index 74f9501..5dd6cdd 100644
@@ -14,7 +14,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx53.h>
 #include <asm/imx-common/mx5_video.h>
-#include <asm/arch/spl.h>
+#include <asm/spl.h>
 #include <asm/errno.h>
 #include <netdev.h>
 #include <i2c.h>
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH v2 1/1 spl: consolidate arch/arm/include/asm/arch-*/spl.h

Quoted 8 lines · Masahiro Yamada

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.

Quoted 8 lines

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.

Acked-by Stephen Warren <[email protected]>

(Not that I'm the Tegra maintainer)

#2 lore raw

PATCH v2 1/1 spl: consolidate arch/arm/include/asm/arch-*/spl.h

In reply to Masahiro Yamada
Quoted 32 lines · Masahiro Yamada

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 <[email protected]>
Cc Tom Rini <[email protected]>
Cc Michal Simek <[email protected]>
Cc Andreas Bie?mann <[email protected]>
Cc Stephen Warren <[email protected]>
Cc Tom Warren <[email protected]>
CC Stefano Babic <[email protected]>
CC Minkyu Kang <[email protected]>
Cc Dinh Nguyen <[email protected]>
Acked-by Andreas Bie?mann <[email protected]>
Acked-by Michal Simek <[email protected]>
Acked-by Stefano Babic <[email protected]>
Acked-by Stephen Warren <[email protected]>
Acked-by Tim Harvey <[email protected]>
Tested-by Bo Shen <[email protected]> [on sama5d3xek board for at91 part]
Quoted 1 line

---

Tested-by Stefano Babic <[email protected]> [applying Tim's i.MX6 patches]

Tom, what about this patch ? Tim's patchset for SPL on i.MX6 depends on this. Is it appliable ?

Stefano

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#3 lore raw

PATCH v2 1/1 spl: consolidate arch/arm/include/asm/arch-*/spl.h

Quoted 35 lines · Stefano Babic
Quoted 32 lines · Masahiro Yamada

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 <[email protected]>
Cc Tom Rini <[email protected]>
Cc Michal Simek <[email protected]>
Cc Andreas Bie?mann <[email protected]>
Cc Stephen Warren <[email protected]>
Cc Tom Warren <[email protected]>
CC Stefano Babic <[email protected]>
CC Minkyu Kang <[email protected]>
Cc Dinh Nguyen <[email protected]>
Acked-by Andreas Bie?mann <[email protected]>
Acked-by Michal Simek <[email protected]>
Acked-by Stefano Babic <[email protected]>
Acked-by Stephen Warren <[email protected]>
Acked-by Tim Harvey <[email protected]>
Tested-by Bo Shen <[email protected]> [on sama5d3xek board for at91 part]
Quoted 1 line

---

Quoted 4 lines
Tested-by Stefano Babic <[email protected]> [applying Tim's i.MX6 patches]

Tom, what about this patch ? Tim's patchset for SPL on i.MX6 depends on this. Is it appliable ?

Acked-by Tom Rini <[email protected]>

Go ahead and bring it in via the imx tree.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140605/59d8131f/attachment.pgp>
#4 lore raw

PATCH v2 1/1 spl: consolidate arch/arm/include/asm/arch-*/spl.h

In reply to Masahiro Yamada

Hi Masahiro,

Quoted 32 lines · Masahiro Yamada

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 <[email protected]>
Cc Tom Rini <[email protected]>
Cc Michal Simek <[email protected]>
Cc Andreas Bie?mann <[email protected]>
Cc Stephen Warren <[email protected]>
Cc Tom Warren <[email protected]>
CC Stefano Babic <[email protected]>
CC Minkyu Kang <[email protected]>
Cc Dinh Nguyen <[email protected]>
Acked-by Andreas Bie?mann <[email protected]>
Acked-by Michal Simek <[email protected]>
Acked-by Stefano Babic <[email protected]>
Acked-by Stephen Warren <[email protected]>
Acked-by Tim Harvey <[email protected]>
Tested-by Bo Shen <[email protected]> [on sama5d3xek board for at91 part]
Quoted 1 line

---

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================