[U-Boot] [PATCHv2 10/20] arm: socfpga: spl: Use common lowlevel_init

Marek Vasut
2015-03-04T13:11:32Z

On Monday, March 02, 2015 at 05:27:58 PM, dinguyen at opensource.altera.com wrote:
> From: Dinh Nguyen <dinguyen@opensource.altera.com>
>
> For SoCFGPA, use the common ARMv7 lowlevel_init.
>
> Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
> ---
> arch/arm/cpu/armv7/Makefile | 2 +-
> arch/arm/cpu/armv7/socfpga/lowlevel_init.S | 4 ----
> 2 files changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile
> index b228ed6..924bcf4 100644
> --- a/arch/arm/cpu/armv7/Makefile
> +++ b/arch/arm/cpu/armv7/Makefile
> @@ -12,7 +12,7 @@ obj-y += cache_v7.o
> obj-y += cpu.o
> obj-y += syslib.o
>
> -ifneq
> ($(CONFIG_AM43XX)$(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CON
> FIG_TEGRA)$(CONFIG_MX6)$(CONFIG_TI81XX)$(CONFIG_AT91FAMILY)$(CONFIG_SUNXI),
> ) +ifneq
> ($(CONFIG_AM43XX)$(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CON
> FIG_TEGRA)$(CONFIG_MX6)$(CONFIG_TI81XX)$(CONFIG_AT91FAMILY)$(CONFIG_SUNXI)$
> (CONFIG_SOCFPGA),) ifneq ($(CONFIG_SKIP_LOWLEVEL_INIT),y)
> obj-y += lowlevel_init.o
> endif
> diff --git a/arch/arm/cpu/armv7/socfpga/lowlevel_init.S
> b/arch/arm/cpu/armv7/socfpga/lowlevel_init.S index afed773..723508c 100644
> --- a/arch/arm/cpu/armv7/socfpga/lowlevel_init.S
> +++ b/arch/arm/cpu/armv7/socfpga/lowlevel_init.S
> @@ -7,10 +7,6 @@
> #include <config.h>
> #include <version.h>
>
> -/* Set up the platform, once the cpu has been initialized */
> -.globl lowlevel_init
> -lowlevel_init:
> -

Hi!

you should zap the entire file, no? The rest of the content of the file is the
implementation of the function lowlevel_init, which by removing the label turned
into an unreachable code. Right ?

> /* Remap */
> #ifdef CONFIG_SPL_BUILD
> /*

Best regards,
Marek Vasut