ColdFire 54455: Fix correct boot location for atmel and intel

[u-boot] / common / cmd_immap.c

diff --git a/common/cmd_immap.c b/common/cmd_immap.c
index abf5590b4680c79e6bc9c6e2a0af563bb4378b2d..ae95758247d5e15cd26da5aca3b36ea45cdba7f8 100644 (file)
--- a/common/cmd_immap.c
+++ b/common/cmd_immap.c
@@ -28,18 +28,23 @@
 #include <common.h>
 #include <command.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_IMMAP) && \
+#if defined(CONFIG_CMD_IMMAP) && \
     (defined(CONFIG_8xx) || defined(CONFIG_8260))
 
 #if defined(CONFIG_8xx)
 #include <asm/8xx_immap.h>
 #include <commproc.h>
+#include <asm/iopin_8xx.h>
 #elif defined(CONFIG_8260)
 #include <asm/immap_8260.h>
 #include <asm/cpm_8260.h>
 #include <asm/iopin_8260.h>
 #endif
 
+#if defined(CONFIG_8xx) || defined(CONFIG_8260)
+DECLARE_GLOBAL_DATA_PTR;
+#endif
+
 static void
 unimplemented ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
@@ -316,13 +321,21 @@ do_iopinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 int
 do_iopset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
-#if defined(CONFIG_8260)
        uint rcode = 0;
+       iopin_t iopin;
        static uint port = 0;
        static uint pin = 0;
        static uint value = 0;
-       static enum { DIR, PAR, SOR, ODR, DAT } cmd = DAT;
-       iopin_t iopin;
+       static enum {
+               DIR,
+               PAR,
+               SOR,
+               ODR,
+               DAT,
+#if defined(CONFIG_8xx)
+               INT
+#endif
+       } cmd = DAT;
 
        if (argc != 5) {
                puts ("iopset PORT PIN CMD VALUE\n");
@@ -356,6 +369,11 @@ do_iopset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        case 's':
                cmd = SOR;
                break;
+#if defined(CONFIG_8xx)
+       case 'i':
+               cmd = INT;
+               break;
+#endif
        default:
                printf ("iopset: unknown command %s\n", argv[3]);
                rcode = 1;
@@ -369,6 +387,7 @@ do_iopset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        if (rcode == 0) {
                iopin.port = port;
                iopin.pin = pin;
+               iopin.flag = 0;
                switch (cmd) {
                case DIR:
                        if (value)
@@ -400,14 +419,18 @@ do_iopset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        else
                                iopin_set_low (&iopin);
                        break;
+#if defined(CONFIG_8xx)
+               case INT:
+                       if (value)
+                               iopin_set_falledge (&iopin);
+                       else
+                               iopin_set_anyedge (&iopin);
+                       break;
+#endif
                }
 
        }
        return rcode;
-#else
-       unimplemented (cmdtp, flag, argc, argv);
-       return 0;
-#endif
 }
 
 int
@@ -431,10 +454,8 @@ static void prbrg (int n, uint val)
        uint div16 = (val & CPM_BRG_DIV16) != 0;
 
 #if defined(CONFIG_8xx)
-       DECLARE_GLOBAL_DATA_PTR;
        ulong clock = gd->cpu_clk;
 #elif defined(CONFIG_8260)
-       DECLARE_GLOBAL_DATA_PTR;
        ulong clock = gd->brg_clk;
 #endif
 
@@ -699,4 +720,4 @@ U_BOOT_CMD(
 );
 
 
-#endif /* CFG_CMD_IMMAP && (CONFIG_8xx || CONFIG_8260) */
+#endif