# HG changeset patch
# User jlarmour
# Date 1226377894 0
# Node ID 6e645dcefcb19ae672493d0c55faaa20c3576305
# Parent  d1dda316c2d155b11419bae7a83a438061f2a400
	* cdl/hal_powerpc_viper.cdl: Clean up of CDL strings.

	* include/pkgconf/mlt_powerpc_viper_romram.ldi: Include relocs and
	.eh_frame sections.
	* include/pkgconf/mlt_powerpc_viper_rom.ldi: Ditto.
	* include/pkgconf/mlt_powerpc_viper_ram.ldi: Ditto.

	* include/pkgconf/mlt_powerpc_viper_romram.mlt: Delete. Out of date and
	unmaintained.
	* include/pkgconf/mlt_powerpc_viper_rom.mlt: Ditto.
	* include/pkgconf/mlt_powerpc_viper_ram.mlt: Ditto.

// Copyright (C) 2004 eCosCentric Limited

diff --git a/packages/hal/powerpc/viper/current/ChangeLog b/packages/hal/powerpc/viper/current/ChangeLog
--- a/packages/hal/powerpc/viper/current/ChangeLog
+++ b/packages/hal/powerpc/viper/current/ChangeLog
@@ -1,3 +1,19 @@
+2004-09-30  John Dallaway  <jld@ecoscentric.com>
+
+	* cdl/hal_powerpc_viper.cdl: Clean up of CDL strings.
+
+2004-09-28  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* include/pkgconf/mlt_powerpc_viper_romram.ldi: Include relocs and
+	.eh_frame sections.
+	* include/pkgconf/mlt_powerpc_viper_rom.ldi: Ditto.
+	* include/pkgconf/mlt_powerpc_viper_ram.ldi: Ditto.
+
+	* include/pkgconf/mlt_powerpc_viper_romram.mlt: Delete. Out of date and
+	unmaintained.
+	* include/pkgconf/mlt_powerpc_viper_rom.mlt: Ditto.
+	* include/pkgconf/mlt_powerpc_viper_ram.mlt: Ditto.
+
 2003-12-21  Gary Thomas  <gary@mlbassoc.com>
 
 	* src/viper.S: Only clear caches on non-RAM startup.  This is to
@@ -243,6 +259,7 @@ 2001-01-31  Jesper Skov  <jskov@redhat.c
 // -------------------------------------------
 // This file is part of eCos, the Embedded Configurable Operating System.
 // Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+// Copyright (C) 2004 eCosCentric Limited
 //
 // eCos is free software; you can redistribute it and/or modify it under
 // the terms of the GNU General Public License as published by the Free
diff --git a/packages/hal/powerpc/viper/current/cdl/hal_powerpc_viper.cdl b/packages/hal/powerpc/viper/current/cdl/hal_powerpc_viper.cdl
--- a/packages/hal/powerpc/viper/current/cdl/hal_powerpc_viper.cdl
+++ b/packages/hal/powerpc/viper/current/cdl/hal_powerpc_viper.cdl
@@ -10,6 +10,7 @@
 ## This file is part of eCos, the Embedded Configurable Operating System.
 ## Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
 ## Copyright (C) 2002, 2003 Gary Thomas
+## Copyright (C) 2004 eCosCentric Limited
 ##
 ## eCos is free software; you can redistribute it and/or modify it under
 ## the terms of the GNU General Public License as published by the Free
@@ -51,14 +52,14 @@
 # ====================================================================
 
 cdl_package CYGPKG_HAL_POWERPC_VIPER {
-    display       "A&M VIPER PowerPC evaluation board"
+    display       "A&M Viper PowerPC evaluation board"
     parent        CYGPKG_HAL_POWERPC
     requires      CYGPKG_HAL_POWERPC_MPC8xx
     define_header hal_powerpc_viper.h
     include_dir   cyg/hal
     description   "
         The VIPER HAL package provides the support needed to run
-        eCos on a A&M VIPER board equipped with a PowerPC processor."
+        eCos on a A&M Viper board equipped with a PowerPC processor."
 
     compile       hal_diag.c hal_aux.c viper.S
 
diff --git a/packages/hal/powerpc/viper/current/include/pkgconf/mlt_powerpc_viper_ram.ldi b/packages/hal/powerpc/viper/current/include/pkgconf/mlt_powerpc_viper_ram.ldi
--- a/packages/hal/powerpc/viper/current/include/pkgconf/mlt_powerpc_viper_ram.ldi
+++ b/packages/hal/powerpc/viper/current/include/pkgconf/mlt_powerpc_viper_ram.ldi
@@ -17,12 +17,14 @@ SECTIONS
     CYG_LABEL_DEFN(__reserved_virtual_table) = ALIGN (0x10); . = CYG_LABEL_DEFN(__reserved_virtual_table) + 0x100;
     CYG_LABEL_DEFN(__reserved_for_rom) = ALIGN (0x10); . = CYG_LABEL_DEFN(__reserved_for_rom) + 0x3cd00;
     SECTION_vectors (ram, ALIGN (0x10), LMA_EQ_VMA)
+    SECTION_RELOCS (ram, ALIGN(0x4), LMA_EQ_VMA)
     SECTION_text (ram, ALIGN (0x4), LMA_EQ_VMA)
     SECTION_fini (ram, ALIGN (0x4), LMA_EQ_VMA)
     SECTION_rodata1 (ram, ALIGN (0x8), LMA_EQ_VMA)
     SECTION_rodata (ram, ALIGN (0x8), LMA_EQ_VMA)
     SECTION_fixup (ram, ALIGN (0x4), LMA_EQ_VMA)
     SECTION_gcc_except_table (ram, ALIGN (0x1), LMA_EQ_VMA)
+    SECTION_eh_frame (ram, ALIGN (0x4), LMA_EQ_VMA)
     SECTION_data (ram, ALIGN (0x8), LMA_EQ_VMA)
     SECTION_sbss (ram, ALIGN (0x4), LMA_EQ_VMA)
     SECTION_bss (ram, ALIGN (0x10), LMA_EQ_VMA)
diff --git a/packages/hal/powerpc/viper/current/include/pkgconf/mlt_powerpc_viper_rom.ldi b/packages/hal/powerpc/viper/current/include/pkgconf/mlt_powerpc_viper_rom.ldi
--- a/packages/hal/powerpc/viper/current/include/pkgconf/mlt_powerpc_viper_rom.ldi
+++ b/packages/hal/powerpc/viper/current/include/pkgconf/mlt_powerpc_viper_rom.ldi
@@ -14,11 +14,13 @@ SECTIONS
 {
     SECTIONS_BEGIN
     SECTION_vectors (rom, 0xfe000000, LMA_EQ_VMA)
+    SECTION_RELOCS (rom, ALIGN(0x4), LMA_EQ_VMA)
     SECTION_text (rom, ALIGN (0x4), LMA_EQ_VMA)
     SECTION_fini (rom, ALIGN (0x4), LMA_EQ_VMA)
     SECTION_rodata1 (rom, ALIGN (0x8), LMA_EQ_VMA)
     SECTION_rodata (rom, ALIGN (0x8), LMA_EQ_VMA)
     SECTION_fixup (rom, ALIGN (0x4), LMA_EQ_VMA)
+    SECTION_eh_frame (rom, ALIGN (0x4), LMA_EQ_VMA)
     SECTION_gcc_except_table (rom, ALIGN (0x1), LMA_EQ_VMA)
     CYG_LABEL_DEFN(__reserved_vectors) = 0; . = CYG_LABEL_DEFN(__reserved_vectors) + 0x3000;
     CYG_LABEL_DEFN(__reserved_vsr_table) = ALIGN (0x1); . = CYG_LABEL_DEFN(__reserved_vsr_table) + 0x200;
diff --git a/packages/hal/powerpc/viper/current/include/pkgconf/mlt_powerpc_viper_romram.ldi b/packages/hal/powerpc/viper/current/include/pkgconf/mlt_powerpc_viper_romram.ldi
--- a/packages/hal/powerpc/viper/current/include/pkgconf/mlt_powerpc_viper_romram.ldi
+++ b/packages/hal/powerpc/viper/current/include/pkgconf/mlt_powerpc_viper_romram.ldi
@@ -14,11 +14,13 @@ SECTIONS
     SECTIONS_BEGIN
     SECTION_vectors (ram, 0, LMA_EQ_VMA)
     SECTION_text (ram, 0x3400, LMA_EQ_VMA)
+    SECTION_RELOCS (ram, ALIGN(0x4), LMA_EQ_VMA)
     SECTION_fini (ram, ALIGN (0x4), LMA_EQ_VMA)
     SECTION_rodata1 (ram, ALIGN (0x8), LMA_EQ_VMA)
     SECTION_rodata (ram, ALIGN (0x8), LMA_EQ_VMA)
     SECTION_fixup (ram, ALIGN (0x4), LMA_EQ_VMA)
     SECTION_gcc_except_table (ram, ALIGN (0x1), LMA_EQ_VMA)
+    SECTION_eh_frame (ram, ALIGN (0x4), LMA_EQ_VMA)
     SECTION_data (ram, ALIGN (0x8), LMA_EQ_VMA)
     SECTION_sbss (ram, ALIGN (0x4), LMA_EQ_VMA)
     SECTION_bss (ram, ALIGN (0x10), LMA_EQ_VMA)