Mercurial > ecos

changeset 1956:7ad97fa3d1d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* cdl/hal_arm_xscale_ixp425.cdl: Only require CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS_DEFAULT if the exec command is included.
author asl
date Thu, 21 Apr 2005 18:20:27 +0000
parents b2fa19bf91f1
children 2120c8cc24c2
files packages/hal/arm/xscale/ixp425/current/ChangeLog packages/hal/arm/xscale/ixp425/current/cdl/hal_arm_xscale_ixp425.cdl
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/packages/hal/arm/xscale/ixp425/current/ChangeLog
+++ b/packages/hal/arm/xscale/ixp425/current/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-21  David Vrabel  <dvrabel@arcom.com>
+
+	* cdl/hal_arm_xscale_ixp425.cdl: Only require
+	CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS_DEFAULT if the exec command
+	is included.
+
 2004-11-05  David Vrabel  <dvrabel@arcom.com>
 
 	* src/ixp425_redboot.c: Put #ifdef CYGPKG_IO_FLASH around flash
--- a/packages/hal/arm/xscale/ixp425/current/cdl/hal_arm_xscale_ixp425.cdl
+++ b/packages/hal/arm/xscale/ixp425/current/cdl/hal_arm_xscale_ixp425.cdl
@@ -201,7 +201,7 @@ cdl_package CYGPKG_HAL_ARM_XSCALE_IXP425
 	compile -library=libextras.a ixp425_redboot.c
 
         # RedBoot details
-        requires { CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS_DEFAULT != 0 }
+        requires { !CYGPKG_REDBOOT_BUILD_WITH_EXEC || CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS_DEFAULT != 0 }
         define_proc {
             puts $::cdl_header "#define CYGHWR_REDBOOT_ARM_TRAMPOLINE_ADDRESS 0x00001f00"
             puts $::cdl_header "#define HAL_FLASH_READ(a,b,c,d) hal_flash_read((a),(b),(c),(d))"