make show_boot_progress () weak.

Signed-off-by: Heiko Schocher <[email protected]>

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index a6499e8dd9bc3fc853606567c847d0a064f02e55..ba286f1e636c1f6d36ea41b0366b6e192ef03d0f 100644 (file)
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -56,13 +56,6 @@ DECLARE_GLOBAL_DATA_PTR;
 #include <hush.h>
 #endif
 
 #include <hush.h>
 #endif
 

-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-# include <status_led.h>
-# define SHOW_BOOT_PROGRESS(arg)       show_boot_progress(arg)
-#else
-# define SHOW_BOOT_PROGRESS(arg)
-#endif
-

 #ifdef CFG_INIT_RAM_LOCK
 #include <asm/cache.h>
 #endif
 #ifdef CFG_INIT_RAM_LOCK
 #include <asm/cache.h>
 #endif


@@ -176,7 +169,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                addr = simple_strtoul(argv[1], NULL, 16);
        }
 
                addr = simple_strtoul(argv[1], NULL, 16);
        }
 

-       SHOW_BOOT_PROGRESS (1);
+       show_boot_progress (1);

        printf ("## Booting image at %08lx ...\n", addr);
 
        /* Copy header so we can blank CRC field for re-calculation */
        printf ("## Booting image at %08lx ...\n", addr);
 
        /* Copy header so we can blank CRC field for re-calculation */


@@ -200,11 +193,11 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 #endif /* __I386__ */
            {
                puts ("Bad Magic Number\n");
 #endif /* __I386__ */
            {
                puts ("Bad Magic Number\n");

-               SHOW_BOOT_PROGRESS (-1);
+               show_boot_progress (-1);

                return 1;
            }
        }
                return 1;
            }
        }

-       SHOW_BOOT_PROGRESS (2);
+       show_boot_progress (2);

 
        data = (ulong)&header;
        len  = sizeof(image_header_t);
 
        data = (ulong)&header;
        len  = sizeof(image_header_t);


@@ -214,10 +207,10 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        if (crc32 (0, (uchar *)data, len) != checksum) {
                puts ("Bad Header Checksum\n");
 
        if (crc32 (0, (uchar *)data, len) != checksum) {
                puts ("Bad Header Checksum\n");

-               SHOW_BOOT_PROGRESS (-2);
+               show_boot_progress (-2);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS (3);
+       show_boot_progress (3);

 
 #ifdef CONFIG_HAS_DATAFLASH
        if (addr_dataflash(addr)){
 
 #ifdef CONFIG_HAS_DATAFLASH
        if (addr_dataflash(addr)){


@@ -238,12 +231,12 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                puts ("   Verifying Checksum ... ");
                if (crc32 (0, (uchar *)data, len) != ntohl(hdr->ih_dcrc)) {
                        printf ("Bad Data CRC\n");
                puts ("   Verifying Checksum ... ");
                if (crc32 (0, (uchar *)data, len) != ntohl(hdr->ih_dcrc)) {
                        printf ("Bad Data CRC\n");

-                       SHOW_BOOT_PROGRESS (-3);
+                       show_boot_progress (-3);

                        return 1;
                }
                puts ("OK\n");
        }
                        return 1;
                }
                puts ("OK\n");
        }

-       SHOW_BOOT_PROGRESS (4);
+       show_boot_progress (4);

 
        len_ptr = (ulong *)data;
 
 
        len_ptr = (ulong *)data;
 


@@ -272,10 +265,10 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 #endif
        {
                printf ("Unsupported Architecture 0x%x\n", hdr->ih_arch);
 #endif
        {
                printf ("Unsupported Architecture 0x%x\n", hdr->ih_arch);

-               SHOW_BOOT_PROGRESS (-4);
+               show_boot_progress (-4);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS (5);
+       show_boot_progress (5);

 
        switch (hdr->ih_type) {
        case IH_TYPE_STANDALONE:
 
        switch (hdr->ih_type) {
        case IH_TYPE_STANDALONE:


@@ -297,10 +290,10 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        data += 4;
                break;
        default: printf ("Wrong Image Type for %s command\n", cmdtp->name);
                        data += 4;
                break;
        default: printf ("Wrong Image Type for %s command\n", cmdtp->name);

-               SHOW_BOOT_PROGRESS (-5);
+               show_boot_progress (-5);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS (6);
+       show_boot_progress (6);

 
        /*
         * We have reached the point of no return: we are going to
 
        /*
         * We have reached the point of no return: we are going to


@@ -351,7 +344,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                if (gunzip ((void *)ntohl(hdr->ih_load), unc_len,
                            (uchar *)data, &len) != 0) {
                        puts ("GUNZIP ERROR - must RESET board to recover\n");
                if (gunzip ((void *)ntohl(hdr->ih_load), unc_len,
                            (uchar *)data, &len) != 0) {
                        puts ("GUNZIP ERROR - must RESET board to recover\n");

-                       SHOW_BOOT_PROGRESS (-6);
+                       show_boot_progress (-6);

                        do_reset (cmdtp, flag, argc, argv);
                }
                break;
                        do_reset (cmdtp, flag, argc, argv);
                }
                break;


@@ -368,7 +361,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                                                CFG_MALLOC_LEN < (4096 * 1024), 0);
                if (i != BZ_OK) {
                        printf ("BUNZIP2 ERROR %d - must RESET board to recover\n", i);
                                                CFG_MALLOC_LEN < (4096 * 1024), 0);
                if (i != BZ_OK) {
                        printf ("BUNZIP2 ERROR %d - must RESET board to recover\n", i);

-                       SHOW_BOOT_PROGRESS (-6);
+                       show_boot_progress (-6);

                        udelay(100000);
                        do_reset (cmdtp, flag, argc, argv);
                }
                        udelay(100000);
                        do_reset (cmdtp, flag, argc, argv);
                }


@@ -378,11 +371,11 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                if (iflag)
                        enable_interrupts();
                printf ("Unimplemented compression type %d\n", hdr->ih_comp);
                if (iflag)
                        enable_interrupts();
                printf ("Unimplemented compression type %d\n", hdr->ih_comp);

-               SHOW_BOOT_PROGRESS (-7);
+               show_boot_progress (-7);

                return 1;
        }
        puts ("OK\n");
                return 1;
        }
        puts ("OK\n");

-       SHOW_BOOT_PROGRESS (7);
+       show_boot_progress (7);

 
        switch (hdr->ih_type) {
        case IH_TYPE_STANDALONE:
 
        switch (hdr->ih_type) {
        case IH_TYPE_STANDALONE:


@@ -409,10 +402,10 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                if (iflag)
                        enable_interrupts();
                printf ("Can't boot image type %d\n", hdr->ih_type);
                if (iflag)
                        enable_interrupts();
                printf ("Can't boot image type %d\n", hdr->ih_type);

-               SHOW_BOOT_PROGRESS (-8);
+               show_boot_progress (-8);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS (8);
+       show_boot_progress (8);

 
        switch (hdr->ih_os) {
        default:                        /* handled by (original) Linux case */
 
        switch (hdr->ih_os) {
        default:                        /* handled by (original) Linux case */


@@ -458,7 +451,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 #endif
        }
 
 #endif
        }
 

-       SHOW_BOOT_PROGRESS (-9);
+       show_boot_progress (-9);

 #ifdef DEBUG
        puts ("\n## Control returned to monitor - resetting...\n");
        do_reset (cmdtp, flag, argc, argv);
 #ifdef DEBUG
        puts ("\n## Control returned to monitor - resetting...\n");
        do_reset (cmdtp, flag, argc, argv);


@@ -637,7 +630,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
 #endif
        if (argc >= 3) {
                debug ("Not skipping initrd\n");
 #endif
        if (argc >= 3) {
                debug ("Not skipping initrd\n");

-               SHOW_BOOT_PROGRESS (9);
+               show_boot_progress (9);

 
                addr = simple_strtoul(argv[2], NULL, 16);
 
 
                addr = simple_strtoul(argv[2], NULL, 16);
 


@@ -648,7 +641,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
 
                if (ntohl(hdr->ih_magic)  != IH_MAGIC) {
                        puts ("Bad Magic Number\n");
 
                if (ntohl(hdr->ih_magic)  != IH_MAGIC) {
                        puts ("Bad Magic Number\n");

-                       SHOW_BOOT_PROGRESS (-10);
+                       show_boot_progress (-10);

                        do_reset (cmdtp, flag, argc, argv);
                }
 
                        do_reset (cmdtp, flag, argc, argv);
                }
 


@@ -660,11 +653,11 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
 
                if (crc32 (0, (uchar *)data, len) != checksum) {
                        puts ("Bad Header Checksum\n");
 
                if (crc32 (0, (uchar *)data, len) != checksum) {
                        puts ("Bad Header Checksum\n");

-                       SHOW_BOOT_PROGRESS (-11);
+                       show_boot_progress (-11);

                        do_reset (cmdtp, flag, argc, argv);
                }
 
                        do_reset (cmdtp, flag, argc, argv);
                }
 

-               SHOW_BOOT_PROGRESS (10);
+               show_boot_progress (10);

 
                print_image_hdr (hdr);
 
 
                print_image_hdr (hdr);
 


@@ -697,19 +690,19 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
 
                        if (csum != ntohl(hdr->ih_dcrc)) {
                                puts ("Bad Data CRC\n");
 
                        if (csum != ntohl(hdr->ih_dcrc)) {
                                puts ("Bad Data CRC\n");

-                               SHOW_BOOT_PROGRESS (-12);
+                               show_boot_progress (-12);

                                do_reset (cmdtp, flag, argc, argv);
                        }
                        puts ("OK\n");
                }
 
                                do_reset (cmdtp, flag, argc, argv);
                        }
                        puts ("OK\n");
                }
 

-               SHOW_BOOT_PROGRESS (11);
+               show_boot_progress (11);

 
                if ((hdr->ih_os   != IH_OS_LINUX)       ||
                    (hdr->ih_arch != IH_CPU_PPC)        ||
                    (hdr->ih_type != IH_TYPE_RAMDISK)   ) {
                        puts ("No Linux PPC Ramdisk Image\n");
 
                if ((hdr->ih_os   != IH_OS_LINUX)       ||
                    (hdr->ih_arch != IH_CPU_PPC)        ||
                    (hdr->ih_type != IH_TYPE_RAMDISK)   ) {
                        puts ("No Linux PPC Ramdisk Image\n");

-                       SHOW_BOOT_PROGRESS (-13);
+                       show_boot_progress (-13);

                        do_reset (cmdtp, flag, argc, argv);
                }
 
                        do_reset (cmdtp, flag, argc, argv);
                }
 


@@ -720,7 +713,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
                u_long tail    = ntohl(len_ptr[0]) % 4;
                int i;
 
                u_long tail    = ntohl(len_ptr[0]) % 4;
                int i;
 

-               SHOW_BOOT_PROGRESS (13);
+               show_boot_progress (13);

 
                /* skip kernel length and terminator */
                data = (ulong)(&len_ptr[2]);
 
                /* skip kernel length and terminator */
                data = (ulong)(&len_ptr[2]);


@@ -739,7 +732,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
                /*
                 * no initrd image
                 */
                /*
                 * no initrd image
                 */

-               SHOW_BOOT_PROGRESS (14);
+               show_boot_progress (14);

 
                len = data = 0;
        }
 
                len = data = 0;
        }


@@ -890,7 +883,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
                                initrd_start = nsp;
                }
 
                                initrd_start = nsp;
                }
 

-               SHOW_BOOT_PROGRESS (12);
+               show_boot_progress (12);

 
                debug ("## initrd at 0x%08lX ... 0x%08lX (len=%ld=0x%lX)\n",
                        data, data + len - 1, len, len);
 
                debug ("## initrd at 0x%08lX ... 0x%08lX (len=%ld=0x%lX)\n",
                        data, data + len - 1, len, len);


@@ -926,7 +919,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
        debug ("## Transferring control to Linux (at address %08lx) ...\n",
                (ulong)kernel);
 
        debug ("## Transferring control to Linux (at address %08lx) ...\n",
                (ulong)kernel);
 

-       SHOW_BOOT_PROGRESS (15);
+       show_boot_progress (15);

 
 #if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500)
        unlock_ram_in_cache();
 
 #if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500)
        unlock_ram_in_cache();


@@ -1115,7 +1108,7 @@ do_bootm_netbsd (cmd_tbl_t *cmdtp, int flag,
        printf ("## Transferring control to NetBSD stage-2 loader (at address %08lx) ...\n",
                (ulong)loader);
 
        printf ("## Transferring control to NetBSD stage-2 loader (at address %08lx) ...\n",
                (ulong)loader);
 

-       SHOW_BOOT_PROGRESS (15);
+       show_boot_progress (15);

 
        /*
         * NetBSD Stage-2 Loader Parameters:
 
        /*
         * NetBSD Stage-2 Loader Parameters:


@@ -1578,7 +1571,7 @@ do_bootm_rtems (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        printf ("## Transferring control to RTEMS (at address %08lx) ...\n",
                (ulong)entry_point);
 
        printf ("## Transferring control to RTEMS (at address %08lx) ...\n",
                (ulong)entry_point);
 

-       SHOW_BOOT_PROGRESS (15);
+       show_boot_progress (15);

 
        /*
         * RTEMS Parameters:
 
        /*
         * RTEMS Parameters:

diff --git a/common/cmd_doc.c b/common/cmd_doc.c
index 4e624a2f3fabcebf6925ae22858dbb3a9804b888..9814d754fb7adf5ab8d07cd1b071656e26a04c45 100644 (file)
--- a/common/cmd_doc.c
+++ b/common/cmd_doc.c
@@ -12,13 +12,6 @@
 #include <malloc.h>
 #include <asm/io.h>
 
 #include <malloc.h>
 #include <asm/io.h>
 

-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-# include <status_led.h>
-# define SHOW_BOOT_PROGRESS(arg)       show_boot_progress(arg)
-#else
-# define SHOW_BOOT_PROGRESS(arg)
-#endif
-

 #if (CONFIG_COMMANDS & CFG_CMD_DOC)
 
 #include <linux/mtd/nftl.h>
 #if (CONFIG_COMMANDS & CFG_CMD_DOC)
 
 #include <linux/mtd/nftl.h>


@@ -216,7 +209,7 @@ int do_docboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        image_header_t *hdr;
        int rcode = 0;
 
        image_header_t *hdr;
        int rcode = 0;
 

-       SHOW_BOOT_PROGRESS (34);
+       show_boot_progress (34);

        switch (argc) {
        case 1:
                addr = CFG_LOAD_ADDR;
        switch (argc) {
        case 1:
                addr = CFG_LOAD_ADDR;


@@ -237,27 +230,27 @@ int do_docboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                break;
        default:
                printf ("Usage:\n%s\n", cmdtp->usage);
                break;
        default:
                printf ("Usage:\n%s\n", cmdtp->usage);

-               SHOW_BOOT_PROGRESS (-35);
+               show_boot_progress (-35);

                return 1;
        }
 
                return 1;
        }
 

-       SHOW_BOOT_PROGRESS (35);
+       show_boot_progress (35);

        if (!boot_device) {
                puts ("\n** No boot device **\n");
        if (!boot_device) {
                puts ("\n** No boot device **\n");

-               SHOW_BOOT_PROGRESS (-36);
+               show_boot_progress (-36);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS (36);
+       show_boot_progress (36);

 
        dev = simple_strtoul(boot_device, &ep, 16);
 
        if ((dev >= CFG_MAX_DOC_DEVICE) ||
            (doc_dev_desc[dev].ChipID == DOC_ChipID_UNKNOWN)) {
                printf ("\n** Device %d not available\n", dev);
 
        dev = simple_strtoul(boot_device, &ep, 16);
 
        if ((dev >= CFG_MAX_DOC_DEVICE) ||
            (doc_dev_desc[dev].ChipID == DOC_ChipID_UNKNOWN)) {
                printf ("\n** Device %d not available\n", dev);

-               SHOW_BOOT_PROGRESS (-37);
+               show_boot_progress (-37);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS (37);
+       show_boot_progress (37);

 
        printf ("\nLoading from device %d: %s at 0x%lX (offset 0x%lX)\n",
                dev, doc_dev_desc[dev].name, doc_dev_desc[dev].physadr,
 
        printf ("\nLoading from device %d: %s at 0x%lX (offset 0x%lX)\n",
                dev, doc_dev_desc[dev].name, doc_dev_desc[dev].physadr,


@@ -266,10 +259,10 @@ int do_docboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        if (doc_rw (doc_dev_desc + dev, 1, offset,
                    SECTORSIZE, NULL, (u_char *)addr)) {
                printf ("** Read error on %d\n", dev);
        if (doc_rw (doc_dev_desc + dev, 1, offset,
                    SECTORSIZE, NULL, (u_char *)addr)) {
                printf ("** Read error on %d\n", dev);

-               SHOW_BOOT_PROGRESS (-38);
+               show_boot_progress (-38);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS (38);
+       show_boot_progress (38);

 
        hdr = (image_header_t *)addr;
 
 
        hdr = (image_header_t *)addr;
 


@@ -281,18 +274,18 @@ int do_docboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                cnt -= SECTORSIZE;
        } else {
                puts ("\n** Bad Magic Number **\n");
                cnt -= SECTORSIZE;
        } else {
                puts ("\n** Bad Magic Number **\n");

-               SHOW_BOOT_PROGRESS (-39);
+               show_boot_progress (-39);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS (39);
+       show_boot_progress (39);

 
        if (doc_rw (doc_dev_desc + dev, 1, offset + SECTORSIZE, cnt,
                    NULL, (u_char *)(addr+SECTORSIZE))) {
                printf ("** Read error on %d\n", dev);
 
        if (doc_rw (doc_dev_desc + dev, 1, offset + SECTORSIZE, cnt,
                    NULL, (u_char *)(addr+SECTORSIZE))) {
                printf ("** Read error on %d\n", dev);

-               SHOW_BOOT_PROGRESS (-40);
+               show_boot_progress (-40);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS (40);
+       show_boot_progress (40);

 
        /* Loading ok, update default load address */
 
 
        /* Loading ok, update default load address */
 

diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index c74cde96e89b0e953ed861e3a6153ceba8b1f99a..877915694903a9bf07e753e5de07898b294d46f9 100644 (file)
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -59,13 +59,6 @@ unsigned long mips_io_port_base = 0;
 #endif
 #endif
 
 #endif
 #endif
 

-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-# include <status_led.h>
-# define SHOW_BOOT_PROGRESS(arg)       show_boot_progress(arg)
-#else
-# define SHOW_BOOT_PROGRESS(arg)
-#endif
-

 #ifdef CONFIG_IDE_8xx_DIRECT
 DECLARE_GLOBAL_DATA_PTR;
 #endif
 #ifdef CONFIG_IDE_8xx_DIRECT
 DECLARE_GLOBAL_DATA_PTR;
 #endif


@@ -385,7 +378,7 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        image_header_t *hdr;
        int rcode = 0;
 
        image_header_t *hdr;
        int rcode = 0;
 

-       SHOW_BOOT_PROGRESS (41);
+       show_boot_progress (41);

        switch (argc) {
        case 1:
                addr = CFG_LOAD_ADDR;
        switch (argc) {
        case 1:
                addr = CFG_LOAD_ADDR;


@@ -401,50 +394,50 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                break;
        default:
                printf ("Usage:\n%s\n", cmdtp->usage);
                break;
        default:
                printf ("Usage:\n%s\n", cmdtp->usage);

-               SHOW_BOOT_PROGRESS (-42);
+               show_boot_progress (-42);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS (42);
+       show_boot_progress (42);

 
        if (!boot_device) {
                puts ("\n** No boot device **\n");
 
        if (!boot_device) {
                puts ("\n** No boot device **\n");

-               SHOW_BOOT_PROGRESS (-43);
+               show_boot_progress (-43);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS (43);
+       show_boot_progress (43);

 
        dev = simple_strtoul(boot_device, &ep, 16);
 
        if (ide_dev_desc[dev].type==DEV_TYPE_UNKNOWN) {
                printf ("\n** Device %d not available\n", dev);
 
        dev = simple_strtoul(boot_device, &ep, 16);
 
        if (ide_dev_desc[dev].type==DEV_TYPE_UNKNOWN) {
                printf ("\n** Device %d not available\n", dev);

-               SHOW_BOOT_PROGRESS (-44);
+               show_boot_progress (-44);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS (44);
+       show_boot_progress (44);

 
        if (*ep) {
                if (*ep != ':') {
                        puts ("\n** Invalid boot device, use `dev[:part]' **\n");
 
        if (*ep) {
                if (*ep != ':') {
                        puts ("\n** Invalid boot device, use `dev[:part]' **\n");

-                       SHOW_BOOT_PROGRESS (-45);
+                       show_boot_progress (-45);

                        return 1;
                }
                part = simple_strtoul(++ep, NULL, 16);
        }
                        return 1;
                }
                part = simple_strtoul(++ep, NULL, 16);
        }

-       SHOW_BOOT_PROGRESS (45);
+       show_boot_progress (45);

        if (get_partition_info (&ide_dev_desc[dev], part, &info)) {
        if (get_partition_info (&ide_dev_desc[dev], part, &info)) {

-               SHOW_BOOT_PROGRESS (-46);
+               show_boot_progress (-46);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS (46);
+       show_boot_progress (46);

        if ((strncmp((char *)info.type, BOOT_PART_TYPE, sizeof(info.type)) != 0) &&
            (strncmp((char *)info.type, BOOT_PART_COMP, sizeof(info.type)) != 0)) {
                printf ("\n** Invalid partition type \"%.32s\""
                        " (expect \"" BOOT_PART_TYPE "\")\n",
                        info.type);
        if ((strncmp((char *)info.type, BOOT_PART_TYPE, sizeof(info.type)) != 0) &&
            (strncmp((char *)info.type, BOOT_PART_COMP, sizeof(info.type)) != 0)) {
                printf ("\n** Invalid partition type \"%.32s\""
                        " (expect \"" BOOT_PART_TYPE "\")\n",
                        info.type);

-               SHOW_BOOT_PROGRESS (-47);
+               show_boot_progress (-47);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS (47);
+       show_boot_progress (47);

 
        printf ("\nLoading from IDE device %d, partition %d: "
                "Name: %.32s  Type: %.32s\n",
 
        printf ("\nLoading from IDE device %d, partition %d: "
                "Name: %.32s  Type: %.32s\n",


@@ -455,29 +448,29 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        if (ide_dev_desc[dev].block_read (dev, info.start, 1, (ulong *)addr) != 1) {
                printf ("** Read error on %d:%d\n", dev, part);
 
        if (ide_dev_desc[dev].block_read (dev, info.start, 1, (ulong *)addr) != 1) {
                printf ("** Read error on %d:%d\n", dev, part);

-               SHOW_BOOT_PROGRESS (-48);
+               show_boot_progress (-48);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS (48);
+       show_boot_progress (48);

 
        hdr = (image_header_t *)addr;
 
        if (ntohl(hdr->ih_magic) != IH_MAGIC) {
                printf("\n** Bad Magic Number **\n");
 
        hdr = (image_header_t *)addr;
 
        if (ntohl(hdr->ih_magic) != IH_MAGIC) {
                printf("\n** Bad Magic Number **\n");

-               SHOW_BOOT_PROGRESS (-49);
+               show_boot_progress (-49);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS (49);
+       show_boot_progress (49);

 
        checksum = ntohl(hdr->ih_hcrc);
        hdr->ih_hcrc = 0;
 
        if (crc32 (0, (uchar *)hdr, sizeof(image_header_t)) != checksum) {
                puts ("\n** Bad Header Checksum **\n");
 
        checksum = ntohl(hdr->ih_hcrc);
        hdr->ih_hcrc = 0;
 
        if (crc32 (0, (uchar *)hdr, sizeof(image_header_t)) != checksum) {
                puts ("\n** Bad Header Checksum **\n");

-               SHOW_BOOT_PROGRESS (-50);
+               show_boot_progress (-50);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS (50);
+       show_boot_progress (50);

        hdr->ih_hcrc = htonl(checksum); /* restore checksum for later use */
 
        print_image_hdr (hdr);
        hdr->ih_hcrc = htonl(checksum); /* restore checksum for later use */
 
        print_image_hdr (hdr);


@@ -490,10 +483,10 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        if (ide_dev_desc[dev].block_read (dev, info.start+1, cnt,
                      (ulong *)(addr+info.blksz)) != cnt) {
                printf ("** Read error on %d:%d\n", dev, part);
        if (ide_dev_desc[dev].block_read (dev, info.start+1, cnt,
                      (ulong *)(addr+info.blksz)) != cnt) {
                printf ("** Read error on %d:%d\n", dev, part);

-               SHOW_BOOT_PROGRESS (-51);
+               show_boot_progress (-51);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS (51);
+       show_boot_progress (51);

 
 
        /* Loading ok, update default load address */
 
 
        /* Loading ok, update default load address */

diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index b088150f3bf43825ad7e62a46643d1cc8abcddd1..cb62661ec2703375099409ffaf71f3826d07bafa 100644 (file)
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -25,14 +25,6 @@
 #include <watchdog.h>
 #include <malloc.h>
 #include <asm/byteorder.h>
 #include <watchdog.h>
 #include <malloc.h>
 #include <asm/byteorder.h>

-
-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-# include <status_led.h>
-# define SHOW_BOOT_PROGRESS(arg)       show_boot_progress(arg)
-#else
-# define SHOW_BOOT_PROGRESS(arg)
-#endif
-

 #include <jffs2/jffs2.h>
 #include <nand.h>
 
 #include <jffs2/jffs2.h>
 #include <nand.h>
 


@@ -486,19 +478,19 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
        r = nand_read(nand, offset, &cnt, (u_char *) addr);
        if (r) {
                puts("** Read error\n");
        r = nand_read(nand, offset, &cnt, (u_char *) addr);
        if (r) {
                puts("** Read error\n");

-               SHOW_BOOT_PROGRESS(-56);
+               show_boot_progress (-56);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS(56);
+       show_boot_progress (56);

 
        hdr = (image_header_t *) addr;
 
        if (ntohl(hdr->ih_magic) != IH_MAGIC) {
                printf("\n** Bad Magic Number 0x%x **\n", hdr->ih_magic);
 
        hdr = (image_header_t *) addr;
 
        if (ntohl(hdr->ih_magic) != IH_MAGIC) {
                printf("\n** Bad Magic Number 0x%x **\n", hdr->ih_magic);

-               SHOW_BOOT_PROGRESS(-57);
+               show_boot_progress (-57);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS(57);
+       show_boot_progress (57);

 
        print_image_hdr(hdr);
 
 
        print_image_hdr(hdr);
 


@@ -507,10 +499,10 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
        r = nand_read(nand, offset, &cnt, (u_char *) addr);
        if (r) {
                puts("** Read error\n");
        r = nand_read(nand, offset, &cnt, (u_char *) addr);
        if (r) {
                puts("** Read error\n");

-               SHOW_BOOT_PROGRESS(-58);
+               show_boot_progress (-58);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS(58);
+       show_boot_progress (58);

 
        /* Loading ok, update default load address */
 
 
        /* Loading ok, update default load address */
 


@@ -562,7 +554,7 @@ int do_nandboot(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        }
 #endif
 
        }
 #endif
 

-       SHOW_BOOT_PROGRESS(52);
+       show_boot_progress(52);

        switch (argc) {
        case 1:
                addr = CFG_LOAD_ADDR;
        switch (argc) {
        case 1:
                addr = CFG_LOAD_ADDR;


@@ -586,26 +578,26 @@ int do_nandboot(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 usage:
 #endif
                printf("Usage:\n%s\n", cmdtp->usage);
 usage:
 #endif
                printf("Usage:\n%s\n", cmdtp->usage);

-               SHOW_BOOT_PROGRESS(-53);
+               show_boot_progress(-53);

                return 1;
        }
 
                return 1;
        }
 

-       SHOW_BOOT_PROGRESS(53);
+       show_boot_progress(53);

        if (!boot_device) {
                puts("\n** No boot device **\n");
        if (!boot_device) {
                puts("\n** No boot device **\n");

-               SHOW_BOOT_PROGRESS(-54);
+               show_boot_progress(-54);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS(54);
+       show_boot_progress(54);

 
        idx = simple_strtoul(boot_device, NULL, 16);
 
        if (idx < 0 || idx >= CFG_MAX_NAND_DEVICE || !nand_info[idx].name) {
                printf("\n** Device %d not available\n", idx);
 
        idx = simple_strtoul(boot_device, NULL, 16);
 
        if (idx < 0 || idx >= CFG_MAX_NAND_DEVICE || !nand_info[idx].name) {
                printf("\n** Device %d not available\n", idx);

-               SHOW_BOOT_PROGRESS(-55);
+               show_boot_progress(-55);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS(55);
+       show_boot_progress(55);

 
        return nand_load_image(cmdtp, &nand_info[idx], offset, addr, argv[0]);
 }
 
        return nand_load_image(cmdtp, &nand_info[idx], offset, addr, argv[0]);
 }


@@ -627,11 +619,11 @@ U_BOOT_CMD(nboot, 4, 1, do_nandboot,
 #include <asm/io.h>
 #include <watchdog.h>
 
 #include <asm/io.h>
 #include <watchdog.h>
 

-#ifdef CONFIG_SHOW_BOOT_PROGRESS
+#ifdef CONFIG_show_boot_progress

 # include <status_led.h>
 # include <status_led.h>

-# define SHOW_BOOT_PROGRESS(arg)       show_boot_progress(arg)
+# define show_boot_progress(arg)       show_boot_progress(arg)

 #else
 #else

-# define SHOW_BOOT_PROGRESS(arg)
+# define show_boot_progress(arg)

 #endif
 
 #if (CONFIG_COMMANDS & CFG_CMD_NAND)
 #endif
 
 #if (CONFIG_COMMANDS & CFG_CMD_NAND)


@@ -894,7 +886,7 @@ int do_nandboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        ulong offset = 0;
        image_header_t *hdr;
        int rcode = 0;
        ulong offset = 0;
        image_header_t *hdr;
        int rcode = 0;

-       SHOW_BOOT_PROGRESS(52);
+       show_boot_progress (52);

        switch (argc) {
        case 1:
                addr = CFG_LOAD_ADDR;
        switch (argc) {
        case 1:
                addr = CFG_LOAD_ADDR;


@@ -915,27 +907,27 @@ int do_nandboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                break;
        default:
                printf ("Usage:\n%s\n", cmdtp->usage);
                break;
        default:
                printf ("Usage:\n%s\n", cmdtp->usage);

-               SHOW_BOOT_PROGRESS (-53);
+               show_boot_progress (-53);

                return 1;
        }
 
                return 1;
        }
 

-       SHOW_BOOT_PROGRESS(53);
+       show_boot_progress (53);

        if (!boot_device) {
                puts ("\n** No boot device **\n");
        if (!boot_device) {
                puts ("\n** No boot device **\n");

-               SHOW_BOOT_PROGRESS (-54);
+               show_boot_progress (-54);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS(54);
+       show_boot_progress (54);

 
        dev = simple_strtoul(boot_device, &ep, 16);
 
        if ((dev >= CFG_MAX_NAND_DEVICE) ||
            (nand_dev_desc[dev].ChipID == NAND_ChipID_UNKNOWN)) {
                printf ("\n** Device %d not available\n", dev);
 
        dev = simple_strtoul(boot_device, &ep, 16);
 
        if ((dev >= CFG_MAX_NAND_DEVICE) ||
            (nand_dev_desc[dev].ChipID == NAND_ChipID_UNKNOWN)) {
                printf ("\n** Device %d not available\n", dev);

-               SHOW_BOOT_PROGRESS (-55);
+               show_boot_progress (-55);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS(55);
+       show_boot_progress (55);

 
        printf ("\nLoading from device %d: %s at 0x%lx (offset 0x%lx)\n",
                dev, nand_dev_desc[dev].name, nand_dev_desc[dev].IO_ADDR,
 
        printf ("\nLoading from device %d: %s at 0x%lx (offset 0x%lx)\n",
                dev, nand_dev_desc[dev].name, nand_dev_desc[dev].IO_ADDR,


@@ -944,10 +936,10 @@ int do_nandboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        if (nand_legacy_rw (nand_dev_desc + dev, NANDRW_READ, offset,
                        SECTORSIZE, NULL, (u_char *)addr)) {
                printf ("** Read error on %d\n", dev);
        if (nand_legacy_rw (nand_dev_desc + dev, NANDRW_READ, offset,
                        SECTORSIZE, NULL, (u_char *)addr)) {
                printf ("** Read error on %d\n", dev);

-               SHOW_BOOT_PROGRESS (-56);
+               show_boot_progress (-56);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS(56);
+       show_boot_progress (56);

 
        hdr = (image_header_t *)addr;
 
 
        hdr = (image_header_t *)addr;
 


@@ -959,19 +951,19 @@ int do_nandboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                cnt -= SECTORSIZE;
        } else {
                printf ("\n** Bad Magic Number 0x%x **\n", ntohl(hdr->ih_magic));
                cnt -= SECTORSIZE;
        } else {
                printf ("\n** Bad Magic Number 0x%x **\n", ntohl(hdr->ih_magic));

-               SHOW_BOOT_PROGRESS (-57);
+               show_boot_progress (-57);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS(57);
+       show_boot_progress (57);

 
        if (nand_legacy_rw (nand_dev_desc + dev, NANDRW_READ,
                        offset + SECTORSIZE, cnt, NULL,
                        (u_char *)(addr+SECTORSIZE))) {
                printf ("** Read error on %d\n", dev);
 
        if (nand_legacy_rw (nand_dev_desc + dev, NANDRW_READ,
                        offset + SECTORSIZE, cnt, NULL,
                        (u_char *)(addr+SECTORSIZE))) {
                printf ("** Read error on %d\n", dev);

-               SHOW_BOOT_PROGRESS (-58);
+               show_boot_progress (-58);

                return 1;
        }
                return 1;
        }

-       SHOW_BOOT_PROGRESS(58);
+       show_boot_progress (58);

 
        /* Loading ok, update default load address */
 
 
        /* Loading ok, update default load address */
 

diff --git a/common/cmd_net.c b/common/cmd_net.c
index e9d552e235292ec8cdd5f0eada82c72020d93dd9..f1097a9951d368b9e1e5ac44cb6dba275405574c 100644 (file)
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -30,14 +30,6 @@
 
 #if (CONFIG_COMMANDS & CFG_CMD_NET)
 
 
 #if (CONFIG_COMMANDS & CFG_CMD_NET)
 

-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-# include <status_led.h>
-extern void show_boot_progress (int val);
-# define SHOW_BOOT_PROGRESS(arg)       show_boot_progress (arg)
-#else
-# define SHOW_BOOT_PROGRESS(arg)
-#endif
-

 extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
 
 static int netboot_common (proto_t, cmd_tbl_t *, int , char *[]);
 extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
 
 static int netboot_common (proto_t, cmd_tbl_t *, int , char *[]);


@@ -191,23 +183,23 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
                break;
 
        default: printf ("Usage:\n%s\n", cmdtp->usage);
                break;
 
        default: printf ("Usage:\n%s\n", cmdtp->usage);

-               SHOW_BOOT_PROGRESS(-80);
+               show_boot_progress (-80);

                return 1;
        }
 
                return 1;
        }
 

-       SHOW_BOOT_PROGRESS(80);
+       show_boot_progress (80);

        if ((size = NetLoop(proto)) < 0) {
        if ((size = NetLoop(proto)) < 0) {

-               SHOW_BOOT_PROGRESS(-81);
+               show_boot_progress (-81);

                return 1;
        }
 
                return 1;
        }
 

-       SHOW_BOOT_PROGRESS(81);
+       show_boot_progress (81);

        /* NetLoop ok, update environment */
        netboot_update_env();
 
        /* done if no file was loaded (no errors though) */
        if (size == 0) {
        /* NetLoop ok, update environment */
        netboot_update_env();
 
        /* done if no file was loaded (no errors though) */
        if (size == 0) {

-               SHOW_BOOT_PROGRESS(-82);
+               show_boot_progress (-82);

                return 0;
        }
 
                return 0;
        }
 


@@ -222,23 +214,21 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
 
                printf ("Automatic boot of image at addr 0x%08lX ...\n",
                        load_addr);
 
                printf ("Automatic boot of image at addr 0x%08lX ...\n",
                        load_addr);

-               SHOW_BOOT_PROGRESS(82);
+               show_boot_progress (82);

                rcode = do_bootm (cmdtp, 0, 1, local_args);
        }
 
 #ifdef CONFIG_AUTOSCRIPT
        if (((s = getenv("autoscript")) != NULL) && (strcmp(s,"yes") == 0)) {
                printf("Running autoscript at addr 0x%08lX ...\n", load_addr);
                rcode = do_bootm (cmdtp, 0, 1, local_args);
        }
 
 #ifdef CONFIG_AUTOSCRIPT
        if (((s = getenv("autoscript")) != NULL) && (strcmp(s,"yes") == 0)) {
                printf("Running autoscript at addr 0x%08lX ...\n", load_addr);

-               SHOW_BOOT_PROGRESS(83);
+               show_boot_progress (83);

                rcode = autoscript (load_addr);
        }
 #endif
                rcode = autoscript (load_addr);
        }
 #endif

-#if defined(CONFIG_SHOW_BOOT_PROGRESS)

        if (rcode < 0)
        if (rcode < 0)

-               SHOW_BOOT_PROGRESS(-83);
+               show_boot_progress (-83);

        else
        else

-               SHOW_BOOT_PROGRESS(84);
-#endif
+               show_boot_progress (84);

        return rcode;
 }
 
        return rcode;
 }
 

diff --git a/common/env_common.c b/common/env_common.c
index 0462cad6d7256b6c3e0d2f07f438d6233bd6157f..a49481244e2f7ae3c64c1829201161edee3436a1 100644 (file)
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -30,13 +30,6 @@
 #include <linux/stddef.h>
 #include <malloc.h>
 
 #include <linux/stddef.h>
 #include <malloc.h>
 

-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-# include <status_led.h>
-# define SHOW_BOOT_PROGRESS(arg)       show_boot_progress(arg)
-#else
-# define SHOW_BOOT_PROGRESS(arg)
-#endif
-

 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_AMIGAONEG3SE
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_AMIGAONEG3SE


@@ -232,7 +225,7 @@ void env_relocate (void)
                puts ("Using default environment\n\n");
 #else
                puts ("*** Warning - bad CRC, using default environment\n\n");
                puts ("Using default environment\n\n");
 #else
                puts ("*** Warning - bad CRC, using default environment\n\n");

-               SHOW_BOOT_PROGRESS (-60);
+               show_boot_progress (-60);

 #endif
 
                if (sizeof(default_environment) > ENV_SIZE)
 #endif
 
                if (sizeof(default_environment) > ENV_SIZE)

diff --git a/common/main.c b/common/main.c
index a00ebc194c576460908e0d4680e8f807de4ab3fb..000686d85a9a833a8521d896c1bef294f7fd642a 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -44,6 +44,12 @@
 DECLARE_GLOBAL_DATA_PTR;
 #endif
 
 DECLARE_GLOBAL_DATA_PTR;
 #endif
 

+/*
+ * Board-specific Platform code can reimplement show_boot_progress () if needed
+ */
+void inline __show_boot_progress (int val) {}
+void inline show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
+

 #if defined(CONFIG_BOOT_RETRY_TIME) && defined(CONFIG_RESET_TO_RETRY)
 extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);              /* for do_reset() prototype */
 #endif
 #if defined(CONFIG_BOOT_RETRY_TIME) && defined(CONFIG_RESET_TO_RETRY)
 extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);              /* for do_reset() prototype */
 #endif

diff --git a/drivers/nand_legacy/nand_legacy.c b/drivers/nand_legacy/nand_legacy.c
index 458046d41c371ccb94167861b049d64bb76cc086..753f5412953c1635b9be192556023f0745b230ac 100644 (file)
--- a/drivers/nand_legacy/nand_legacy.c
+++ b/drivers/nand_legacy/nand_legacy.c
@@ -15,13 +15,6 @@
 #include <asm/io.h>
 #include <watchdog.h>
 
 #include <asm/io.h>
 #include <watchdog.h>
 

-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-# include <status_led.h>
-# define SHOW_BOOT_PROGRESS(arg)       show_boot_progress(arg)
-#else
-# define SHOW_BOOT_PROGRESS(arg)
-#endif
-

 #if (CONFIG_COMMANDS & CFG_CMD_NAND) && defined(CFG_NAND_LEGACY)
 
 #include <linux/mtd/nand_legacy.h>
 #if (CONFIG_COMMANDS & CFG_CMD_NAND) && defined(CFG_NAND_LEGACY)
 
 #include <linux/mtd/nand_legacy.h>

diff --git a/include/common.h b/include/common.h
index d8b6b469e5f6cd57e2b5c40f7368730be2941ef8..23f93907ee41f94b2be84d456fc2d150f007803b 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -626,9 +626,13 @@ int        fgetc(int file);
 
 int    pcmcia_init (void);
 
 
 int    pcmcia_init (void);
 

-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-void   show_boot_progress (int status);
+#ifdef CONFIG_STATUS_LED
+# include <status_led.h>

 #endif
 #endif

+/*
+ * Board-specific Platform code can reimplement show_boot_progress () if needed
+ */
+void inline show_boot_progress (int val);

 
 #ifdef CONFIG_INIT_CRITICAL
 #error CONFIG_INIT_CRITICAL is deprecated!
 
 #ifdef CONFIG_INIT_CRITICAL
 #error CONFIG_INIT_CRITICAL is deprecated!

diff --git a/lib_arm/armlinux.c b/lib_arm/armlinux.c
index 56b7fca83331ec84e68c2af5a4868ebe7a539cd7..6d32a411fdee5acf4e78f085a3987f19c8d770eb 100644 (file)
--- a/lib_arm/armlinux.c
+++ b/lib_arm/armlinux.c
@@ -66,13 +66,6 @@ static void setup_videolfb_tag (gd_t *gd);
 static struct tag *params;
 #endif /* CONFIG_SETUP_MEMORY_TAGS || CONFIG_CMDLINE_TAG || CONFIG_INITRD_TAG */
 
 static struct tag *params;
 #endif /* CONFIG_SETUP_MEMORY_TAGS || CONFIG_CMDLINE_TAG || CONFIG_INITRD_TAG */
 

-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-# include <status_led.h>
-# define SHOW_BOOT_PROGRESS(arg)       show_boot_progress(arg)
-#else
-# define SHOW_BOOT_PROGRESS(arg)
-#endif
-

 extern image_header_t header;  /* from cmd_bootm.c */
 
 
 extern image_header_t header;  /* from cmd_bootm.c */
 
 


@@ -96,7 +89,7 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
         * Check if there is an initrd image
         */
        if (argc >= 3) {
         * Check if there is an initrd image
         */
        if (argc >= 3) {

-               SHOW_BOOT_PROGRESS (9);
+               show_boot_progress (9);

 
                addr = simple_strtoul (argv[2], NULL, 16);
 
 
                addr = simple_strtoul (argv[2], NULL, 16);
 


@@ -114,7 +107,7 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
 
                if (ntohl (hdr->ih_magic) != IH_MAGIC) {
                        printf ("Bad Magic Number\n");
 
                if (ntohl (hdr->ih_magic) != IH_MAGIC) {
                        printf ("Bad Magic Number\n");

-                       SHOW_BOOT_PROGRESS (-10);
+                       show_boot_progress (-10);

                        do_reset (cmdtp, flag, argc, argv);
                }
 
                        do_reset (cmdtp, flag, argc, argv);
                }
 


@@ -126,11 +119,11 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
 
                if (crc32 (0, (unsigned char *) data, len) != checksum) {
                        printf ("Bad Header Checksum\n");
 
                if (crc32 (0, (unsigned char *) data, len) != checksum) {
                        printf ("Bad Header Checksum\n");

-                       SHOW_BOOT_PROGRESS (-11);
+                       show_boot_progress (-11);

                        do_reset (cmdtp, flag, argc, argv);
                }
 
                        do_reset (cmdtp, flag, argc, argv);
                }
 

-               SHOW_BOOT_PROGRESS (10);
+               show_boot_progress (10);

 
                print_image_hdr (hdr);
 
 
                print_image_hdr (hdr);
 


@@ -151,19 +144,19 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
                        csum = crc32 (0, (unsigned char *) data, len);
                        if (csum != ntohl (hdr->ih_dcrc)) {
                                printf ("Bad Data CRC\n");
                        csum = crc32 (0, (unsigned char *) data, len);
                        if (csum != ntohl (hdr->ih_dcrc)) {
                                printf ("Bad Data CRC\n");

-                               SHOW_BOOT_PROGRESS (-12);
+                               show_boot_progress (-12);

                                do_reset (cmdtp, flag, argc, argv);
                        }
                        printf ("OK\n");
                }
 
                                do_reset (cmdtp, flag, argc, argv);
                        }
                        printf ("OK\n");
                }
 

-               SHOW_BOOT_PROGRESS (11);
+               show_boot_progress (11);

 
                if ((hdr->ih_os != IH_OS_LINUX) ||
                    (hdr->ih_arch != IH_CPU_ARM) ||
                    (hdr->ih_type != IH_TYPE_RAMDISK)) {
                        printf ("No Linux ARM Ramdisk Image\n");
 
                if ((hdr->ih_os != IH_OS_LINUX) ||
                    (hdr->ih_arch != IH_CPU_ARM) ||
                    (hdr->ih_type != IH_TYPE_RAMDISK)) {
                        printf ("No Linux ARM Ramdisk Image\n");

-                       SHOW_BOOT_PROGRESS (-13);
+                       show_boot_progress (-13);

                        do_reset (cmdtp, flag, argc, argv);
                }
 
                        do_reset (cmdtp, flag, argc, argv);
                }
 


@@ -182,7 +175,7 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
                ulong tail = ntohl (len_ptr[0]) % 4;
                int i;
 
                ulong tail = ntohl (len_ptr[0]) % 4;
                int i;
 

-               SHOW_BOOT_PROGRESS (13);
+               show_boot_progress (13);

 
                /* skip kernel length and terminator */
                data = (ulong) (&len_ptr[2]);
 
                /* skip kernel length and terminator */
                data = (ulong) (&len_ptr[2]);


@@ -201,7 +194,7 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
                /*
                 * no initrd image
                 */
                /*
                 * no initrd image
                 */

-               SHOW_BOOT_PROGRESS (14);
+               show_boot_progress (14);

 
                len = data = 0;
        }
 
                len = data = 0;
        }


@@ -220,7 +213,7 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
                initrd_end = 0;
        }
 
                initrd_end = 0;
        }
 

-       SHOW_BOOT_PROGRESS (15);
+       show_boot_progress (15);

 
        debug ("## Transferring control to Linux (at address %08lx) ...\n",
               (ulong) theKernel);
 
        debug ("## Transferring control to Linux (at address %08lx) ...\n",
               (ulong) theKernel);

diff --git a/lib_avr32/avr32_linux.c b/lib_avr32/avr32_linux.c
index 6095e2ff214aac67e4741e5a36ee531e2190d157..62afbd24974b1a7129d2c66458993d902f2e2f3b 100644 (file)
--- a/lib_avr32/avr32_linux.c
+++ b/lib_avr32/avr32_linux.c
@@ -36,13 +36,6 @@ extern int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 /* CPU-specific hook to allow flushing of caches, etc. */
 extern void prepare_to_boot(void);
 
 /* CPU-specific hook to allow flushing of caches, etc. */
 extern void prepare_to_boot(void);
 

-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-# include <status_led.h>
-# define SHOW_BOOT_PROGRESS(arg) show_boot_progress(arg)
-#else
-# define SHOW_BOOT_PROGRESS(arg)
-#endif
-

 extern image_header_t header;          /* from cmd_bootm.c */
 
 static struct tag *setup_start_tag(struct tag *params)
 extern image_header_t header;          /* from cmd_bootm.c */
 
 static struct tag *setup_start_tag(struct tag *params)


@@ -204,7 +197,7 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
         * Check if there is an initrd image
         */
        if (argc >= 3) {
         * Check if there is an initrd image
         */
        if (argc >= 3) {

-               SHOW_BOOT_PROGRESS(9);
+               show_boot_progress (9);

 
                addr = simple_strtoul(argv[2], NULL, 16);
 
 
                addr = simple_strtoul(argv[2], NULL, 16);
 


@@ -215,7 +208,7 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
 
                if (ntohl(hdr->ih_magic) != IH_MAGIC) {
                        puts("Bad Magic Number\n");
 
                if (ntohl(hdr->ih_magic) != IH_MAGIC) {
                        puts("Bad Magic Number\n");

-                       SHOW_BOOT_PROGRESS(-10);
+                       show_boot_progress (-10);

                        do_reset(cmdtp, flag, argc, argv);
                }
 
                        do_reset(cmdtp, flag, argc, argv);
                }
 


@@ -226,11 +219,11 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
 
                if (crc32(0, (unsigned char *)data, len) != checksum) {
                        puts("Bad Header Checksum\n");
 
                if (crc32(0, (unsigned char *)data, len) != checksum) {
                        puts("Bad Header Checksum\n");

-                       SHOW_BOOT_PROGRESS(-11);
+                       show_boot_progress (-11);

                        do_reset(cmdtp, flag, argc, argv);
                }
 
                        do_reset(cmdtp, flag, argc, argv);
                }
 

-               SHOW_BOOT_PROGRESS(10);
+               show_boot_progress (10);

 
                print_image_hdr(hdr);
 
 
                print_image_hdr(hdr);
 


@@ -244,26 +237,26 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
                        csum = crc32(0, (unsigned char *)data, len);
                        if (csum != ntohl(hdr->ih_dcrc)) {
                                puts("Bad Data CRC\n");
                        csum = crc32(0, (unsigned char *)data, len);
                        if (csum != ntohl(hdr->ih_dcrc)) {
                                puts("Bad Data CRC\n");

-                               SHOW_BOOT_PROGRESS(-12);
+                               show_boot_progress (-12);

                                do_reset(cmdtp, flag, argc, argv);
                        }
                        puts("OK\n");
                }
 
                                do_reset(cmdtp, flag, argc, argv);
                        }
                        puts("OK\n");
                }
 

-               SHOW_BOOT_PROGRESS(11);
+               show_boot_progress (11);

 
                if ((hdr->ih_os != IH_OS_LINUX) ||
                    (hdr->ih_arch != IH_CPU_AVR32) ||
                    (hdr->ih_type != IH_TYPE_RAMDISK)) {
                        puts("Not a Linux/AVR32 RAMDISK image\n");
 
                if ((hdr->ih_os != IH_OS_LINUX) ||
                    (hdr->ih_arch != IH_CPU_AVR32) ||
                    (hdr->ih_type != IH_TYPE_RAMDISK)) {
                        puts("Not a Linux/AVR32 RAMDISK image\n");

-                       SHOW_BOOT_PROGRESS(-13);
+                       show_boot_progress (-13);

                        do_reset(cmdtp, flag, argc, argv);
                }
        } else if ((hdr->ih_type == IH_TYPE_MULTI) && (len_ptr[1])) {
                ulong tail = ntohl (len_ptr[0]) % 4;
                int i;
 
                        do_reset(cmdtp, flag, argc, argv);
                }
        } else if ((hdr->ih_type == IH_TYPE_MULTI) && (len_ptr[1])) {
                ulong tail = ntohl (len_ptr[0]) % 4;
                int i;
 

-               SHOW_BOOT_PROGRESS (13);
+               show_boot_progress (13);

 
                /* skip kernel length and terminator */
                data = (ulong) (&len_ptr[2]);
 
                /* skip kernel length and terminator */
                data = (ulong) (&len_ptr[2]);


@@ -279,7 +272,7 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
                len = ntohl (len_ptr[1]);
        } else {
                /* no initrd image */
                len = ntohl (len_ptr[1]);
        } else {
                /* no initrd image */

-               SHOW_BOOT_PROGRESS(14);
+               show_boot_progress (14);

                len = data = 0;
        }
 
                len = data = 0;
        }
 


@@ -291,7 +284,7 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
                initrd_end = 0;
        }
 
                initrd_end = 0;
        }
 

-       SHOW_BOOT_PROGRESS(15);
+       show_boot_progress (15);

 
        params = params_start = (struct tag *)gd->bd->bi_boot_params;
        params = setup_start_tag(params);
 
        params = params_start = (struct tag *)gd->bd->bi_boot_params;
        params = setup_start_tag(params);

diff --git a/lib_blackfin/bf533_linux.c b/lib_blackfin/bf533_linux.c
index 3b9c4df9883ac1805387bd6fd1d98ef69a955cc2..80a3dc7d6e1f58a1a5abb2ac282744d78bd241d2 100644 (file)
--- a/lib_blackfin/bf533_linux.c
+++ b/lib_blackfin/bf533_linux.c
@@ -36,13 +36,6 @@
 #define        LINUX_MAX_ENVS          256
 #define        LINUX_MAX_ARGS          256
 
 #define        LINUX_MAX_ENVS          256
 #define        LINUX_MAX_ARGS          256
 

-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-#include <status_led.h>
-#define SHOW_BOOT_PROGRESS(arg)        show_boot_progress(arg)
-#else
-#define SHOW_BOOT_PROGRESS(arg)
-#endif
-

 #define CMD_LINE_ADDR 0xFF900000       /* L1 scratchpad */
 
 #ifdef SHARED_RESOURCES
 #define CMD_LINE_ADDR 0xFF900000       /* L1 scratchpad */
 
 #ifdef SHARED_RESOURCES

diff --git a/lib_blackfin/post.c b/lib_blackfin/post.c
index 0e76026adf10d7df0a72cc9b288368259fc4bd57..7c9478def5cb76903c70d5da95a2e05e001dfcfc 100644 (file)
--- a/lib_blackfin/post.c
+++ b/lib_blackfin/post.c
@@ -132,9 +132,7 @@ void post_output_backlog(void)
                                post_log("PASSED\n");
                        else {
                                post_log("FAILED\n");
                                post_log("PASSED\n");
                        else {
                                post_log("FAILED\n");

-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-                               show_boot_progress(-31);
-#endif
+                               show_boot_progress (-31);

                        }
                }
        }
                        }
                }
        }


@@ -245,9 +243,7 @@ static int post_run_single(struct post_test *test,
                } else {
                        if ((*test->test) (flags) != 0) {
                                post_log("FAILED\n");
                } else {
                        if ((*test->test) (flags) != 0) {
                                post_log("FAILED\n");

-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-                               show_boot_progress(-32);
-#endif
+                               show_boot_progress (-32);

                        } else
                                post_log("PASSED\n");
                }
                        } else
                                post_log("PASSED\n");
                }

diff --git a/lib_m68k/m68k_linux.c b/lib_m68k/m68k_linux.c
index f87f56ea8f2ef9b96ec7581a2b042a8330253cd8..6c194f80aa770b7d6654f7751e831f062bfcce4a 100644 (file)
--- a/lib_m68k/m68k_linux.c
+++ b/lib_m68k/m68k_linux.c
@@ -34,13 +34,6 @@ DECLARE_GLOBAL_DATA_PTR;
 #define LINUX_MAX_ENVS         256
 #define LINUX_MAX_ARGS         256
 
 #define LINUX_MAX_ENVS         256
 #define LINUX_MAX_ARGS         256
 

-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-# include <status_led.h>
-# define SHOW_BOOT_PROGRESS(arg)       show_boot_progress(arg)
-#else
-# define SHOW_BOOT_PROGRESS(arg)
-#endif
-

 extern image_header_t header;  /* from cmd_bootm.c */
 
 extern int do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]);
 extern image_header_t header;  /* from cmd_bootm.c */
 
 extern int do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]);


@@ -73,7 +66,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
         * Check if there is an initrd image
         */
        if (argc >= 3) {
         * Check if there is an initrd image
         */
        if (argc >= 3) {

-               SHOW_BOOT_PROGRESS (9);
+               show_boot_progress (9);

 
                addr = simple_strtoul (argv[2], NULL, 16);
 
 
                addr = simple_strtoul (argv[2], NULL, 16);
 


@@ -84,7 +77,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
 
                if (ntohl (hdr->ih_magic) != IH_MAGIC) {
                        printf ("Bad Magic Number\n");
 
                if (ntohl (hdr->ih_magic) != IH_MAGIC) {
                        printf ("Bad Magic Number\n");

-                       SHOW_BOOT_PROGRESS (-10);
+                       show_boot_progress (-10);

                        do_reset (cmdtp, flag, argc, argv);
                }
 
                        do_reset (cmdtp, flag, argc, argv);
                }
 


@@ -96,11 +89,11 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
 
                if (crc32 (0, (char *) data, len) != checksum) {
                        printf ("Bad Header Checksum\n");
 
                if (crc32 (0, (char *) data, len) != checksum) {
                        printf ("Bad Header Checksum\n");

-                       SHOW_BOOT_PROGRESS (-11);
+                       show_boot_progress (-11);

                        do_reset (cmdtp, flag, argc, argv);
                }
 
                        do_reset (cmdtp, flag, argc, argv);
                }
 

-               SHOW_BOOT_PROGRESS (10);
+               show_boot_progress (10);

 
                print_image_hdr (hdr);
 
 
                print_image_hdr (hdr);
 


@@ -114,19 +107,19 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
                        csum = crc32 (0, (char *) data, len);
                        if (csum != ntohl (hdr->ih_dcrc)) {
                                printf ("Bad Data CRC\n");
                        csum = crc32 (0, (char *) data, len);
                        if (csum != ntohl (hdr->ih_dcrc)) {
                                printf ("Bad Data CRC\n");

-                               SHOW_BOOT_PROGRESS (-12);
+                               show_boot_progress (-12);

                                do_reset (cmdtp, flag, argc, argv);
                        }
                        printf ("OK\n");
                }
 
                                do_reset (cmdtp, flag, argc, argv);
                        }
                        printf ("OK\n");
                }
 

-               SHOW_BOOT_PROGRESS (11);
+               show_boot_progress (11);

 
                if ((hdr->ih_os != IH_OS_LINUX) ||
                    (hdr->ih_arch != IH_CPU_M68K) ||
                    (hdr->ih_type != IH_TYPE_RAMDISK)) {
                        printf ("No Linux M68K Ramdisk Image\n");
 
                if ((hdr->ih_os != IH_OS_LINUX) ||
                    (hdr->ih_arch != IH_CPU_M68K) ||
                    (hdr->ih_type != IH_TYPE_RAMDISK)) {
                        printf ("No Linux M68K Ramdisk Image\n");

-                       SHOW_BOOT_PROGRESS (-13);
+                       show_boot_progress (-13);

                        do_reset (cmdtp, flag, argc, argv);
                }
 
                        do_reset (cmdtp, flag, argc, argv);
                }
 


@@ -137,7 +130,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
                ulong tail = ntohl (len_ptr[0]) % 4;
                int i;
 
                ulong tail = ntohl (len_ptr[0]) % 4;
                int i;
 

-               SHOW_BOOT_PROGRESS (13);
+               show_boot_progress (13);

 
                /* skip kernel length and terminator */
                data = (ulong) (&len_ptr[2]);
 
                /* skip kernel length and terminator */
                data = (ulong) (&len_ptr[2]);


@@ -156,7 +149,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
                /*
                 * no initrd image
                 */
                /*
                 * no initrd image
                 */

-               SHOW_BOOT_PROGRESS (14);
+               show_boot_progress (14);

 
                data = 0;
        }
 
                data = 0;
        }


@@ -175,7 +168,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
                initrd_end = 0;
        }
 
                initrd_end = 0;
        }
 

-       SHOW_BOOT_PROGRESS (15);
+       show_boot_progress (15);

 
 #ifdef DEBUG
        printf ("## Transferring control to Linux (at address %08lx) ...\n",
 
 #ifdef DEBUG
        printf ("## Transferring control to Linux (at address %08lx) ...\n",

diff --git a/lib_microblaze/microblaze_linux.c b/lib_microblaze/microblaze_linux.c
index 2c7885c1f11ba1e8cc943317f7b9c7013b72c870..68b58d4be89d71884231df5feef926a81d1376bd 100644 (file)
--- a/lib_microblaze/microblaze_linux.c
+++ b/lib_microblaze/microblaze_linux.c
@@ -32,13 +32,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
 
 DECLARE_GLOBAL_DATA_PTR;
 

-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-# include <status_led.h>
-# define SHOW_BOOT_PROGRESS(arg)        show_boot_progress(arg)
-#else
-# define SHOW_BOOT_PROGRESS(arg)
-#endif
-

 extern image_header_t header;  /* from cmd_bootm.c */
 /*cmd_boot.c*/
 extern int do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]);
 extern image_header_t header;  /* from cmd_bootm.c */
 /*cmd_boot.c*/
 extern int do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]);


@@ -59,7 +52,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
 
        /* Check if there is an initrd image */
        if (argc >= 3) {
 
        /* Check if there is an initrd image */
        if (argc >= 3) {

-               SHOW_BOOT_PROGRESS (9);
+               show_boot_progress (9);

 
                addr = simple_strtoul (argv[2], NULL, 16);
 
 
                addr = simple_strtoul (argv[2], NULL, 16);
 


@@ -70,7 +63,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
 
                if (ntohl (hdr->ih_magic) != IH_MAGIC) {
                        printf ("Bad Magic Number\n");
 
                if (ntohl (hdr->ih_magic) != IH_MAGIC) {
                        printf ("Bad Magic Number\n");

-                       SHOW_BOOT_PROGRESS (-10);
+                       show_boot_progress (-10);

                        do_reset (cmdtp, flag, argc, argv);
                }
 
                        do_reset (cmdtp, flag, argc, argv);
                }
 


@@ -82,11 +75,11 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
 
                if (crc32 (0, (char *)data, len) != checksum) {
                        printf ("Bad Header Checksum\n");
 
                if (crc32 (0, (char *)data, len) != checksum) {
                        printf ("Bad Header Checksum\n");

-                       SHOW_BOOT_PROGRESS (-11);
+                       show_boot_progress (-11);

                        do_reset (cmdtp, flag, argc, argv);
                }
 
                        do_reset (cmdtp, flag, argc, argv);
                }
 

-               SHOW_BOOT_PROGRESS (10);
+               show_boot_progress (10);

 
                print_image_hdr (hdr);
 
 
                print_image_hdr (hdr);
 


@@ -100,19 +93,19 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
                        csum = crc32 (0, (char *)data, len);
                        if (csum != ntohl (hdr->ih_dcrc)) {
                                printf ("Bad Data CRC\n");
                        csum = crc32 (0, (char *)data, len);
                        if (csum != ntohl (hdr->ih_dcrc)) {
                                printf ("Bad Data CRC\n");

-                               SHOW_BOOT_PROGRESS (-12);
+                               show_boot_progress (-12);

                                do_reset (cmdtp, flag, argc, argv);
                        }
                        printf ("OK\n");
                }
 
                                do_reset (cmdtp, flag, argc, argv);
                        }
                        printf ("OK\n");
                }
 

-               SHOW_BOOT_PROGRESS (11);
+               show_boot_progress (11);

 
                if ((hdr->ih_os != IH_OS_LINUX) ||
                    (hdr->ih_arch != IH_CPU_MICROBLAZE) ||
                    (hdr->ih_type != IH_TYPE_RAMDISK)) {
                        printf ("No Linux Microblaze Ramdisk Image\n");
 
                if ((hdr->ih_os != IH_OS_LINUX) ||
                    (hdr->ih_arch != IH_CPU_MICROBLAZE) ||
                    (hdr->ih_type != IH_TYPE_RAMDISK)) {
                        printf ("No Linux Microblaze Ramdisk Image\n");

-                       SHOW_BOOT_PROGRESS (-13);
+                       show_boot_progress (-13);

                        do_reset (cmdtp, flag, argc, argv);
                }
 
                        do_reset (cmdtp, flag, argc, argv);
                }
 


@@ -122,7 +115,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
        } else if ((hdr->ih_type == IH_TYPE_MULTI) && (len_ptr[1])) {
                ulong tail = ntohl (len_ptr[0]) % 4;
 
        } else if ((hdr->ih_type == IH_TYPE_MULTI) && (len_ptr[1])) {
                ulong tail = ntohl (len_ptr[0]) % 4;
 

-               SHOW_BOOT_PROGRESS (13);
+               show_boot_progress (13);

 
                /* skip kernel length and terminator */
                data = (ulong) (&len_ptr[2]);
 
                /* skip kernel length and terminator */
                data = (ulong) (&len_ptr[2]);


@@ -141,7 +134,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
                /*
                 * no initrd image
                 */
                /*
                 * no initrd image
                 */

-               SHOW_BOOT_PROGRESS (14);
+               show_boot_progress (14);

 
                data = 0;
        }
 
                data = 0;
        }


@@ -160,7 +153,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
                initrd_end = 0;
        }
 
                initrd_end = 0;
        }
 

-       SHOW_BOOT_PROGRESS (15);
+       show_boot_progress (15);

 
 #ifdef DEBUG
        printf ("## Transferring control to Linux (at address %08lx) ...\n",
 
 #ifdef DEBUG
        printf ("## Transferring control to Linux (at address %08lx) ...\n",

diff --git a/lib_mips/mips_linux.c b/lib_mips/mips_linux.c
index 952d5a90ee9635650697ca594293f83354c6a0be..556b1804e04020d6fdd28d487269af18f1e876db 100644 (file)
--- a/lib_mips/mips_linux.c
+++ b/lib_mips/mips_linux.c
@@ -33,13 +33,6 @@ DECLARE_GLOBAL_DATA_PTR;
 #define        LINUX_MAX_ENVS          256
 #define        LINUX_MAX_ARGS          256
 
 #define        LINUX_MAX_ENVS          256
 #define        LINUX_MAX_ARGS          256
 

-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-# include <status_led.h>
-# define SHOW_BOOT_PROGRESS(arg)       show_boot_progress(arg)
-#else
-# define SHOW_BOOT_PROGRESS(arg)
-#endif
-

 extern image_header_t header;           /* from cmd_bootm.c */
 
 extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 extern image_header_t header;           /* from cmd_bootm.c */
 
 extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);


@@ -73,7 +66,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
         * Check if there is an initrd image
         */
        if (argc >= 3) {
         * Check if there is an initrd image
         */
        if (argc >= 3) {

-               SHOW_BOOT_PROGRESS (9);
+               show_boot_progress (9);

 
                addr = simple_strtoul (argv[2], NULL, 16);
 
 
                addr = simple_strtoul (argv[2], NULL, 16);
 


@@ -84,7 +77,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
 
                if (ntohl (hdr->ih_magic) != IH_MAGIC) {
                        printf ("Bad Magic Number\n");
 
                if (ntohl (hdr->ih_magic) != IH_MAGIC) {
                        printf ("Bad Magic Number\n");

-                       SHOW_BOOT_PROGRESS (-10);
+                       show_boot_progress (-10);

                        do_reset (cmdtp, flag, argc, argv);
                }
 
                        do_reset (cmdtp, flag, argc, argv);
                }
 


@@ -96,11 +89,11 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
 
                if (crc32 (0, (uchar *) data, len) != checksum) {
                        printf ("Bad Header Checksum\n");
 
                if (crc32 (0, (uchar *) data, len) != checksum) {
                        printf ("Bad Header Checksum\n");

-                       SHOW_BOOT_PROGRESS (-11);
+                       show_boot_progress (-11);

                        do_reset (cmdtp, flag, argc, argv);
                }
 
                        do_reset (cmdtp, flag, argc, argv);
                }
 

-               SHOW_BOOT_PROGRESS (10);
+               show_boot_progress (10);

 
                print_image_hdr (hdr);
 
 
                print_image_hdr (hdr);
 


@@ -114,19 +107,19 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
                        csum = crc32 (0, (uchar *) data, len);
                        if (csum != ntohl (hdr->ih_dcrc)) {
                                printf ("Bad Data CRC\n");
                        csum = crc32 (0, (uchar *) data, len);
                        if (csum != ntohl (hdr->ih_dcrc)) {
                                printf ("Bad Data CRC\n");

-                               SHOW_BOOT_PROGRESS (-12);
+                               show_boot_progress (-12);

                                do_reset (cmdtp, flag, argc, argv);
                        }
                        printf ("OK\n");
                }
 
                                do_reset (cmdtp, flag, argc, argv);
                        }
                        printf ("OK\n");
                }
 

-               SHOW_BOOT_PROGRESS (11);
+               show_boot_progress (11);

 
                if ((hdr->ih_os != IH_OS_LINUX) ||
                    (hdr->ih_arch != IH_CPU_MIPS) ||
                    (hdr->ih_type != IH_TYPE_RAMDISK)) {
                        printf ("No Linux MIPS Ramdisk Image\n");
 
                if ((hdr->ih_os != IH_OS_LINUX) ||
                    (hdr->ih_arch != IH_CPU_MIPS) ||
                    (hdr->ih_type != IH_TYPE_RAMDISK)) {
                        printf ("No Linux MIPS Ramdisk Image\n");

-                       SHOW_BOOT_PROGRESS (-13);
+                       show_boot_progress (-13);

                        do_reset (cmdtp, flag, argc, argv);
                }
 
                        do_reset (cmdtp, flag, argc, argv);
                }
 


@@ -137,7 +130,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
                ulong tail = ntohl (len_ptr[0]) % 4;
                int i;
 
                ulong tail = ntohl (len_ptr[0]) % 4;
                int i;
 

-               SHOW_BOOT_PROGRESS (13);
+               show_boot_progress (13);

 
                /* skip kernel length and terminator */
                data = (ulong) (&len_ptr[2]);
 
                /* skip kernel length and terminator */
                data = (ulong) (&len_ptr[2]);


@@ -156,7 +149,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
                /*
                 * no initrd image
                 */
                /*
                 * no initrd image
                 */

-               SHOW_BOOT_PROGRESS (14);
+               show_boot_progress (14);

 
                data = 0;
        }
 
                data = 0;
        }


@@ -175,7 +168,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
                initrd_end = 0;
        }
 
                initrd_end = 0;
        }
 

-       SHOW_BOOT_PROGRESS (15);
+       show_boot_progress (15);

 
 #ifdef DEBUG
        printf ("## Transferring control to Linux (at address %08lx) ...\n",
 
 #ifdef DEBUG
        printf ("## Transferring control to Linux (at address %08lx) ...\n",

diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index f5d18fa9f6b16d1a08e882e33ad69c1108579633..3b1bfeab4a540ca84b3cc11535061bbdec2905c0 100644 (file)
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -1117,9 +1117,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 void hang (void)
 {
        puts ("### ERROR ### Please RESET the board ###\n");
 void hang (void)
 {
        puts ("### ERROR ### Please RESET the board ###\n");

-#ifdef CONFIG_SHOW_BOOT_PROGRESS

        show_boot_progress(-30);
        show_boot_progress(-30);

-#endif

        for (;;);
 }
 
        for (;;);
 }
 

diff --git a/net/eth.c b/net/eth.c
index 7414d70a0330521ba91ed69ec45c37da4d7690d3..9fb3a10edb8d4ef52deccb85da919fbe7516209b 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -28,14 +28,6 @@
 
 #if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI)
 
 
 #if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI)
 

-#if defined(CONFIG_SHOW_BOOT_PROGRESS)
-# include <status_led.h>
-extern void show_ethcfg_progress (int arg);
-# define SHOW_BOOT_PROGRESS(arg)       show_boot_progress (arg)
-#else
-# define SHOW_BOOT_PROGRESS(arg)
-#endif
-

 #ifdef CFG_GT_6426x
 extern int gt6426x_eth_initialize(bd_t *bis);
 #endif
 #ifdef CFG_GT_6426x
 extern int gt6426x_eth_initialize(bd_t *bis);
 #endif


@@ -150,7 +142,7 @@ int eth_initialize(bd_t *bis)
        eth_devices = NULL;
        eth_current = NULL;
 
        eth_devices = NULL;
        eth_current = NULL;
 

-       SHOW_BOOT_PROGRESS(64);
+       show_boot_progress (64);

 #if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII)
        miiphy_init();
 #endif
 #if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII)
        miiphy_init();
 #endif


@@ -256,12 +248,12 @@ int eth_initialize(bd_t *bis)
 
        if (!eth_devices) {
                puts ("No ethernet found.\n");
 
        if (!eth_devices) {
                puts ("No ethernet found.\n");

-               SHOW_BOOT_PROGRESS(-64);
+               show_boot_progress (-64);

        } else {
                struct eth_device *dev = eth_devices;
                char *ethprime = getenv ("ethprime");
 
        } else {
                struct eth_device *dev = eth_devices;
                char *ethprime = getenv ("ethprime");
 

-               SHOW_BOOT_PROGRESS(65);
+               show_boot_progress (65);

                do {
                        if (eth_number)
                                puts (", ");
                do {
                        if (eth_number)
                                puts (", ");

diff --git a/post/post.c b/post/post.c
index 28435cc4af8dc15fa15d9754310c653dd885e0c3..4ff75ee4b12abe44157e4d807516e63c12d2b5c9 100644 (file)
--- a/post/post.c
+++ b/post/post.c
@@ -129,9 +129,7 @@ void post_output_backlog ( void )
                                post_log ("PASSED\n");
                        else {
                                post_log ("FAILED\n");
                                post_log ("PASSED\n");
                        else {
                                post_log ("FAILED\n");

-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-                               show_boot_progress(-31);
-#endif
+                               show_boot_progress (-31);

                        }
                }
        }
                        }
                }
        }


@@ -241,9 +239,7 @@ static int post_run_single (struct post_test *test,
                } else {
                if ((*test->test) (flags) != 0) {
                        post_log ("FAILED\n");
                } else {
                if ((*test->test) (flags) != 0) {
                        post_log ("FAILED\n");

-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-                       show_boot_progress(-32);
-#endif
+                       show_boot_progress (-32);

                }
                else
                        post_log ("PASSED\n");
                }
                else
                        post_log ("PASSED\n");