[U-Boot] [PATCH] ARM: remove unused CPU directory

There is no board with CPU "arm_intcm".
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com Cc: Albert Aribaud albert.u.boot@aribaud.net ---
arch/arm/cpu/arm_intcm/Makefile | 9 ----- arch/arm/cpu/arm_intcm/config.mk | 8 ---- arch/arm/cpu/arm_intcm/cpu.c | 36 ------------------ arch/arm/cpu/arm_intcm/start.S | 79 ---------------------------------------- 4 files changed, 132 deletions(-) delete mode 100644 arch/arm/cpu/arm_intcm/Makefile delete mode 100644 arch/arm/cpu/arm_intcm/config.mk delete mode 100644 arch/arm/cpu/arm_intcm/cpu.c delete mode 100644 arch/arm/cpu/arm_intcm/start.S
diff --git a/arch/arm/cpu/arm_intcm/Makefile b/arch/arm/cpu/arm_intcm/Makefile deleted file mode 100644 index 3279f12..0000000 --- a/arch/arm/cpu/arm_intcm/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# -# (C) Copyright 2000-2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -extra-y = start.o -obj-y = cpu.o diff --git a/arch/arm/cpu/arm_intcm/config.mk b/arch/arm/cpu/arm_intcm/config.mk deleted file mode 100644 index 438668d..0000000 --- a/arch/arm/cpu/arm_intcm/config.mk +++ /dev/null @@ -1,8 +0,0 @@ -# -# (C) Copyright 2002 -# Gary Jennejohn, DENX Software Engineering, garyj@denx.de -# -# SPDX-License-Identifier: GPL-2.0+ -# - -PLATFORM_CPPFLAGS += -march=armv4 diff --git a/arch/arm/cpu/arm_intcm/cpu.c b/arch/arm/cpu/arm_intcm/cpu.c deleted file mode 100644 index 0d00e4b..0000000 --- a/arch/arm/cpu/arm_intcm/cpu.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * (C) Copyright 2002 - * Sysgo Real-Time Solutions, GmbH <www.elinos.com> - * Marius Groeger mgroeger@sysgo.de - * - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, garyj@denx.de - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -/* - * CPU specific code for an unknown cpu - * - hence fairly empty...... - */ - -#include <common.h> -#include <command.h> - -int cleanup_before_linux (void) -{ - /* - * this function is called just before we call linux - * it prepares the processor for linux - * - * we turn off caches etc ... - */ - - disable_interrupts (); - - /* Since the CM has unknown processor we do not support - * cache operations - */ - - return (0); -} diff --git a/arch/arm/cpu/arm_intcm/start.S b/arch/arm/cpu/arm_intcm/start.S deleted file mode 100644 index c0c07b6..0000000 --- a/arch/arm/cpu/arm_intcm/start.S +++ /dev/null @@ -1,79 +0,0 @@ -/* - * armboot - Startup Code for ARM926EJS CPU-core - * - * Copyright (c) 2003 Texas Instruments - * - * ----- Adapted for OMAP1610 OMAP730 from ARM925t code ------ - * - * Copyright (c) 2001 Marius Gröger mag@sysgo.de - * Copyright (c) 2002 Alex Züpke azu@sysgo.de - * Copyright (c) 2002 Gary Jennejohn garyj@denx.de - * Copyright (c) 2003 Richard Woodruff r-woodruff2@ti.com - * Copyright (c) 2003 Kshitij kshitij@ti.com - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include <asm-offsets.h> -#include <config.h> -#include <version.h> - -/* - ************************************************************************* - * - * Startup Code (reset vector) - * - * do important init only if we don't start from memory! - * setup memory and board specific bits prior to relocation. - * relocate armboot to ram - * setup stack - * - ************************************************************************* - */ - - .globl reset - -reset: - /* - * set the cpu to SVC32 mode - */ - mrs r0,cpsr - bic r0,r0,#0x1f - orr r0,r0,#0xd3 - msr cpsr,r0 - - /* - * we do sys-critical inits only at reboot, - * not when booting from ram! - */ -#ifndef CONFIG_SKIP_LOWLEVEL_INIT - bl cpu_init_crit -#endif - - bl _main - -/*------------------------------------------------------------------------------*/ - - .globl c_runtime_cpu_setup -c_runtime_cpu_setup: - - mov pc, lr - -/* - ************************************************************************* - * - * CPU_init_critical registers - * - * setup important registers - * setup memory timing - * - ************************************************************************* - */ - -#ifndef CONFIG_SKIP_LOWLEVEL_INIT -cpu_init_crit: - /* arm_int_generic assumes the ARM boot monitor, or user software, - * has initialized the platform - */ - mov pc, lr /* back to my caller */ -#endif

Hello Masahiro,
On Thu, 13 Nov 2014 18:40:07 +0900, Masahiro Yamada yamada.m@jp.panasonic.com wrote:
There is no board with CPU "arm_intcm".
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com Cc: Albert Aribaud albert.u.boot@aribaud.net
arch/arm/cpu/arm_intcm/Makefile | 9 ----- arch/arm/cpu/arm_intcm/config.mk | 8 ---- arch/arm/cpu/arm_intcm/cpu.c | 36 ------------------ arch/arm/cpu/arm_intcm/start.S | 79 ---------------------------------------- 4 files changed, 132 deletions(-) delete mode 100644 arch/arm/cpu/arm_intcm/Makefile delete mode 100644 arch/arm/cpu/arm_intcm/config.mk delete mode 100644 arch/arm/cpu/arm_intcm/cpu.c delete mode 100644 arch/arm/cpu/arm_intcm/start.S
diff --git a/arch/arm/cpu/arm_intcm/Makefile b/arch/arm/cpu/arm_intcm/Makefile deleted file mode 100644 index 3279f12..0000000 --- a/arch/arm/cpu/arm_intcm/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# -# (C) Copyright 2000-2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -#
-extra-y = start.o -obj-y = cpu.o diff --git a/arch/arm/cpu/arm_intcm/config.mk b/arch/arm/cpu/arm_intcm/config.mk deleted file mode 100644 index 438668d..0000000 --- a/arch/arm/cpu/arm_intcm/config.mk +++ /dev/null @@ -1,8 +0,0 @@ -# -# (C) Copyright 2002 -# Gary Jennejohn, DENX Software Engineering, garyj@denx.de -# -# SPDX-License-Identifier: GPL-2.0+ -#
-PLATFORM_CPPFLAGS += -march=armv4 diff --git a/arch/arm/cpu/arm_intcm/cpu.c b/arch/arm/cpu/arm_intcm/cpu.c deleted file mode 100644 index 0d00e4b..0000000 --- a/arch/arm/cpu/arm_intcm/cpu.c +++ /dev/null @@ -1,36 +0,0 @@ -/*
- (C) Copyright 2002
- Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- Marius Groeger mgroeger@sysgo.de
- (C) Copyright 2002
- Gary Jennejohn, DENX Software Engineering, garyj@denx.de
- SPDX-License-Identifier: GPL-2.0+
- */
-/*
- CPU specific code for an unknown cpu
- hence fairly empty......
- */
-#include <common.h> -#include <command.h>
-int cleanup_before_linux (void) -{
- /*
* this function is called just before we call linux
* it prepares the processor for linux
*
* we turn off caches etc ...
*/
- disable_interrupts ();
- /* Since the CM has unknown processor we do not support
* cache operations
*/
- return (0);
-} diff --git a/arch/arm/cpu/arm_intcm/start.S b/arch/arm/cpu/arm_intcm/start.S deleted file mode 100644 index c0c07b6..0000000 --- a/arch/arm/cpu/arm_intcm/start.S +++ /dev/null @@ -1,79 +0,0 @@ -/*
- armboot - Startup Code for ARM926EJS CPU-core
- Copyright (c) 2003 Texas Instruments
- ----- Adapted for OMAP1610 OMAP730 from ARM925t code ------
- Copyright (c) 2001 Marius Gröger mag@sysgo.de
- Copyright (c) 2002 Alex Züpke azu@sysgo.de
- Copyright (c) 2002 Gary Jennejohn garyj@denx.de
- Copyright (c) 2003 Richard Woodruff r-woodruff2@ti.com
- Copyright (c) 2003 Kshitij kshitij@ti.com
- SPDX-License-Identifier: GPL-2.0+
- */
-#include <asm-offsets.h> -#include <config.h> -#include <version.h>
-/*
- Startup Code (reset vector)
- do important init only if we don't start from memory!
- setup memory and board specific bits prior to relocation.
- relocate armboot to ram
- setup stack
- */
- .globl reset
-reset:
- /*
* set the cpu to SVC32 mode
*/
- mrs r0,cpsr
- bic r0,r0,#0x1f
- orr r0,r0,#0xd3
- msr cpsr,r0
- /*
* we do sys-critical inits only at reboot,
* not when booting from ram!
*/
-#ifndef CONFIG_SKIP_LOWLEVEL_INIT
- bl cpu_init_crit
-#endif
- bl _main
-/*------------------------------------------------------------------------------*/
- .globl c_runtime_cpu_setup
-c_runtime_cpu_setup:
- mov pc, lr
-/*
- CPU_init_critical registers
- setup important registers
- setup memory timing
- */
-#ifndef CONFIG_SKIP_LOWLEVEL_INIT -cpu_init_crit:
- /* arm_int_generic assumes the ARM boot monitor, or user software,
* has initialized the platform
*/
- mov pc, lr /* back to my caller */
-#endif
1.9.1
Applied to u-boot-arm/master, thanks!
Amicalement,
participants (2)
-
Albert ARIBAUD
-
Masahiro Yamada