2008-09-23 Joel Sherrill <joel.sherrill@oarcorp.com>

	* configure.ac, include/bspopts.h.in: Make letting boot_card() handle
	work area allocation mandatory. Rename
	RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION to BSP_BOOTCARD_OPTIONS.

6 files changed, 16 insertions, 14 deletions

diff --git a/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog b/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog
index e395aaae69..635fc785ff 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-23	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* configure.ac, include/bspopts.h.in: Make letting boot_card() handle
+	work area allocation mandatory. Rename
+	RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION to BSP_BOOTCARD_OPTIONS.
+
 2008-09-22	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* include/bsp.h, startup/misc.c: Use standardized bsp_cleanup() which
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/configure.ac b/c/src/lib/libbsp/powerpc/mvme3100/configure.ac
index 6ceb46881a..d9d7b12acc 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/configure.ac
+++ b/c/src/lib/libbsp/powerpc/mvme3100/configure.ac
@@ -35,7 +35,7 @@ RTEMS_BSPOPTS_HELP([PPC_USE_DATA_CACHE],
  of PowerPC 603e revisions and emulator versions.
  The BSP actually contains the call that enables this.])
 
-RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION
+BSP_BOOTCARD_OPTIONS
 
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile])
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/include/bspopts.h.in b/c/src/lib/libbsp/powerpc/mvme3100/include/bspopts.h.in
index 735eb7495f..f2430b85a8 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/include/bspopts.h.in
+++ b/c/src/lib/libbsp/powerpc/mvme3100/include/bspopts.h.in
@@ -1,11 +1,6 @@
 /* include/bspopts.h.in.  Generated from configure.ac by autoheader.  */
 
-/* BSP uses shared logic in bootcard.c */
-#undef BSP_BOOTCARD_HANDLES_RAM_ALLOCATION
-
-/* If defined, then PSIM will put a non-zero pattern into the RTEMS Workspace
-   and C program heap. This should assist in finding code that assumes memory
-   starts set to zero. */
+/* If defined */
 #undef BSP_DIRTY_MEMORY
 
 /* Define to the address where bug reports for this package should be sent. */
diff --git a/c/src/lib/libbsp/powerpc/virtex/ChangeLog b/c/src/lib/libbsp/powerpc/virtex/ChangeLog
index e83788b07d..b5144380c4 100644
--- a/c/src/lib/libbsp/powerpc/virtex/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/virtex/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-23	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* configure.ac, include/bspopts.h.in: Make letting boot_card() handle
+	work area allocation mandatory. Rename
+	RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION to BSP_BOOTCARD_OPTIONS.
+
 2008-09-22	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* Makefile.am, configure.ac, include/bspopts.h.in: Use standardized
diff --git a/c/src/lib/libbsp/powerpc/virtex/configure.ac b/c/src/lib/libbsp/powerpc/virtex/configure.ac
index 06faece213..2356042ad0 100644
--- a/c/src/lib/libbsp/powerpc/virtex/configure.ac
+++ b/c/src/lib/libbsp/powerpc/virtex/configure.ac
@@ -50,7 +50,7 @@ RTEMS_BSPOPTS_SET([BSP_RESET_BOARD_AT_EXIT],[*],[1])
 RTEMS_BSPOPTS_HELP([BSP_RESET_BOARD_AT_EXIT],
 [If defined, reset the board when the application exits.])
 
-RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION
+BSP_BOOTCARD_OPTIONS
 
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile])
diff --git a/c/src/lib/libbsp/powerpc/virtex/include/bspopts.h.in b/c/src/lib/libbsp/powerpc/virtex/include/bspopts.h.in
index c6336f3b18..60bcd77b16 100644
--- a/c/src/lib/libbsp/powerpc/virtex/include/bspopts.h.in
+++ b/c/src/lib/libbsp/powerpc/virtex/include/bspopts.h.in
@@ -1,11 +1,6 @@
 /* include/bspopts.h.in.  Generated from configure.ac by autoheader.  */
 
-/* BSP uses shared logic in bootcard.c */
-#undef BSP_BOOTCARD_HANDLES_RAM_ALLOCATION
-
-/* If defined, then PSIM will put a non-zero pattern into the RTEMS Workspace
-   and C program heap. This should assist in finding code that assumes memory
-   starts set to zero. */
+/* If defined */
 #undef BSP_DIRTY_MEMORY
 
 /* If defined, print a message and wait until pressed before resetting board