diff options
| author | Marek Vasut <marek.vasut+renesas@gmail.com> | 2018-04-13 23:13:00 +0200 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2018-04-13 23:41:45 +0200 |
| commit | 0e592d075979bfe4b8c9ea7e3c9055156ef17caf (patch) | |
| tree | 64e03ab110553efce74656ff51da1b2b7d316978 /arch | |
| parent | 98a100e9a315a5eff42d4343e1e54ddac774bd3f (diff) | |
| download | u-boot-0e592d075979bfe4b8c9ea7e3c9055156ef17caf.tar.gz u-boot-0e592d075979bfe4b8c9ea7e3c9055156ef17caf.tar.xz u-boot-0e592d075979bfe4b8c9ea7e3c9055156ef17caf.zip | |
ARM: rmobile: Convert TPL to SPL
There is currently no use for building the SPL anymore, since the
SPI loader can easily be replaced by TPL and TPL does load U-Boot
directly. Upgrade TPL to SPL and replace what used to be SPL with
it. This way we build the U-Boot sources only twice, not thrice.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-rmobile/Kconfig.32 | 8 | ||||
| -rw-r--r-- | arch/arm/mach-rmobile/include/mach/boot0.h | 4 | ||||
| -rw-r--r-- | arch/arm/mach-rmobile/lowlevel_init_ca15.S | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/arch/arm/mach-rmobile/Kconfig.32 b/arch/arm/mach-rmobile/Kconfig.32 index d5b00ef379..bcadb21ba9 100644 --- a/arch/arm/mach-rmobile/Kconfig.32 +++ b/arch/arm/mach-rmobile/Kconfig.32 @@ -70,21 +70,17 @@ config TARGET_PORTER bool "Porter board" select DM select DM_SERIAL - select SUPPORT_TPL select SUPPORT_SPL - select SPL_DM if SPL select USE_TINY_PRINTF - select TPL_TINY_MEMSET + select SPL_TINY_MEMSET config TARGET_STOUT bool "Stout board" select DM select DM_SERIAL - select SUPPORT_TPL select SUPPORT_SPL - select SPL_DM if SPL select USE_TINY_PRINTF - select TPL_TINY_MEMSET + select SPL_TINY_MEMSET endchoice diff --git a/arch/arm/mach-rmobile/include/mach/boot0.h b/arch/arm/mach-rmobile/include/mach/boot0.h index 3edd461cbf..61044698bf 100644 --- a/arch/arm/mach-rmobile/include/mach/boot0.h +++ b/arch/arm/mach-rmobile/include/mach/boot0.h @@ -1,5 +1,5 @@ /* - * Specialty padding for the RCar Gen2 TPL JTAG loading + * Specialty padding for the RCar Gen2 SPL JTAG loading * * SPDX-License-Identifier: GPL-2.0 */ @@ -10,7 +10,7 @@ _start: ARM_VECTORS -#ifdef CONFIG_TPL_BUILD +#ifdef CONFIG_SPL_BUILD .word 0x0badc0d3; .word 0x0badc0d3; .word 0x0badc0d3; diff --git a/arch/arm/mach-rmobile/lowlevel_init_ca15.S b/arch/arm/mach-rmobile/lowlevel_init_ca15.S index ef2280bea4..806a3bc2f9 100644 --- a/arch/arm/mach-rmobile/lowlevel_init_ca15.S +++ b/arch/arm/mach-rmobile/lowlevel_init_ca15.S @@ -11,7 +11,7 @@ #include <linux/linkage.h> ENTRY(lowlevel_init) -#ifndef CONFIG_TPL_BUILD +#ifndef CONFIG_SPL_BUILD mrc p15, 0, r4, c0, c0, 5 /* mpidr */ orr r4, r4, r4, lsr #6 and r4, r4, #7 /* id 0-3 = ca15.0,1,2,3 */ |