Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85aecac8 authored by David Gibson's avatar David Gibson Committed by Paul Mackerras
Browse files

[POWERPC] Consolidate cuboot initialization code 



The various cuboot platforms (i.e. pre-device tree aware u-boot for
83xx, 85xx and Ebony) share a certain amount of code for parsing the
boot parameters.  To a certain extent that's inevitable, since they
platforms have different definitions of the bd_t structure.  However,
with some macro work and a helper function, this patch improves the
situation a bit.

In the process, this fixes a bug on Ebony, which was incorrectly
handling the parameters passed form u-boot for the command line (the
bug was copied from 83xx and 85xx which have subsequently been fixed).

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent b2ba34f3

arch/powerpc/boot/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ $(addprefix $(obj)/,$(zlib) gunzip_util.o main.o): \ 
src-wlib := string.S crt0.S stdio.c main.c flatdevtree.c flatdevtree_misc.c \

src-wlib := string.S crt0.S stdio.c main.c flatdevtree.c flatdevtree_misc.c \

		ns16550.c serial.c simple_alloc.c div64.S util.S \

		ns16550.c serial.c simple_alloc.c div64.S util.S \

		gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \

		gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \

		44x.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c

		44x.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c

src-plat := of.c cuboot-83xx.c cuboot-85xx.c holly.c \

src-plat := of.c cuboot-83xx.c cuboot-85xx.c holly.c \

		cuboot-ebony.c treeboot-ebony.c prpmc2800.c

		cuboot-ebony.c treeboot-ebony.c prpmc2800.c

src-boot := $(src-wlib) $(src-plat) empty.c

src-boot := $(src-wlib) $(src-plat) empty.c

arch/powerpc/boot/cuboot-83xx.c

+2 −11
Original line number Original line Diff line number Diff line
@@ -12,12 +12,12 @@ 




#include "ops.h"

#include "ops.h"

#include "stdio.h"

#include "stdio.h"

#include "cuboot.h"





#define TARGET_83xx

#define TARGET_83xx

#include "ppcboot.h"

#include "ppcboot.h"





static bd_t bd;

static bd_t bd;

extern char _end[];

extern char _dtb_start[], _dtb_end[];

extern char _dtb_start[], _dtb_end[];





static void platform_fixups(void)

static void platform_fixups(void)
@@ -52,16 +52,7 @@ static void platform_fixups(void) 
void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,

void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,

                   unsigned long r6, unsigned long r7)

                   unsigned long r6, unsigned long r7)

{

{

	unsigned long end_of_ram = bd.bi_memstart + bd.bi_memsize;

	CUBOOT_INIT();

	unsigned long avail_ram = end_of_ram - (unsigned long)_end;



	memcpy(&bd, (bd_t *)r3, sizeof(bd));

	loader_info.initrd_addr = r4;

	loader_info.initrd_size = r4 ? r5 - r4 : 0;

	loader_info.cmdline = (char *)r6;

	loader_info.cmdline_len = r7 - r6;



	simple_alloc_init(_end, avail_ram - 1024*1024, 32, 64);

	ft_init(_dtb_start, _dtb_end - _dtb_start, 32);

	ft_init(_dtb_start, _dtb_end - _dtb_start, 32);

	serial_console_init();

	serial_console_init();

	platform_ops.fixups = platform_fixups;

	platform_ops.fixups = platform_fixups;

arch/powerpc/boot/cuboot-85xx.c

+2 −11
Original line number Original line Diff line number Diff line
@@ -12,12 +12,12 @@ 




#include "ops.h"

#include "ops.h"

#include "stdio.h"

#include "stdio.h"

#include "cuboot.h"





#define TARGET_85xx

#define TARGET_85xx

#include "ppcboot.h"

#include "ppcboot.h"





static bd_t bd;

static bd_t bd;

extern char _end[];

extern char _dtb_start[], _dtb_end[];

extern char _dtb_start[], _dtb_end[];





static void platform_fixups(void)

static void platform_fixups(void)
@@ -53,16 +53,7 @@ static void platform_fixups(void) 
void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,

void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,

                   unsigned long r6, unsigned long r7)

                   unsigned long r6, unsigned long r7)

{

{

	unsigned long end_of_ram = bd.bi_memstart + bd.bi_memsize;

	CUBOOT_INIT();

	unsigned long avail_ram = end_of_ram - (unsigned long)_end;



	memcpy(&bd, (bd_t *)r3, sizeof(bd));

	loader_info.initrd_addr = r4;

	loader_info.initrd_size = r4 ? r5 - r4 : 0;

	loader_info.cmdline = (char *)r6;

	loader_info.cmdline_len = r7 - r6;



	simple_alloc_init(_end, avail_ram - 1024*1024, 32, 64);

	ft_init(_dtb_start, _dtb_end - _dtb_start, 32);

	ft_init(_dtb_start, _dtb_end - _dtb_start, 32);

	serial_console_init();

	serial_console_init();

	platform_ops.fixups = platform_fixups;

	platform_ops.fixups = platform_fixups;

arch/powerpc/boot/cuboot-ebony.c

+2 −14
Original line number Original line Diff line number Diff line
@@ -15,28 +15,16 @@ 
#include "ops.h"

#include "ops.h"

#include "stdio.h"

#include "stdio.h"

#include "44x.h"

#include "44x.h"

#include "cuboot.h"





#define TARGET_44x

#define TARGET_44x

#include "ppcboot.h"

#include "ppcboot.h"





static bd_t bd;

static bd_t bd;

extern char _end[];



BSS_STACK(4096);





void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,

void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,

                   unsigned long r6, unsigned long r7)

                   unsigned long r6, unsigned long r7)

{

{

	unsigned long end_of_ram = bd.bi_memstart + bd.bi_memsize;

	CUBOOT_INIT();

	unsigned long avail_ram = end_of_ram - (unsigned long)_end;



	memcpy(&bd, (bd_t *)r3, sizeof(bd));

	loader_info.initrd_addr = r4;

	loader_info.initrd_size = r4 ? r5 : 0;

	loader_info.cmdline = (char *)r6;

	loader_info.cmdline_len = r7 - r6;



	simple_alloc_init(_end, avail_ram, 32, 64);



	ebony_init(&bd.bi_enetaddr, &bd.bi_enet1addr);

	ebony_init(&bd.bi_enetaddr, &bd.bi_enet1addr);

}
 
}

arch/powerpc/boot/cuboot.c

0 → 100644
+35 −0
Original line number Original line Diff line number Diff line 
/*

 * Compatibility for old (not device tree aware) U-Boot versions

 *

 * Author: Scott Wood <scottwood@freescale.com>

 * Consolidated using macros by David Gibson <david@gibson.dropbear.id.au>

 *

 * Copyright 2007 David Gibson, IBM Corporation.

 * Copyright (c) 2007 Freescale Semiconductor, Inc.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License version 2 as published

 * by the Free Software Foundation.

 */



#include "ops.h"

#include "stdio.h"



#include "ppcboot.h"



extern char _end[];

extern char _dtb_start[], _dtb_end[];



void cuboot_init(unsigned long r4, unsigned long r5,

		 unsigned long r6, unsigned long r7,

		 unsigned long end_of_ram)

{

	unsigned long avail_ram = end_of_ram - (unsigned long)_end;



	loader_info.initrd_addr = r4;

	loader_info.initrd_size = r4 ? r5 - r4 : 0;

	loader_info.cmdline = (char *)r6;

	loader_info.cmdline_len = r7 - r6;



	simple_alloc_init(_end, avail_ram - 1024*1024, 32, 64);

}