Commit 8f23735d authored by Gerhard Pircher's avatar Gerhard Pircher Committed by Benjamin Herrenschmidt
Browse files

powerpc/amigaone: Bootwrapper and serial console support for AmigaOne 



This adds the bootwrapper for the cuImage target and a compatible property
check for "pnpPNP,501" to the generic serial console support code.
The default link address for the cuImage target is set to 0x800000. This
allows to boot the kernel with AmigaOS4's second level bootloader, which
always loads a uImage at 0x500000.

Signed-off-by: default avatarGerhard Pircher <gerhard_pircher@gmx.net>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 50408b7d

arch/powerpc/boot/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c 
		cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \

		cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \

		virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \

		cuboot-acadia.c

		cuboot-acadia.c cuboot-amigaone.c

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



src-boot := $(addprefix $(obj)/, $(src-boot))
@@ -276,6 +276,9 @@ image-$(CONFIG_STORCENTER) += cuImage.storcenter 
image-$(CONFIG_MPC7448HPC2)		+= cuImage.mpc7448hpc2

image-$(CONFIG_PPC_C2K)			+= cuImage.c2k



# Board port in arch/powerpc/platform/amigaone/Kconfig

image-$(CONFIG_AMIGAONE)		+= cuImage.amigaone



# For 32-bit powermacs, build the COFF and miboot images

# as well as the ELF images.

ifeq ($(CONFIG_PPC32),y)

arch/powerpc/boot/cuboot-amigaone.c

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

 * Old U-boot compatibility for AmigaOne

 *

 * Author: Gerhard Pircher (gerhard_pircher@gmx.net)

 *

 *   Based on cuboot-83xx.c

 * 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 "cuboot.h"



#include "ppcboot.h"



static bd_t bd;



static void platform_fixups(void)

{

	dt_fixup_memory(bd.bi_memstart, bd.bi_memsize);

	dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 4, bd.bi_busfreq);

}



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

                   unsigned long r6, unsigned long r7)

{

	CUBOOT_INIT();

	fdt_init(_dtb_start);

	serial_console_init();

	platform_ops.fixups = platform_fixups;

}

arch/powerpc/boot/serial.c

+2 −1
Original line number Diff line number Diff line
@@ -117,7 +117,8 @@ int serial_console_init(void) 
	if (devp == NULL)

		goto err_out;



	if (dt_is_compatible(devp, "ns16550"))

	if (dt_is_compatible(devp, "ns16550") ||

	    dt_is_compatible(devp, "pnpPNP,501"))

		rc = ns16550_console_init(devp, &serial_cd);

	else if (dt_is_compatible(devp, "marvell,mv64360-mpsc"))

		rc = mpsc_console_init(devp, &serial_cd);

arch/powerpc/boot/wrapper

+3 −0
Original line number Diff line number Diff line
@@ -186,6 +186,9 @@ cuboot*) 
    *-mpc85*|*-tqm85*|*-sbc85*)

        platformo=$object/cuboot-85xx.o

        ;;

    *-amigaone)

        link_address='0x800000'

        ;;

    esac

    ;;

ps3)

CRA Git | Maintained and supported by SUSTech CRA and CCSE