[PATCH] ARM: remove unused struct param_struct and related info.

[PATCH] ARM: remove unused struct param_struct and related info.

[Krzysztof Halasa]

Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>

diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h
index 89df4dc..6ce35fb 100644
--- a/arch/arm/include/asm/setup.h
+++ b/arch/arm/include/asm/setup.h
@@ -1,6 +1,4 @@
 /*
- *  linux/include/asm/setup.h
- *
  *  Copyright (C) 1997-1999 Russell King
  *
  * This program is free software; you can redistribute it and/or modify
@@ -10,13 +8,6 @@
  *  Structure passed to kernel to tell it about the
  *  hardware it's running on.  See linux/Documentation/arm/Setup
  *  for more info.
- *
- * NOTE:
- *  This file contains two ways to pass information from the boot
- *  loader to the kernel. The old struct param_struct is deprecated,
- *  but it will be kept in the kernel for 5 years from now
- *  (2001). This will allow boot loaders to convert to the new struct
- *  tag way.
  */
 #ifndef __ASMARM_SETUP_H
 #define __ASMARM_SETUP_H
@@ -32,50 +23,6 @@
  */
 #define COMMAND_LINE_SIZE 1024
 
-/* This is the old deprecated way to pass parameters to the kernel */
-struct param_struct {
-    union {
-	struct {
-	    unsigned long page_size;		/*  0 */
-	    unsigned long nr_pages;		/*  4 */
-	    unsigned long ramdisk_size;		/*  8 */
-	    unsigned long flags;		/* 12 */
-#define FLAG_READONLY	1
-#define FLAG_RDLOAD	4
-#define FLAG_RDPROMPT	8
-	    unsigned long rootdev;		/* 16 */
-	    unsigned long video_num_cols;	/* 20 */
-	    unsigned long video_num_rows;	/* 24 */
-	    unsigned long video_x;		/* 28 */
-	    unsigned long video_y;		/* 32 */
-	    unsigned long memc_control_reg;	/* 36 */
-	    unsigned char sounddefault;		/* 40 */
-	    unsigned char adfsdrives;		/* 41 */
-	    unsigned char bytes_per_char_h;	/* 42 */
-	    unsigned char bytes_per_char_v;	/* 43 */
-	    unsigned long pages_in_bank[4];	/* 44 */
-	    unsigned long pages_in_vram;	/* 60 */
-	    unsigned long initrd_start;		/* 64 */
-	    unsigned long initrd_size;		/* 68 */
-	    unsigned long rd_start;		/* 72 */
-	    unsigned long system_rev;		/* 76 */
-	    unsigned long system_serial_low;	/* 80 */
-	    unsigned long system_serial_high;	/* 84 */
-	    unsigned long mem_fclk_21285;       /* 88 */
-	} s;
-	char unused[256];
-    } u1;
-    union {
-	char paths[8][128];
-	struct {
-	    unsigned long magic;
-	    char n[1024 - sizeof(unsigned long)];
-	} s;
-    } u2;
-    char commandline[COMMAND_LINE_SIZE];
-};
-
-
 /*
  * The new way of passing information: a list of tagged entries
  */

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] ARM: remove unused struct param_struct and related info.

[Sascha Hauer]

On Sat, May 05, 2012 at 11:35:56PM +0200, Krzysztof Halasa wrote:
> Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>

Applied, thanks.

Sascha

> 
> diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h
> index 89df4dc..6ce35fb 100644
> --- a/arch/arm/include/asm/setup.h
> +++ b/arch/arm/include/asm/setup.h
> @@ -1,6 +1,4 @@
>  /*
> - *  linux/include/asm/setup.h
> - *
>   *  Copyright (C) 1997-1999 Russell King
>   *
>   * This program is free software; you can redistribute it and/or modify
> @@ -10,13 +8,6 @@
>   *  Structure passed to kernel to tell it about the
>   *  hardware it's running on.  See linux/Documentation/arm/Setup
>   *  for more info.
> - *
> - * NOTE:
> - *  This file contains two ways to pass information from the boot
> - *  loader to the kernel. The old struct param_struct is deprecated,
> - *  but it will be kept in the kernel for 5 years from now
> - *  (2001). This will allow boot loaders to convert to the new struct
> - *  tag way.
>   */
>  #ifndef __ASMARM_SETUP_H
>  #define __ASMARM_SETUP_H
> @@ -32,50 +23,6 @@
>   */
>  #define COMMAND_LINE_SIZE 1024
>  
> -/* This is the old deprecated way to pass parameters to the kernel */
> -struct param_struct {
> -    union {
> -	struct {
> -	    unsigned long page_size;		/*  0 */
> -	    unsigned long nr_pages;		/*  4 */
> -	    unsigned long ramdisk_size;		/*  8 */
> -	    unsigned long flags;		/* 12 */
> -#define FLAG_READONLY	1
> -#define FLAG_RDLOAD	4
> -#define FLAG_RDPROMPT	8
> -	    unsigned long rootdev;		/* 16 */
> -	    unsigned long video_num_cols;	/* 20 */
> -	    unsigned long video_num_rows;	/* 24 */
> -	    unsigned long video_x;		/* 28 */
> -	    unsigned long video_y;		/* 32 */
> -	    unsigned long memc_control_reg;	/* 36 */
> -	    unsigned char sounddefault;		/* 40 */
> -	    unsigned char adfsdrives;		/* 41 */
> -	    unsigned char bytes_per_char_h;	/* 42 */
> -	    unsigned char bytes_per_char_v;	/* 43 */
> -	    unsigned long pages_in_bank[4];	/* 44 */
> -	    unsigned long pages_in_vram;	/* 60 */
> -	    unsigned long initrd_start;		/* 64 */
> -	    unsigned long initrd_size;		/* 68 */
> -	    unsigned long rd_start;		/* 72 */
> -	    unsigned long system_rev;		/* 76 */
> -	    unsigned long system_serial_low;	/* 80 */
> -	    unsigned long system_serial_high;	/* 84 */
> -	    unsigned long mem_fclk_21285;       /* 88 */
> -	} s;
> -	char unused[256];
> -    } u1;
> -    union {
> -	char paths[8][128];
> -	struct {
> -	    unsigned long magic;
> -	    char n[1024 - sizeof(unsigned long)];
> -	} s;
> -    } u2;
> -    char commandline[COMMAND_LINE_SIZE];
> -};
> -
> -
>  /*
>   * The new way of passing information: a list of tagged entries
>   */
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox