XPedite5500 board support
PATCH 1/17 XPedite5500 board support
From: John Schmoller <[email protected]>
Initial support for Extreme Engineering Solutions XPedite5500 - a P2020-based PMC/XMC single board computer.
---
Some of the changes in this series touch both common and X-ES-specific code so I put them in one series and tried to CC the proper custodian.
MAINTAINERS | 1 + board/xes/common/Makefile | 2 + board/xes/common/fsl_8xxx_clk.c | 11 + board/xes/common/fsl_8xxx_pci.c | 41 +++- board/xes/xpedite5500/Makefile | 39 +++ board/xes/xpedite5500/config.mk | 30 ++ board/xes/xpedite5500/ddr.c | 165 ++++++++++ board/xes/xpedite5500/law.c | 54 ++++ board/xes/xpedite5500/tlb.c | 98 ++++++ board/xes/xpedite5500/xpedite5500.c | 127 ++++++++ boards.cfg | 1 + include/configs/XPEDITE5500.h | 590 +++++++++++++++++++++++++++++++++++ 12 files changed, 1158 insertions(+), 1 deletions(-) create mode 100644 board/xes/xpedite5500/Makefile create mode 100644 board/xes/xpedite5500/config.mk create mode 100644 board/xes/xpedite5500/ddr.c create mode 100644 board/xes/xpedite5500/law.c create mode 100644 board/xes/xpedite5500/tlb.c create mode 100644 board/xes/xpedite5500/xpedite5500.c create mode 100644 include/configs/XPEDITE5500.h
MAINTAINERS +1 -0
@@ -462,6 +462,7 @@ Peter Tyser <[email protected]> XPEDITE5170 MPC8640 XPEDITE5200 MPC8548 XPEDITE5370 MPC8572 + XPEDITE5500 P2020 David Updegraff <[email protected]>
board/xes/common/Makefile +2 -0
@@ -32,7 +32,9 @@ LIB = $(obj)lib$(VENDOR).a COBJS-$(CONFIG_FSL_PCI_INIT) += fsl_8xxx_pci.o COBJS-$(CONFIG_MPC8572) += fsl_8xxx_clk.o COBJS-$(CONFIG_MPC86xx) += fsl_8xxx_clk.o +COBJS-$(CONFIG_P2020) += fsl_8xxx_clk.o COBJS-$(CONFIG_FSL_DDR2) += fsl_8xxx_ddr.o +COBJS-$(CONFIG_FSL_DDR3) += fsl_8xxx_ddr.o COBJS-$(CONFIG_NAND_ACTL) += actl_nand.o SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
board/xes/common/fsl_8xxx_clk.c +11 -0
@@ -38,7 +38,11 @@ unsigned long get_board_sys_clk(ulong dummy)if (in_be32 (&gur->gpporcr) &0x10000 )return 66666666 ; else +#ifdef CONFIG_P2020 +return 100000000 ; +#else return 50000000 ; +#endif }#ifdef CONFIG_MPC85xx
@@ -54,6 +58,13 @@ unsigned long get_board_ddr_clk(ulong dummy)if (ddr_ratio ==0x7 )return get_board_sys_clk (dummy); +#ifdef CONFIG_P2020 +if (in_be32 (&gur->gpporcr) &0x20000 ) +return 66666666 ; +else +return 100000000 ; +#else return 66666666 ; +#endif }#endif
board/xes/common/fsl_8xxx_pci.c +40 -1
47 lines not on this page · raw message
board/xes/xpedite5500/Makefile new file +39 -0
@@ -0,0 +1,39 @@ +# +# Copyright 2007-2008 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 as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# + +include $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).a + +COBJS-y += $(BOARD).o +COBJS-y += ddr.o +COBJS-y += law.o +COBJS-y += tlb.o + +SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS-y)) + +$(LIB): $(obj).depend $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) + +clean: + rm -f $(OBJS) $(SOBJS) + +distclean: clean + rm -f $(LIB) core *.bak .depend + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +#########################################################################
board/xes/xpedite5500/config.mk new file +30 -0
@@ -0,0 +1,30 @@ +# +# Copyright 2010 Extreme Engineering Solutions, Inc. +# Copyright 2007-2008 Freescale Semiconductor, Inc. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# 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. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +# +# xpedite5500 board +# + +ifndef TEXT_BASE +TEXT_BASE = 0xfff80000 +endif
board/xes/xpedite5500/ddr.c new file +165 -0
165 lines not on this page · raw message
board/xes/xpedite5500/law.c new file +54 -0
54 lines not on this page · raw message
board/xes/xpedite5500/tlb.c new file +98 -0
98 lines not on this page · raw message
board/xes/xpedite5500/xpedite5500.c new file +127 -0
127 lines not on this page · raw message
boards.cfg +1 -0
@@ -342,6 +342,7 @@ MPC8568MDS powerpc mpc85xx mpc8568mds freescale P4080DS powerpc mpc85xx corenet_ds freescale XPEDITE5200 powerpc mpc85xx xpedite5200 xes XPEDITE5370 powerpc mpc85xx xpedite5370 xes +XPEDITE5500 powerpc mpc85xx xpedite5500 xes P1022DS powerpc mpc85xx p1022ds freescale sbc8641d powerpc mpc86xx MPC8610HPCD powerpc mpc86xx mpc8610hpcd freescale
include/configs/XPEDITE5500.h new file +590 -0
590 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH 2/17 mpc8640: Update the io_sel fields for PCI Express
Previously io_sel=0xe incorrect stated PCIE1 was enabled. Also add support for the mpc8640's PCIE2 interface.
--- arch/powerpc/cpu/mpc8xxx/pci_cfg.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
arch/powerpc/cpu/mpc8xxx/pci_cfg.c +4 -1
@@ -138,7 +138,10 @@ static struct pci_info pci_config_info[] = { [LAW_TRGT_IF_PCIE_1] = { .cfg = (1 << 2) | (1 << 3) | (1 << 5) | (1 << 6) | - (1 << 7) | (1 << 0xe) | (1 << 0xf), + (1 << 7) | (1 << 0xf), + }, + [LAW_TRGT_IF_PCIE_2] = { + .cfg = (1 << 3) | (1 << 0xe) | (1 << 0xf), }, }; #elif defined(CONFIG_P1011) || defined(CONFIG_P1020) || \
Signature · 1 line
1.7.0.4
PATCH 2/17 mpc8640: Update the io_sel fields for PCI Express
Quoted 8 lines · Peter Tyser
Previously io_sel=0xe incorrect stated PCIE1 was enabled. Also add support for the mpc8640's PCIE2 interface.
Signed-off-by Peter Tyser <[email protected]>CC Kumar Gala <[email protected]>---
arch/powerpc/cpu/mpc8xxx/pci_cfg.c| 5 ++++-1 files changed, 4 insertions(+), 1 deletions(-)
Can you convert this to what we are doing on MPC8536, I want to kill arch/powerpc/cpu/mpc8xxx/pci_cfg.c.
See the following two commits:
commit 54648985e2a64e29784e3ed37cd45b637305cd65
Author: Kumar Gala <[email protected]> Date: Tue Apr 20 10:21:12 2010 -0500
85xx/mpc8536ds: Use is_serdes_configured() to determine of PCIe enabled
The new is_serdes_configured covers a broader range of devices than the PCI specific code. Use it instead as we convert away from the is_fsl_pci_cfg() code.
Additionally move to setting LAWs for PCI based on if its configured. Also updated PCI FDT fixup code to remove PCI controllers from dtb if they are configured.
commit 6ab4011b796e0af130ca160ea3c674d462f3bec4
Author: Kumar Gala <[email protected]> Date: Tue Apr 20 10:20:33 2010 -0500
85xx: Add is_serdes_configured() support to MPC8536 SERDES
Add the ability to determine if a given IP block connected on SERDES is configured. This is useful for things like PCIe and SRIO since they are only ever connected on SERDES.
- k
PATCH 2/17 mpc8640: Update the io_sel fields for PCI Express
Quoted 5 lines · Kumar Gala
Quoted 3 lines · Peter Tyser
Previously io_sel=0xe incorrect stated PCIE1 was enabled. Also add support for the mpc8640's PCIE2 interface.
Quoted 7 lines
Quoted 5 lines
Signed-off-by Peter Tyser <[email protected]>CC Kumar Gala <[email protected]>---
arch/powerpc/cpu/mpc8xxx/pci_cfg.c| 5 ++++-1 files changed, 4 insertions(+), 1 deletions(-)Can you convert this to what we are doing on MPC8536, I want to kill
arch/powerpc/cpu/mpc8xxx/pci_cfg.c.
Sure. Our X-ES PCI code supports the 8548, 2020, 1020, 8572, and 8640, so I'll add *_serdes.c files for them as needed.
It might be a few days before I can get to it. Any interest in applying the pending patches and I can do an incremental migration to kill arch/powerpc/cpu/mpc8xxx/pci_cfg.c where appropriate?
Thanks,
Peter
Kumar Gala
AppliedPATCH 2/17 mpc8640: Update the io_sel fields for PCI Express
In reply to Peter TyserQuoted 8 lines · Peter Tyser
Previously io_sel=0xe incorrect stated PCIE1 was enabled. Also add support for the mpc8640's PCIE2 interface.
Signed-off-by Peter Tyser <[email protected]>CC Kumar Gala <[email protected]>---
arch/powerpc/cpu/mpc8xxx/pci_cfg.c| 5 ++++-1 files changed, 4 insertions(+), 1 deletions(-)
applied to 85xx since it does fix a bug, even if I want this removed.
- k
PATCH 3/17 xes: Use common PCI initialization code
In reply to Peter TyserCommon Freescale code for PCI initialization now exists, so migrate X-ES boards to use it.
--- board/xes/common/fsl_8xxx_pci.c | 367 +++++--------------------------------- include/configs/XPEDITE5170.h | 12 +- include/configs/XPEDITE5200.h | 6 +- include/configs/XPEDITE5370.h | 12 +- include/configs/XPEDITE5500.h | 6 +- 5 files changed, 67 insertions(+), 336 deletions(-)
board/xes/common/fsl_8xxx_pci.c +49 -318
@@ -25,10 +25,10 @@#include <pci.h> #include <asm/fsl_pci.h> #include <asm/io.h> +#include <linux/compiler.h> #include <libfdt.h> #include <fdt_support.h> -int first_free_busno =0 ;#ifdef CONFIG_PCI1 static struct pci_controller pci1_hose;
@@ -43,150 +43,6 @@ static struct pci_controller pcie2_hose;static struct pci_controller pcie3_hose;#endif -#if definedCONFIG_P2020 -/* Correlate host/agent POR bits to usable info. Table 4-14 */ -struct host_agent_cfg_t { -uchar pcie_root[3 ]; -uchar rio_host[2 ]; -} host_agent_cfg[8 ] = { - {{0 ,0 ,0 }, {0 ,0 }}, - {{0 ,1 ,1 }, {1 ,1 }}, - {{1 ,0 ,1 }, {0 ,0 }}, - {{1 ,1 ,0 }, {1 ,1 }}, - {{0 ,0 ,1 }, {0 ,0 }}, - {{0 ,1 ,0 }, {1 ,1 }}, - {{1 ,0 ,0 }, {0 ,0 }}, - {{1 ,1 ,1 }, {1 ,1 }} -}; - -/* Correlate port width POR bits to usable info. Table 4-15 */ -struct io_port_cfg_t { -uchar pcie_width[3 ]; -uchar rio_width[2 ]; -uchar etsec_width[2 ]; -} io_port_cfg[16 ] = { - {{1 ,0 ,0 }, {0 ,0 }, {0 ,0 }}, - {{0 ,0 ,0 }, {0 ,0 }, {0 ,0 }}, - {{1 ,1 ,2 }, {0 ,0 }, {0 ,0 }}, - {{0 ,0 ,0 }, {0 ,0 }, {0 ,0 }}, - {{2 ,0 ,2 }, {0 ,0 }, {0 ,0 }}, - {{0 ,0 ,0 }, {0 ,0 }, {0 ,0 }}, - {{4 ,0 ,0 }, {0 ,0 }, {0 ,0 }}, - {{0 ,0 ,0 }, {1 ,1 }, {0 ,0 }}, - {{0 ,0 ,0 }, {0 ,4 }, {0 ,0 }}, - {{0 ,0 ,0 }, {0 ,4 }, {0 ,0 }}, - {{0 ,0 ,0 }, {0 ,4 }, {0 ,0 }}, - {{0 ,0 ,0 }, {1 ,1 }, {1 ,1 }}, - {{0 ,0 ,0 }, {1 ,1 }, {1 ,1 }}, - {{1 ,0 ,0 }, {1 ,0 }, {1 ,1 }}, - {{1 ,1 ,0 }, {0 ,0 }, {1 ,1 }}, - {{2 ,0 ,0 }, {0 ,0 }, {1 ,1 }}, -}; -#elif CONFIG_MPC8572 -/* Correlate host/agent POR bits to usable info. Table 4-14 */ -struct host_agent_cfg_t { -uchar pcie_root[3 ]; -uchar rio_host; -} host_agent_cfg[8 ] = { - {{0 ,0 ,0 },0 }, - {{0 ,1 ,1 },1 }, - {{1 ,0 ,1 },0 }, - {{1 ,1 ,0 },1 }, - {{0 ,0 ,1 },0 }, - {{0 ,1 ,0 },1 }, - {{1 ,0 ,0 },0 }, - {{1 ,1 ,1 },1 } -}; - -/* Correlate port width POR bits to usable info. Table 4-15 */ -struct io_port_cfg_t { -uchar pcie_width[3 ]; -uchar rio_width; -} io_port_cfg[16 ] = { - {{0 ,0 ,0 },0 }, - {{0 ,0 ,0 },0 }, - {{4 ,0 ,0 },0 }, - {{4 ,4 ,0 },0 }, - {{0 ,0 ,0 },0 }, - {{0 ,0 ,0 },0 }, - {{0 ,0 ,0 },4 }, - {{4 ,2 ,2 },0 }, - {{0 ,0 ,0 },0 }, - {{0 ,0 ,0 },0 }, - {{0 ,0 ,0 },0 }, - {{4 ,0 ,0 },4 }, - {{4 ,0 ,0 },4 }, - {{0 ,0 ,0 },4 }, - {{0 ,0 ,0 },4 }, - {{8 ,0 ,0 },0 }, -}; -#elif definedCONFIG_MPC8548 -/* Correlate host/agent POR bits to usable info. Table 4-12 */ -struct host_agent_cfg_t { -uchar pci_host[2 ]; -uchar pcie_root[1 ]; -uchar rio_host; -} host_agent_cfg[8 ] = { - {{1 ,1 }, {0 },0 }, - {{1 ,1 }, {1 },0 }, - {{1 ,1 }, {0 },1 }, - {{0 ,0 }, {0 },0 },/* reserved */ - {{0 ,1 }, {1 },0 }, - {{1 ,1 }, {1 },0 }, - {{0 ,1 }, {1 },1 }, - {{1 ,1 }, {1 },1 } -}; - -/* Correlate port width POR bits to usable info. Table 4-13 */ -struct io_port_cfg_t { -uchar pcie_width[1 ]; -uchar rio_width; -} io_port_cfg[8 ] = { - {{0 },0 }, - {{0 },0 }, - {{0 },0 }, - {{4 },4 }, - {{4 },4 }, - {{0 },4 }, - {{0 },4 }, - {{8 },0 }, -}; -#elif defined CONFIG_MPC86xx -/* Correlate host/agent POR bits to usable info. Table 4-17 */ -struct host_agent_cfg_t { -uchar pcie_root[2 ]; -uchar rio_host; -} host_agent_cfg[8 ] = { - {{0 ,0 },0 }, - {{1 ,0 },1 }, - {{0 ,1 },0 }, - {{1 ,1 },1 } -}; - -/* Correlate port width POR bits to usable info. Table 4-16 */ -struct io_port_cfg_t { -uchar pcie_width[2 ]; -uchar rio_width; -} io_port_cfg[16 ] = { - {{0 ,0 },0 }, - {{0 ,0 },0 }, - {{8 ,0 },0 }, - {{8 ,8 },0 }, - {{0 ,0 },0 }, - {{8 ,0 },4 }, - {{8 ,0 },4 }, - {{8 ,0 },4 }, - {{0 ,0 },0 }, - {{0 ,0 },4 }, - {{0 ,0 },4 }, - {{0 ,0 },4 }, - {{0 ,0 },0 }, - {{0 ,0 },0 }, - {{0 ,8 },0 }, - {{8 ,8 },0 }, -}; -#endif -/* * 85xx and 86xx share naming conventions, but different layout. * Correlate names to CPU-specific values to share common
@@ -212,22 +68,22 @@ struct io_port_cfg_t {void pci_init_board (void ) { -struct pci_controller *hose; -volatile ccsr_fsl_pci_t *pci; -int width; -int host; +struct fsl_pci_info pci_info[3 ]; +int first_free_busno =0 ; +int num =0 ; +int pcie_ep; +__maybe_unused int pcie_configured; +#if defined(CONFIG_MPC85xx)volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);#elif defined(CONFIG_MPC86xx)immap_t *immap = (immap_t *)CONFIG_SYS_IMMR ;volatile ccsr_gur_t *gur = &immap->im_gur;#endif -uint devdisr =in_be32 (&gur->devdisr); -uint io_sel = (in_be32 (&gur->pordevsr) & MPC8xxx_PORDEVSR_IO_SEL) >> +u32 devdisr =in_be32 (&gur->devdisr); +u32 pordevsr =in_be32 (&gur->pordevsr); +__maybe_unused uint io_sel = (pordevsr & MPC8xxx_PORDEVSR_IO_SEL) >> MPC8xxx_PORDEVSR_IO_SEL_SHIFT; -uint host_agent = (in_be32 (&gur->porbmsr) & MPC8xxx_PORBMSR_HA) >> - MPC8xxx_PORBMSR_HA_SHIFT; -struct pci_region *r;#ifdef CONFIG_PCI1 uint pci_spd_norm =in_be32 (&gur->pordevsr) & MPC85xx_PORDEVSR_PCI1_SPD;
@@ -236,49 +92,19 @@ void pci_init_board(void)uint pcix =in_be32 (&gur->pordevsr) & MPC85xx_PORDEVSR_PCI1;uint freq =CONFIG_SYS_CLK_FREQ /1000 /1000 ; - width =0 ;/* Silence compiler warning... */ - io_sel &=0xf ;/* Silence compiler warning... */ - pci = (ccsr_fsl_pci_t *)CONFIG_SYS_PCI1_ADDR ; - hose = &pci1_hose; - host = host_agent_cfg[host_agent].pci_host[0 ]; - r = hose->regions; -if (!(devdisr & MPC85xx_DEVDISR_PCI1)) { +SET_STD_PCI_INFO (pci_info[num],1 ); + pcie_ep =fsl_setup_hose (&pci1_hose, pci_info[num].regs);printf ("\n PCI1: %d bit %s, %s %d MHz, %s, %s\n" , pci_32 ?32 :64 , pcix ?"PCIX" :"PCI" , pci_spd_norm ?">=" :"<=" , pcix ? freq *2 : freq, - host ?"host" :"agent" , + pcie_ep ?"agent" :"host" , pci_arb ?"arbiter" :"external-arbiter" ); -/* outbound memory */ -pci_set_region (r++, -CONFIG_SYS_PCI1_MEM_BASE , -CONFIG_SYS_PCI1_MEM_PHYS , -CONFIG_SYS_PCI1_MEM_SIZE , -PCI_REGION_MEM ); - -/* outbound io */ -pci_set_region (r++, -CONFIG_SYS_PCI1_IO_BASE , -CONFIG_SYS_PCI1_IO_PHYS , -CONFIG_SYS_PCI1_IO_SIZE , -PCI_REGION_IO ); - - hose->region_count = r - hose->regions; - - hose->first_busno = first_free_busno; - -fsl_pci_init (hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data); - -/* Unlock inbound PCI configuration cycles */ -if (!host) -fsl_pci_config_unlock (hose); - - first_free_busno = hose->last_busno +1 ; -printf (" PCI1 on bus %02x - %02x\n" , - hose->first_busno, hose->last_busno); + first_free_busno =fsl_pci_init_port (&pci_info[num++], + &pci1_hose, first_free_busno); }else {printf (" PCI1: disabled\n" ); }
@@ -286,148 +112,53 @@ void pci_init_board(void)/* PCI1 not present on MPC8572 */ setbits_be32 (&gur->devdisr, MPC85xx_DEVDISR_PCI1);#endif -#ifdef CONFIG_PCIE1 - pci = (ccsr_fsl_pci_t *)CONFIG_SYS_PCIE1_ADDR ; - hose = &pcie1_hose; - host = host_agent_cfg[host_agent].pcie_root[0 ]; - width = io_port_cfg[io_sel].pcie_width[0 ]; - r = hose->regions; - -if (width && !(devdisr & MPC8xxx_DEVDISR_PCIE1)) { -printf ("\n PCIE1 connected as %s (x%d)" , - host ?"Root Complex" :"Endpoint" , width); -if (in_be32 (&pci->pme_msg_det)) { -out_be32 (&pci->pme_msg_det,0xffffffff ); -debug (" with errors. Clearing. Now 0x%08x" , -in_be32 (&pci->pme_msg_det)); - } -printf ("\n" ); - -/* outbound memory */ -pci_set_region (r++, -CONFIG_SYS_PCIE1_MEM_BASE , -CONFIG_SYS_PCIE1_MEM_PHYS , -CONFIG_SYS_PCIE1_MEM_SIZE , -PCI_REGION_MEM ); - -/* outbound io */ -pci_set_region (r++, -CONFIG_SYS_PCIE1_IO_BASE , -CONFIG_SYS_PCIE1_IO_PHYS , -CONFIG_SYS_PCIE1_IO_SIZE , -PCI_REGION_IO ); - - hose->region_count = r - hose->regions; - - hose->first_busno = first_free_busno; - -fsl_pci_init (hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data); -/* Unlock inbound PCI configuration cycles */ -if (!host) -fsl_pci_config_unlock (hose); - - first_free_busno = hose->last_busno +1 ; -printf (" PCIE1 on bus %02x - %02x\n" , - hose->first_busno, hose->last_busno); +#ifdef CONFIG_PCIE1 + pcie_configured =is_fsl_pci_cfg (LAW_TRGT_IF_PCIE_1 , io_sel); + +if (pcie_configured && !(devdisr & MPC8xxx_DEVDISR_PCIE1)) { +SET_STD_PCIE_INFO (pci_info[num],1 ); + pcie_ep =fsl_setup_hose (&pcie1_hose, pci_info[num].regs); +printf (" PCIE1 connected as %s\n" , + pcie_ep ?"Endpoint" :"Root Complex" ); + first_free_busno =fsl_pci_init_port (&pci_info[num++], + &pcie1_hose, first_free_busno); + }else { +printf (" PCIE1: disabled\n" ); }#else setbits_be32 (&gur->devdisr, MPC8xxx_DEVDISR_PCIE1);#endif /* CONFIG_PCIE1 */ #ifdef CONFIG_PCIE2 - pci = (ccsr_fsl_pci_t *)CONFIG_SYS_PCIE2_ADDR ; - hose = &pcie2_hose; - host = host_agent_cfg[host_agent].pcie_root[1 ]; - width = io_port_cfg[io_sel].pcie_width[1 ]; - r = hose->regions; - -if (width && !(devdisr & MPC8xxx_DEVDISR_PCIE2)) { -printf ("\n PCIE2 connected as %s (x%d)" , - host ?"Root Complex" :"Endpoint" , width); -if (in_be32 (&pci->pme_msg_det)) { -out_be32 (&pci->pme_msg_det,0xffffffff ); -debug (" with errors. Clearing. Now 0x%08x" , -in_be32 (&pci->pme_msg_det)); - } -printf ("\n" ); - -/* outbound memory */ -pci_set_region (r++, -CONFIG_SYS_PCIE2_MEM_BASE , -CONFIG_SYS_PCIE2_MEM_PHYS , -CONFIG_SYS_PCIE2_MEM_SIZE , -PCI_REGION_MEM ); - -/* outbound io */ -pci_set_region (r++, -CONFIG_SYS_PCIE2_IO_BASE , -CONFIG_SYS_PCIE2_IO_PHYS , -CONFIG_SYS_PCIE2_IO_SIZE , -PCI_REGION_IO ); - - hose->region_count = r - hose->regions; - - hose->first_busno = first_free_busno; - -fsl_pci_init (hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data); - -/* Unlock inbound PCI configuration cycles */ -if (!host) -fsl_pci_config_unlock (hose); - - first_free_busno = hose->last_busno +1 ; -printf (" PCIE2 on bus %02x - %02x\n" , - hose->first_busno, hose->last_busno); + pcie_configured =is_fsl_pci_cfg (LAW_TRGT_IF_PCIE_2 , io_sel); + +if (pcie_configured && !(devdisr & MPC8xxx_DEVDISR_PCIE2)) { +SET_STD_PCIE_INFO (pci_info[num],2 ); + pcie_ep =fsl_setup_hose (&pcie2_hose, pci_info[num].regs); +printf (" PCIE2 connected as %s\n" , + pcie_ep ?"Endpoint" :"Root Complex" ); + first_free_busno =fsl_pci_init_port (&pci_info[num++], + &pcie2_hose, first_free_busno); + }else { +printf (" PCIE2: disabled\n" ); }#else setbits_be32 (&gur->devdisr, MPC8xxx_DEVDISR_PCIE2);#endif /* CONFIG_PCIE2 */ #ifdef CONFIG_PCIE3 - pci = (ccsr_fsl_pci_t *)CONFIG_SYS_PCIE3_ADDR ; - hose = &pcie3_hose; - host = host_agent_cfg[host_agent].pcie_root[2 ]; - width = io_port_cfg[io_sel].pcie_width[2 ]; - r = hose->regions; - -if (width && !(devdisr & MPC8xxx_DEVDISR_PCIE3)) { -printf ("\n PCIE3 connected as %s (x%d)" , - host ?"Root Complex" :"Endpoint" , width); -if (in_be32 (&pci->pme_msg_det)) { -out_be32 (&pci->pme_msg_det,0xffffffff ); -debug (" with errors. Clearing. Now 0x%08x" , -in_be32 (&pci->pme_msg_det)); - } -printf ("\n" ); - -/* outbound memory */ -pci_set_region (r++, -CONFIG_SYS_PCIE3_MEM_BASE , -CONFIG_SYS_PCIE3_MEM_PHYS , -CONFIG_SYS_PCIE3_MEM_SIZE , -PCI_REGION_MEM ); - -/* outbound io */ -pci_set_region (r++, -CONFIG_SYS_PCIE3_IO_BASE , -CONFIG_SYS_PCIE3_IO_PHYS , -CONFIG_SYS_PCIE3_IO_SIZE , -PCI_REGION_IO ); - - hose->region_count = r - hose->regions; - - hose->first_busno = first_free_busno; - -fsl_pci_init (hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data); - -/* Unlock inbound PCI configuration cycles */ -if (!host) -fsl_pci_config_unlock (hose); - - first_free_busno = hose->last_busno +1 ; -printf (" PCIE3 on bus %02x - %02x\n" , - hose->first_busno, hose->last_busno); + pcie_configured =is_fsl_pci_cfg (LAW_TRGT_IF_PCIE_3 , io_sel); + +if (pcie_configured && !(devdisr & MPC8xxx_DEVDISR_PCIE3)) { +SET_STD_PCIE_INFO (pci_info[num],3 ); + pcie_ep =fsl_setup_hose (&pcie3_hose, pci_info[num].regs); +printf (" PCIE3 connected as %s\n" , + pcie_ep ?"Endpoint" :"Root Complex" ); + first_free_busno =fsl_pci_init_port (&pci_info[num++], + &pcie3_hose, first_free_busno); + }else { +printf (" PCIE3: disabled\n" ); }#else setbits_be32 (&gur->devdisr, MPC8xxx_DEVDISR_PCIE3);
include/configs/XPEDITE5170.h +6 -6
@@ -321,18 +321,18 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);* Memory space is mapped 1-1, but I/O space must start from 0. */ /* PCIE1 - PEX8518 */ -#define CONFIG_SYS_PCIE1_MEM_BASE 0x80000000 -#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BASE +#define CONFIG_SYS_PCIE1_MEM_BUS 0x80000000 +#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BUS#define CONFIG_SYS_PCIE1_MEM_SIZE 0x40000000/* 1G */ -#define CONFIG_SYS_PCIE1_IO_BASE 0x00000000 +#define CONFIG_SYS_PCIE1_IO_BUS 0x00000000#define CONFIG_SYS_PCIE1_IO_PHYS 0xe8000000#define CONFIG_SYS_PCIE1_IO_SIZE 0x00800000/* 8M */ /* PCIE2 - VPX P1 */ -#define CONFIG_SYS_PCIE2_MEM_BASE 0xc0000000 -#define CONFIG_SYS_PCIE2_MEM_PHYS CONFIG_SYS_PCIE2_MEM_BASE +#define CONFIG_SYS_PCIE2_MEM_BUS 0xc0000000 +#define CONFIG_SYS_PCIE2_MEM_PHYS CONFIG_SYS_PCIE2_MEM_BUS#define CONFIG_SYS_PCIE2_MEM_SIZE 0x10000000/* 256M */ -#define CONFIG_SYS_PCIE2_IO_BASE 0x00000000 +#define CONFIG_SYS_PCIE2_IO_BUS 0x00000000#define CONFIG_SYS_PCIE2_IO_PHYS 0xe8800000#define CONFIG_SYS_PCIE2_IO_SIZE 0x00800000/* 8M */
include/configs/XPEDITE5200.h +3 -3
@@ -264,10 +264,10 @@* General PCI * Memory space is mapped 1-1, but I/O space must start from 0. */ -#define CONFIG_SYS_PCI1_MEM_BASE 0x80000000 -#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BASE +#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000 +#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS#define CONFIG_SYS_PCI1_MEM_SIZE 0x40000000/* 1G */ -#define CONFIG_SYS_PCI1_IO_BASE 0x00000000 +#define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe8000000#define CONFIG_SYS_PCI1_IO_SIZE 0x00800000/* 1M */
include/configs/XPEDITE5370.h +6 -6
@@ -330,18 +330,18 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);* Memory space is mapped 1-1, but I/O space must start from 0. */ /* PCIE1 - VPX P1 */ -#define CONFIG_SYS_PCIE1_MEM_BASE 0x80000000 -#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BASE +#define CONFIG_SYS_PCIE1_MEM_BUS 0x80000000 +#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BUS#define CONFIG_SYS_PCIE1_MEM_SIZE 0x40000000/* 1G */ -#define CONFIG_SYS_PCIE1_IO_BASE 0x00000000 +#define CONFIG_SYS_PCIE1_IO_BUS 0x00000000#define CONFIG_SYS_PCIE1_IO_PHYS 0xe8000000#define CONFIG_SYS_PCIE1_IO_SIZE 0x00800000/* 8M */ /* PCIE2 - PEX8518 */ -#define CONFIG_SYS_PCIE2_MEM_BASE 0xc0000000 -#define CONFIG_SYS_PCIE2_MEM_PHYS CONFIG_SYS_PCIE2_MEM_BASE +#define CONFIG_SYS_PCIE2_MEM_BUS 0xc0000000 +#define CONFIG_SYS_PCIE2_MEM_PHYS CONFIG_SYS_PCIE2_MEM_BUS#define CONFIG_SYS_PCIE2_MEM_SIZE 0x10000000/* 256M */ -#define CONFIG_SYS_PCIE2_IO_BASE 0x00000000 +#define CONFIG_SYS_PCIE2_IO_BUS 0x00000000#define CONFIG_SYS_PCIE2_IO_PHYS 0xe8800000#define CONFIG_SYS_PCIE2_IO_SIZE 0x00800000/* 8M */
include/configs/XPEDITE5500.h +3 -3
@@ -311,10 +311,10 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);*/ /* controller 1 - PEX8112 or XMC, depending on build option */ -#define CONFIG_SYS_PCIE1_MEM_BASE 0x80000000 -#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BASE +#define CONFIG_SYS_PCIE1_MEM_BUS 0x80000000 +#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BUS#define CONFIG_SYS_PCIE1_MEM_SIZE 0x40000000/* 1G */ -#define CONFIG_SYS_PCIE1_IO_BASE 0x00000000 +#define CONFIG_SYS_PCIE1_IO_BUS 0x00000000#define CONFIG_SYS_PCIE1_IO_PHYS 0xe8000000#define CONFIG_SYS_PCIE1_IO_SIZE 0x00800000/* 8M */
Signature · 1 line
1.7.0.4
PATCH 4/17 pci: Add ability to re-enumerate PCI buses
In reply to Peter TyserFrom: John Schmoller <[email protected]>
Add a new 'pci enum' command which re-enumerates the PCI buses. This command is enabled via the CONFIG_CMD_PCI_ENUM define and can be useful in boards with FPGAs connected via PCI/PCIe, boards that support PCI hot-plugging, or during PCI debug.
Also enable the 'pci enum' command for X-ES's Freescale-based boards.
--- common/cmd_pci.c | 13 +++++++++++++ drivers/pci/fsl_pci_init.c | 3 +++ drivers/pci/pci.c | 4 +++- include/configs/XPEDITE5170.h | 1 + include/configs/XPEDITE5200.h | 1 + include/configs/XPEDITE5370.h | 1 + include/configs/XPEDITE5500.h | 1 + 7 files changed, 23 insertions(+), 1 deletions(-)
common/cmd_pci.c +13 -0
@@ -497,6 +497,10 @@ int do_pci (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])if ((bdf =get_pci_dev (argv[2 ])) ==-1 )return 1 ;break ; +#ifdef CONFIG_CMD_PCI_ENUM +case 'e' : +break ; +#endif default :/* scan bus */ value =1 ;/* short listing */ bdf =0 ;/* bus number */
@@ -518,6 +522,11 @@ int do_pci (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])return 0 ;case 'd' :/* display */ return pci_cfg_display (bdf, addr, size, value); +#ifdef CONFIG_CMD_PCI_ENUM +case 'e' : +pci_init (); +return 0 ; +#endif case 'n' :/* next */ if (argc <4 ) goto usage;
@@ -545,6 +554,10 @@ U_BOOT_CMD( "list and access PCI Configuration Space", "[bus] [long]\n" " - short or long list of PCI devices on bus 'bus'\n" +#ifdef CONFIG_CMD_PCI_ENUM +"pci enum\n" + " - re-enumerate PCI buses\n" +#endif "pci header b.d.f\n" " - show header of PCI device 'bus.device.function'\n" "pci display[.b, .w, .l] b.d.f [address] [# of objects]\n"
drivers/pci/fsl_pci_init.c +3 -0
@@ -91,6 +91,9 @@ int fsl_setup_hose(struct pci_controller *hose, unsigned long addr) {volatile ccsr_fsl_pci_t *pci = (ccsr_fsl_pci_t *) addr; +/* Reset hose to make sure its in a clean state */ +memset (hose,0 ,sizeof (struct pci_controller )); +pci_setup_indirect (hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);return fsl_is_pci_agent (hose);
drivers/pci/pci.c +3 -1
@@ -139,7 +139,7 @@ void *pci_map_bar(pci_dev_t pdev, int bar, int flags)* */ -static struct pci_controller * hose_head =NULL ; +static struct pci_controller * hose_head;void pci_register_hose (struct pci_controller * hose) {
@@ -640,6 +640,8 @@ void pci_init(void) }#endif /* CONFIG_PCI_BOOTDELAY */ + hose_head =NULL ; +/* now call board specific pci_init()... */ pci_init_board (); }
include/configs/XPEDITE5170.h +1 -0
@@ -542,6 +542,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO #define CONFIG_CMD_PCI +#define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO #define CONFIG_CMD_SNTP
include/configs/XPEDITE5200.h +1 -0
@@ -335,6 +335,7 @@#define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO #define CONFIG_CMD_PCI +#define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_PING #define CONFIG_CMD_SNTP #define CONFIG_CMD_REGINFO
include/configs/XPEDITE5370.h +1 -0
@@ -392,6 +392,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO #define CONFIG_CMD_PCI +#define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_PING #define CONFIG_CMD_SAVEENV #define CONFIG_CMD_SNTP
include/configs/XPEDITE5500.h +1 -0
@@ -380,6 +380,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO #define CONFIG_CMD_PCI +#define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO #define CONFIG_CMD_SAVEENV
Signature · 1 line
1.7.0.4
PATCH 4/17 pci: Add ability to re-enumerate PCI buses
Quoted 12 lines · Peter Tyser
From: John Schmoller <[email protected]>
Add a new 'pci enum' command which re-enumerates the PCI buses. This command is enabled via the
CONFIG_CMD_PCI_ENUMdefine and can be useful in boards with FPGAs connected via PCI/PCIe, boards that support PCI hot-plugging, or during PCI debug.Also enable the 'pci enum' command for X-ES's Freescale-based boards.
Signed-off-by John Schmoller <[email protected]>Signed-off-by Peter Tyser <[email protected]>---
Quoted 8 lines
common/cmd_pci.c | 13 +++++++++++++ drivers/pci/fsl_pci_init.c | 3 +++ drivers/pci/pci.c | 4 +++- include/configs/XPEDITE5170.h | 1 + include/configs/XPEDITE5200.h | 1 + include/configs/XPEDITE5370.h | 1 + include/configs/XPEDITE5500.h | 1 + 7 files changed, 23 insertions(+), 1 deletions(-)
Need a Wolfgang Ack. looks good to me.
- k
PATCH 4/17 pci: Add ability to re-enumerate PCI buses
In reply to Peter TyserDear Peter Tyser,
Quoted 11 lines · In message <[email protected]> you wrote:
From: John Schmoller <[email protected]>
Add a new 'pci enum' command which re-enumerates the PCI buses. This command is enabled via the
CONFIG_CMD_PCI_ENUMdefine and can be useful in boards with FPGAs connected via PCI/PCIe, boards that support PCI hot-plugging, or during PCI debug.Also enable the 'pci enum' command for X-ES's Freescale-based boards.
Signed-off-by John Schmoller <[email protected]>Signed-off-by Peter Tyser <[email protected]>
Quoted 9 lines
--- common/cmd_pci.c | 13 +++++++++++++ drivers/pci/fsl_pci_init.c | 3 +++ drivers/pci/pci.c | 4 +++- include/configs/XPEDITE5170.h | 1 + include/configs/XPEDITE5200.h | 1 + include/configs/XPEDITE5370.h | 1 + include/configs/XPEDITE5500.h | 1 + 7 files changed, 23 insertions(+), 1 deletions(-)
Peter, I tried to apply, but I cannot:
Applying: pci: Add ability to re-enumerate PCI buses
fatal: sha1 information is lacking or useless (include/configs/XPEDITE5170.h). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge.
Patch failed at 0001 pci: Add ability to re-enumerate PCI buses
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de "I can call spirits from the vasty deep." "Why so can I, or so can any man; but will they come when you do call for them?" - Shakespeare, 1 King Henry IV, Act III, Scene I.
PATCH 4/17 pci: Add ability to re-enumerate PCI buses
Quoted 26 lines · Wolfgang Denk
Dear Peter Tyser,
Quoted 11 lines · In message <[email protected]> you wrote:
From: John Schmoller <[email protected]>
Add a new 'pci enum' command which re-enumerates the PCI buses. This command is enabled via the
CONFIG_CMD_PCI_ENUMdefine and can be useful in boards with FPGAs connected via PCI/PCIe, boards that support PCI hot-plugging, or during PCI debug.Also enable the 'pci enum' command for X-ES's Freescale-based boards.
Signed-off-by John Schmoller <[email protected]>Signed-off-by Peter Tyser <[email protected]>Quoted 9 lines
--- common/cmd_pci.c | 13 +++++++++++++ drivers/pci/fsl_pci_init.c | 3 +++ drivers/pci/pci.c | 4 +++- include/configs/XPEDITE5170.h | 1 + include/configs/XPEDITE5200.h | 1 + include/configs/XPEDITE5370.h | 1 + include/configs/XPEDITE5500.h | 1 + 7 files changed, 23 insertions(+), 1 deletions(-)Acked-by Wolfgang Denk <[email protected]>
Quoted 7 lines
Peter, I tried to apply, but I cannot:
Applying: pci: Add ability to re-enumerate PCI buses
fatal: sha1 information is lacking or useless (include/configs/XPEDITE5170.h). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge.
Patch failed at 0001 pci: Add ability to re-enumerate PCI buses
I'll rebase and resubmit with your ack and let Kumar pick it up since it touches some 85xx board config files which get moved in the series.
Thanks,
Peter
PATCH 5/17 ppc: Don't initialize write protected NOR flashes
In reply to Peter TyserFrom: John Schmoller <[email protected]>
If a NOR flash is write protected it can not be initialized/detected so add the ability for boards to skip NOR initialization on bootup. A board can skip NOR initialization by implementing the board_flash_wp_on() function.
--- arch/powerpc/lib/board.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-)
arch/powerpc/lib/board.c +15 -1
@@ -175,6 +175,16 @@ void __board_add_ram_info(int use_default) }void board_add_ram_info (int ) __attribute__((weak,alias ("__board_add_ram_info" ))); +int __board_flash_wp_on (void ) +{ +/* +* Most flashes can't be detected when write protection is enabled, +* so provide a way to let U-Boot gracefully ignore write protected +* devices. +*/ +return 0 ; +} +int board_flash_wp_on (void ) __attribute__((weak,alias ("__board_flash_wp_on" )));static int init_func_ram (void ) {
@@ -703,7 +713,11 @@ void board_init_r (gd_t *id, ulong dest_addr)#if !defined(CONFIG_SYS_NO_FLASH )puts ("FLASH: " ); -if ((flash_size =flash_init ()) >0 ) { +if (board_flash_wp_on ()) { +printf ("Uninitialized - Write Protect On\n" ); +/* Since WP is on, we can't find real size. Set to 0 */ + flash_size =0 ; + }else if ((flash_size =flash_init ()) >0 ) {# ifdef CONFIG_SYS_FLASH_CHECKSUM print_size (flash_size,"" );/*
Signature · 1 line
1.7.0.4
PATCH 5/17 ppc: Don't initialize write protected NOR flashes
Quoted 7 lines · Peter Tyser
From: John Schmoller <[email protected]>
If a NOR flash is write protected it can not be initialized/detected so add the ability for boards to skip NOR initialization on bootup. A board can skip NOR initialization by implementing the
board_flash_wp_on()function.
Quoted 6 lines
Signed-off-by John Schmoller <[email protected]>Signed-off-by Peter Tyser <[email protected]>CC sr at denx.de---
arch/powerpc/lib/board.c| 16 +++++++++++++++-1 files changed, 15 insertions(+), 1 deletions(-)
Needs a Wolfgang or Stefan ack.
- k
PATCH 5/17 ppc: Don't initialize write protected NOR flashes
Quoted 8 lines · On Wednesday 20 October 2010 08:46:03 Kumar Gala wrote:
Quoted 7 lines · Peter Tyser
From: John Schmoller <[email protected]>
If a NOR flash is write protected it can not be initialized/detected so add the ability for boards to skip NOR initialization on bootup. A board can skip NOR initialization by implementing the
board_flash_wp_on()function.
Quoted 8 lines
Quoted 6 lines
Signed-off-by John Schmoller <[email protected]>Signed-off-by Peter Tyser <[email protected]>CC sr at denx.de---
arch/powerpc/lib/board.c| 16 +++++++++++++++-1 files changed, 15 insertions(+), 1 deletions(-)Needs a Wolfgang or Stefan ack.
Fine with me:
Cheers,
Stefan
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de
Wolfgang Denk
AppliedPATCH 5/17 ppc: Don't initialize write protected NOR flashes
In reply to Peter TyserDear Peter Tyser,
Quoted 7 lines · In message <[email protected]> you wrote:
From: John Schmoller <[email protected]>
If a NOR flash is write protected it can not be initialized/detected so add the ability for boards to skip NOR initialization on bootup. A board can skip NOR initialization by implementing the
board_flash_wp_on()function.
Quoted 6 lines
Signed-off-by John Schmoller <[email protected]>Signed-off-by Peter Tyser <[email protected]>CC sr at denx.de--- arch/powerpc/lib/board.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de No user-servicable parts inside. Refer to qualified service personnel.
PATCH 6/17 xes: Consolidate checkboard()
In reply to Peter TyserFrom: John Schmoller <[email protected]>
Create a common checkboard() function to support all X-ES's Freescale boards.
Also, add a get_board_derivative() function which reads hardware strapping resistors to determine what model a board is. This allows one U-Boot image to support multiple boards.
--- board/xes/common/Makefile | 2 + board/xes/common/board.c | 64 +++++++++++++++++++++++++++++++++++ board/xes/common/fsl_8xxx_misc.c | 47 +++++++++++++++++++++++++ board/xes/common/fsl_8xxx_misc.h | 28 +++++++++++++++ board/xes/xpedite5170/xpedite5170.c | 20 +---------- board/xes/xpedite5200/xpedite5200.c | 27 --------------- board/xes/xpedite5370/xpedite5370.c | 20 ----------- board/xes/xpedite5500/xpedite5500.c | 20 ----------- include/configs/XPEDITE1000.h | 1 + include/configs/XPEDITE5170.h | 1 + include/configs/XPEDITE5370.h | 1 + 11 files changed, 145 insertions(+), 86 deletions(-) create mode 100644 board/xes/common/board.c create mode 100644 board/xes/common/fsl_8xxx_misc.c create mode 100644 board/xes/common/fsl_8xxx_misc.h
board/xes/common/Makefile +2 -0
@@ -35,6 +35,8 @@ COBJS-$(CONFIG_MPC86xx) += fsl_8xxx_clk.o COBJS-$(CONFIG_P2020) += fsl_8xxx_clk.o COBJS-$(CONFIG_FSL_DDR2) += fsl_8xxx_ddr.o COBJS-$(CONFIG_FSL_DDR3) += fsl_8xxx_ddr.o +COBJS-$(CONFIG_MPC85xx) += fsl_8xxx_misc.o board.o +COBJS-$(CONFIG_MPC86xx) += fsl_8xxx_misc.o board.o COBJS-$(CONFIG_NAND_ACTL) += actl_nand.o SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
board/xes/common/board.c new file +64 -0
64 lines not on this page · raw message
board/xes/common/fsl_8xxx_misc.c new file +47 -0
47 lines not on this page · raw message
board/xes/common/fsl_8xxx_misc.h new file +28 -0
@@ -0,0 +1,28 @@ +/* +* Copyright 2008 Extreme Engineering Solutions, Inc. +* +* See file CREDITS for list of people who contributed to this +* project. +* +* 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. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, +* MA 02111-1307 USA +*/ + +#ifndef __FSL_8XXX_MISC_H___ +#define __FSL_8XXX_MISC_H___ + +uint get_board_derivative (void ); + +#endif /* __FSL_8XXX_MISC_H__ */
board/xes/xpedite5170/xpedite5170.c +1 -19
@@ -26,30 +26,12 @@#include <asm/io.h> #include <fdt_support.h> #include <pca953x.h> +#include "../common/fsl_8xxx_misc.h" #if defined(CONFIG_OF_BOARD_SETUP ) && defined(CONFIG_PCI )extern void ft_board_pci_setup (void *blob,bd_t *bd);#endif -int checkboard (void ) -{ -char *s; - -printf ("Board: X-ES %s 3U VPX SBC\n" ,CONFIG_SYS_BOARD_NAME ); -printf (" " ); - s =getenv ("board_rev" ); -if (s) -printf ("Rev %s, " , s); - s =getenv ("serial#" ); -if (s) -printf ("Serial# %s, " , s); - s =getenv ("board_cfg" ); -if (s) -printf ("Cfg %s" , s); -printf ("\n" ); - -return 0 ; -}/* * Print out which flash was booted from and if booting from the 2nd flash, * swap flash chip selects to maintain consistent flash numbering/addresses.
board/xes/xpedite5200/xpedite5200.c +0 -27
@@ -36,33 +36,6 @@extern void ft_board_pci_setup (void *blob,bd_t *bd); -int checkboard (void ) -{ -volatile fsl_lbc_t *lbc =LBC_BASE_ADDR ; -volatile ccsr_local_ecm_t *ecm = (void *)(CONFIG_SYS_MPC85xx_ECM_ADDR); -char *s; - -printf ("Board: X-ES %s PMC\n" ,CONFIG_SYS_BOARD_NAME ); -printf (" " ); - s =getenv ("board_rev" ); -if (s) -printf ("Rev %s, " , s); - s =getenv ("serial#" ); -if (s) -printf ("Serial# %s, " , s); - s =getenv ("board_cfg" ); -if (s) -printf ("Cfg %s" , s); -printf ("\n" ); - -out_be32 (&lbc->ltesr,0xffffffff );/* Clear LBC error IRQs */ -out_be32 (&lbc->lteir,0xffffffff );/* Enable LBC error IRQs */ -out_be32 (&ecm->eedr,0xffffffff );/* Clear ecm errors */ -out_be32 (&ecm->eeer,0xffffffff );/* Enable ecm errors */ - -return 0 ; -} -static void flash_cs_fixup (void ) {int flash_sel;
board/xes/xpedite5370/xpedite5370.c +0 -20
@@ -36,26 +36,6 @@ DECLARE_GLOBAL_DATA_PTR;extern void ft_board_pci_setup (void *blob,bd_t *bd); -int checkboard (void ) -{ -char *s; - -printf ("Board: X-ES %s 3U VPX SBC\n" ,CONFIG_SYS_BOARD_NAME ); -printf (" " ); - s =getenv ("board_rev" ); -if (s) -printf ("Rev %s, " , s); - s =getenv ("serial#" ); -if (s) -printf ("Serial# %s, " , s); - s =getenv ("board_cfg" ); -if (s) -printf ("Cfg %s" , s); -printf ("\n" ); - -return 0 ; -} -static void flash_cs_fixup (void ) {int flash_sel;
board/xes/xpedite5500/xpedite5500.c +0 -20
@@ -36,26 +36,6 @@ DECLARE_GLOBAL_DATA_PTR;extern void ft_board_pci_setup (void *blob,bd_t *bd); -int checkboard (void ) -{ -char *s; - -printf ("Board: X-ES %s PMC/XMC SBC\n" ,CONFIG_SYS_BOARD_NAME ); -printf (" " ); - s =getenv ("board_rev" ); -if (s) -printf ("Rev %s, " , s); - s =getenv ("serial#" ); -if (s) -printf ("Serial# %s, " , s); - s =getenv ("board_cfg" ); -if (s) -printf ("Cfg %s" , s); -printf ("\n" ); - -return 0 ; -} -static void flash_cs_fixup (void ) {int flash_sel;
include/configs/XPEDITE1000.h +1 -0
@@ -33,6 +33,7 @@/* High Level Configuration Options */ #define CONFIG_XPEDITE1000 1#define CONFIG_SYS_BOARD_NAME "XPedite1000" +#define CONFIG_SYS_FORM_PMC 1#define CONFIG_4xx 1/* ... PPC4xx family */ #define CONFIG_440 1#define CONFIG_440GX 1/* 440 GX */
include/configs/XPEDITE5170.h +1 -0
@@ -34,6 +34,7 @@#define CONFIG_MPC8641 1/* MPC8641 specific */ #define CONFIG_XPEDITE5140 1/* MPC8641HPCN board specific */ #define CONFIG_SYS_BOARD_NAME "XPedite5170" +#define CONFIG_SYS_FORM_3U_VPX 1#define CONFIG_LINUX_RESET_VEC 0x100/* Reset vector used by Linux */ #define CONFIG_BOARD_EARLY_INIT_R /* Call board_pre_init */ #define CONFIG_HIGH_BATS 1/* High BATs supported and enabled */
include/configs/XPEDITE5370.h +1 -0
@@ -36,6 +36,7 @@#define CONFIG_MPC8572 1#define CONFIG_XPEDITE5370 1#define CONFIG_SYS_BOARD_NAME "XPedite5370" +#define CONFIG_SYS_FORM_3U_VPX 1#define CONFIG_BOARD_EARLY_INIT_R /* Call board_pre_init */ #define CONFIG_PCI 1/* Enable PCI/PCIE */
Signature · 1 line
1.7.0.4
PATCH 7/17 xes: Add board_flash_wp_on()
In reply to Peter TyserFrom: John Schmoller <[email protected]>
Add board_flash_wp_on() to check a pca9557 gpio pin to see if non-volatile memory write protection is enabled.
Previously, write protected NOR flashes would fail initialization which resulted in a bootup error such as:
...
DTT: 53 C local / 64 C remote (adt7461 at 4c)
DTT: 54 C local (ds1621 at 48)
FLASH: Executed from FLASH1
POST memory PASSED
FLASH: ## Unknown FLASH on Bank 1 - Size = 0x00000000 = 0 MB ## Unknown FLASH on Bank 2 - Size = 0x00000000 = 0 MB *** failed ***
### ERROR ### Please RESET the board ###
With this patch, NOR flash initialization is skipped:
...
DTT: 53 C local / 64 C remote (adt7461 at 4c)
DTT: 54 C local (ds1621 at 48)
FLASH: Executed from FLASH1
POST memory PASSED
FLASH: Uninitialized - Write Protect On
L2: 1024 KB enabled
NAND: 1024 MiB
...
Note that flash related commands such as flinfo and saveenv will error out when flash write protection is enabled.
--- board/xes/common/fsl_8xxx_misc.c | 15 +++++++++++++++ include/configs/XPEDITE5200.h | 2 +- 2 files changed, 16 insertions(+), 1 deletions(-)
board/xes/common/fsl_8xxx_misc.c +15 -0
@@ -22,6 +22,21 @@#include <common.h> #include <asm/mmu.h> +#ifdef CONFIG_PCA953X +#include <pca953x.h> + +/* +* Determine if a board's flashes are write protected +*/ +int board_flash_wp_on (void ) +{ +if (pca953x_get_val (CONFIG_SYS_I2C_PCA953X_ADDR0 ) & +CONFIG_SYS_PCA953X_NVM_WP ) +return 1 ; + +return 0 ; +} +#endif /* * Return a board's derivative model number. For example:
include/configs/XPEDITE5200.h +1 -1
@@ -246,7 +246,7 @@#define CONFIG_SYS_PCA953X_BRD_CFG2 0x04#define CONFIG_SYS_PCA953X_XMC_ROOT0 0x08#define CONFIG_SYS_PCA953X_FLASH_PASS_CS 0x10 -#define CONFIG_SYS_PCA953X_FLASH_WP 0x20 +#define CONFIG_SYS_PCA953X_NVM_WP 0x20#define CONFIG_SYS_PCA953X_MONARCH 0x40#define CONFIG_SYS_PCA953X_EREADY 0x80
Signature · 1 line
1.7.0.4
PATCH 8/17 xes: Make X-ES board names more generic
In reply to Peter TyserSome U-Boot images for X-ES boards support multiple products in the same family. For example, the XPedite5370, XPedite5371, and XPedite5372 are similar enough that one U-Boot image can work on all 3 cards. To make it clear that a U-Boot image can work on boards of the same family, rename the boards with the least significant digit of 'x'.
While we're at it, change the board config file and make targets to be lowercase.
Also change the default uImage and fdt filenames to "board.uImage" and "board.dtb" to be more generic.
---
board/xes/{xpedite5170 => xpedite517x}/Makefile | 0
board/xes/{xpedite5170 => xpedite517x}/config.mk | 2 +-
board/xes/{xpedite5170 => xpedite517x}/ddr.c | 0
board/xes/{xpedite5170 => xpedite517x}/law.c | 0
board/xes/{xpedite5170 => xpedite517x}/u-boot.lds | 0
.../xpedite5170.c => xpedite517x/xpedite517x.c} | 0
board/xes/{xpedite5200 => xpedite520x}/Makefile | 0
board/xes/{xpedite5200 => xpedite520x}/config.mk | 2 +-
board/xes/{xpedite5200 => xpedite520x}/ddr.c | 0
board/xes/{xpedite5200 => xpedite520x}/law.c | 0
board/xes/{xpedite5200 => xpedite520x}/tlb.c | 0
.../xpedite5200.c => xpedite520x/xpedite520x.c} | 0
board/xes/{xpedite5370 => xpedite537x}/Makefile | 0
board/xes/{xpedite5370 => xpedite537x}/config.mk | 2 +-
board/xes/{xpedite5370 => xpedite537x}/ddr.c | 0
board/xes/{xpedite5370 => xpedite537x}/law.c | 0
board/xes/{xpedite5370 => xpedite537x}/tlb.c | 0
.../xpedite5370.c => xpedite537x/xpedite537x.c} | 0
board/xes/{xpedite5500 => xpedite550x}/Makefile | 0
board/xes/{xpedite5500 => xpedite550x}/config.mk | 2 +-
board/xes/{xpedite5500 => xpedite550x}/ddr.c | 0
board/xes/{xpedite5500 => xpedite550x}/law.c | 0
board/xes/{xpedite5500 => xpedite550x}/tlb.c | 0
.../xpedite5500.c => xpedite550x/xpedite550x.c} | 0
boards.cfg | 10 +++++-----
include/configs/{XPEDITE1000.h => xpedite1000.h} | 4 ++--
include/configs/{XPEDITE5170.h => xpedite517x.h} | 6 +++---
include/configs/{XPEDITE5200.h => xpedite520x.h} | 6 +++---
include/configs/{XPEDITE5370.h => xpedite537x.h} | 6 +++---
include/configs/{XPEDITE5500.h => xpedite550x.h} | 6 +++---
30 files changed, 23 insertions(+), 23 deletions(-)
rename board/xes/{xpedite5170 => xpedite517x}/Makefile (100%)
rename board/xes/{xpedite5170 => xpedite517x}/config.mk (98%)
rename board/xes/{xpedite5170 => xpedite517x}/ddr.c (100%)
rename board/xes/{xpedite5170 => xpedite517x}/law.c (100%)
rename board/xes/{xpedite5170 => xpedite517x}/u-boot.lds (100%)
rename board/xes/{xpedite5170/xpedite5170.c => xpedite517x/xpedite517x.c} (100%)
rename board/xes/{xpedite5200 => xpedite520x}/Makefile (100%)
rename board/xes/{xpedite5200 => xpedite520x}/config.mk (97%)
rename board/xes/{xpedite5200 => xpedite520x}/ddr.c (100%)
rename board/xes/{xpedite5200 => xpedite520x}/law.c (100%)
rename board/xes/{xpedite5200 => xpedite520x}/tlb.c (100%)
rename board/xes/{xpedite5200/xpedite5200.c => xpedite520x/xpedite520x.c} (100%)
rename board/xes/{xpedite5370 => xpedite537x}/Makefile (100%)
rename board/xes/{xpedite5370 => xpedite537x}/config.mk (97%)
rename board/xes/{xpedite5370 => xpedite537x}/ddr.c (100%)
rename board/xes/{xpedite5370 => xpedite537x}/law.c (100%)
rename board/xes/{xpedite5370 => xpedite537x}/tlb.c (100%)
rename board/xes/{xpedite5370/xpedite5370.c => xpedite537x/xpedite537x.c} (100%)
rename board/xes/{xpedite5500 => xpedite550x}/Makefile (100%)
rename board/xes/{xpedite5500 => xpedite550x}/config.mk (97%)
rename board/xes/{xpedite5500 => xpedite550x}/ddr.c (100%)
rename board/xes/{xpedite5500 => xpedite550x}/law.c (100%)
rename board/xes/{xpedite5500 => xpedite550x}/tlb.c (100%)
rename board/xes/{xpedite5500/xpedite5500.c => xpedite550x/xpedite550x.c} (100%)
rename include/configs/{XPEDITE1000.h => xpedite1000.h} (99%)
rename include/configs/{XPEDITE5170.h => xpedite517x.h} (99%)
rename include/configs/{XPEDITE5200.h => xpedite520x.h} (99%)
rename include/configs/{XPEDITE5370.h => xpedite537x.h} (99%)
rename include/configs/{XPEDITE5500.h => xpedite550x.h} (99%)board/xes/xpedite517x/Makefile renamed from board/xes/xpedite5170/Makefile +0 -0
board/xes/xpedite517x/config.mk renamed from board/xes/xpedite5170/config.mk +1 -1
@@ -22,6 +22,6 @@ # # -# XPedite5170 +# XPedite517x # TEXT_BASE = 0xfff00000
board/xes/xpedite517x/ddr.c renamed from board/xes/xpedite5170/ddr.c +0 -0
board/xes/xpedite517x/law.c renamed from board/xes/xpedite5170/law.c +0 -0
board/xes/xpedite517x/u-boot.lds renamed from board/xes/xpedite5170/u-boot.lds +0 -0
board/xes/xpedite517x/xpedite517x.c renamed from board/xes/xpedite5170/xpedite5170.c +0 -0
board/xes/xpedite520x/Makefile renamed from board/xes/xpedite5200/Makefile +0 -0
board/xes/xpedite520x/config.mk renamed from board/xes/xpedite5200/config.mk +1 -1
@@ -22,7 +22,7 @@ # # -# xpedite5200 board +# xpedite520x board # ifndef TEXT_BASE TEXT_BASE = 0xfff80000
board/xes/xpedite520x/ddr.c renamed from board/xes/xpedite5200/ddr.c +0 -0
board/xes/xpedite520x/law.c renamed from board/xes/xpedite5200/law.c +0 -0
board/xes/xpedite520x/tlb.c renamed from board/xes/xpedite5200/tlb.c +0 -0
board/xes/xpedite520x/xpedite520x.c renamed from board/xes/xpedite5200/xpedite5200.c +0 -0
board/xes/xpedite537x/Makefile renamed from board/xes/xpedite5370/Makefile +0 -0
board/xes/xpedite537x/config.mk renamed from board/xes/xpedite5370/config.mk +1 -1
@@ -22,7 +22,7 @@ # # -# xpedite5370 board +# xpedite537x board # ifndef TEXT_BASE TEXT_BASE = 0xfff80000
board/xes/xpedite537x/ddr.c renamed from board/xes/xpedite5370/ddr.c +0 -0
board/xes/xpedite537x/law.c renamed from board/xes/xpedite5370/law.c +0 -0
board/xes/xpedite537x/tlb.c renamed from board/xes/xpedite5370/tlb.c +0 -0
board/xes/xpedite537x/xpedite537x.c renamed from board/xes/xpedite5370/xpedite5370.c +0 -0
board/xes/xpedite550x/Makefile renamed from board/xes/xpedite5500/Makefile +0 -0
board/xes/xpedite550x/config.mk renamed from board/xes/xpedite5500/config.mk +1 -1
@@ -22,7 +22,7 @@ # # -# xpedite5500 board +# xpedite550x board # ifndef TEXT_BASE
board/xes/xpedite550x/ddr.c renamed from board/xes/xpedite5500/ddr.c +0 -0
board/xes/xpedite550x/law.c renamed from board/xes/xpedite5500/law.c +0 -0
board/xes/xpedite550x/tlb.c renamed from board/xes/xpedite5500/tlb.c +0 -0
board/xes/xpedite550x/xpedite550x.c renamed from board/xes/xpedite5500/xpedite5500.c +0 -0
boards.cfg +5 -5
@@ -340,13 +340,13 @@ MPC8544DS powerpc mpc85xx mpc8544ds freescale MPC8560ADS powerpc mpc85xx mpc8560ads freescale MPC8568MDS powerpc mpc85xx mpc8568mds freescale P4080DS powerpc mpc85xx corenet_ds freescale -XPEDITE5200 powerpc mpc85xx xpedite5200 xes -XPEDITE5370 powerpc mpc85xx xpedite5370 xes -XPEDITE5500 powerpc mpc85xx xpedite5500 xes +xpedite520x powerpc mpc85xx - xes +xpedite537x powerpc mpc85xx - xes +xpedite550x powerpc mpc85xx - xes P1022DS powerpc mpc85xx p1022ds freescale sbc8641d powerpc mpc86xx MPC8610HPCD powerpc mpc86xx mpc8610hpcd freescale -XPEDITE5170 powerpc mpc86xx xpedite5170 xes +xpedite517x powerpc mpc86xx - xes cogent_mpc8xx powerpc mpc8xx cogent ESTEEM192E powerpc mpc8xx esteem192e RPXClassic powerpc mpc8xx
@@ -360,7 +360,7 @@ CPCIISER4 powerpc ppc4xx cpciiser4 esd DASA_SIM powerpc ppc4xx dasa_sim esd PMC405DE powerpc ppc4xx pmc405de esd METROBOX powerpc ppc4xx metrobox sandburst -XPEDITE1000 powerpc ppc4xx xpedite1000 xes +xpedite1000 powerpc ppc4xx - xes grsim_leon2 sparc leon2 - gaisler gr_cpci_ax2000 sparc leon3 - gaisler gr_ep2s60 sparc leon3 - gaisler
include/configs/xpedite1000.h renamed from include/configs/XPEDITE1000.h +2 -2
@@ -347,8 +347,8 @@ extern void out32(unsigned int, unsigned long);"misc_args=ip=on\0" \"set_bootargs=setenv bootargs ${console_args} ${root_args} ${misc_args}\0" \"bootfile=/home/user/file\0" \ -"osfile=/home/user/uImage-XPedite1000\0" \ -"fdtfile=/home/user/xpedite1000.dtb\0" \ +"osfile=/home/user/board.uImage\0" \ +"fdtfile=/home/user/board.dtb\0" \"ubootfile=/home/user/u-boot.bin\0" \"fdtaddr=c00000\0" \"osaddr=0x1000000\0" \
include/configs/xpedite517x.h renamed from include/configs/XPEDITE5170.h +3 -3
@@ -22,7 +22,7 @@*/ /* -* xpedite5170 board configuration file +* xpedite517x board configuration file */ #ifndef __CONFIG_H#define __CONFIG_H
@@ -730,8 +730,8 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);"misc_args=ip=on\0" \"set_bootargs=setenv bootargs ${console_args} ${root_args} ${misc_args}\0" \"bootfile=/home/user/file\0" \ -"osfile=/home/user/uImage-XPedite5170\0" \ -"fdtfile=/home/user/xpedite5170.dtb\0" \ +"osfile=/home/user/board.uImage\0" \ +"fdtfile=/home/user/board.dtb\0" \"ubootfile=/home/user/u-boot.bin\0" \"fdtaddr=c00000\0" \"osaddr=0x1000000\0" \
include/configs/xpedite520x.h renamed from include/configs/XPEDITE5200.h +3 -3
@@ -22,7 +22,7 @@*/ /* -* xpedite5200 board configuration file +* xpedite520x board configuration file */ #ifndef __CONFIG_H#define __CONFIG_H
@@ -524,8 +524,8 @@"misc_args=ip=on\0" \"set_bootargs=setenv bootargs ${console_args} ${root_args} ${misc_args}\0" \"bootfile=/home/user/file\0" \ -"osfile=/home/user/uImage-XPedite5200\0" \ -"fdtfile=/home/user/xpedite5200.dtb\0" \ +"osfile=/home/user/board.uImage\0" \ +"fdtfile=/home/user/board.dtb\0" \"ubootfile=/home/user/u-boot.bin\0" \"fdtaddr=c00000\0" \"osaddr=0x1000000\0" \
include/configs/xpedite537x.h renamed from include/configs/XPEDITE5370.h +3 -3
@@ -22,7 +22,7 @@*/ /* -* xpedite5370 board configuration file +* xpedite537x board configuration file */ #ifndef __CONFIG_H#define __CONFIG_H
@@ -582,8 +582,8 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);"misc_args=ip=on\0" \"set_bootargs=setenv bootargs ${console_args} ${root_args} ${misc_args}\0" \"bootfile=/home/user/file\0" \ -"osfile=/home/user/uImage-XPedite5370\0" \ -"fdtfile=/home/user/xpedite5370.dtb\0" \ +"osfile=/home/user/board.uImage\0" \ +"fdtfile=/home/user/board.dtb\0" \"ubootfile=/home/user/u-boot.bin\0" \"fdtaddr=c00000\0" \"osaddr=0x1000000\0" \
include/configs/xpedite550x.h renamed from include/configs/XPEDITE5500.h +3 -3
@@ -21,7 +21,7 @@*/ /* -* xpedite5500 board configuration file +* xpedite550x board configuration file */ #ifndef __CONFIG_H#define __CONFIG_H
@@ -570,8 +570,8 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);"misc_args=ip=on\0" \"set_bootargs=setenv bootargs ${console_args} ${root_args} ${misc_args}\0" \"bootfile=/home/user/file\0" \ -"osfile=/home/user/uImage-XPedite5500\0" \ -"fdtfile=/home/user/xpedite5500.dtb\0" \ +"osfile=/home/user/board.uImage\0" \ +"fdtfile=/home/user/board.dtb\0" \"ubootfile=/home/user/u-boot.bin\0" \"fdtaddr=c00000\0" \"osaddr=0x1000000\0" \
Signature · 1 line
1.7.0.4
PATCH 9/17 xes: Add POST support for 8xxx boards
In reply to Peter TyserAdd memory and I2C posts to the XPedite517x/520x/537x/550x board families.
--- board/xes/common/Makefile | 5 ++++ board/xes/common/fsl_8xxx_post.c | 43 ++++++++++++++++++++++++++++++++++++++ include/configs/xpedite517x.h | 15 +++++++++++++ include/configs/xpedite520x.h | 10 ++++++++ include/configs/xpedite537x.h | 13 +++++++++++ include/configs/xpedite550x.h | 9 ++++++++ 6 files changed, 95 insertions(+), 0 deletions(-) create mode 100644 board/xes/common/fsl_8xxx_post.c
board/xes/common/Makefile +5 -0
@@ -39,6 +39,11 @@ COBJS-$(CONFIG_MPC85xx) += fsl_8xxx_misc.o board.o COBJS-$(CONFIG_MPC86xx) += fsl_8xxx_misc.o board.o COBJS-$(CONFIG_NAND_ACTL) += actl_nand.o +ifneq ($(CONFIG_HAS_POST),) +COBJS-$(CONFIG_MPC85xx) += fsl_8xxx_post.o +COBJS-$(CONFIG_MPC86xx) += fsl_8xxx_post.o +endif + SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y)) SOBJS := $(addprefix $(obj),$(SOBJS))
board/xes/common/fsl_8xxx_post.c new file +43 -0
43 lines not on this page · raw message
include/configs/xpedite517x.h +15 -0
@@ -105,6 +105,19 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#define CONFIG_SYS_ALT_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x10000000#define CONFIG_SYS_MEMTEST_END 0x20000000 +#define CONFIG_POST (CONFIG_SYS_POST_MEMORY |\ + CONFIG_SYS_POST_I2C) +#define I2C_ADDR_LIST {CONFIG_SYS_I2C_DS1621_ADDR, \ + CONFIG_SYS_I2C_DS4510_ADDR, \ + CONFIG_SYS_I2C_EEPROM_ADDR, \ + CONFIG_SYS_I2C_LM90_ADDR, \ + CONFIG_SYS_I2C_PCA9553_ADDR, \ + CONFIG_SYS_I2C_PCA953X_ADDR0, \ + CONFIG_SYS_I2C_PCA953X_ADDR1, \ + CONFIG_SYS_I2C_PCA953X_ADDR2, \ + CONFIG_SYS_I2C_PCA953X_ADDR3, \ + CONFIG_SYS_I2C_PEX8518_ADDR, \ + CONFIG_SYS_I2C_RTC_ADDR}/* * Memory map
@@ -256,6 +269,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#define CONFIG_SYS_I2C_DS1621_ADDR 0x48#define CONFIG_DTT_DS1621 #define CONFIG_DTT_SENSORS { 0 } +#define CONFIG_SYS_I2C_LM90_ADDR 0x4c/* I2C EEPROM - AT24C128B */ #define CONFIG_SYS_I2C_EEPROM_ADDR 0x54
@@ -279,6 +293,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#define CONFIG_SYS_I2C_PCA953X_ADDR2 0x1e#define CONFIG_SYS_I2C_PCA953X_ADDR3 0x1f#define CONFIG_SYS_I2C_PCA953X_ADDR CONFIG_SYS_I2C_PCA953X_ADDR0 +#define CONFIG_SYS_I2C_PCA9553_ADDR 0x62/* * PU = pulled high, PD = pulled low
include/configs/xpedite520x.h +10 -0
@@ -88,6 +88,13 @@#define CONFIG_SYS_ALT_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x10000000#define CONFIG_SYS_MEMTEST_END 0x20000000 +#define CONFIG_POST (CONFIG_SYS_POST_MEMORY | \ + CONFIG_SYS_POST_I2C) +#define I2C_ADDR_LIST {CONFIG_SYS_I2C_MAX1237_ADDR, \ + CONFIG_SYS_I2C_EEPROM_ADDR, \ + CONFIG_SYS_I2C_PCA953X_ADDR0, \ + CONFIG_SYS_I2C_PCA953X_ADDR1, \ + CONFIG_SYS_I2C_RTC_ADDR}/* * Memory map
@@ -260,6 +267,9 @@#define CONFIG_SYS_PCA953X_P14_IO6 0x40#define CONFIG_SYS_PCA953X_P14_IO7 0x80 +/* 12-bit ADC used to measure CPU diode */ +#define CONFIG_SYS_I2C_MAX1237_ADDR 0x34 +/* * General PCI * Memory space is mapped 1-1, but I/O space must start from 0.
include/configs/xpedite537x.h +13 -0
@@ -107,6 +107,18 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_SYS_ALT_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x10000000#define CONFIG_SYS_MEMTEST_END 0x20000000 +#define CONFIG_POST (CONFIG_SYS_POST_MEMORY | \ + CONFIG_SYS_POST_I2C) +#define I2C_ADDR_LIST {CONFIG_SYS_I2C_DS1621_ADDR, \ + CONFIG_SYS_I2C_DS4510_ADDR, \ + CONFIG_SYS_I2C_EEPROM_ADDR, \ + CONFIG_SYS_I2C_LM90_ADDR, \ + CONFIG_SYS_I2C_PCA953X_ADDR0, \ + CONFIG_SYS_I2C_PCA953X_ADDR1, \ + CONFIG_SYS_I2C_PCA953X_ADDR2, \ + CONFIG_SYS_I2C_PCA953X_ADDR3, \ + CONFIG_SYS_I2C_PEX8518_ADDR, \ + CONFIG_SYS_I2C_RTC_ADDR}/* * Memory map
@@ -262,6 +274,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_SYS_I2C_DS1621_ADDR 0x48#define CONFIG_DTT_DS1621 #define CONFIG_DTT_SENSORS { 0 } +#define CONFIG_SYS_I2C_LM90_ADDR 0x4c/* I2C EEPROM - AT24C128B */ #define CONFIG_SYS_I2C_EEPROM_ADDR 0x54
include/configs/xpedite550x.h +9 -0
@@ -102,6 +102,15 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_SYS_ALT_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x10000000#define CONFIG_SYS_MEMTEST_END 0x20000000 +#define CONFIG_POST (CONFIG_SYS_POST_MEMORY | \ + CONFIG_SYS_POST_I2C) +#define I2C_ADDR_LIST {CONFIG_SYS_I2C_EEPROM_ADDR, \ + CONFIG_SYS_I2C_LM75_ADDR, \ + CONFIG_SYS_I2C_LM90_ADDR, \ + CONFIG_SYS_I2C_PCA953X_ADDR0, \ + CONFIG_SYS_I2C_PCA953X_ADDR2, \ + CONFIG_SYS_I2C_PCA953X_ADDR3, \ + CONFIG_SYS_I2C_RTC_ADDR}/* * Memory map
Signature · 1 line
1.7.0.4
PATCH 10/17 post/i2c: General clean up
In reply to Peter Tyser- Clean up ifdeffery
- Update coding style
No functional change should have occurred.
--- post/drivers/i2c.c | 48 +++++++++++++++++++++++------------------------- 1 files changed, 23 insertions(+), 25 deletions(-)
post/drivers/i2c.c +23 -25
@@ -21,8 +21,6 @@* MA 02111-1307 USA */ -#include <common.h> -/* * I2C test *
@@ -36,6 +34,7 @@* #endif */ +#include <common.h> #include <post.h> #include <i2c.h>
@@ -44,42 +43,41 @@int i2c_post_test (int flags) {unsigned int i; +#ifndef I2C_ADDR_LIST +for (i =0 ; i <128 ; i++) +if (i2c_probe (i) ==0 ) +return 0 ; + +/* No devices found */ +return -1 ; +#else unsigned int good =0 ; -#ifdef I2C_ADDR_LIST unsigned int bad =0 ;int j;unsigned char i2c_addr_list[] =I2C_ADDR_LIST ;unsigned char i2c_miss_list[] =I2C_ADDR_LIST ; -#endif for (i =0 ; i <128 ; i++) { -if (i2c_probe (i) ==0 ) { -#ifndef I2C_ADDR_LIST - good++; -#else /* I2C_ADDR_LIST */ -for (j=0 ; j<sizeof (i2c_addr_list); ++j) { -if (i == i2c_addr_list[j]) { - good++; - i2c_miss_list[j] =0xFF ; -break ; - } - } -if (j ==sizeof (i2c_addr_list)) { - bad++; -post_log ("I2C: addr %02X not expected\n" , - i); +if (i2c_probe (i) !=0 ) +continue ; +for (j =0 ; j <sizeof (i2c_addr_list); ++j) { +if (i == i2c_addr_list[j]) { + good++; + i2c_miss_list[j] =0xFF ; +break ; } -#endif /* I2C_ADDR_LIST */ + } + +if (j ==sizeof (i2c_addr_list)) { + bad++; +post_log ("I2C: addr %02X not expected\n" , i); } } -#ifndef I2C_ADDR_LIST -return good >0 ?0 :-1 ; -#else /* I2C_ADDR_LIST */ if (good !=sizeof (i2c_addr_list)) { -for (j=0 ; j<sizeof (i2c_miss_list); ++j) { +for (j =0 ; j <sizeof (i2c_miss_list); ++j) {if (i2c_miss_list[j] !=0xFF ) { -post_log ("I2C: addr %02X did not respond\n" , +post_log ("I2C: addr %02X did not respond\n" , i2c_miss_list[j]); } }
Signature · 1 line
1.7.0.4
PATCH 10/17 post/i2c: General clean up
Hello Peter,
Quoted 10 lines · Peter Tyser
- Clean up ifdeffery
- Update coding styleNo functional change should have occurred.
Signed-off-by Peter Tyser <[email protected]>CC hs at denx.de--- post/drivers/i2c.c | 48 +++++++++++++++++++++++------------------------- 1 files changed, 23 insertions(+), 25 deletions(-)
Thanks!
Applies clean on top of master.
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH 11/17 post/i2c: Clean up detection logic
In reply to Peter TyserThe logic previously used in the I2C post was a bit convoluted.
--- post/drivers/i2c.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-)
post/drivers/i2c.c +12 -15
@@ -51,38 +51,35 @@ int i2c_post_test (int flags)/* No devices found */ return -1 ;#else -unsigned int good =0 ; -unsigned int bad =0 ; +unsigned int ret =0 ;int j;unsigned char i2c_addr_list[] =I2C_ADDR_LIST ; -unsigned char i2c_miss_list[] =I2C_ADDR_LIST ;for (i =0 ; i <128 ; i++) {if (i2c_probe (i) !=0 )continue ; +for (j =0 ; j <sizeof (i2c_addr_list); ++j) {if (i == i2c_addr_list[j]) { - good++; - i2c_miss_list[j] =0xFF ; + i2c_addr_list[j] =0xff ;break ; } }if (j ==sizeof (i2c_addr_list)) { - bad++; -post_log ("I2C: addr %02X not expected\n" , i); + ret =-1 ; +post_log ("I2C: addr %02x not expected\n" , i); } } -if (good !=sizeof (i2c_addr_list)) { -for (j =0 ; j <sizeof (i2c_miss_list); ++j) { -if (i2c_miss_list[j] !=0xFF ) { -post_log ("I2C: addr %02X did not respond\n" , - i2c_miss_list[j]); - } - } +for (i =0 ; i <sizeof (i2c_addr_list); ++i) { +if (i2c_addr_list[i] ==0xff ) +continue ; +post_log ("I2C: addr %02x did not respond\n" , i2c_addr_list[i]); + ret =-1 ; } -return ((good ==sizeof (i2c_addr_list)) && (bad ==0 )) ?0 :-1 ; + +return ret;#endif }
Signature · 1 line
1.7.0.4
PATCH 11/17 post/i2c: Clean up detection logic
Hello Peter,
Quoted 7 lines · Peter Tyser
The logic previously used in the I2C post was a bit convoluted.
Signed-off-by Peter Tyser <[email protected]>CC hs at denx.de--- post/drivers/i2c.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-)
Thanks!
Applies clean on top of master.
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH 12/17 post/i2c: Don't probe address 0
In reply to Peter TyserAccording to the I2C specification device address 0 is the "general call address", ie a broadcast address. The I2C specification states that the format of a general call uses at least 2 bytes, which U-Boot's probing routine does not adhere to.
Not probing device address 0 will prevent possible issues with devices that accept general calls. Additionally, this change shouldn't reduce POST coverage since each I2C device should still be accessed via its own, unique address.
--- post/drivers/i2c.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
post/drivers/i2c.c +4 -2
@@ -44,7 +44,8 @@ int i2c_post_test (int flags) {unsigned int i;#ifndef I2C_ADDR_LIST -for (i =0 ; i <128 ; i++) +/* Start at address 1, address 0 is the general call address */ +for (i =1 ; i <128 ; i++)if (i2c_probe (i) ==0 )return 0 ;
@@ -55,7 +56,8 @@ int i2c_post_test (int flags)int j;unsigned char i2c_addr_list[] =I2C_ADDR_LIST ; -for (i =0 ; i <128 ; i++) { +/* Start@address 1, address 0 is the general call address */ +for (i =1 ; i <128 ; i++) {if (i2c_probe (i) !=0 )continue ;
Signature · 1 line
1.7.0.4
PATCH 12/17 post/i2c: Don't probe address 0
Hello Peter,
Quoted 10 lines · Peter Tyser
According to the I2C specification device address 0 is the "general call address", ie a broadcast address. The I2C specification states that the format of a general call uses at least 2 bytes, which U-Boot's probing routine does not adhere to.
Not probing device address 0 will prevent possible issues with devices that accept general calls. Additionally, this change shouldn't reduce POST coverage since each I2C device should still be accessed via its own, unique address.
Quoted 5 lines
Signed-off-by Peter Tyser <[email protected]>CC hs at denx.de--- post/drivers/i2c.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
Thanks!
Applies clean on top of master.
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH 13/17 post/i2c: Add ability to ignore I2C devices
In reply to Peter TyserAdd the ability to not report an I2C POST error for a set of given I2C addresses on bootup. This is useful for the following cases:
- Some form factors such as XMC and Compact PCI Express have an I2C EEPROM whose address changes based on geographical address. Eg installed in one slot its EEPROM address is, 0x50, in another its 0x51, etc. This allows multiple devices to have their EEPROMs present on the same I2C bus. Thus the I2C devices present for an XMC or CPCIe card depend on if and where other cards are installed in the same system.
- Some cards have optional I2C devices. Eg one hardware build configuration has different I2C devices than another.
- Some cards have optional daughtercards with I2C devices on them.
- I2C EEPROMs address range depends on their size. Its possible to support differently size EEPROMs by only probing the EEPROM's base address and ignoring the other addresses that are impacted by its size.
A new I2C_ADDR_IGNORE_LIST define has been added which specifies a list of I2C addresses for the I2C POST to ignore.
--- post/drivers/i2c.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-)
post/drivers/i2c.c +16 -0
@@ -40,6 +40,20 @@#if CONFIG_POST &CONFIG_SYS_POST_I2C +static int i2c_ignore_device (unsigned int chip) +{ +#ifdef I2C_ADDR_IGNORE_LIST +unsigned char i2c_ignore_list[] =I2C_ADDR_IGNORE_LIST ; +int i; + +for (i =0 ; i <sizeof (i2c_ignore_list); i++) +if (i2c_ignore_list[i] == chip) +return 1 ; +#endif + +return 0 ; +} +int i2c_post_test (int flags) {unsigned int i;
@@ -58,6 +72,8 @@ int i2c_post_test (int flags)/* Start@address 1, address 0 is the general call address */ for (i =1 ; i <128 ; i++) { +if (i2c_ignore_device (i)) +continue ;if (i2c_probe (i) !=0 )continue ;
Signature · 1 line
1.7.0.4
PATCH 13/17 post/i2c: Add ability to ignore I2C devices
Hello Peter,
Quoted 21 lines · Peter Tyser
Add the ability to not report an I2C POST error for a set of given I2C addresses on bootup. This is useful for the following cases:
- Some form factors such as XMC and Compact PCI Express have an I2C EEPROM whose address changes based on geographical address. Eg installed in one slot its EEPROM address is,
0x50, in another its0x51, etc. This allows multiple devices to have their EEPROMs present on the same I2C bus. Thus the I2C devices present for an XMC or CPCIe card depend on if and where other cards are installed in the same system.- Some cards have optional I2C devices. Eg one hardware build configuration has different I2C devices than another.
- Some cards have optional daughtercards with I2C devices on them.
- I2C EEPROMs address range depends on their size. Its possible to support differently size EEPROMs by only probing the EEPROM's base address and ignoring the other addresses that are impacted by its size.
Quoted 8 lines
A new
I2C_ADDR_IGNORE_LISTdefine has been added which specifies a list of I2C addresses for the I2C POST to ignore.Signed-off-by Peter Tyser <[email protected]>CC hs at denx.de--- post/drivers/i2c.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-)
Maybe you can add a little info in the README?
post/drivers/i2c.c line 45
Quoted 11 lines
post/drivers/i2c.c +3
-0@@ -40,6 +40,20 @@#if CONFIG_POST &CONFIG_SYS_POST_I2C +static int i2c_ignore_device (unsigned int chip) +{ +#ifdef I2C_ADDR_IGNORE_LIST
Hmm.. as this is only used in post code, this should be visible in the defines name, what with:
I2C_POST_ADDR_IGNORE_LIST
?
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH 13/17 post/i2c: Add ability to ignore I2C devices
Quoted 27 lines · Heiko Schocher
Hello Peter,
Quoted 24 lines · Peter Tyser
Add the ability to not report an I2C POST error for a set of given I2C addresses on bootup. This is useful for the following cases:
- Some form factors such as XMC and Compact PCI Express have an I2C EEPROM whose address changes based on geographical address. Eg installed in one slot its EEPROM address is,
0x50, in another its0x51, etc. This allows multiple devices to have their EEPROMs present on the same I2C bus. Thus the I2C devices present for an XMC or CPCIe card depend on if and where other cards are installed in the same system.- Some cards have optional I2C devices. Eg one hardware build configuration has different I2C devices than another.
- Some cards have optional daughtercards with I2C devices on them.
- I2C EEPROMs address range depends on their size. Its possible to support differently size EEPROMs by only probing the EEPROM's base address and ignoring the other addresses that are impacted by its size.
A new
I2C_ADDR_IGNORE_LISTdefine has been added which specifies a list of I2C addresses for the I2C POST to ignore.
Quoted 7 lines
Quoted 5 lines
Signed-off-by Peter Tyser <[email protected]>CC hs at denx.de--- post/drivers/i2c.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-)Maybe you can add a little info in the README?
The existing I2C_ADDR_LIST isn't documented, so I didn't document this addition. I'll mention them both in doc/README.POST.
Quoted 8 lines
Quoted 8 lines
post/drivers/i2c.c +0
-0@@ -40,6 +40,20 @@#if CONFIG_POST &CONFIG_SYS_POST_I2C
Quoted 8 lines
post/drivers/i2c.c line 45
Quoted 3 lines
post/drivers/i2c.c +3
-0+static int i2c_ignore_device (unsigned int chip) +{ +#ifdef I2C_ADDR_IGNORE_LIST Hmm.. as this is only used in post code, this should be visible in the defines name, what with:
I2C_POST_ADDR_IGNORE_LIST
I was following the lead of the existing I2C_ADDR_LIST define. Agreed it should be named differently. I'll go with CONFIG_SYS_POST_I2C_ADDRS and CONFIG_SYS_POST_I2C_IGNORES unless someone else chimes in.
Thanks for the review,
Peter
PATCH 13/17 post/i2c: Add ability to ignore I2C devices
Hello Peter,
Quoted 33 lines · Peter Tyser
Quoted 32 lines · Heiko Schocher
Hello Peter,
Quoted 29 lines · Peter Tyser
Add the ability to not report an I2C POST error for a set of given I2C addresses on bootup. This is useful for the following cases:
- Some form factors such as XMC and Compact PCI Express have an I2C EEPROM whose address changes based on geographical address. Eg installed in one slot its EEPROM address is,
0x50, in another its0x51, etc. This allows multiple devices to have their EEPROMs present on the same I2C bus. Thus the I2C devices present for an XMC or CPCIe card depend on if and where other cards are installed in the same system.- Some cards have optional I2C devices. Eg one hardware build configuration has different I2C devices than another.
- Some cards have optional daughtercards with I2C devices on them.
- I2C EEPROMs address range depends on their size. Its possible to support differently size EEPROMs by only probing the EEPROM's base address and ignoring the other addresses that are impacted by its size.
A new
I2C_ADDR_IGNORE_LISTdefine has been added which specifies a list of I2C addresses for the I2C POST to ignore.Signed-off-by Peter Tyser <[email protected]>CC hs at denx.de--- post/drivers/i2c.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-)
Quoted 4 lines
Quoted 1 line
Maybe you can add a little info in the README?
The existing
I2C_ADDR_LISTisn't documented, so I didn't document this addition. I'll mention them both in doc/README.POST.
Thanks!
Quoted 14 lines
Quoted 14 lines
post/drivers/i2c.c line 45
Quoted 11 lines
post/drivers/i2c.c +3
-0@@ -40,6 +40,20 @@#if CONFIG_POST &CONFIG_SYS_POST_I2C +static int i2c_ignore_device (unsigned int chip) +{ +#ifdef I2C_ADDR_IGNORE_LIST Hmm.. as this is only used in post code, this should be visible in the defines name, what with:
Quoted 5 lines
Quoted 1 line
I2C_POST_ADDR_IGNORE_LISTI was following the lead of the existing
I2C_ADDR_LISTdefine. Agreed it should be named differently. I'll go withCONFIG_SYS_POST_I2C_ADDRSandCONFIG_SYS_POST_I2C_IGNORESunless someone else chimes in.
Ack. Thanks!
bye,
heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH 13/17 post/i2c: Add ability to ignore I2C devices
In reply to Peter TyserDear Peter Tyser,
Quoted 3 lines · In message <1285828543.20234.5.camel@ptyser-laptop> you wrote:
The existing
I2C_ADDR_LISTisn't documented, so I didn't document this addition. I'll mention them both in doc/README.POST.
Thanks.
What I don't understand yet: why do we need a balck (ignore) list at all, when we already have a white list (I2C_ADDR_LIST) ?
Should not one be sufficient?
Quoted 8 lines
Quoted 4 lines
Hmm.. as this is only used in post code, this should be visible in the defines name, what with:
I2C_POST_ADDR_IGNORE_LISTI was following the lead of the existing
I2C_ADDR_LISTdefine. Agreed it should be named differently. I'll go withCONFIG_SYS_POST_I2C_ADDRSandCONFIG_SYS_POST_I2C_IGNORESunless someone else chimes in.
Argh... I don't like identifiers that need half a line or more...
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Bus error -- please leave by the rear door.
PATCH 13/17 post/i2c: Add ability to ignore I2C devices
Quoted 5 lines
What I don't understand yet: why do we need a balck (ignore) list at all, when we already have a white list (
I2C_ADDR_LIST) ?Should not one be sufficient?
Currently the POST code makes sure every entry in the white list is found, but it also considers any unexpected devices found an error. Eg you plug in a daughter card with an EEPROM on it that isn't listed in I2C_ADDR_LIST, and the POST fails with:
I2C: addr 50 not expected
As an alternative to this patch we could not treat unexpected devices as an error, but you'd lose a small amount of POST coverage and flexibility.
Quoted 10 lines
Quoted 8 lines
Quoted 4 lines
Hmm.. as this is only used in post code, this should be visible in the defines name, what with:
I2C_POST_ADDR_IGNORE_LISTI was following the lead of the existing
I2C_ADDR_LISTdefine. Agreed it should be named differently. I'll go withCONFIG_SYS_POST_I2C_ADDRSandCONFIG_SYS_POST_I2C_IGNORESunless someone else chimes in.Argh... I don't like identifiers that need half a line or more...
Agreed, but its hard when over half the name is the mandatory CONFIG_SYS_POST_ prefix. Any suggestions?
Regards,
Peter
PATCH 13/17 post/i2c: Add ability to ignore I2C devices
Dear Peter Tyser,
Quoted 6 lines · In message <1285851649.22004.5.camel@ptyser-laptop> you wrote:
Currently the POST code makes sure every entry in the white list is found, but it also considers any unexpected devices found an error. Eg you plug in a daughter card with an EEPROM on it that isn't listed in
I2C_ADDR_LIST, and the POST fails with:
I2C: addr 50 not expected
Yes, and this is actually intentional.
Quoted 3 lines
As an alternative to this patch we could not treat unexpected devices as an error, but you'd lose a small amount of POST coverage and flexibility.
No, we don't want to do this.
So the IGNORE_LIST is intended for devices that may or may not be present, and neither state is considered an error?
Quoted 10 lines
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
I2C_POST_ADDR_IGNORE_LISTI was following the lead of the existing
I2C_ADDR_LISTdefine. Agreed it should be named differently. I'll go withCONFIG_SYS_POST_I2C_ADDRSandCONFIG_SYS_POST_I2C_IGNORESunless someone else chimes in.Argh... I don't like identifiers that need half a line or more...
Agreed, but its hard when over half the name is the mandatory
CONFIG_SYS_POST_prefix. Any suggestions?
Omit that ?
<me hides />
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
In an infinite universe all things are possible, including the possi-
bility that the universe does not exist.
- Terry Pratchett, _The Dark Side of the Sun_PATCH 13/17 post/i2c: Add ability to ignore I2C devices
Quoted 2 lines
So the
IGNORE_LISTis intended for devices that may or may not be present, and neither state is considered an error?
Correct. And also for devices that may or may not be present, but are impossible to determine if they should/shouldn't be present, so its impossible to determine what an error case is (if that makes sense...).
I gave a few examples in the original patch of when this might be useful. Most of the examples could be better solved by a more complicated, dynamically generated I2C_ADDR_LIST (eg detect if an XMC card is present, and if so, add device 0x50 to the list of expected devices), but it seems like overkill for a simple POST.
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
Quoted 1 line
I2C_POST_ADDR_IGNORE_LISTI was following the lead of the existing
I2C_ADDR_LISTdefine. Agreed it should be named differently. I'll go withCONFIG_SYS_POST_I2C_ADDRSandCONFIG_SYS_POST_I2C_IGNORESunless someone else chimes in.
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
Argh... I don't like identifiers that need half a line or more...
Agreed, but its hard when over half the name is the mandatory
CONFIG_SYS_POST_prefix. Any suggestions?Omit that ?
<me hides />
:)
Best,
Peter
PATCH 13/17 post/i2c: Add ability to ignore I2C devices
Dear Peter Tyser,
Quoted 7 lines · In message <1285868400.28947.19878.camel@petert> you wrote:
Quoted 2 lines
So the
IGNORE_LISTis intended for devices that may or may not be present, and neither state is considered an error?Correct. And also for devices that may or may not be present, but are impossible to determine if they should/shouldn't be present, so its impossible to determine what an error case is (if that makes sense...).
Quoted 5 lines
I gave a few examples in the original patch of when this might be useful. Most of the examples could be better solved by a more complicated, dynamically generated
I2C_ADDR_LIST(eg detect if an XMC card is present, and if so, add device0x50to the list of expected devices), but it seems like overkill for a simple POST.
Now I understand your intention. I didn't when reading the description in the initial commit message. Maybe you can make this a bit more explicit for slow thinkers like me.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Monday is an awful way to spend one seventh of your life.
PATCH 13/17 post/i2c: Add ability to ignore I2C devices
In reply to Wolfgang DenkHello Wolfgang,
Quoted 22 lines · Wolfgang Denk
Dear Peter Tyser,
Quoted 5 lines · In message <1285851649.22004.5.camel@ptyser-laptop> you wrote:
Currently the POST code makes sure every entry in the white list is found, but it also considers any unexpected devices found an error. Eg you plug in a daughter card with an EEPROM on it that isn't listed in
I2C_ADDR_LIST, and the POST fails with:
I2C: addr 50 not expectedYes, and this is actually intentional.
Quoted 3 lines
As an alternative to this patch we could not treat unexpected devices as an error, but you'd lose a small amount of POST coverage and flexibility.
No, we don't want to do this.
So the
IGNORE_LISTis intended for devices that may or may not be present, and neither state is considered an error?Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
I2C_POST_ADDR_IGNORE_LIST
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Quoted 3 lines
I was following the lead of the existing
I2C_ADDR_LISTdefine. Agreed it should be named differently. I'll go withCONFIG_SYS_POST_I2C_ADDRSandCONFIG_SYS_POST_I2C_IGNORESunless someone else chimes in.Argh... I don't like identifiers that need half a line or more...
Agreed, but its hard when over half the name is the mandatory
CONFIG_SYS_POST_prefix. Any suggestions?Omit that ?
:-(
... this is not only here a problem, this problem occurs *all* over the code, because we have defined that we use CONFIG_SYS_ or CONFIG_ prefixes ... see README "Software Configuration" ...
and yes, this is a long fix prefix definition ... especially if we want to add subsystem prefixes like I2C, POST, USB (which I think is not a bad thing) ... then definelength will grow ...
bye,
Heiko
PATCH 13/17 post/i2c: Add ability to ignore I2C devices
In reply to Peter TyserHello.
Quoted 35 lines · Peter Tyser
Add the ability to not report an I2C POST error for a set of given I2C addresses on bootup. This is useful for the following cases:
- Some form factors such as XMC and Compact PCI Express have an I2C EEPROM whose address changes based on geographical address. Eg installed in one slot its EEPROM address is,
0x50, in another its0x51, etc. This allows multiple devices to have their EEPROMs present on the same I2C bus. Thus the I2C devices present for an XMC or CPCIe card depend on if and where other cards are installed in the same system.- Some cards have optional I2C devices. Eg one hardware build configuration has different I2C devices than another.
- Some cards have optional daughtercards with I2C devices on them.
- I2C EEPROMs address range depends on their size. Its possible to support differently size EEPROMs by only probing the EEPROM's base address and ignoring the other addresses that are impacted by its size.
A new
I2C_ADDR_IGNORE_LISTdefine has been added which specifies a list of I2C addresses for the I2C POST to ignore.Signed-off-by Peter Tyser<[email protected]>CC hs at denx.de--- post/drivers/i2c.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-)post/drivers/i2c.c +0
-0
post/drivers/i2c.c line 46
Quoted 7 lines
post/drivers/i2c.c +4
-0@@ -40,6 +40,20 @@#if CONFIG_POST &CONFIG_SYS_POST_I2C +static int i2c_ignore_device (unsigned int chip) +{ +#ifdef I2C_ADDR_IGNORE_LIST +unsigned char i2c_ignore_list[] =I2C_ADDR_IGNORE_LIST ;
This array is aking to be *static*...
WBR, Sergei
PATCH 13/17 post/i2c: Add ability to ignore I2C devices
Dear Sergei Shtylyov,
Quoted 4 lines
post/drivers/i2c.c line 46
Quoted 2 lines
post/drivers/i2c.c +2
-0+#ifdef I2C_ADDR_IGNORE_LIST +unsigned char i2c_ignore_list[] =I2C_ADDR_IGNORE_LIST ;This array is aking to be *static*...
... and *const* as well ?
Reinhard
PATCH 13/17 post/i2c: Add ability to ignore I2C devices
Quoted 6 lines · Reinhard Meyer
Dear Sergei Shtylyov,
Quoted 4 lines
post/drivers/i2c.c line 46
Quoted 2 lines
post/drivers/i2c.c +2
-0+#ifdef I2C_ADDR_IGNORE_LIST +unsigned char i2c_ignore_list[] =I2C_ADDR_IGNORE_LIST ;This array is aking to be *static*...
... and *const* as well ?
I'll add 'const' in the next version, but I'm not sure if the 'static' adds any benefit since its a local variable.
Thanks for the inputs,
Peter
PATCH 13/17 post/i2c: Add ability to ignore I2C devices
Hello.
Quoted 9 lines · Peter Tyser
Quoted 6 lines
Quoted 4 lines
post/drivers/i2c.c line 46
Quoted 2 lines
post/drivers/i2c.c +2
-0+#ifdef I2C_ADDR_IGNORE_LIST +unsigned char i2c_ignore_list[] =I2C_ADDR_IGNORE_LIST ;This array is aking to be *static*...
... and *const* as well ?
I'll add 'const' in the next version, but I'm not sure if the 'static' adds any benefit since its a local variable.
Have you considered the amount of code needed for non-static array
initialization?
WBR, Sergei
PATCH 13/17 post/i2c: Add ability to ignore I2C devices
Hi Sergei,
Quoted 7 lines
Quoted 4 lines · Peter Tyser
Quoted 4 lines
Quoted 4 lines
post/drivers/i2c.c line 46
Quoted 2 lines
post/drivers/i2c.c +2
-0+#ifdef I2C_ADDR_IGNORE_LIST +unsigned char i2c_ignore_list[] =I2C_ADDR_IGNORE_LIST ;This array is aking to be *static*...
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
... and *const* as well ?
I'll add 'const' in the next version, but I'm not sure if the 'static' adds any benefit since its a local variable.
Have you considered the amount of code needed for non-static array
initialization?
I think I did:) I'd think a const array would generate nearly identical code with or without the static qualifier. In either case the function will load a pointer to the array and loop through it. The array should be stored in the data section of the U-Boot binary so I'm not sure how the array initialization differs. I did a quick comparison for this specific case and the resulting sizes came out the same:
ptyser at petert u-boot $ size ./i2c-static.o
text data bss dec hex filename
347 12 0 359 167 ./i2c-static.o
ptyser at petert u-boot $ size ./i2c-nonstatic.o
text data bss dec hex filename
347 12 0 359 167 ./i2c-nonstatic.oIs there something I'm overlooking?
Regards,
Peter
PATCH 13/17 post/i2c: Add ability to ignore I2C devices
Hello.
Quoted 20 lines · Peter Tyser
Quoted 5 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
post/drivers/i2c.c line 46
Quoted 2 lines
post/drivers/i2c.c +2
-0+#ifdef I2C_ADDR_IGNORE_LIST +unsigned char i2c_ignore_list[] =I2C_ADDR_IGNORE_LIST ;This array is aking to be *static*...
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
... and *const* as well ?
I'll add 'const' in the next version, but I'm not sure if the 'static' adds any benefit since its a local variable.
Have you considered the amount of code needed for non-static array
initialization?I think I did:) I'd think a const array would generate nearly identical code with or without the static qualifier. In either case the function will load a pointer to the array and loop through it. The array should be stored in the data section of the U-Boot binary so I'm not sure how the array initialization differs. I did a quick comparison for this specific case and the resulting sizes came out the same:
ptyser at petert u-boot $ size ./i2c-static.o
Quoted 7 lines
text data bss dec hex filename 347 12 0 359 167 ./i2c-static.o ptyser at petert u-boot $ size ./i2c-nonstatic.o text data bss dec hex filename 347 12 0 359 167 ./i2c-nonstatic.oIs there something I'm overlooking?
If 'const' alone makes it go into the data section, then no. I didn't think
it does.
Quoted 2 lines
Regards,
Peter
WBR, Sergei
PATCH 14/17 xes: Ignore XMC EEPROMs during I2C POST
In reply to Peter TyserThe XPedite517x/537x cards can host an XMC card which contain an I2C EEPROM at address 0x50. The XMC card is optional, so the EEPROM won't always be present.
--- include/configs/xpedite517x.h | 2 ++ include/configs/xpedite537x.h | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-)
include/configs/xpedite517x.h +2 -0
@@ -118,6 +118,8 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);CONFIG_SYS_I2C_PCA953X_ADDR3 , \CONFIG_SYS_I2C_PEX8518_ADDR , \ CONFIG_SYS_I2C_RTC_ADDR} +/* The XPedite5170 can host an XMC which has an EEPROM at address 0x50 */ +#define I2C_ADDR_IGNORE_LIST {0x50}/* * Memory map
include/configs/xpedite537x.h +2 -0
@@ -119,6 +119,8 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);CONFIG_SYS_I2C_PCA953X_ADDR3 , \CONFIG_SYS_I2C_PEX8518_ADDR , \ CONFIG_SYS_I2C_RTC_ADDR} +/* The XPedite5370 can host an XMC which has an EEPROM at address 0x50 */ +#define I2C_ADDR_IGNORE_LIST {0x50}/* * Memory map
Signature · 1 line
1.7.0.4
PATCH 15/17 86xx: Create common linker script
In reply to Peter Tyser---
arch/powerpc/cpu/mpc86xx/config.mk | 3 +
.../powerpc/cpu/mpc86xx}/u-boot.lds | 0
board/freescale/mpc8610hpcd/u-boot.lds | 132 -------------------
board/freescale/mpc8641hpcn/u-boot.lds | 133 --------------------
board/xes/xpedite517x/u-boot.lds | 132 -------------------
5 files changed, 3 insertions(+), 397 deletions(-)
rename {board/sbc8641d => arch/powerpc/cpu/mpc86xx}/u-boot.lds (100%)
delete mode 100644 board/freescale/mpc8610hpcd/u-boot.lds
delete mode 100644 board/freescale/mpc8641hpcn/u-boot.lds
delete mode 100644 board/xes/xpedite517x/u-boot.ldsarch/powerpc/cpu/mpc86xx/config.mk +3 -0
@@ -25,3 +25,6 @@ PLATFORM_RELFLAGS += -fPIC -meabi PLATFORM_CPPFLAGS += -ffixed-r2 -mstring PLATFORM_CPPFLAGS += -maltivec -mabi=altivec -msoft-float + +# Use default linker script. Board port can override in board/*/config.mk +LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc86xx/u-boot.lds
arch/powerpc/cpu/mpc86xx/u-boot.lds renamed from board/sbc8641d/u-boot.lds +0 -0
board/freescale/mpc8610hpcd/u-boot.lds deleted +0 -132
132 lines not on this page · raw message
board/freescale/mpc8641hpcn/u-boot.lds deleted +0 -133
133 lines not on this page · raw message
board/xes/xpedite517x/u-boot.lds deleted +0 -132
132 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH 15/17 86xx: Create common linker script
Quoted 6 lines · Peter Tyser
Signed-off-by Peter Tyser <[email protected]>CC Kumar Gala <[email protected]>---
?arch/powerpc/cpu/mpc86xx/config.mk ? ? ? ? ? ? ? ? | ? ?3 + ?.../powerpc/cpu/mpc86xx}/u-boot.lds ? ? ? ? ? ? ? ?| ? ?0 ?board/freescale/mpc8610hpcd/u-boot.lds ? ? ? ? ? ? | ?132 -------------------
Have you actually tested this on an 8610? If not, I can test it for you.
Signature · 2 lines
Timur Tabi Linux kernel developer at Freescale
PATCH 15/17 86xx: Create common linker script
Quoted 9 lines · Timur Tabi
Quoted 6 lines · Peter Tyser
Signed-off-by Peter Tyser <[email protected]>CC Kumar Gala <[email protected]>--- arch/powerpc/cpu/mpc86xx/config.mk | 3 + .../powerpc/cpu/mpc86xx}/u-boot.lds | 0 board/freescale/mpc8610hpcd/u-boot.lds | 132 -------------------Have you actually tested this on an 8610? If not, I can test it for you.
No, just tested it on an 8640/1 board. I tested the 85xx linker script change on a P2020-based board for reference.
One difference between the boards was that the mpc8641hpcn linker script explicitly called out drivers/bios_emulator/atibios.o, which the combined linker script doesn't. However, I looked at the source of atibios.o and thought there was no reason it needed to be placed in the linker script at that location.
It'd be much appreciated if you did test on a 8610 board.
Thanks,
Peter
PATCH 15/17 86xx: Create common linker script
In reply to Peter TyserQuoted 9 lines · Peter Tyser
Signed-off-by Peter Tyser <[email protected]>CC Kumar Gala <[email protected]>---
arch/powerpc/cpu/mpc86xx/config.mk | 3 + .../powerpc/cpu/mpc86xx}/u-boot.lds | 0 board/freescale/mpc8610hpcd/u-boot.lds | 132 ------------------- board/freescale/mpc8641hpcn/u-boot.lds | 133 -------------------- board/xes/xpedite517x/u-boot.lds | 132 ------------------- 5 files changed, 3 insertions(+), 397 deletions(-)
Quoted 4 lines
rename {board/sbc8641d =>
arch/powerpc/cpu/mpc86xx}/u-boot.lds(100%) delete mode 100644board/freescale/mpc8610hpcd/u-boot.ldsdelete mode 100644board/freescale/mpc8641hpcn/u-boot.ldsdelete mode 100644board/xes/xpedite517x/u-boot.lds
cleaned up and applied to 85xx.
- k
PATCH 16/17 86xx: Use gc-sections to reduce image size
In reply to Peter TyserOn an XPedite5170 over 11KBytes were saved:
Before:
text data bss dec hex filename
319488 28700 33204 381392 5d1d0 ./u-boot
After:
text data bss dec hex filename
307663 29144 33204 370011 5a55b ./u-boot
--- arch/powerpc/cpu/mpc86xx/config.mk | 4 ++++ arch/powerpc/cpu/mpc86xx/u-boot.lds | 26 ++++++++------------------ 2 files changed, 12 insertions(+), 18 deletions(-)
arch/powerpc/cpu/mpc86xx/config.mk +4 -0
@@ -26,5 +26,9 @@ PLATFORM_RELFLAGS += -fPIC -meabi PLATFORM_CPPFLAGS += -ffixed-r2 -mstring PLATFORM_CPPFLAGS += -maltivec -mabi=altivec -msoft-float +# Enable gc-sections to enable generation of smaller images. +PLATFORM_LDFLAGS += --gc-sections +PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections + # Use default linker script. Board port can override in board/*/config.mk LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc86xx/u-boot.lds
arch/powerpc/cpu/mpc86xx/u-boot.lds +8 -18
@@ -60,19 +60,14 @@ SECTIONS lib/crc32.o (.text) arch/powerpc/lib/extable.o (.text) lib/zlib.o (.text) - *(.text) - *(.got1) + *(.text*) } _etext = .; PROVIDE (etext = .); .rodata : { - *(.eh_frame) *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } - .fini : { *(.fini) } =0 - .ctors : { *(.ctors) } - .dtors : { *(.dtors) } /* Read-write section, merged into data segment: */ . = (. + 0x00FF) & 0xFFFFFF00;
@@ -80,23 +75,19 @@ SECTIONS PROVIDE (erotext = .); .reloc : { - *(.got) + KEEP(*(.got)) _GOT2_TABLE_ = .; - *(.got2) + KEEP(*(.got2)) _FIXUP_TABLE_ = .; - *(.fixup) + KEEP(*(.fixup)) } __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >> 2; __fixup_entries = (. - _FIXUP_TABLE_) >> 2; .data : { - *(.data) - *(.data1) - *(.sdata) - *(.sdata2) - *(.dynamic) - CONSTRUCTORS + *(.data*) + *(.sdata*) } _edata = .; PROVIDE (edata = .);
@@ -121,9 +112,8 @@ SECTIONS __bss_start = .; .bss (NOLOAD) : { - *(.sbss) *(.scommon) - *(.dynbss) - *(.bss) + *(.sbss*) + *(.bss*) *(COMMON) . = ALIGN(4); }
Signature · 1 line
1.7.0.4
PATCH 16/17 86xx: Use gc-sections to reduce image size
Quoted 9 lines · Peter Tyser
On an XPedite5170 over 11KBytes were saved:
Before:
text data bss dec hex filename
319488 28700 33204 381392 5d1d0 ./u-bootAfter:
text data bss dec hex filename
307663 29144 33204 370011 5a55b ./u-boot
Quoted 6 lines
Signed-off-by Peter Tyser <[email protected]>CC Kumar Gala <[email protected]>---
arch/powerpc/cpu/mpc86xx/config.mk| 4 ++++arch/powerpc/cpu/mpc86xx/u-boot.lds| 26 ++++++++------------------2 files changed, 12 insertions(+), 18 deletions(-)
cleaned up and applied to 85xx.
- k
PATCH 17/17 85xx: Use gc-sections to reduce image size
In reply to Peter TyserOn an XPedite5370 over 11KBytes were saved:
Before:
text data bss dec hex filename
332456 33364 33476 399296 617c0 ./u-boot
After:
text data bss dec hex filename
321075 33836 33476 388387 5ed23 ./u-boot
--- arch/powerpc/cpu/mpc85xx/config.mk | 4 +++ arch/powerpc/cpu/mpc85xx/u-boot.lds | 52 +++++++---------------------------- 2 files changed, 14 insertions(+), 42 deletions(-)
arch/powerpc/cpu/mpc85xx/config.mk +4 -0
@@ -25,6 +25,10 @@ PLATFORM_RELFLAGS += -fPIC -meabi PLATFORM_CPPFLAGS += -ffixed-r2 -Wa,-me500 -msoft-float -mno-string +# Enable gc-sections to enable generation of smaller images. +PLATFORM_LDFLAGS += --gc-sections +PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections + # -mspe=yes is needed to have -mno-spe accepted by a buggy GCC; # see "[PATCH,rs6000] make -mno-spe work as expected" on # http://gcc.gnu.org/ml/gcc-patches/2008-04/msg00311.html
arch/powerpc/cpu/mpc85xx/u-boot.lds +10 -42
99 lines not on this page · raw message
Signature · 1 line
1.7.0.4
Kumar Gala
AppliedPATCH 17/17 85xx: Use gc-sections to reduce image size
Quoted 9 lines · Peter Tyser
On an XPedite5370 over 11KBytes were saved:
Before:
text data bss dec hex filename
332456 33364 33476 399296 617c0 ./u-bootAfter:
text data bss dec hex filename
321075 33836 33476 388387 5ed23 ./u-boot
Quoted 6 lines
Signed-off-by Peter Tyser <[email protected]>CC Kumar Gala <[email protected]>---
arch/powerpc/cpu/mpc85xx/config.mk| 4 +++arch/powerpc/cpu/mpc85xx/u-boot.lds| 52 +++++++----------------------------2 files changed, 14 insertions(+), 42 deletions(-)
applied to 85xx.
- k
PATCH 1/17 XPedite5500 board support
In reply to Peter TyserQuoted 8 lines · Peter Tyser
From: John Schmoller <[email protected]>
Initial support for Extreme Engineering Solutions XPedite5500 - a P2020-based PMC/XMC single board computer.
Signed-off-by John Schmoller <[email protected]>Signed-off-by Peter Tyser <[email protected]>CC Kumar Gala <[email protected]>
17-patch series:
With these patches, the 8610 still compiles and boots.
Signature · 2 lines
Timur Tabi Linux kernel developer at Freescale
PATCH 1/17 XPedite5500 board support
In reply to Peter TyserQuoted 11 lines · Peter Tyser
From: John Schmoller <[email protected]>
Initial support for Extreme Engineering Solutions XPedite5500 - a P2020-based PMC/XMC single board computer.
Signed-off-by John Schmoller <[email protected]>Signed-off-by Peter Tyser <[email protected]>CC Kumar Gala <[email protected]>---
Some of the changes in this series touch both common and X-ES-specific code so I put them in one series and tried to CC the proper custodian.
This sequence needs a bit of updating to apply to top of tree, also some of these patches need acks from other people (like Wolfgang since the impact things beyond 86xx/85xx arch code). Also, it would have been nice to have all the cleanup happen before introducing the new XPedite5500 support (so its patch is clean).
I've pulled in the ones I could at this point.
- k
PATCH 1/17 XPedite5500 board support
Quoted 14 lines · Kumar Gala
Quoted 11 lines · Peter Tyser
From: John Schmoller <[email protected]>
Initial support for Extreme Engineering Solutions XPedite5500 - a P2020-based PMC/XMC single board computer.
Signed-off-by John Schmoller <[email protected]>Signed-off-by Peter Tyser <[email protected]>CC Kumar Gala <[email protected]>---
Some of the changes in this series touch both common and X-ES-specific code so I put them in one series and tried to CC the proper custodian.
Quoted 5 lines
This sequence needs a bit of updating to apply to top of tree, also some of these patches need acks from other people (like Wolfgang since the impact things beyond 86xx/85xx arch code). Also, it would have been nice to have all the cleanup happen before introducing the new XPedite5500 support (so its patch is clean).
I'll rebase and resubmit. The patch ordering is largely due to the order development took internally. I'll give reordering a shot and see how painful it is.
Quoted 1 line
I've pulled in the ones I could at this point.
Thanks,
Peter