# HG changeset patch
# User msalter
# Date 1029187705 0
# Node ID 9d1f104153ba34b042826dc223b74db710c399ac
# Parent  e514771dd548526add3fadcd0121ebb287468905
Fix config problems due to recent CYGSEM_REDBOOT_ARM_LINUX_BOOT change.

diff --git a/packages/hal/arm/arm9/excalibur/current/ChangeLog b/packages/hal/arm/arm9/excalibur/current/ChangeLog
--- a/packages/hal/arm/arm9/excalibur/current/ChangeLog
+++ b/packages/hal/arm/arm9/excalibur/current/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-12  Mark Salter  <msalter@redhat.com>
+
+	* cdl/hal_arm_arm9_excalibur.cdl: Remove CYGSEM_REDBOOT_ARM_LINUX_BOOT
+	requirement.
+
 2002-05-14  Jesper Skov  <jskov@redhat.com>
 
 	* src/excalibur_misc.c: Fixed warning.
diff --git a/packages/hal/arm/arm9/excalibur/current/cdl/hal_arm_arm9_excalibur.cdl b/packages/hal/arm/arm9/excalibur/current/cdl/hal_arm_arm9_excalibur.cdl
--- a/packages/hal/arm/arm9/excalibur/current/cdl/hal_arm_arm9_excalibur.cdl
+++ b/packages/hal/arm/arm9/excalibur/current/cdl/hal_arm_arm9_excalibur.cdl
@@ -399,7 +399,6 @@ cdl_package CYGPKG_HAL_ARM_ARM9_EXCALIBU
         requires {!CYGPKG_REDBOOT_FLASH || CYGOPT_REDBOOT_FIS_REDBOOT_BACKUP == 0}
 
         # RedBoot details
-        requires { CYGSEM_REDBOOT_ARM_LINUX_BOOT }
         requires { CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS_DEFAULT == 0x00008000 }
         define_proc {
             puts $::cdl_header "#define CYGHWR_REDBOOT_ARM_TRAMPOLINE_ADDRESS 0x00001f00"
diff --git a/packages/hal/arm/iq80310/current/ChangeLog b/packages/hal/arm/iq80310/current/ChangeLog
--- a/packages/hal/arm/iq80310/current/ChangeLog
+++ b/packages/hal/arm/iq80310/current/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-12  Mark Salter  <msalter@redhat.com>
+
+	* cdl/hal_arm_iq80310.cdl: Remove CYGSEM_REDBOOT_ARM_LINUX_BOOT ref.
+	* misc/redboot_ROM.ecm: Ditto.
+	* misc/redboot_RAM.ecm: Ditto.
+
 2002-08-06  Gary Thomas  <gary@chez-thomas.org>
 2002-08-06  Motoya Kurotsu <kurotsu@allied-telesis.co.jp>	
 
diff --git a/packages/hal/arm/iq80310/current/cdl/hal_arm_iq80310.cdl b/packages/hal/arm/iq80310/current/cdl/hal_arm_iq80310.cdl
--- a/packages/hal/arm/iq80310/current/cdl/hal_arm_iq80310.cdl
+++ b/packages/hal/arm/iq80310/current/cdl/hal_arm_iq80310.cdl
@@ -190,7 +190,6 @@ cdl_package CYGPKG_HAL_ARM_IQ80310 {
             configuration."
 
         # RedBoot details
-        requires { CYGSEM_REDBOOT_ARM_LINUX_BOOT }
         requires { CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS_DEFAULT == 0xa0008000 }
         define_proc {
             puts $::cdl_header "#define CYGHWR_REDBOOT_ARM_TRAMPOLINE_ADDRESS 0xA1FF0000"
diff --git a/packages/hal/arm/iq80310/current/misc/redboot_RAM.ecm b/packages/hal/arm/iq80310/current/misc/redboot_RAM.ecm
--- a/packages/hal/arm/iq80310/current/misc/redboot_RAM.ecm
+++ b/packages/hal/arm/iq80310/current/misc/redboot_RAM.ecm
@@ -95,10 +95,6 @@ cdl_component CYGSEM_REDBOOT_BSP_SYSCALL
     inferred_value 1
 };
 
-cdl_option CYGSEM_REDBOOT_ARM_LINUX_BOOT {
-    inferred_value 1
-};
-
 cdl_option CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS_DEFAULT {
     inferred_value 0xA0008000
 };
diff --git a/packages/hal/arm/iq80310/current/misc/redboot_ROM.ecm b/packages/hal/arm/iq80310/current/misc/redboot_ROM.ecm
--- a/packages/hal/arm/iq80310/current/misc/redboot_ROM.ecm
+++ b/packages/hal/arm/iq80310/current/misc/redboot_ROM.ecm
@@ -99,10 +99,6 @@ cdl_component CYGSEM_REDBOOT_BSP_SYSCALL
     inferred_value 1
 };
 
-cdl_option CYGSEM_REDBOOT_ARM_LINUX_BOOT {
-    inferred_value 1
-};
-
 cdl_option CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS_DEFAULT {
     inferred_value 0xA0008000
 };
diff --git a/packages/hal/arm/sa11x0/assabet/current/ChangeLog b/packages/hal/arm/sa11x0/assabet/current/ChangeLog
--- a/packages/hal/arm/sa11x0/assabet/current/ChangeLog
+++ b/packages/hal/arm/sa11x0/assabet/current/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-12  Mark Salter  <msalter@redhat.com>
+
+	* misc/redboot_ROM.ecm: Remove CYGSEM_REDBOOT_ARM_LINUX_BOOT.
+	* misc/redboot_RAM.ecm: Ditto.
+
 2002-05-14  Jesper Skov  <jskov@redhat.com>
 
 	* src/assabet_misc.c: Fixed warning.
diff --git a/packages/hal/arm/sa11x0/assabet/current/misc/redboot_RAM.ecm b/packages/hal/arm/sa11x0/assabet/current/misc/redboot_RAM.ecm
--- a/packages/hal/arm/sa11x0/assabet/current/misc/redboot_RAM.ecm
+++ b/packages/hal/arm/sa11x0/assabet/current/misc/redboot_RAM.ecm
@@ -93,10 +93,6 @@ cdl_component CYGSEM_REDBOOT_BSP_SYSCALL
     inferred_value 1
 };
 
-cdl_option CYGSEM_REDBOOT_ARM_LINUX_BOOT {
-    inferred_value 1
-};
-
 cdl_option CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS_DEFAULT {
     inferred_value 0xC0008000
 };
diff --git a/packages/hal/arm/sa11x0/assabet/current/misc/redboot_ROM.ecm b/packages/hal/arm/sa11x0/assabet/current/misc/redboot_ROM.ecm
--- a/packages/hal/arm/sa11x0/assabet/current/misc/redboot_ROM.ecm
+++ b/packages/hal/arm/sa11x0/assabet/current/misc/redboot_ROM.ecm
@@ -93,10 +93,6 @@ cdl_component CYGSEM_REDBOOT_FLASH_CONFI
     user_value 1
 };
 
-cdl_option CYGSEM_REDBOOT_ARM_LINUX_BOOT {
-    inferred_value 1
-};
-
 cdl_option CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS_DEFAULT {
     inferred_value 0xC0008000
 };
diff --git a/packages/hal/arm/sa11x0/cerf/current/ChangeLog b/packages/hal/arm/sa11x0/cerf/current/ChangeLog
--- a/packages/hal/arm/sa11x0/cerf/current/ChangeLog
+++ b/packages/hal/arm/sa11x0/cerf/current/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-12  Mark Salter  <msalter@redhat.com>
+
+	* misc/redboot_ROM.ecm: Remove CYGSEM_REDBOOT_ARM_LINUX_BOOT.
+	* misc/redboot_RAM.ecm: Ditto.
+
 2002-05-14  Jesper Skov  <jskov@redhat.com>
 
 	* src/cerf_misc.c (hal_mmu_init): Fixed warning.
diff --git a/packages/hal/arm/sa11x0/cerf/current/misc/redboot_RAM.ecm b/packages/hal/arm/sa11x0/cerf/current/misc/redboot_RAM.ecm
--- a/packages/hal/arm/sa11x0/cerf/current/misc/redboot_RAM.ecm
+++ b/packages/hal/arm/sa11x0/cerf/current/misc/redboot_RAM.ecm
@@ -92,10 +92,6 @@ cdl_component CYGSEM_REDBOOT_BSP_SYSCALL
     inferred_value 1
 };
 
-cdl_option CYGSEM_REDBOOT_ARM_LINUX_BOOT {
-    inferred_value 1
-};
-
 cdl_option CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS_DEFAULT {
     inferred_value 0xC0008000
 };
diff --git a/packages/hal/arm/sa11x0/cerf/current/misc/redboot_ROM.ecm b/packages/hal/arm/sa11x0/cerf/current/misc/redboot_ROM.ecm
--- a/packages/hal/arm/sa11x0/cerf/current/misc/redboot_ROM.ecm
+++ b/packages/hal/arm/sa11x0/cerf/current/misc/redboot_ROM.ecm
@@ -92,10 +92,6 @@ cdl_component CYGSEM_REDBOOT_FLASH_CONFI
     user_value 1
 };
 
-cdl_option CYGSEM_REDBOOT_ARM_LINUX_BOOT {
-    inferred_value 1
-};
-
 cdl_option CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS_DEFAULT {
     inferred_value 0xC0008000
 };
diff --git a/packages/hal/arm/sa11x0/ipaq/current/ChangeLog b/packages/hal/arm/sa11x0/ipaq/current/ChangeLog
--- a/packages/hal/arm/sa11x0/ipaq/current/ChangeLog
+++ b/packages/hal/arm/sa11x0/ipaq/current/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-12  Mark Salter  <msalter@redhat.com>
+
+	* misc/redboot_ROM.ecm: Remove CYGSEM_REDBOOT_ARM_LINUX_BOOT.
+	* misc/redboot_RAM.ecm: Ditto.
+
 2002-05-14  Jesper Skov  <jskov@redhat.com>
 
 	* src/atmel_support.c: Fixed warning.
diff --git a/packages/hal/arm/sa11x0/ipaq/current/misc/redboot_RAM.ecm b/packages/hal/arm/sa11x0/ipaq/current/misc/redboot_RAM.ecm
--- a/packages/hal/arm/sa11x0/ipaq/current/misc/redboot_RAM.ecm
+++ b/packages/hal/arm/sa11x0/ipaq/current/misc/redboot_RAM.ecm
@@ -80,10 +80,6 @@ cdl_option CYGOPT_REDBOOT_FIS_REDBOOT_BA
     user_value 0
 };
 
-cdl_option CYGSEM_REDBOOT_ARM_LINUX_BOOT {
-    inferred_value 1
-};
-
 cdl_option CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS_DEFAULT {
     inferred_value 0xC0008000
 };
diff --git a/packages/hal/arm/sa11x0/ipaq/current/misc/redboot_ROM.ecm b/packages/hal/arm/sa11x0/ipaq/current/misc/redboot_ROM.ecm
--- a/packages/hal/arm/sa11x0/ipaq/current/misc/redboot_ROM.ecm
+++ b/packages/hal/arm/sa11x0/ipaq/current/misc/redboot_ROM.ecm
@@ -96,10 +96,6 @@ cdl_option CYGOPT_REDBOOT_FIS_REDBOOT_BA
     user_value 0
 };
 
-cdl_option CYGSEM_REDBOOT_ARM_LINUX_BOOT {
-    inferred_value 1
-};
-
 cdl_option CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS_DEFAULT {
     inferred_value 0xC0008000
 };
diff --git a/packages/hal/arm/sa11x0/nano/current/ChangeLog b/packages/hal/arm/sa11x0/nano/current/ChangeLog
--- a/packages/hal/arm/sa11x0/nano/current/ChangeLog
+++ b/packages/hal/arm/sa11x0/nano/current/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-12  Mark Salter  <msalter@redhat.com>
+
+	* misc/redboot_POST.ecm: Remove CYGSEM_REDBOOT_ARM_LINUX_BOOT.
+	* misc/redboot_RAM.ecm: Ditto.
+
 2002-05-14  Jesper Skov  <jskov@redhat.com>
 
 	* src/nano_misc.c: Fixed warning.
diff --git a/packages/hal/arm/sa11x0/nano/current/misc/redboot_POST.ecm b/packages/hal/arm/sa11x0/nano/current/misc/redboot_POST.ecm
--- a/packages/hal/arm/sa11x0/nano/current/misc/redboot_POST.ecm
+++ b/packages/hal/arm/sa11x0/nano/current/misc/redboot_POST.ecm
@@ -105,10 +105,6 @@ cdl_option CYGOPT_REDBOOT_FIS_REDBOOT_BA
     user_value 1
 };
 
-cdl_option CYGSEM_REDBOOT_ARM_LINUX_BOOT {
-    inferred_value 1
-};
-
 cdl_option CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS_DEFAULT {
     inferred_value 0xC0008000
 };
diff --git a/packages/hal/arm/sa11x0/nano/current/misc/redboot_RAM.ecm b/packages/hal/arm/sa11x0/nano/current/misc/redboot_RAM.ecm
--- a/packages/hal/arm/sa11x0/nano/current/misc/redboot_RAM.ecm
+++ b/packages/hal/arm/sa11x0/nano/current/misc/redboot_RAM.ecm
@@ -101,10 +101,6 @@ cdl_option CYGOPT_REDBOOT_FIS_REDBOOT_BA
     user_value 1
 };
 
-cdl_option CYGSEM_REDBOOT_ARM_LINUX_BOOT {
-    inferred_value 1
-};
-
 cdl_option CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS_DEFAULT {
     inferred_value 0xC0008000
 };
diff --git a/packages/hal/arm/sa11x0/var/current/ChangeLog b/packages/hal/arm/sa11x0/var/current/ChangeLog
--- a/packages/hal/arm/sa11x0/var/current/ChangeLog
+++ b/packages/hal/arm/sa11x0/var/current/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-12  Mark Salter  <msalter@redhat.com>
+
+	* cdl/hal_arm_sa11x0.cdl: Remove CYGSEM_REDBOOT_ARM_LINUX_BOOT
+	requirement.
+
 2002-05-18  Gary Thomas  <gthomas@redhat.com>
 
 	* src/hal_diag.c (cyg_hal_plf_serial_control): Fix return value
diff --git a/packages/hal/arm/sa11x0/var/current/cdl/hal_arm_sa11x0.cdl b/packages/hal/arm/sa11x0/var/current/cdl/hal_arm_sa11x0.cdl
--- a/packages/hal/arm/sa11x0/var/current/cdl/hal_arm_sa11x0.cdl
+++ b/packages/hal/arm/sa11x0/var/current/cdl/hal_arm_sa11x0.cdl
@@ -155,7 +155,6 @@ cdl_package CYGPKG_HAL_ARM_SA11X0 {
         active_if     CYGPKG_REDBOOT
 
         # RedBoot details
-        requires { CYGSEM_REDBOOT_ARM_LINUX_BOOT }
         requires { CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS_DEFAULT == 0xc0008000 }
         define_proc {
             puts $::cdl_header "#define CYGHWR_REDBOOT_ARM_TRAMPOLINE_ADDRESS 0x00001f00"
diff --git a/packages/hal/arm/xscale/iq80321/current/ChangeLog b/packages/hal/arm/xscale/iq80321/current/ChangeLog
--- a/packages/hal/arm/xscale/iq80321/current/ChangeLog
+++ b/packages/hal/arm/xscale/iq80321/current/ChangeLog
@@ -1,5 +1,8 @@
 2002-08-12  Mark Salter  <msalter@redhat.com>
 
+	* misc/redboot_ROM.ecm: Remove CYGSEM_REDBOOT_ARM_LINUX_BOOT.
+	* misc/redboot_RAM.ecm: Ditto.
+
 	* include/hal_platform_setup.h: Do some ATU initialization
 	before scrubbing, so PC BIOS can continue booting during
 	time consuming scrub.
diff --git a/packages/hal/arm/xscale/iq80321/current/misc/redboot_RAM.ecm b/packages/hal/arm/xscale/iq80321/current/misc/redboot_RAM.ecm
--- a/packages/hal/arm/xscale/iq80321/current/misc/redboot_RAM.ecm
+++ b/packages/hal/arm/xscale/iq80321/current/misc/redboot_RAM.ecm
@@ -85,10 +85,6 @@ cdl_component CYGSEM_REDBOOT_BSP_SYSCALL
     inferred_value 1
 };
 
-cdl_option CYGSEM_REDBOOT_ARM_LINUX_BOOT {
-    inferred_value 1
-};
-
 cdl_option CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS_DEFAULT {
     inferred_value 0xA0008000
 };
diff --git a/packages/hal/arm/xscale/iq80321/current/misc/redboot_ROM.ecm b/packages/hal/arm/xscale/iq80321/current/misc/redboot_ROM.ecm
--- a/packages/hal/arm/xscale/iq80321/current/misc/redboot_ROM.ecm
+++ b/packages/hal/arm/xscale/iq80321/current/misc/redboot_ROM.ecm
@@ -89,10 +89,6 @@ cdl_component CYGSEM_REDBOOT_BSP_SYSCALL
     inferred_value 1
 };
 
-cdl_option CYGSEM_REDBOOT_ARM_LINUX_BOOT {
-    inferred_value 1
-};
-
 cdl_option CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS_DEFAULT {
     inferred_value 0xA0008000
 };
diff --git a/packages/hal/arm/xscale/verde/current/ChangeLog b/packages/hal/arm/xscale/verde/current/ChangeLog
--- a/packages/hal/arm/xscale/verde/current/ChangeLog
+++ b/packages/hal/arm/xscale/verde/current/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-12  Mark Salter  <msalter@redhat.com>
+
+	* cdl/hal_arm_xscale_verde.cdl: Remove CYGSEM_REDBOOT_ARM_LINUX_BOOT
+	requirement.
+
 2002-05-28  Mark Salter  <msalter@redhat.com>
 
 	* cdl/hal_arm_xscale_verde.cdl: Fix linux exec address test.
diff --git a/packages/hal/arm/xscale/verde/current/cdl/hal_arm_xscale_verde.cdl b/packages/hal/arm/xscale/verde/current/cdl/hal_arm_xscale_verde.cdl
--- a/packages/hal/arm/xscale/verde/current/cdl/hal_arm_xscale_verde.cdl
+++ b/packages/hal/arm/xscale/verde/current/cdl/hal_arm_xscale_verde.cdl
@@ -126,7 +126,6 @@ cdl_package CYGPKG_HAL_ARM_XSCALE_VERDE 
             configuration."
 
         # RedBoot details
-        requires { CYGSEM_REDBOOT_ARM_LINUX_BOOT }
         requires { CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS_DEFAULT == 0xA0008000 }
         define_proc {
             puts $::cdl_header "#define CYGHWR_REDBOOT_ARM_TRAMPOLINE_ADDRESS 0x00001f00"