Remove support for booting ARTOS images
PATCH 1/1 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 <[email protected]>
--- common/cmd_bootm.c | 99 -------------------------------------------- common/image.c | 3 - include/configs/NETPHONE.h | 2 - include/configs/NETTA.h | 2 - include/configs/NETTA2.h | 2 - include/configs/NETVIA.h | 2 - 6 files changed, 0 insertions(+), 110 deletions(-)
common/cmd_bootm.c +0 -99
@@ -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 */ - asmvolatile ("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
common/image.c +0 -3
@@ -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", },
include/configs/NETPHONE.h +0 -2
@@ -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 */ /****************************************************************/
include/configs/NETTA.h +0 -2
@@ -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 */ /***********************************************************************************************************
include/configs/NETTA2.h +0 -2
@@ -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 */ /****************************************************************/
include/configs/NETVIA.h +0 -2
@@ -357,8 +357,6 @@/* Ethernet at SCC2 */ #define CONFIG_SCC2_ENET -#define CONFIG_ARTOS /* include ARTOS support */ -/****************************************************************/ #define DSP_SIZE 0x00010000/* 64K */
Signature · 1 line
1.5.5.1
PATCH 1/1 Remove support for booting ARTOS images
Hello Kumar,
Quoted 8 lines · Kumar Gala
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_charoutside of the environment code.Signed-off-by Kumar Gala <[email protected]>
Quoted 8 lines
--- common/cmd_bootm.c | 99 -------------------------------------------- common/image.c | 3 - include/configs/NETPHONE.h | 2 - include/configs/NETTA.h | 2 - include/configs/NETTA2.h | 2 - include/configs/NETVIA.h | 2 - 6 files changed, 0 insertions(+), 110 deletions(-)
ARTOS references in the following 2 files could also be cleaned up:
./README./doc/uImage.FIT/source_file_format.txt
Peter