Add comment about PCR on MPC8240.

Enable HUSH shell for PCIPPC2.

diff --git a/cpu/mpc824x/speed.c b/cpu/mpc824x/speed.c
index 5fb0783f8eb09ca0695071a4c5816e0dac60f92e..69f6a8bf3e0895802c53eb5a2d41e0bbef3877a8 100644 (file)
--- a/cpu/mpc824x/speed.c
+++ b/cpu/mpc824x/speed.c
@@ -30,17 +30,23 @@
 #include <asm/processor.h>
 
 /* ------------------------------------------------------------------------- */
-/* NOTE: This describes the proper use of this file. */
-/* CONFIG_SYS_CLK_FREQ should be defined as the input frequency on PCI_SYNC_IN */
-/* CONFIG_PLL_PCI_TO_MEM_MULTIPLIER is only required on MPC8240 boards */
-/*   it should be defined as the PCI to Memory Multiplier as documented */
-/*   in the MPC8240 Hardware Specs */
-/* Other mpc824x boards don't need CONFIG_PLL_PCI_TO_MEM_MULTIPLIER because */
-/*   they can determine it from the PCR */
-
-/* If the PCR is an undocumented feature on the mpc8240 then we can do away */
-/*   with CONFIG_PLL_PCI_TO_MEM_MULTIPLIER altogether */
-
+/* NOTE: This describes the proper use of this file.
+ *
+ * CONFIG_SYS_CLK_FREQ should be defined as the input frequency on
+ * PCI_SYNC_IN .
+ *
+ * CONFIG_PLL_PCI_TO_MEM_MULTIPLIER is only required on MPC8240
+ * boards. It should be defined as the PCI to Memory Multiplier as
+ * documented in the MPC8240 Hardware Specs.
+ *
+ * Other mpc824x boards don't need CONFIG_PLL_PCI_TO_MEM_MULTIPLIER
+ * because they can determine it from the PCR.
+ *
+ * Gary Milliorn <gary.milliorn@motorola.com> (who should know since
+ * he designed the Sandpoint) told us that the PCR is not in all revs
+ * of the MPC8240 CPU, so it's not guaranteeable and we cannot do
+ * away with CONFIG_PLL_PCI_TO_MEM_MULTIPLIER altogether.
+ */
 /* ------------------------------------------------------------------------- */
 
 /* This gives the PCI to Memory multiplier times 10 */
@@ -63,8 +69,8 @@ short pll_pci_to_mem_multiplier[] = {
 #endif
 };
 
-#define CU824_PLL_STATE_REG  0xFE80002F
-#define PCR                             0x800000E2
+#define CU824_PLL_STATE_REG    0xFE80002F
+#define PCR                    0x800000E2
 
 /* ------------------------------------------------------------------------- */
 

diff --git a/include/config_PCIPPC2.h b/include/config_PCIPPC2.h
index ddb25a5b90da73e4c3dde21c2910378263192ad0..720016a8ad71426f05555047a1ce6431ac9ebd7f 100644 (file)
--- a/include/config_PCIPPC2.h
+++ b/include/config_PCIPPC2.h
@@ -74,6 +74,11 @@
  */
 #define CFG_LONGHELP                   /* undef to save memory         */
 #define CFG_PROMPT     "=> "           /* Monitor Command Prompt       */
+
+#define        CFG_HUSH_PARSER         1       /* use "hush" command parser    */
+#ifdef CFG_HUSH_PARSER
+#define        CFG_PROMPT_HUSH_PS2     "> "
+#endif
 #define CFG_CBSIZE     256             /* Console I/O Buffer Size      */
 
 /* Print Buffer Size