Remove support for booting ARTOS images

Pantelis Antoniou stated:
	AFAIK, it is still used but the products using PPC are long gone.
	Nuke it plz (from orbit).

So remove it since it cleans up a usage of env_get_char outside of
the environment code.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/README b/README
index 2cdb2686497e78eb785eb74db55441cb8151c059..402ded303ca86b9b5b08c16d9f99415ef6cc7cb4 100644 (file)
--- a/README
+++ b/README
@@ -3030,8 +3030,8 @@ details; basically, the header defines the following image properties:
 
 * Target Operating System (Provisions for OpenBSD, NetBSD, FreeBSD,
   4.4BSD, Linux, SVR4, Esix, Solaris, Irix, SCO, Dell, NCR, VxWorks,
-  LynxOS, pSOS, QNX, RTEMS, ARTOS;
-  Currently supported: Linux, NetBSD, VxWorks, QNX, RTEMS, ARTOS, LynxOS).
+  LynxOS, pSOS, QNX, RTEMS;
+  Currently supported: Linux, NetBSD, VxWorks, QNX, RTEMS, LynxOS).
 * Target CPU Architecture (Provisions for Alpha, ARM, AVR32, Intel x86,
   IA64, MIPS, NIOS, PowerPC, IBM S390, SuperH, Sparc, Sparc 64 Bit;
   Currently supported: ARM, AVR32, Intel x86, MIPS, NIOS, PowerPC).

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 8dbab02b87eb30481590399f93d70d4fd37b020c..08a014f4484d3035835b937fd7200aa9e1e14140 100644 (file)
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -108,9 +108,6 @@ static boot_os_fn do_bootm_qnxelf;
 int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 int do_bootelf (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 #endif
-#if defined(CONFIG_ARTOS) && defined(CONFIG_PPC)
-static boot_os_fn do_bootm_artos;
-#endif
 
 ulong load_addr = CFG_LOAD_ADDR;       /* Default Load Address */
 static bootm_headers_t images;         /* pointers to os/initrd/fdt images */
@@ -455,11 +452,6 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
            break;
 #endif
 
-#ifdef CONFIG_ARTOS
-       case IH_OS_ARTOS:
-           do_bootm_artos (0, argc, argv, &images);
-           break;
-#endif
        }
 
        show_boot_progress (-9);
@@ -1152,94 +1144,3 @@ static int do_bootm_qnxelf(int flag, int argc, char *argv[],
        return 1;
 }
 #endif
-
-#if defined(CONFIG_ARTOS) && defined(CONFIG_PPC)
-static int do_bootm_artos (int flag, int argc, char *argv[],
-                          bootm_headers_t *images)
-{
-       ulong top;
-       char *s, *cmdline;
-       char **fwenv, **ss;
-       int i, j, nxt, len, envno, envsz;
-       bd_t *kbd;
-       void (*entry)(bd_t *bd, char *cmdline, char **fwenv, ulong top);
-
-#if defined(CONFIG_FIT)
-       if (!images->legacy_hdr_valid) {
-               fit_unsupported_reset ("ARTOS");
-               return 1;
-       }
-#endif
-
-       /*
-        * Booting an ARTOS kernel image + application
-        */
-
-       /* this used to be the top of memory, but was wrong... */
-#ifdef CONFIG_PPC
-       /* get stack pointer */
-       asm volatile ("mr %0,1" : "=r"(top) );
-#endif
-       debug ("## Current stack ends at 0x%08lX ", top);
-
-       top -= 2048;            /* just to be sure */
-       if (top > CFG_BOOTMAPSZ)
-               top = CFG_BOOTMAPSZ;
-       top &= ~0xF;
-
-       debug ("=> set upper limit to 0x%08lX\n", top);
-
-       /* first check the artos specific boot args, then the linux args*/
-       if ((s = getenv( "abootargs")) == NULL && (s = getenv ("bootargs")) == NULL)
-               s = "";
-
-       /* get length of cmdline, and place it */
-       len = strlen (s);
-       top = (top - (len + 1)) & ~0xF;
-       cmdline = (char *)top;
-       debug ("## cmdline at 0x%08lX ", top);
-       strcpy (cmdline, s);
-
-       /* copy bdinfo */
-       top = (top - sizeof (bd_t)) & ~0xF;
-       debug ("## bd at 0x%08lX ", top);
-       kbd = (bd_t *)top;
-       memcpy (kbd, gd->bd, sizeof (bd_t));
-
-       /* first find number of env entries, and their size */
-       envno = 0;
-       envsz = 0;
-       for (i = 0; env_get_char (i) != '\0'; i = nxt + 1) {
-               for (nxt = i; env_get_char (nxt) != '\0'; ++nxt)
-                       ;
-               envno++;
-               envsz += (nxt - i) + 1; /* plus trailing zero */
-       }
-       envno++;        /* plus the terminating zero */
-       debug ("## %u envvars total size %u ", envno, envsz);
-
-       top = (top - sizeof (char **) * envno) & ~0xF;
-       fwenv = (char **)top;
-       debug ("## fwenv at 0x%08lX ", top);
-
-       top = (top - envsz) & ~0xF;
-       s = (char *)top;
-       ss = fwenv;
-
-       /* now copy them */
-       for (i = 0; env_get_char (i) != '\0'; i = nxt + 1) {
-               for (nxt = i; env_get_char (nxt) != '\0'; ++nxt)
-                       ;
-               *ss++ = s;
-               for (j = i; j < nxt; ++j)
-                       *s++ = env_get_char (j);
-               *s++ = '\0';
-       }
-       *ss++ = NULL;   /* terminate */
-
-       entry = (void (*)(bd_t *, char *, char **, ulong))images->ep;
-       (*entry) (kbd, cmdline, fwenv, top);
-
-       return 1;
-}
-#endif

diff --git a/common/image.c b/common/image.c
index 94f01ad455d3d018770b13bb8345ab337dec5446..78efe2ebb73ddd4d69e19b4ce323d3ab9ccb3244 100644 (file)
--- a/common/image.c
+++ b/common/image.c
@@ -105,9 +105,6 @@ static table_entry_t uimage_arch[] = {
 
 static table_entry_t uimage_os[] = {
        {       IH_OS_INVALID,  NULL,           "Invalid OS",           },
-#if defined(CONFIG_ARTOS) || defined(USE_HOSTCC)
-       {       IH_OS_ARTOS,    "artos",        "ARTOS",                },
-#endif
        {       IH_OS_LINUX,    "linux",        "Linux",                },
 #if defined(CONFIG_LYNXKDI) || defined(USE_HOSTCC)
        {       IH_OS_LYNXOS,   "lynxos",       "LynxOS",               },

diff --git a/doc/uImage.FIT/source_file_format.txt b/doc/uImage.FIT/source_file_format.txt
index c1244fbadaeee9892b827de35171a1aabeffbf0c..1e30d22005aad0d3e32c3a1c7022478087e19ad2 100644 (file)
--- a/doc/uImage.FIT/source_file_format.txt
+++ b/doc/uImage.FIT/source_file_format.txt
@@ -169,7 +169,7 @@ the '/images' node should have the following layout:
   - os : OS name, mandatory for type="kernel", valid OS names are: "openbsd",
     "netbsd", "freebsd", "4_4bsd", "linux", "svr4", "esix", "solaris", "irix",
     "sco", "dell", "ncr", "lynxos", "vxworks", "psos", "qnx", "u_boot",
-    "rtems", "artos", "unity".
+    "rtems", "unity".
   - arch : Architecture name, mandatory for types: "standalone", "kernel",
     "firmware", "ramdisk" and "fdt". Valid architecture names are: "alpha",
     "arm", "i386", "ia64", "mips", "mips64", "ppc", "s390", "sh", "sparc",

diff --git a/include/configs/NETPHONE.h b/include/configs/NETPHONE.h
index 6c18b81691472720a7bccc59ee2f2fc2906d1a54..1494190bf978e2e70be146c1279e3d6f84dcaafc 100644 (file)
--- a/include/configs/NETPHONE.h
+++ b/include/configs/NETPHONE.h
@@ -487,8 +487,6 @@
 #define        BOOTFLAG_COLD   0x01            /* Normal Power-On: Boot from FLASH     */
 #define BOOTFLAG_WARM  0x02            /* Software reboot                      */
 
-#define CONFIG_ARTOS                   /* include ARTOS support */
-
 #define CONFIG_LAST_STAGE_INIT         /* needed to reset the damn phys */
 
 /****************************************************************/

diff --git a/include/configs/NETTA.h b/include/configs/NETTA.h
index 1f1bc540bb4a4516cfe0eab5eef049c2374acf20..64806342aeba200fdbd206a8af68eade093c30f0 100644 (file)
--- a/include/configs/NETTA.h
+++ b/include/configs/NETTA.h
@@ -496,8 +496,6 @@
 #define        BOOTFLAG_COLD   0x01            /* Normal Power-On: Boot from FLASH     */
 #define BOOTFLAG_WARM  0x02            /* Software reboot                      */
 
-#define CONFIG_ARTOS                   /* include ARTOS support */
-
 #define CONFIG_LAST_STAGE_INIT         /* needed to reset the damn phys */
 
 /***********************************************************************************************************

diff --git a/include/configs/NETTA2.h b/include/configs/NETTA2.h
index ea5d1604cc96e2416e79beda743903db1b770381..efa91e304a25bdfb750c37fe7e6087ceca5e6f0e 100644 (file)
--- a/include/configs/NETTA2.h
+++ b/include/configs/NETTA2.h
@@ -488,8 +488,6 @@
 #define        BOOTFLAG_COLD   0x01            /* Normal Power-On: Boot from FLASH     */
 #define BOOTFLAG_WARM  0x02            /* Software reboot                      */
 
-#define CONFIG_ARTOS                   /* include ARTOS support */
-
 #define CONFIG_LAST_STAGE_INIT         /* needed to reset the damn phys */
 
 /****************************************************************/

diff --git a/include/configs/NETVIA.h b/include/configs/NETVIA.h
index c029594187072395d85fe78e901e787e9e9c9f86..40e09fba62005523deb96d66bf6491409cedbc7f 100644 (file)
--- a/include/configs/NETVIA.h
+++ b/include/configs/NETVIA.h
@@ -357,8 +357,6 @@
 /* Ethernet at SCC2 */
 #define CONFIG_SCC2_ENET
 
-#define CONFIG_ARTOS                   /* include ARTOS support */
-
 /****************************************************************/
 
 #define DSP_SIZE       0x00010000      /* 64K */