From 1554415ee88eb0811cc606235678502a4bf866d2 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 25 Apr 2018 14:54:27 +0200 Subject: bsp/sparc64: Move asm.S to bsps and rename This patch is a part of the BSP source reorganization. Update #3285. --- c/src/lib/libbsp/sparc64/niagara/Makefile.am | 2 +- c/src/lib/libbsp/sparc64/shared/asm/asm.S | 17 ----------------- c/src/lib/libbsp/sparc64/usiii/Makefile.am | 2 +- 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 c/src/lib/libbsp/sparc64/shared/asm/asm.S (limited to 'c/src/lib') diff --git a/c/src/lib/libbsp/sparc64/niagara/Makefile.am b/c/src/lib/libbsp/sparc64/niagara/Makefile.am index 6a39088dde..0744847185 100644 --- a/c/src/lib/libbsp/sparc64/niagara/Makefile.am +++ b/c/src/lib/libbsp/sparc64/niagara/Makefile.am @@ -33,7 +33,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc64/shared/helenos/boot/spar librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc64/shared/helenos/boot/sparc64/loader/main.c librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc64/shared/helenos/boot/sparc64/loader/ofwasm.S librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc64/niagara/start/bspinit.S -librtemsbsp_a_SOURCES += ../shared/asm/asm.S +librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc64/shared/start/halt.S librtemsbsp_a_SOURCES +=../../../../../../bsps/sparc64/shared/clock/ckinit.c diff --git a/c/src/lib/libbsp/sparc64/shared/asm/asm.S b/c/src/lib/libbsp/sparc64/shared/asm/asm.S deleted file mode 100644 index 41a5c38afb..0000000000 --- a/c/src/lib/libbsp/sparc64/shared/asm/asm.S +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2010. Gedare Bloom. - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - -#include - -.text - -PUBLIC(halt) - .global halt - SYM(halt): - b halt - nop diff --git a/c/src/lib/libbsp/sparc64/usiii/Makefile.am b/c/src/lib/libbsp/sparc64/usiii/Makefile.am index 0b3eeeba5d..751ed93c70 100644 --- a/c/src/lib/libbsp/sparc64/usiii/Makefile.am +++ b/c/src/lib/libbsp/sparc64/usiii/Makefile.am @@ -39,7 +39,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc64/shared/helenos/boot/gene librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc64/shared/helenos/boot/sparc64/loader/ofwarch.c librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc64/shared/helenos/boot/sparc64/loader/main.c librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc64/shared/helenos/boot/sparc64/loader/ofwasm.S -librtemsbsp_a_SOURCES += ../shared/asm/asm.S +librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc64/shared/start/halt.S librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc64/usiii/start/bspinit.S librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc64/shared/helenos/kernel/sparc64/src/cache.S -- cgit v1.2.3