mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 21:21:41 +00:00
3b4497668f
When building with W=1:
CC arch/m68k/kernel/uboot.o
arch/m68k/kernel/uboot.c: In function ‘parse_uboot_commandline’:
arch/m68k/kernel/uboot.c:68:36: warning: variable ‘uboot_initrd_end’ set but not used [-Wunused-but-set-variable]
unsigned long uboot_initrd_start, uboot_initrd_end;
^~~~~~~~~~~~~~~~
arch/m68k/kernel/uboot.c:68:16: warning: variable ‘uboot_initrd_start’ set but not used [-Wunused-but-set-variable]
unsigned long uboot_initrd_start, uboot_initrd_end;
^~~~~~~~~~~~~~~~~~
arch/m68k/kernel/uboot.c:66:16: warning: variable ‘uboot_kbd’ set but not used [-Wunused-but-set-variable]
unsigned long uboot_kbd;
^~~~~~~~~
arch/m68k/kernel/uboot.c: At top level:
arch/m68k/kernel/uboot.c:90:13: warning: no previous prototype for ‘process_uboot_commandline’ [-Wmissing-prototypes]
__init void process_uboot_commandline(char *commandp, int size)
^~~~~~~~~~~~~~~~~~~~~~~~~
A couple of issues here. Firstly we already have a bootinfo.h that has a
prototype for process_uboot_commandline(), we should include that.
Secondly uboot_kbd is not used at all and can be removed. Thirdly the
conditional code based on CONFIG_BLK_DEV_INITRD means that sometimes
uboot_initrd_start and uboot_initrd_end are not needed. Make their
declaration and asignment conditional on CONFIG_BLK_DEV_INITRD same as
the code that uses them.
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
109 lines
2.7 KiB
C
109 lines
2.7 KiB
C
/*
|
|
* uboot.c -- uboot arguments support
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file COPYING in the main directory of this archive
|
|
* for more details.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/fb.h>
|
|
#include <linux/module.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/console.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/string.h>
|
|
#include <linux/memblock.h>
|
|
#include <linux/seq_file.h>
|
|
#include <linux/init.h>
|
|
#include <linux/initrd.h>
|
|
#include <linux/root_dev.h>
|
|
#include <linux/rtc.h>
|
|
|
|
#include <asm/setup.h>
|
|
#include <asm/irq.h>
|
|
#include <asm/machdep.h>
|
|
#include <asm/sections.h>
|
|
#include <asm/bootinfo.h>
|
|
|
|
/*
|
|
* parse_uboot_commandline
|
|
*
|
|
* Copies u-boot commandline arguments and store them in the proper linux
|
|
* variables.
|
|
*
|
|
* Assumes:
|
|
* _init_sp global contains the address in the stack pointer when the
|
|
* kernel starts (see head.S::_start)
|
|
*
|
|
* U-Boot calling convention:
|
|
* (*kernel) (kbd, initrd_start, initrd_end, cmd_start, cmd_end);
|
|
*
|
|
* _init_sp can be parsed as such
|
|
*
|
|
* _init_sp+00 = u-boot cmd after jsr into kernel (skip)
|
|
* _init_sp+04 = &kernel board_info (residual data)
|
|
* _init_sp+08 = &initrd_start
|
|
* _init_sp+12 = &initrd_end
|
|
* _init_sp+16 = &cmd_start
|
|
* _init_sp+20 = &cmd_end
|
|
*
|
|
* This also assumes that the memory locations pointed to are still
|
|
* unmodified. U-boot places them near the end of external SDRAM.
|
|
*
|
|
* Argument(s):
|
|
* commandp = the linux commandline arg container to fill.
|
|
* size = the sizeof commandp.
|
|
*
|
|
* Returns:
|
|
*/
|
|
static void __init parse_uboot_commandline(char *commandp, int size)
|
|
{
|
|
extern unsigned long _init_sp;
|
|
unsigned long *sp;
|
|
unsigned long uboot_cmd_start, uboot_cmd_end;
|
|
#if defined(CONFIG_BLK_DEV_INITRD)
|
|
unsigned long uboot_initrd_start, uboot_initrd_end;
|
|
#endif /* if defined(CONFIG_BLK_DEV_INITRD) */
|
|
|
|
sp = (unsigned long *)_init_sp;
|
|
uboot_cmd_start = sp[4];
|
|
uboot_cmd_end = sp[5];
|
|
|
|
if (uboot_cmd_start && uboot_cmd_end)
|
|
strncpy(commandp, (const char *)uboot_cmd_start, size);
|
|
|
|
#if defined(CONFIG_BLK_DEV_INITRD)
|
|
uboot_initrd_start = sp[2];
|
|
uboot_initrd_end = sp[3];
|
|
|
|
if (uboot_initrd_start && uboot_initrd_end &&
|
|
(uboot_initrd_end > uboot_initrd_start)) {
|
|
initrd_start = uboot_initrd_start;
|
|
initrd_end = uboot_initrd_end;
|
|
ROOT_DEV = Root_RAM0;
|
|
pr_info("initrd at 0x%lx:0x%lx\n", initrd_start, initrd_end);
|
|
}
|
|
#endif /* if defined(CONFIG_BLK_DEV_INITRD) */
|
|
}
|
|
|
|
__init void process_uboot_commandline(char *commandp, int size)
|
|
{
|
|
int len, n;
|
|
|
|
n = strnlen(commandp, size);
|
|
commandp += n;
|
|
len = size - n;
|
|
if (len) {
|
|
/* Add the whitespace separator */
|
|
*commandp++ = ' ';
|
|
len--;
|
|
}
|
|
|
|
parse_uboot_commandline(commandp, len);
|
|
commandp[len - 1] = 0;
|
|
}
|