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

Commit 3e9e7c1d authored by Matt Porter's avatar Matt Porter Committed by Linus Torvalds
Browse files

[PATCH] ppc32: cleanup AMCC PPC40x eval boards to support U-Boot 



Cleanup PPC40x eval boards (bubinga, walnut and sycamore) to support U-Boot
as bootloader.  The OpenBIOS bd_info struct is not used in the kernel
anymore (only U-Boot now).

uImage (U-Boot) tested on walnut, sycamore and bubinga
zImage (OpenBIOS) tested on sycamore, bubinga and ebony

Signed-off-by: default avatarStefan Roese <sr@denx.de>
Signed-off-by: default avatarMatt Porter <mporter@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 90eb2665

arch/ppc/boot/simple/Makefile

+20 −1
Original line number Diff line number Diff line
@@ -67,6 +67,12 @@ zimageinitrd-$(CONFIG_BAMBOO) := zImage.initrd-TREE 
  entrypoint-$(CONFIG_BAMBOO)		:= 0x01000000

     extra.o-$(CONFIG_BAMBOO)		:= pibs.o



      zimage-$(CONFIG_BUBINGA)		:= zImage-TREE

zimageinitrd-$(CONFIG_BUBINGA)		:= zImage.initrd-TREE

         end-$(CONFIG_BUBINGA)		:= bubinga

  entrypoint-$(CONFIG_BUBINGA)		:= 0x01000000

     extra.o-$(CONFIG_BUBINGA)		:= openbios.o



      zimage-$(CONFIG_EBONY)		:= zImage-TREE

zimageinitrd-$(CONFIG_EBONY)		:= zImage.initrd-TREE

         end-$(CONFIG_EBONY)		:= ebony
@@ -91,6 +97,18 @@ zimageinitrd-$(CONFIG_OCOTEA) := zImage.initrd-TREE 
  entrypoint-$(CONFIG_OCOTEA)		:= 0x01000000

     extra.o-$(CONFIG_OCOTEA)		:= pibs.o



      zimage-$(CONFIG_SYCAMORE)		:= zImage-TREE

zimageinitrd-$(CONFIG_SYCAMORE)		:= zImage.initrd-TREE

         end-$(CONFIG_SYCAMORE)		:= sycamore

  entrypoint-$(CONFIG_SYCAMORE)		:= 0x01000000

     extra.o-$(CONFIG_SYCAMORE)		:= openbios.o



      zimage-$(CONFIG_WALNUT)		:= zImage-TREE

zimageinitrd-$(CONFIG_WALNUT)		:= zImage.initrd-TREE

         end-$(CONFIG_WALNUT)		:= walnut

  entrypoint-$(CONFIG_WALNUT)		:= 0x01000000

     extra.o-$(CONFIG_WALNUT)		:= openbios.o



     extra.o-$(CONFIG_EV64260)		:= misc-ev64260.o

         end-$(CONFIG_EV64260)		:= ev64260

   cacheflag-$(CONFIG_EV64260)		:= -include $(clear_L2_L3)
@@ -168,7 +186,8 @@ OBJCOPY_ARGS := -O elf32-powerpc 


# head.o and relocate.o must be at the start.

boot-y				:= head.o relocate.o $(extra.o-y) $(misc-y)

boot-$(CONFIG_40x)		+= embed_config.o

boot-$(CONFIG_REDWOOD_5)	+= embed_config.o

boot-$(CONFIG_REDWOOD_6)	+= embed_config.o

boot-$(CONFIG_8xx)		+= embed_config.o

boot-$(CONFIG_8260)		+= embed_config.o

boot-$(CONFIG_BSEIP)		+= iic.o

arch/ppc/boot/simple/misc.c

+13 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <asm/page.h>

#include <asm/mmu.h>

#include <asm/bootinfo.h>

#ifdef CONFIG_44x

#ifdef CONFIG_4xx

#include <asm/ibm4xx.h>

#endif

#include <asm/reg.h>
@@ -88,6 +88,14 @@ get_mem_size(void) 
	return 0;

}



#if defined(CONFIG_40x)

#define PPC4xx_EMAC0_MR0	EMAC0_BASE

#endif



#if defined(CONFIG_44x) && defined(PPC44x_EMAC0_MR0)

#define PPC4xx_EMAC0_MR0	PPC44x_EMAC0_MR0

#endif



struct bi_record *

decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum)

{
@@ -103,13 +111,13 @@ decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum) 
	com_port = serial_init(0, NULL);

#endif



#if defined(CONFIG_44x) && defined(PPC44x_EMAC0_MR0)

#if defined(PPC4xx_EMAC0_MR0)

	/* Reset MAL */

	mtdcr(DCRN_MALCR(DCRN_MAL_BASE), MALCR_MMSR);

	/* Wait for reset */

	while (mfdcr(DCRN_MALCR(DCRN_MAL_BASE)) & MALCR_MMSR) {};

	/* Reset EMAC */

	*(volatile unsigned long *)PPC44x_EMAC0_MR0 = 0x20000000;

	*(volatile unsigned long *)PPC4xx_EMAC0_MR0 = 0x20000000;

	__asm__ __volatile__("eieio");

#endif
@@ -164,7 +172,9 @@ decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum) 
		puts(" "); puthex((unsigned long)(&__ramdisk_end));puts("\n");

	}



#ifndef CONFIG_40x /* don't overwrite the 40x image located at 0x00400000! */

	avail_ram = (char *)0x00400000;

#endif

	end_avail = (char *)0x00800000;

	puts("avail ram:     "); puthex((unsigned long)avail_ram); puts(" ");

	puthex((unsigned long)end_avail); puts("\n");

arch/ppc/boot/simple/openbios.c

+100 −6
Original line number Diff line number Diff line 
/*

 * arch/ppc/boot/simple/openbios.c

 *

 * Copyright (c) 2005 DENX Software Engineering

 * Stefan Roese <sr@denx.de>

 *

 * Based on original work by

 *      2005 (c) SYSGO AG - g.jaeger@sysgo.com

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2.  This program is licensed "as is" without

 * any warranty of any kind, whether express or implied.

 *

 * Derived from arch/ppc/boot/simple/pibs.c (from MontaVista)

 */



#include <linux/types.h>

#include <linux/config.h>

#include <linux/string.h>

#include <asm/ppcboot.h>

#include <platforms/4xx/ebony.h>

#include <asm/ibm4xx.h>

#include <asm/reg.h>

#ifdef CONFIG_40x

#include <asm/io.h>

#endif



#if defined(CONFIG_BUBINGA)

#define BOARD_INFO_VECTOR       0xFFF80B50 /* openbios 1.19 moved this vector down  - armin */

#else

#define BOARD_INFO_VECTOR	0xFFFE0B50

#endif



#ifdef CONFIG_40x

/* Supply a default Ethernet address for those eval boards that don't

 * ship with one.  This is an address from the MBX board I have, so

 * it is unlikely you will find it on your network.

 */

static	ushort	def_enet_addr[] = { 0x0800, 0x3e26, 0x1559 };



extern unsigned long timebase_period_ns;

#endif /* CONFIG_40x */



extern unsigned long decompress_kernel(unsigned long load_addr, int num_words,

				       unsigned long cksum);
@@ -23,15 +47,85 @@ extern unsigned long decompress_kernel(unsigned long load_addr, int num_words, 
bd_t hold_resid_buf __attribute__ ((__section__ (".data.boot")));

bd_t *hold_residual = &hold_resid_buf;



typedef struct openbios_board_info {

        unsigned char    bi_s_version[4];       /* Version of this structure */

        unsigned char    bi_r_version[30];      /* Version of the IBM ROM */

        unsigned int     bi_memsize;            /* DRAM installed, in bytes */

#ifdef CONFIG_405EP

        unsigned char    bi_enetaddr[2][6];     /* Local Ethernet MAC address */

#else /* CONFIG_405EP */

        unsigned char    bi_enetaddr[6];        /* Local Ethernet MAC address */

#endif /* CONFIG_405EP */

        unsigned char    bi_pci_enetaddr[6];    /* PCI Ethernet MAC address */

        unsigned int     bi_intfreq;            /* Processor speed, in Hz */

        unsigned int     bi_busfreq;            /* PLB Bus speed, in Hz */

        unsigned int     bi_pci_busfreq;        /* PCI Bus speed, in Hz */

#ifdef CONFIG_405EP

        unsigned int     bi_opb_busfreq;        /* OPB Bus speed, in Hz */

        unsigned int     bi_pllouta_freq;       /* PLL OUTA speed, in Hz */

#endif /* CONFIG_405EP */

} openbios_bd_t;



void *

load_kernel(unsigned long load_addr, int num_words, unsigned long cksum,

		void *ign1, void *ign2)

{

	decompress_kernel(load_addr, num_words, cksum);

#ifdef CONFIG_40x

	openbios_bd_t *openbios_bd = NULL;

	openbios_bd_t *(*get_board_info)(void) =

		(openbios_bd_t *(*)(void))(*(unsigned long *)BOARD_INFO_VECTOR);



	/*

	 * On 40x platforms we not only need the MAC-addresses, but also the

	 * clocks and memsize. Now try to get all values using the OpenBIOS

	 * "get_board_info()" callback.

	 */

	if ((openbios_bd = get_board_info()) != NULL) {

		/*

		 * Copy bd_info from OpenBIOS struct into U-Boot struct

		 * used by kernel

		 */

	        hold_residual->bi_memsize = openbios_bd->bi_memsize;

	        hold_residual->bi_intfreq = openbios_bd->bi_intfreq;

	        hold_residual->bi_busfreq = openbios_bd->bi_busfreq;

	        hold_residual->bi_pci_busfreq = openbios_bd->bi_pci_busfreq;

		memcpy(hold_residual->bi_pci_enetaddr, openbios_bd->bi_pci_enetaddr, 6);

#ifdef CONFIG_405EP

		memcpy(hold_residual->bi_enetaddr, openbios_bd->bi_enetaddr[0], 6);

		memcpy(hold_residual->bi_enet1addr, openbios_bd->bi_enetaddr[1], 6);

	        hold_residual->bi_opbfreq = openbios_bd->bi_opb_busfreq;

	        hold_residual->bi_procfreq = openbios_bd->bi_pllouta_freq;

#else /* CONFIG_405EP */

		memcpy(hold_residual->bi_enetaddr, openbios_bd->bi_enetaddr, 6);

#endif /* CONFIG_405EP */

	} else {

		/* Hmmm...better try to stuff some defaults.

		 */

		hold_residual->bi_memsize = 16 * 1024 * 1024;

		hold_residual->bi_intfreq = 200000000;

		hold_residual->bi_busfreq = 100000000;

		hold_residual->bi_pci_busfreq = 66666666;



		/*

		 * Only supply one mac-address in this fallback

		 */

		memcpy(hold_residual->bi_enetaddr, (void *)def_enet_addr, 6);

#ifdef CONFIG_405EP

	        hold_residual->bi_opbfreq = 50000000;

	        hold_residual->bi_procfreq = 200000000;

#endif /* CONFIG_405EP */

	}



	timebase_period_ns = 1000000000 / hold_residual->bi_intfreq;

#endif /* CONFIG_40x */



#ifdef CONFIG_440GP

	/* simply copy the MAC addresses */

	memcpy(hold_residual->bi_enetaddr,  (char *)EBONY_OPENBIOS_MAC_BASE, 6);

	memcpy(hold_residual->bi_enet1addr, (char *)(EBONY_OPENBIOS_MAC_BASE+EBONY_OPENBIOS_MAC_OFFSET), 6);

	memcpy(hold_residual->bi_enetaddr,  (char *)OPENBIOS_MAC_BASE, 6);

	memcpy(hold_residual->bi_enet1addr, (char *)(OPENBIOS_MAC_BASE+OPENBIOS_MAC_OFFSET), 6);

#endif /* CONFIG_440GP */



	decompress_kernel(load_addr, num_words, cksum);



	return (void *)hold_residual;

}

arch/ppc/platforms/4xx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ config EMBEDDEDBOOT 


config IBM_OPENBIOS

	bool

	depends on ASH || BUBINGA || REDWOOD_5 || REDWOOD_6 || SYCAMORE || WALNUT

	depends on ASH || REDWOOD_5 || REDWOOD_6

	default y



config PPC4xx_DMA

arch/ppc/platforms/4xx/bubinga.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ bubinga_early_serial_map(void) 
          * by 16.

          */

	uart_div = (mfdcr(DCRN_CPC0_UCR_BASE) & DCRN_CPC0_UCR_U0DIV);

	uart_clock = __res.bi_pllouta_freq / uart_div;

	uart_clock = __res.bi_procfreq / uart_div;



	/* Setup serial port access */

	memset(&port, 0, sizeof(port));