# HG changeset patch
# User gthomas
# Date 1077812450 0
# Node ID 2e1b9250937f2482fb61c17414bfb1a8a31a0bf4
# Parent  a46dcfdbe3eadec91fe1e4eb10797f46e0b9cc49
Better identification of RedBoot mode

diff --git a/packages/hal/powerpc/moab/current/ChangeLog b/packages/hal/powerpc/moab/current/ChangeLog
--- a/packages/hal/powerpc/moab/current/ChangeLog
+++ b/packages/hal/powerpc/moab/current/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-26  Gary Thomas  <gary@mlbassoc.com>
+
+	* misc/redboot_BOOT.ecm: 
+	* cdl/hal_powerpc_moab.cdl: Use HAL_PLATFORM_EXTRA to display operating
+	mode of RedBoot (BOOT, NAND FLASH or RAM)
+
 2004-02-25  Gary Thomas  <gary@mlbassoc.com>
 
 	* misc/redboot_RAM+FLASH.ecm: Remove FIS - can't be supported in
diff --git a/packages/hal/powerpc/moab/current/cdl/hal_powerpc_moab.cdl b/packages/hal/powerpc/moab/current/cdl/hal_powerpc_moab.cdl
--- a/packages/hal/powerpc/moab/current/cdl/hal_powerpc_moab.cdl
+++ b/packages/hal/powerpc/moab/current/cdl/hal_powerpc_moab.cdl
@@ -9,7 +9,7 @@
 ## -------------------------------------------
 ## This file is part of eCos, the Embedded Configurable Operating System.
 ## Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-## Copyright (C) 2002, 2003 Gary Thomas
+## Copyright (C) 2002, 2003, 2004 Gary Thomas
 ##
 ## eCos is free software; you can redistribute it and/or modify it under
 ## the terms of the GNU General Public License as published by the Free
@@ -86,10 +86,6 @@ cdl_package CYGPKG_HAL_POWERPC_MOAB {
         puts $::cdl_system_header "#define CYGBLD_HAL_TARGET_H   <pkgconf/hal_powerpc_ppc40x.h>"
         puts $::cdl_system_header "#define CYGBLD_HAL_PLATFORM_H <pkgconf/hal_powerpc_moab.h>"
         puts $::cdl_system_header "#define CYGBLD_HAL_PLF_IO_H   <cyg/hal/plf_io.h>"
-
-	puts $::cdl_header "#define HAL_PLATFORM_CPU    \"PowerPC 405GPr\""
-        puts $::cdl_header "#define HAL_PLATFORM_BOARD  \"TAMS MOAB\""
-        puts $::cdl_header "#define HAL_PLATFORM_EXTRA  \"\""
     }
 
     cdl_component CYG_HAL_STARTUP {
@@ -312,6 +308,27 @@ cdl_package CYGPKG_HAL_POWERPC_MOAB {
             This option lists the target's requirements for a valid Redboot
             configuration."
 
+        define_proc {
+    	    puts $::cdl_header "#define HAL_PLATFORM_CPU    \"PowerPC 405GPr\""
+            puts $::cdl_header "#define HAL_PLATFORM_BOARD  \"TAMS MOAB\""
+        }
+
+        cdl_option CYGBLD_REDBOOT_MODE {
+            display        "RedBoot operational mode"
+            flavor         data
+            legal_values   { "BOOT" "NAND" "RAM" }
+            default_value  { CYG_HAL_STARTUP == "RAM" ? "RAM" : "NAND" }
+            define_proc {
+                puts $::cdl_header "#if defined(CYGBLD_REDBOOT_MODE_BOOT)"
+                puts $::cdl_header "#define HAL_PLATFORM_EXTRA \"\[Bootstrap\]\""
+                puts $::cdl_header "#elif defined(CYGBLD_REDBOOT_MODE_NAND)"
+                puts $::cdl_header "#define HAL_PLATFORM_EXTRA \"\""
+                puts $::cdl_header "#else"
+                puts $::cdl_header "#define HAL_PLATFORM_EXTRA \"\[RAM\]\""
+                puts $::cdl_header "#endif"
+            }
+        }
+
         cdl_option CYGSEM_REDBOOT_PLF_LINUX_BOOT {
             active_if      CYGBLD_BUILD_REDBOOT_WITH_EXEC
             display        "Support booting Linux via RedBoot"
diff --git a/packages/hal/powerpc/moab/current/misc/redboot_BOOT.ecm b/packages/hal/powerpc/moab/current/misc/redboot_BOOT.ecm
--- a/packages/hal/powerpc/moab/current/misc/redboot_BOOT.ecm
+++ b/packages/hal/powerpc/moab/current/misc/redboot_BOOT.ecm
@@ -19,7 +19,9 @@ cdl_configuration eCos {
     package -hardware CYGPKG_DEVS_FLASH_TOSHIBA_TC58XXX current ;
     package -hardware CYGPKG_DEVS_ETH_POWERPC_MOAB current ;
     package -hardware CYGPKG_DEVS_ETH_POWERPC_PPC405 current ;
+    package -hardware CYGPKG_DEVS_ETH_NS_DP83816 current ;
     package -hardware CYGPKG_DEVS_ETH_PHY current ;
+    package -hardware CYGPKG_IO_PCI current ;
     package -hardware CYGPKG_DEVICES_WALLCLOCK_DALLAS_DS1307 current ;
     package -hardware CYGPKG_DEVICES_WALLCLOCK_POWERPC_MOAB current ;
     package -hardware CYGPKG_IO_SERIAL_GENERIC_16X5X current ;
@@ -52,6 +54,10 @@ cdl_option CYGHWR_DEVS_ETH_PHY_DP83847 {
     inferred_value 1
 };
 
+cdl_option CYGIMP_HAL_COMMON_INTERRUPTS_USE_INTERRUPT_STACK {
+    inferred_value 0
+};
+
 cdl_option CYGNUM_HAL_COMMON_INTERRUPTS_STACK_SIZE {
     user_value 4096
 };
@@ -84,6 +90,10 @@ cdl_option CYGHWR_HAL_POWERPC_ENABLE_MMU
     inferred_value 0
 };
 
+cdl_option CYGSEM_HAL_POWERPC_PPC405_PCI_SHOW_BUS {
+    user_value 0
+};
+
 cdl_component CYG_HAL_STARTUP {
     user_value ROMRAM
 };
@@ -104,6 +114,10 @@ cdl_option CYGSEM_REDBOOT_PLF_STARTUP {
     user_value 1
 };
 
+cdl_option CYGSEM_REDBOOT_PLF_ESA_VALIDATE {
+    inferred_value 1
+};
+
 cdl_option CYGBLD_REDBOOT_MIN_IMAGE_SIZE {
     user_value 0x00080000
 };
@@ -128,6 +142,10 @@ cdl_option CYGSEM_REDBOOT_FLASH_CONFIG_R
     inferred_value 0
 };
 
+cdl_option CYGBLD_REDBOOT_MODE {
+    user_value BOOT
+};
+
 cdl_option CYGBLD_ISO_STRTOK_R_HEADER {
     inferred_value 1 <cyg/libc/string/string.h>
 };