Add PPC440SP and Luan ref board support
PATCH 1/1 Add PPC440SP and Luan ref board support
Adds support for the IBM/AMCC PPC440SP SoC. Also adds support for the Luan reference board that has a 440SP on it.
Signed-off-by Matt Porter <[email protected]>
arch/ppc/boot/simple/Makefile +6 -0
@@ -66,6 +66,12 @@ end-$(CONFIG_EBONY) := ebony entrypoint-$(CONFIG_EBONY) := 0x01000000 + zimage-$(CONFIG_LUAN) := zImage-TREE +zimageinitrd-$(CONFIG_LUAN) := zImage.initrd-TREE + end-$(CONFIG_LUAN) := luan + entrypoint-$(CONFIG_LUAN) := 0x01000000 + extra.o-$(CONFIG_LUAN) := pibs.o + zimage-$(CONFIG_OCOTEA) := zImage-TREE zimageinitrd-$(CONFIG_OCOTEA) := zImage.initrd-TREE end-$(CONFIG_OCOTEA) := ocotea
arch/ppc/boot/simple/pibs.c +8 -6
@@ -1,5 +1,5 @@/* -* 2004 (c) MontaVista, Software, Inc. This file is licensed under +* 2004-2005 (c) MontaVista, Software, Inc. 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.
@@ -10,7 +10,7 @@#include <linux/string.h> #include <linux/ctype.h> #include <asm/ppcboot.h> -#include <platforms/4xx/ocotea.h> +#include <asm/ibm4xx.h> extern unsigned long decompress_kernel (unsigned long load_addr,int num_words,unsigned long cksum);
@@ -89,13 +89,15 @@decompress_kernel (load_addr, num_words, cksum); - mac64 =simple_strtoull ((char *)OCOTEA_PIBS_MAC_BASE ,0 ,16 ); + mac64 =simple_strtoull ((char *)PIBS_MAC_BASE ,0 ,16 );memcpy (hold_residual->bi_enetaddr, (char *)&mac64+2 ,6 ); - mac64 =simple_strtoull ((char *)(OCOTEA_PIBS_MAC_BASE +OCOTEA_PIBS_MAC_OFFSET ),0 ,16 ); +#ifdef CONFIG_440GX + mac64 =simple_strtoull ((char *)(PIBS_MAC_BASE +PIBS_MAC_OFFSET ),0 ,16 );memcpy (hold_residual->bi_enet1addr, (char *)&mac64+2 ,6 ); - mac64 =simple_strtoull ((char *)(OCOTEA_PIBS_MAC_BASE +OCOTEA_PIBS_MAC_OFFSET *2 ),0 ,16 ); + mac64 =simple_strtoull ((char *)(PIBS_MAC_BASE +PIBS_MAC_OFFSET *2 ),0 ,16 );memcpy (hold_residual->bi_enet2addr, (char *)&mac64+2 ,6 ); - mac64 =simple_strtoull ((char *)(OCOTEA_PIBS_MAC_BASE +OCOTEA_PIBS_MAC_OFFSET *3 ),0 ,16 ); + mac64 =simple_strtoull ((char *)(PIBS_MAC_BASE +PIBS_MAC_OFFSET *3 ),0 ,16 );memcpy (hold_residual->bi_enet3addr, (char *)&mac64+2 ,6 ); +#endif return (void *)hold_residual; }
arch/ppc/configs/luan_defconfig new file +668 -0
668 lines not on this page · raw message
arch/ppc/kernel/head_44x.S +3 -3
@@ -21,7 +21,7 @@ * Author: MontaVista Software, Inc. * [email protected] or [email protected] * [email protected] - * Copyright 2002-2004 MontaVista Software, Inc. + * Copyright 2002-2005 MontaVista Software, Inc. * PowerPC 44x support, Matt Porter <[email protected]> * * This program is free software; you can redistribute it and/or modify it
@@ -185,11 +185,11 @@ * are used for polled operation. */ /* pageid fields */ - lis r3,0xe000 + lis r3,UART0_IO_BASE@h ori r3,r3,PPC44x_TLB_VALID | PPC44x_TLB_256M /* xlat fields */ - lis r4,0x4000 /* RPN is 0x40000000 */ + lis r4,UART0_PHYS_IO_BASE@h /* RPN depends on SoC */ ori r4,r4,0x0001 /* ERPN is 1 for second 4GB page */ /* attrib fields */
arch/ppc/platforms/4xx/Kconfig +13 -3
@@ -73,6 +73,11 @@ help This option enables support for the IBM PPC440GP evaluation board. +config LUAN + bool "Luan" + help + This option enables support for the IBM PPC440SP evaluation board. + config OCOTEA bool "Ocotea" help
@@ -103,9 +108,14 @@ depends on OCOTEA default y +config 440SP + bool + depends on LUAN + default y + config 440 bool - depends on 440GP + depends on 440GP || 440SP default y config 440A
@@ -132,7 +142,7 @@ config IBM_OCP bool - depends on ASH || BUBINGA || CPCI405 || EBONY || EP405 || OCOTEA || REDWOOD_5 || REDWOOD_6 || SYCAMORE || WALNUT + depends on ASH || BUBINGA || CPCI405 || EBONY || EP405 || LUAN || OCOTEA || REDWOOD_5 || REDWOOD_6 || SYCAMORE || WALNUT default y config XILINX_OCP
@@ -142,7 +152,7 @@ config IBM_EMAC4 bool - depends on 440GX + depends on 440GX || 440SP default y config BIOS_FIXUP
arch/ppc/platforms/4xx/Makefile +2 -0
@@ -6,6 +6,7 @@ obj-$(CONFIG_EBONY) += ebony.o obj-$(CONFIG_EP405) += ep405.o obj-$(CONFIG_BUBINGA) += bubinga.o +obj-$(CONFIG_LUAN) += luan.o obj-$(CONFIG_OAK) += oak.o obj-$(CONFIG_OCOTEA) += ocotea.o obj-$(CONFIG_REDWOOD_5) += redwood5.o
@@ -20,6 +21,7 @@ obj-$(CONFIG_REDWOOD_6) += ibmstbx25.o obj-$(CONFIG_440GP) += ibm440gp.o obj-$(CONFIG_440GX) += ibm440gx.o +obj-$(CONFIG_440SP) += ibm440sp.o obj-$(CONFIG_405EP) += ibm405ep.o obj-$(CONFIG_405GPR) += ibm405gpr.o obj-$(CONFIG_VIRTEX_II_PRO) += virtex-ii_pro.o
arch/ppc/platforms/4xx/ebony.c +2 -2
@@ -4,7 +4,7 @@* Ebony board specific routines * * Matt Porter <[email protected]> -* Copyright 2002-2004 MontaVista Software Inc. +* Copyright 2002-2005 MontaVista Software Inc. * * Eugene Surovegin <[email protected]> or <[email protected]> * Copyright (c) 2003, 2004 Zultys Technologies
@@ -140,7 +140,7 @@ {void *pcix_reg_base; - pcix_reg_base =ioremap64 (PCIX0_REG_BASE ,PCIX0_REG_SIZE ); + pcix_reg_base =ioremap64 (PCIX0_REG_BASE ,PCIX_REG_SIZE );/* Disable all windows */ PCIX_WRITEL (0 ,PCIX0_POM0SA );
arch/ppc/platforms/4xx/ibm440sp.c new file +131 -0
131 lines not on this page · raw message
arch/ppc/platforms/4xx/ibm440sp.h new file +64 -0
64 lines not on this page · raw message
arch/ppc/platforms/4xx/luan.c new file +387 -0
387 lines not on this page · raw message
arch/ppc/platforms/4xx/luan.h new file +80 -0
80 lines not on this page · raw message
arch/ppc/platforms/4xx/ocotea.c +2 -2
@@ -5,7 +5,7 @@* * Matt Porter <[email protected]> * -* Copyright 2003-2004 MontaVista Software Inc. +* Copyright 2003-2005 MontaVista Software Inc. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the
@@ -163,7 +163,7 @@ {void *pcix_reg_base; - pcix_reg_base =ioremap64 (PCIX0_REG_BASE ,PCIX0_REG_SIZE ); + pcix_reg_base =ioremap64 (PCIX0_REG_BASE ,PCIX_REG_SIZE );/* Enable PCIX0 I/O, Mem, and Busmaster cycles */ PCIX_WRITEW (PCIX_READW (PCIX0_COMMAND ) |PCI_COMMAND_IO |PCI_COMMAND_MEMORY |PCI_COMMAND_MASTER ,PCIX0_COMMAND );
arch/ppc/platforms/4xx/ocotea.h +7 -7
@@ -3,9 +3,9 @@* * Ocotea board definitions * -* Matt Porter <[email protected]> +* Matt Porter <[email protected]> * -* Copyright 2003 MontaVista Software Inc. +* Copyright 2003-2005 MontaVista Software Inc. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the
@@ -22,13 +22,13 @@#include <platforms/4xx/ibm440gx.h> /* F/W TLB mapping used in bootloader glue to reset EMAC */ -#define PPC44x_EMAC0_MR0 0xE0000800 +#define PPC44x_EMAC0_MR0 0xe0000800/* Location of MAC addresses in PIBS image */ -#define OCOTEA_PIBS_FLASH 0xfff00000 -#define OCOTEA_PIBS_MAC_BASE (OCOTEA_PIBS_FLASH+0xb0500) -#define OCOTEA_PIBS_MAC_SIZE 0x200 -#define OCOTEA_PIBS_MAC_OFFSET 0x100 +#define PIBS_FLASH_BASE 0xfff00000 +#define PIBS_MAC_BASE (PIBS_FLASH_BASE+0xb0500) +#define PIBS_MAC_SIZE 0x200 +#define PIBS_MAC_OFFSET 0x100/* External timer clock frequency */ #define OCOTEA_TMR_CLK 25000000
arch/ppc/syslib/Makefile +2 -0
@@ -13,6 +13,7 @@ obj-$(CONFIG_44x) += ibm44x_common.o obj-$(CONFIG_440GP) += ibm440gp_common.o obj-$(CONFIG_440GX) += ibm440gx_common.o +obj-$(CONFIG_440SP) += ibm440gx_common.o ibm440sp_common.o ifeq ($(CONFIG_4xx),y) ifeq ($(CONFIG_VIRTEX_II_PRO),y) obj-$(CONFIG_40x) += xilinx_pic.o
@@ -52,6 +53,7 @@ obj-$(CONFIG_K2) += i8259.o indirect_pci.o todc_time.o \ pci_auto.o obj-$(CONFIG_LOPEC) += i8259.o pci_auto.o todc_time.o +obj-$(CONFIG_LUAN) += indirect_pci.o pci_auto.o todc_time.o obj-$(CONFIG_KATANA) += pci_auto.o obj-$(CONFIG_MCPN765) += todc_time.o indirect_pci.o pci_auto.o \ open_pic.o i8259.o hawk_common.o
arch/ppc/syslib/ibm440sp_common.c new file +71 -0
71 lines not on this page · raw message
arch/ppc/syslib/ibm440sp_common.h new file +25 -0
@@ -0,0 +1,25 @@ +/* +* arch/ppc/syslib/ibm440sp_common.h +* +* PPC440SP system library +* +* Matt Porter <[email protected]> +* Copyright 2004-2005 MontaVista Software, Inc. +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation; either version 2 of the License, or (at your +* option) any later version. +* +*/ +#ifdef __KERNEL__ +#ifndef __PPC_SYSLIB_IBM440SP_COMMON_H +#define __PPC_SYSLIB_IBM440SP_COMMON_H + +#ifndef __ASSEMBLY__ + +extern unsigned long __init ibm440sp_find_end_of_memory (void ); + +#endif /* __ASSEMBLY__ */ +#endif /* __PPC_SYSLIB_IBM440SP_COMMON_H */ +#endif /* __KERNEL__ */
arch/ppc/syslib/ibm44x_common.c +10 -4
@@ -4,7 +4,7 @@* PPC44x system library * * Matt Porter <[email protected]> -* Copyright 2002-2004 MontaVista Software Inc. +* Copyright 2002-2005 MontaVista Software Inc. * * Eugene Surovegin <[email protected]> or <[email protected]> * Copyright (c) 2003, 2004 Zultys Technologies
@@ -39,11 +39,17 @@* address in the 440's 36-bit address space. Fix * them up with the appropriate ERPN */ -if ((addr >= PPC44x_IO_LO) && (addr < PPC44x_IO_HI)) +if ((addr >= PPC44x_IO_LO) && (addr <= PPC44x_IO_HI)) page_4gb = PPC44x_IO_PAGE; -else if ((addr >= PPC44x_PCICFG_LO) && (addr < PPC44x_PCICFG_HI)) +else if ((addr >= PPC44x_PCI0CFG_LO) && (addr <= PPC44x_PCI0CFG_HI)) page_4gb = PPC44x_PCICFG_PAGE; -else if ((addr >= PPC44x_PCIMEM_LO) && (addr < PPC44x_PCIMEM_HI)) +#ifdef CONFIG_440SP + else if ((addr >= PPC44x_PCI1CFG_LO) && (addr <= PPC44x_PCI1CFG_HI)) + page_4gb = PPC44x_PCICFG_PAGE; + else if ((addr >= PPC44x_PCI2CFG_LO) && (addr <= PPC44x_PCI2CFG_HI)) + page_4gb = PPC44x_PCICFG_PAGE; +#endif + else if ((addr >= PPC44x_PCIMEM_LO) && (addr <= PPC44x_PCIMEM_HI)) page_4gb = PPC44x_PCIMEM_PAGE;return (page_4gb | addr);
include/asm-ppc/ibm44x.h +101 -35
228 lines not on this page · raw message
include/asm-ppc/ibm4xx.h +4 -0
@@ -101,6 +101,10 @@#include <platforms/4xx/ebony.h> #endif +#if defined(CONFIG_LUAN ) +#include <platforms/4xx/luan.h> +#endif +#if defined(CONFIG_OCOTEA )#include <platforms/4xx/ocotea.h> #endif