From e3df5e2f3b380e3176bc3580167b5a864995ebe8 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 17 Sep 2009 17:36:53 +0000 Subject: 2009-09-17 Joel Sherrill * hello.adb: Make follow standard RTEMS test output format. * hello_world_ada.scn: New file. * pc386-elf2boot: Removed. --- hello_world_ada/ChangeLog | 6 ++++ hello_world_ada/hello.adb | 4 +-- hello_world_ada/hello_world_ada.scn | 7 +++++ hello_world_ada/pc386-elf2boot | 57 ------------------------------------- 4 files changed, 15 insertions(+), 59 deletions(-) create mode 100644 hello_world_ada/hello_world_ada.scn delete mode 100755 hello_world_ada/pc386-elf2boot diff --git a/hello_world_ada/ChangeLog b/hello_world_ada/ChangeLog index dccc9db..9b1bb8d 100644 --- a/hello_world_ada/ChangeLog +++ b/hello_world_ada/ChangeLog @@ -1,3 +1,9 @@ +2009-09-17 Joel Sherrill + + * hello.adb: Make follow standard RTEMS test output format. + * hello_world_ada.scn: New file. + * pc386-elf2boot: Removed. + 2009-09-17 Joel Sherrill * .cvsignore: Update or add .cvsignore. diff --git a/hello_world_ada/hello.adb b/hello_world_ada/hello.adb index 63f8ac0..803b94e 100644 --- a/hello_world_ada/hello.adb +++ b/hello_world_ada/hello.adb @@ -6,7 +6,7 @@ with Text_IO; use Text_IO; procedure Hello is begin - Put_Line ("GNAT/RTEMS Hello World Test"); + Put_Line ("*** GNAT/RTEMS Hello World Test ***"); New_Line; Put_Line ("Welcome to the World of Lady Ada"); @@ -15,6 +15,6 @@ begin delay 2.5; Put_Line ("Delay Complete"); - Put_Line ("Test Complete"); + Put_Line ("*** END OF GNAT/RTEMS Hello World Test ***"); end Hello; diff --git a/hello_world_ada/hello_world_ada.scn b/hello_world_ada/hello_world_ada.scn new file mode 100644 index 0000000..fba9905 --- /dev/null +++ b/hello_world_ada/hello_world_ada.scn @@ -0,0 +1,7 @@ +*** GNAT/RTEMS Hello World Test *** + +Welcome to the World of Lady Ada + +Initiating 2.5 second delay +Delay Complete +*** END OF GNAT/RTEMS Hello World Test *** diff --git a/hello_world_ada/pc386-elf2boot b/hello_world_ada/pc386-elf2boot deleted file mode 100755 index 05d9258..0000000 --- a/hello_world_ada/pc386-elf2boot +++ /dev/null @@ -1,57 +0,0 @@ -#! /bin/sh -# -# Script for pc386 BSP to convert ELF files to GRUB bootable images -# - -if [ "X${RTEMS_MAKEFILE_PATH}" = "X" ] ; then - echo RTEMS_MAKEFILE_PATH is not set - exit 1 -fi - -BSPINC=${RTEMS_MAKEFILE_PATH}/Makefile.inc -if [ ! -r ${BSPINC} ] ; then - echo "${BSPINC} does not exist." - echo "Is your BSP installed?" - exit 1 -fi - -OBJCOPY=`grep ^OBJCOPY_FOR_TARGET ${BSPINC} | cut -d'=' -f2` - -set -x - -if [ $# -ne 2 ] ; then - echo "Usage: $0 elf_file boot_file" - exit 1 -fi -if [ ! -r ${BSPINC} ] ; then - echo "${BSPINC} does not exist." - echo "Is your BSP installed?" - exit 1 -fi - -echo ${OBJCOPY} -elf=${1} -bt=${2} - -tmpbin=${elf}.bin -tmpbin=${elf}.bin -exit 0 - -# Constants for relocating -HEADERADDR=0x00097E00 -START16FILE=$(RTEMS_MAKEFILE_PATH)/lib/start16.bin -START16ADDR=0x00097C00 -RELOCADDR=0x00100000 - -# Tool helpers -${OBJCOPY} -O elf32-i386 \ - --remove-section=.rodata \ - --remove-section=.comment \ - --remove-section=.note \ - --strip-unneeded ${MAIN}.obj $@ -${OBJCOPY} -O binary ${MAIN}.obj ${MAIN}.bin -${RTEMS_MAKEFILE_PATH}/build-tools/bin2boot -v \ - ${MAIN}.bt ${HEADERADDR} \ - ${START16FILE} ${START16ADDR} 0 ${MAIN}.bin ${RELOCADDR} 0 - -exit 0 -- cgit v1.2.3