--- a/packages/hal/arm/edb7xxx/current/misc/STUBS_config
+++ b/packages/hal/arm/edb7xxx/current/misc/STUBS_config
@@ -20,8 +20,8 @@ else
   exit 1
 fi
 
-$TCL $1/pkgconf.tcl                                              \
-  --target=arm --platform=${EDB7xxx} --startup=stubs             \
+$TCL $1/pkgconf.tcl                                             \
+  --target=arm --platform=${EDB7xxx} --startup=rom              \
   --disable CYGPKG_KERNEL --disable CYGPKG_UITRON               \
   --disable CYGPKG_LIBC --disable CYGPKG_LIBM                   \
   --disable CYGPKG_ERROR --disable CYGPKG_IO                    \
@@ -29,12 +29,36 @@ fi
   --disable CYGPKG_DEVICES_WATCHDOG --disable-cygmon
 
 patch <<END_OF_PATCHES -p0
-
-// This patch enables GDB stub support
-
---- pkgconf/hal.h~      Thu Jul  8 08:26:44 1999
-+++ pkgconf/hal.h       Wed Jul 28 10:51:07 1999
-@@ -369,10 +369,10 @@
+--- pkgconf/hal.h.orig	Thu Feb 10 09:05:07 2000
++++ pkgconf/hal.h	Thu Feb 10 09:04:56 2000
+@@ -122,7 +122,7 @@
+  }
+ 
+  }}CFG_DATA */
+-#define CYGFUN_HAL_COMMON_KERNEL_SUPPORT
++#undef  CYGFUN_HAL_COMMON_KERNEL_SUPPORT
+ #undef  CYGDBG_HAL_DIAG_DISABLE_GDB_PROTOCOL
+ 
+ #ifdef CYGDBG_HAL_DIAG_DISABLE_GDB_PROTOCOL
+@@ -243,7 +243,7 @@
+ #define CYGIMP_HAL_COMMON_INTERRUPTS_USE_INTERRUPT_STACK
+ #define CYGNUM_HAL_COMMON_INTERRUPTS_STACK_SIZE 4096
+ #undef  CYGSEM_HAL_COMMON_INTERRUPTS_ALLOW_NESTING
+-#define CYGDBG_HAL_COMMON_INTERRUPTS_SAVE_MINIMUM_CONTEXT
++#undef  CYGDBG_HAL_COMMON_INTERRUPTS_SAVE_MINIMUM_CONTEXT
+ #undef  CYGIMP_HAL_COMMON_INTERRUPTS_CHAIN
+ #undef  CYGIMP_HAL_COMMON_INTERRUPTS_IGNORE_SPURIOUS
+ 
+@@ -272,7 +272,7 @@
+  }
+  
+  }}CFG_DATA */
+-#define CYGDBG_HAL_COMMON_CONTEXT_SAVE_MINIMUM
++#undef  CYGDBG_HAL_COMMON_CONTEXT_SAVE_MINIMUM
+ 
+ /* {{CFG_DATA
+ 
+@@ -423,10 +423,10 @@
  
     }}CFG_DATA */
  
@@ -48,19 +72,17 @@ patch <<END_OF_PATCHES -p0
  
  /*
   * NOTE:
-
-// This patch selects statis MMU tables, in ROM
+@@ -522,7 +522,7 @@
 
---- pkgconf/hal.h~      Mon Nov 22 07:42:33 1999
-+++ pkgconf/hal.h       Mon Nov 22 08:33:32 1999
-@@ -348,7 +348,7 @@
-    }}CFG_DATA */
+ 
+ /* Enable this when configuring as a ROM monitor (i.e., stub) */
+-#undef  CYGSEM_HAL_ROM_MONITOR
++#define CYGSEM_HAL_ROM_MONITOR
  
- #define CYGSEM_HAL_INSTALL_MMU_TABLES
--#undef  CYGSEM_HAL_STATIC_MMU_TABLES
-+#define CYGSEM_HAL_STATIC_MMU_TABLES
- 
- /* ---------------------------------------------------------------------
-  * Options related to source-level debugging and diagnostics.
+ #include CYGBLD_HAL_TARGET_H
+ #include CYGBLD_HAL_PLATFORM_H 
+END_OF_PATCHES
 
-END_OF_PATCHES
+make
+make -C hal/common/current/src/stubrom
+arm-elf-objcopy -O binary hal/common/current/src/stubrom/stubrom stubrom.bin