This is the mail archive of the ecos-patches@sources.redhat.com mailing list for the eCos project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: Redboot jumb patch


> I don't understand your changes.  Most (if not all) of the HALs have
> something like this (in their CDL) for enabling/disabling the Linux
> boot code:

Actually, only the ARM has this. The other its not possible to turn it
off. What i've done is taken out most of the #ifdef's i put in and
replaced them with changes to the CDL. I've now made the compilation
of redboot_linux_exec.c active_if CYGBLD_BUILD_REBOOT_WITH_EXEC. This
is uniform across all HALs. The only exception, ironically, is the
ebsa285. This HAL just does it differently to start with and the file
has a different name etc. 

I've configured redboot work trees where possible to see if i've
broken anything. I don't have the tool chains to actually compile
everything i've modified. dreamcast redboot is broken by the way, it
want the CYG_FS_ISO packages which does not appear to be in ecos.db.

     Andrew

Index: hal/arm/arch/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/arch/current/ChangeLog,v
retrieving revision 1.72
diff -c -c -r1.72 ChangeLog
*** hal/arm/arch/current/ChangeLog	15 Jul 2002 19:37:12 -0000	1.72
--- hal/arm/arch/current/ChangeLog	6 Aug 2002 10:55:24 -0000
***************
*** 1,3 ****
--- 1,7 ----
+ 2002-08-02  Andrew Lunn <Andrew.Lunn@ascom.ch>
+ 
+ 	* cdl/hal_arm.cdl: Redboot exec command can now be disabled by CDL
+ 	
  2002-07-15  Mark Salter  <msalter@redhat.com>
  
  	* include/arm_stub.h: Comment out NUMREGBYTES.
Index: hal/arm/arch/current/cdl/hal_arm.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/arch/current/cdl/hal_arm.cdl,v
retrieving revision 1.11
diff -c -c -r1.11 hal_arm.cdl
*** hal/arm/arch/current/cdl/hal_arm.cdl	31 May 2002 01:05:54 -0000	1.11
--- hal/arm/arch/current/cdl/hal_arm.cdl	6 Aug 2002 10:55:25 -0000
***************
*** 222,264 ****
              This option lists the target's requirements for a valid Redboot
              configuration."
  
!         cdl_option CYGSEM_REDBOOT_ARM_LINUX_BOOT {
!             display        "Support booting Linux via RedBoot"
!             flavor         bool
!             default_value  0
              description    "
!                This option enables RedBoot to support booting of a Linux kernel."
! 
              compile -library=libextras.a redboot_linux_exec.c
-         }
  
!         cdl_option CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS {
!             display       "Physical base address of linux kernel"
!             flavor        data
!             default_value CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS_DEFAULT
!             description   "
!                 This is the physical address of the base of the Linux kernel
!                 image."
!         }
  
!         cdl_option CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS_DEFAULT {
!             display       "Default physical base address of linux kernel"
!             flavor        data
!             default_value 0x00008000
!             no_define
!             description   "
!                 This is the physical address of the base of the Linux kernel
!                 image. This option gets set by the platform CDL."
!         }
  
!         cdl_option CYGHWR_REDBOOT_ARM_LINUX_TAGS_ADDRESS {
!             display       "Base address of linux kernel parameter tags"
!             flavor        data
!             default_value 0x100
!             description   "
!                 This is the base address of the area of memory used to
!                 pass parameters to the Linux kernel. This should be chosen
!                 to avoid overlap with the kernel and any ramdisk image."
          }
  
      }
--- 222,268 ----
              This option lists the target's requirements for a valid Redboot
              configuration."
  
!         cdl_component CYGPKG_REDBOOT_ARM_LINUX_EXEC {
!             display        "Provide the exec command in RedBoot"
!             flavor         none
!             parent         CYGPKG_REDBOOT_ARM_OPTIONS
!             active_if      CYGBLD_BUILD_REDBOOT_WITH_EXEC
!             active_if      !CYGPKG_HAL_ARM_EBSA285
              description    "
!                 This option contains requirements for booting linux
!                 from RedBoot. The component is enabled/disabled from
!                 RedBoots CDL."
              compile -library=libextras.a redboot_linux_exec.c
  
!             cdl_option CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS {
!                 display       "Physical base address of linux kernel"
!                 flavor        data
!                 default_value CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS_DEFAULT
!                 description   "
!                     This is the physical address of the base of the 
!                     Linux kernel image."
!             }
  
!             cdl_option CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS_DEFAULT {
!                 display       "Default physical base address of linux kernel"
!                 flavor        data
!                 default_value 0x00008000
!                 no_define
!                 description   "
!                     This is the physical address of the base of the 
!                     Linux kernel image. This option gets set by the 
!                     platform CDL."
!             }
  
!             cdl_option CYGHWR_REDBOOT_ARM_LINUX_TAGS_ADDRESS {
!                 display       "Base address of linux kernel parameter tags"
!                 flavor        data
!                 default_value 0x100
!                 description   "
!                    This is the base address of the area of memory used to
!                    pass parameters to the Linux kernel. This should be chosen
!                    to avoid overlap with the kernel and any ramdisk image."
!             }
          }
  
      }
Index: hal/arm/arm9/aaed2000/current/cdl/hal_arm_arm9_aaed2000.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/arm9/aaed2000/current/cdl/hal_arm_arm9_aaed2000.cdl,v
retrieving revision 1.2
diff -c -c -r1.2 hal_arm_arm9_aaed2000.cdl
*** hal/arm/arm9/aaed2000/current/cdl/hal_arm_arm9_aaed2000.cdl	23 May 2002 23:01:42 -0000	1.2
--- hal/arm/arm9/aaed2000/current/cdl/hal_arm_arm9_aaed2000.cdl	6 Aug 2002 10:55:25 -0000
***************
*** 517,523 ****
          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 == 0xf0008000 }
          define_proc {
              puts $::cdl_header "#define CYGHWR_REDBOOT_ARM_TRAMPOLINE_ADDRESS 0x00001f00"
--- 517,523 ----
          requires {!CYGPKG_REDBOOT_FLASH || CYGOPT_REDBOOT_FIS_REDBOOT_BACKUP == 0}
  
          # RedBoot details
!         requires { CYGPKG_REDBOOT_ARM_LINUX_EXEC }
          requires { CYGHWR_REDBOOT_ARM_LINUX_EXEC_ADDRESS_DEFAULT == 0xf0008000 }
          define_proc {
              puts $::cdl_header "#define CYGHWR_REDBOOT_ARM_TRAMPOLINE_ADDRESS 0x00001f00"
Index: hal/arm/ebsa285/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/ebsa285/current/ChangeLog,v
retrieving revision 1.25
diff -c -c -r1.25 ChangeLog
*** hal/arm/ebsa285/current/ChangeLog	23 May 2002 23:01:54 -0000	1.25
--- hal/arm/ebsa285/current/ChangeLog	6 Aug 2002 10:55:25 -0000
***************
*** 1,3 ****
--- 1,8 ----
+ 2002-08-02  Andrew Lunn <Andrew.Lunn@ascom.ch>
+ 
+ 	* src/redboot_cmds.c: Redboot exec command can now be disabled by CDL
+ 	* cdl/hal_arm_ebsa285.cdl: Support needed for above.
+ 	
  2002-05-14  Jesper Skov  <jskov@redhat.com>
  
  	* src/ebsa285_misc.c: Fixed warning.
Index: hal/arm/ebsa285/current/cdl/hal_arm_ebsa285.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/ebsa285/current/cdl/hal_arm_ebsa285.cdl,v
retrieving revision 1.16
diff -c -c -r1.16 hal_arm_ebsa285.cdl
*** hal/arm/ebsa285/current/cdl/hal_arm_ebsa285.cdl	23 May 2002 23:01:55 -0000	1.16
--- hal/arm/ebsa285/current/cdl/hal_arm_ebsa285.cdl	6 Aug 2002 10:55:25 -0000
***************
*** 376,382 ****
          description   "
              This option lists the target's requirements for a valid Redboot
              configuration."
! 
          compile -library=libextras.a redboot_cmds.c
  
          cdl_option CYGBLD_BUILD_REDBOOT_BIN {
--- 376,382 ----
          description   "
              This option lists the target's requirements for a valid Redboot
              configuration."
!         
          compile -library=libextras.a redboot_cmds.c
  
          cdl_option CYGBLD_BUILD_REDBOOT_BIN {
Index: hal/arm/ebsa285/current/src/redboot_cmds.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/ebsa285/current/src/redboot_cmds.c,v
retrieving revision 1.6
diff -c -c -r1.6 redboot_cmds.c
*** hal/arm/ebsa285/current/src/redboot_cmds.c	23 May 2002 23:01:56 -0000	1.6
--- hal/arm/ebsa285/current/src/redboot_cmds.c	6 Aug 2002 10:55:25 -0000
***************
*** 58,63 ****
--- 58,65 ----
  #include <cyg/hal/hal_intr.h>
  #include <cyg/hal/hal_cache.h>
  
+ #ifdef CYGBLD_BUILD_REDBOOT_WITH_EXEC 
+ 
  // Exported CLI function(s)
  static void do_exec(int argc, char *argv[]);
  RedBoot_cmd("exec", 
***************
*** 198,200 ****
--- 200,204 ----
                    "movs pc,lr" : : );
   end1:
  }
+ 
+ #endif
Index: hal/mips/arch/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mips/arch/current/ChangeLog,v
retrieving revision 1.63
diff -c -c -r1.63 ChangeLog
*** hal/mips/arch/current/ChangeLog	23 May 2002 23:03:17 -0000	1.63
--- hal/mips/arch/current/ChangeLog	6 Aug 2002 10:55:29 -0000
***************
*** 1,3 ****
--- 1,8 ----
+ 2002-08-02  Andrew Lunn <Andrew.Lunn@ascom.ch>
+ 
+ 	* cdl/hal_mips.cdl: Redboot exec command can now be disabled 
+ 	  by CDL
+ 	
  2002-05-17  Jesper Skov  <jskov@redhat.com>
  
  	* include/hal_intr.h: Fix CYGNUM_HAL_EXCEPTION_MIN definition so
Index: hal/mips/arch/current/cdl/hal_mips.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mips/arch/current/cdl/hal_mips.cdl,v
retrieving revision 1.10
diff -c -c -r1.10 hal_mips.cdl
*** hal/mips/arch/current/cdl/hal_mips.cdl	23 May 2002 23:03:19 -0000	1.10
--- hal/mips/arch/current/cdl/hal_mips.cdl	6 Aug 2002 10:55:29 -0000
***************
*** 153,158 ****
--- 153,159 ----
              configuration."
  
          cdl_component CYGSEM_REDBOOT_MIPS_LINUX_BOOT {
+             active_if      CYGBLD_BUILD_REDBOOT_WITH_EXEC
              display        "Support booting Linux via RedBoot"
              flavor         bool
              default_value  1
Index: hal/mn10300/asb2305/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mn10300/asb2305/current/ChangeLog,v
retrieving revision 1.2
diff -c -c -r1.2 ChangeLog
*** hal/mn10300/asb2305/current/ChangeLog	23 May 2002 23:04:04 -0000	1.2
--- hal/mn10300/asb2305/current/ChangeLog	6 Aug 2002 10:55:30 -0000
***************
*** 1,3 ****
--- 1,8 ----
+ 2002-08-02  Andrew Lunn <Andrew.Lunn@ascom.ch>
+ 
+ 	* cdl/hal_mn10300_am33_asb2305.cdl: Redboot exec command can now
+ 	be disabled by CDL
+ 	
  2001-10-18  David Howells  <dhowells@redhat.com>
  
  	* cdl/hal_mn10300_am33_asb2305.cdl: change incorrect "BootFlash"
Index: hal/mn10300/asb2305/current/cdl/hal_mn10300_am33_asb2305.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mn10300/asb2305/current/cdl/hal_mn10300_am33_asb2305.cdl,v
retrieving revision 1.2
diff -c -c -r1.2 hal_mn10300_am33_asb2305.cdl
*** hal/mn10300/asb2305/current/cdl/hal_mn10300_am33_asb2305.cdl	23 May 2002 23:04:04 -0000	1.2
--- hal/mn10300/asb2305/current/cdl/hal_mn10300_am33_asb2305.cdl	6 Aug 2002 10:55:30 -0000
***************
*** 373,380 ****
          description   "
              This option lists the target's requirements for a valid Redboot
              configuration."
! 
!         compile -library=libextras.a redboot_cmds.c
  
          cdl_option CYGBLD_BUILD_REDBOOT_BIN {
              display       "Build Redboot ROM binary image"
--- 373,391 ----
          description   "
              This option lists the target's requirements for a valid Redboot
              configuration."
!             
!         cdl_component CYGPKG_REDBOOT_HAL_LINUX_EXEC {
!             display       "Provide the exec command in RedBoot"
!             flavor        none
!             no_define
!             parent        CYGPKG_REDBOOT_HAL_OPTIONS
!             active_if     CYGBLD_BUILD_REDBOOT_WITH_EXEC
!             description "
!                 This option contains requirements for booting linux
!                 from RedBoot. The component is enabled/disabled from
!                 RedBoots CDL."
!             compile -library=libextras.a redboot_cmds.c
!         }
  
          cdl_option CYGBLD_BUILD_REDBOOT_BIN {
              display       "Build Redboot ROM binary image"
Index: hal/powerpc/mbx/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/powerpc/mbx/current/ChangeLog,v
retrieving revision 1.28
diff -c -c -r1.28 ChangeLog
*** hal/powerpc/mbx/current/ChangeLog	27 Jun 2002 20:27:16 -0000	1.28
--- hal/powerpc/mbx/current/ChangeLog	6 Aug 2002 10:55:30 -0000
***************
*** 1,3 ****
--- 1,8 ----
+ 2002-08-02  Andrew Lunn <Andrew.Lunn@ascom.ch>
+ 
+ 	* cdl/hal_powerpc_mbx.cdl: Redboot exec command can now be disabled 
+ 	  by CDL
+ 	
  2002-06-27  Gary Thomas  <gary@chez-thomas.org>
  
  	* include/plf_regs.h: New file - platform overrides.
Index: hal/powerpc/mbx/current/cdl/hal_powerpc_mbx.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/powerpc/mbx/current/cdl/hal_powerpc_mbx.cdl,v
retrieving revision 1.13
diff -c -c -r1.13 hal_powerpc_mbx.cdl
*** hal/powerpc/mbx/current/cdl/hal_powerpc_mbx.cdl	23 May 2002 23:04:24 -0000	1.13
--- hal/powerpc/mbx/current/cdl/hal_powerpc_mbx.cdl	6 Aug 2002 10:55:31 -0000
***************
*** 348,353 ****
--- 348,354 ----
              configuration."
  
          cdl_option CYGSEM_REDBOOT_HAL_LINUX_BOOT {
+             active_if      CYGBLD_BUILD_REDBOOT_WITH_EXEC
              display        "Support booting Linux via RedBoot"
              flavor         bool
              default_value  1
Index: hal/powerpc/viper/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/powerpc/viper/current/ChangeLog,v
retrieving revision 1.14
diff -c -c -r1.14 ChangeLog
*** hal/powerpc/viper/current/ChangeLog	31 Jul 2002 14:16:33 -0000	1.14
--- hal/powerpc/viper/current/ChangeLog	6 Aug 2002 10:55:31 -0000
***************
*** 1,3 ****
--- 1,8 ----
+ 2002-08-02  Andrew Lunn <Andrew.Lunn@ascom.ch>
+ 
+ 	* cdl/hal_powerpc_viper.cdl: the RedBoot exec command can now 
+ 	  be disabled by CDL
+ 	
  2002-07-31  Gary Thomas  <gary@chez-thomas.org>
  
  	* misc/redboot_ROMRAM.ecm: 
Index: hal/powerpc/viper/current/cdl/hal_powerpc_viper.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/powerpc/viper/current/cdl/hal_powerpc_viper.cdl,v
retrieving revision 1.8
diff -c -c -r1.8 hal_powerpc_viper.cdl
*** hal/powerpc/viper/current/cdl/hal_powerpc_viper.cdl	31 Jul 2002 14:16:35 -0000	1.8
--- hal/powerpc/viper/current/cdl/hal_powerpc_viper.cdl	6 Aug 2002 10:55:31 -0000
***************
*** 335,340 ****
--- 335,341 ----
              configuration."
  
          cdl_option CYGSEM_REDBOOT_HAL_LINUX_BOOT {
+             active_if      CYGBLD_BUILD_REDBOOT_WITH_EXEC
              display        "Support booting Linux via RedBoot"
              flavor         bool
              default_value  1
Index: hal/sh/arch/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/sh/arch/current/ChangeLog,v
retrieving revision 1.39
diff -c -c -r1.39 ChangeLog
*** hal/sh/arch/current/ChangeLog	23 May 2002 23:04:35 -0000	1.39
--- hal/sh/arch/current/ChangeLog	6 Aug 2002 10:55:31 -0000
***************
*** 1,3 ****
--- 1,8 ----
+ 2002-08-02  Andrew Lunn <Andrew.Lunn@ascom.ch>
+ 
+ 	* cdl/hal_sh.cdl: The Redboot exec command can now be 
+ 	  disabled by CDL
+ 	
  2002-04-30  Jesper Skov  <jskov@redhat.com>
  
  	* include/hal_var_sp.inc: Allow variant to provide custom
Index: hal/sh/arch/current/cdl/hal_sh.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/sh/arch/current/cdl/hal_sh.cdl,v
retrieving revision 1.20
diff -c -c -r1.20 hal_sh.cdl
*** hal/sh/arch/current/cdl/hal_sh.cdl	23 May 2002 23:04:35 -0000	1.20
--- hal/sh/arch/current/cdl/hal_sh.cdl	6 Aug 2002 10:55:31 -0000
***************
*** 231,236 ****
--- 231,237 ----
              configuration."
  
          cdl_component CYGSEM_REDBOOT_SH_LINUX_BOOT {
+             active_if      CYGBLD_BUILD_REDBOOT_WITH_EXEC
              display        "Support booting Linux via RedBoot"
              flavor         bool
              default_value  1
***************
*** 294,296 ****
--- 295,298 ----
          }
      }
  }
+ 
Index: redboot/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/ChangeLog,v
retrieving revision 1.64
diff -c -c -r1.64 ChangeLog
*** redboot/current/ChangeLog	30 Jul 2002 12:59:22 -0000	1.64
--- redboot/current/ChangeLog	6 Aug 2002 10:55:36 -0000
***************
*** 1,3 ****
--- 1,14 ----
+ 2002-08-06  Andrew Lunn  <Andrew.Lunn@ascom.ch>
+ 
+ 	* src/io.c: Fix the parsing of boot scripts to allow the use
+ 	  of aliases. This was broken when the ability to do startup
+ 	  type specific scripting was added.
+ 
+ 2002-08-05  Andrew Lunn  <Andrew.Lunn@ascom.ch>
+ 
+ 	* src/main.c: Made more of the commands conditionally compilable
+ 	* cdl/redboot.cdl: CDL code to control the compilation.
+ 	
  2002-07-30  Gary Thomas  <gary@chez-thomas.org>
  
  	* src/net/net_io.c: Handle broadcast/mask setup better (failed if
Index: redboot/current/cdl/redboot.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/cdl/redboot.cdl,v
retrieving revision 1.39
diff -c -c -r1.39 redboot.cdl
*** redboot/current/cdl/redboot.cdl	9 Jul 2002 20:23:47 -0000	1.39
--- redboot/current/cdl/redboot.cdl	6 Aug 2002 10:55:37 -0000
***************
*** 68,73 ****
--- 68,78 ----
          default_value 1
      }
  
+ 
+     cdl_interface CYGINT_REDBOOT_LOAD_METHOD {
+         display "Redboot of methods of loading images using redboot"
+     }
+ 
      cdl_component CYGBLD_BUILD_REDBOOT {
          display "Build Redboot ROM ELF image"
          default_value 0
***************
*** 87,92 ****
--- 92,98 ----
  
          requires CYGINT_ISO_STRING_MEMFUNCS 
          requires CYGINT_ISO_STRING_STRFUNCS
+         requires CYGINT_REDBOOT_LOAD_METHOD
  
          cdl_option CYGBLD_BUILD_REDBOOT_WITH_ZLIB {
              display       "Include support gzip/zlib decompression"
***************
*** 97,102 ****
--- 103,116 ----
              compile       decompress.c
          }
  
+         cdl_option CYGBLD_BUILD_REDBOOT_WITH_XYZMODEM {
+             display       "Include support for xyzModem downloads"
+             no_define
+             default_value 1
+             implements    CYGINT_REDBOOT_LOAD_METHOD
+             compile       xyzModem.c
+         }
+ 
          cdl_option CYGBLD_BUILD_REDBOOT_WITH_THREADS {
              display "Threads debugging support"
              no_define
***************
*** 145,150 ****
--- 159,179 ----
              default_value 1
          }
  
+         cdl_option CYGBLD_BUILD_REDBOOT_WITH_DUMP {
+             display       "Include memory dump command"
+             default_value 1
+         }
+ 
+         cdl_option CYGBLD_BUILD_REDBOOT_WITH_CACHES {
+             display       "Include cache command"
+             default_value 1
+         }
+ 
+         cdl_option CYGBLD_BUILD_REDBOOT_WITH_EXEC {
+             display       "Include exec command"
+             default_value 1
+         }
+ 
          no_define
          description "This option enables the building of the Redboot ELF image.
                       The image may require further relocation or symbol
***************
*** 153,159 ****
  
          compile main.c crc.c
          compile misc_funs.c io.c parse.c ticks.c syscall.c alias.c
!         compile -library=libextras.a load.c xyzModem.c 
  
          make -priority 320 {
              <PREFIX>/bin/redboot.elf : $(PREFIX)/lib/target.ld $(PREFIX)/lib/vectors.o $(PREFIX)/lib/libtarget.a $(PREFIX)/lib/libextras.a
--- 182,188 ----
  
          compile main.c crc.c
          compile misc_funs.c io.c parse.c ticks.c syscall.c alias.c
!         compile -library=libextras.a load.c
  
          make -priority 320 {
              <PREFIX>/bin/redboot.elf : $(PREFIX)/lib/target.ld $(PREFIX)/lib/vectors.o $(PREFIX)/lib/libtarget.a $(PREFIX)/lib/libextras.a
***************
*** 168,173 ****
--- 197,203 ----
          flavor        bool
          active_if     CYGPKG_IO_ETH_DRIVERS
          default_value 1
+         implements    CYGINT_REDBOOT_LOAD_METHOD
          compile net/bootp.c net/udp.c net/ip.c net/pktbuf.c net/cksum.c
          compile net/enet.c net/icmp.c net/tcp.c net/timers.c net/arp.c
          compile net/net_io.c net/inet_addr.c
Index: redboot/current/src/io.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/src/io.c,v
retrieving revision 1.26
diff -c -c -r1.26 io.c
*** redboot/current/src/io.c	11 Jul 2002 16:42:35 -0000	1.26
--- redboot/current/src/io.c	6 Aug 2002 10:55:37 -0000
***************
*** 284,291 ****
  
  	} else {
  	    *cp = *script++;
! 	    if (*cp == '\n')
! 		newline = true;
  	    return true;
  	}
      }
--- 284,294 ----
  
  	} else {
  	    *cp = *script++;
! 	    if (*cp == '\n') {
!               newline = true;
!             } else {
!               newline = false;
!             }
  	    return true;
  	}
      }
Index: redboot/current/src/main.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/src/main.c,v
retrieving revision 1.32
diff -c -c -r1.32 main.c
*** redboot/current/src/main.c	23 May 2002 23:08:31 -0000	1.32
--- redboot/current/src/main.c	6 Aug 2002 10:55:37 -0000
***************
*** 94,99 ****
--- 94,100 ----
              "[-w <timeout>] [entry]",
              do_go 
      );
+ #ifdef CYGBLD_BUILD_REDBOOT_WITH_DUMP
  RedBoot_cmd("dump", 
              "Display (hex dump) a range of memory", 
              "-b <location> [-l <length>] [-s] [-1|2|4]",
***************
*** 104,109 ****
--- 105,111 ----
              "-b <location> [-l <length>] [-s] [-1|2|4]",
              do_x
      );
+ #endif
  #ifdef CYGBLD_BUILD_REDBOOT_WITH_CKSUM
  RedBoot_cmd("cksum", 
              "Compute a 32bit checksum [POSIX algorithm] for a range of memory", 
***************
*** 125,135 ****
--- 127,139 ----
              do_mcmp
      );
  #endif
+ #ifdef CYGBLD_BUILD_REDBOOT_WITH_CACHES
  RedBoot_cmd("cache", 
              "Manage machine caches", 
              "[ON | OFF]",
              do_caches 
      );
+ #endif
  #ifdef HAL_PLATFORM_RESET
  RedBoot_cmd("reset", 
              "Reset the system", 
***************
*** 368,373 ****
--- 372,378 ----
      }
  }
  
+ #ifdef CYGBLD_BUILD_REDBOOT_WITH_CACHES
  void
  do_caches(int argc, char *argv[])
  {
***************
*** 403,409 ****
                      dcache_on?"On":"Off", icache_on?"On":"Off");
      }
  }
! 
  void
  show_help(struct cmd *cmd, struct cmd *cmd_end, char *which, char *pre)
  {
--- 408,414 ----
                      dcache_on?"On":"Off", icache_on?"On":"Off");
      }
  }
! #endif
  void
  show_help(struct cmd *cmd, struct cmd *cmd_end, char *which, char *pre)
  {
***************
*** 443,448 ****
--- 448,454 ----
      return;
  }
  
+ #ifdef CYGBLD_BUILD_REDBOOT_WITH_DUMP
  void
  do_dump(int argc, char *argv[])
  {
***************
*** 533,539 ****
  {
      do_dump(argc, argv);
  }
! 
  #ifdef CYGBLD_BUILD_REDBOOT_WITH_CKSUM
  void
  do_cksum(int argc, char *argv[])
--- 539,545 ----
  {
      do_dump(argc, argv);
  }
! #endif
  #ifdef CYGBLD_BUILD_REDBOOT_WITH_CKSUM
  void
  do_cksum(int argc, char *argv[])


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]