Skip to contentSkip to conversation

Updated patch to add SBC8641D

PATCH New Joe Hamman 3 participants 4 messages Aug 6, 2007

lore
Share & tools
lore

Joe Hamman

author
#0 lore raw

PATCH 1/2 Updated patch to add SBC8641D

Add support for Wind River's SBC8641D reference board.

Resend to add fixes per JDL.

Signed-off by: Joe Hamman <[email protected]>

board/sbc8641d/config.mk +30 -0
diff -uprN -X dontdiff u-boot/board/sbc8641d/config.mk u-boot-esi/board/sbc8641d/config.mk
@@ -0,0 +1,30 @@
+# Copyright 2004 Freescale Semiconductor.
+# Modified by Jeff Brown
+#
+# 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
+#
+
+#
+# sbc8641 board
+# default CCSRBAR is at 0xff700000
+#
+TEXT_BASE = 0xfff00000
+
+PLATFORM_CPPFLAGS += -DCONFIG_MPC86xx=1
+PLATFORM_CPPFLAGS += -DCONFIG_MPC8641=1 -maltivec -mabi=altivec -msoft-float
board/sbc8641d/init.S +192 -0

192 lines not on this page · raw message

board/sbc8641d/Makefile +52 -0

52 lines not on this page · raw message

board/sbc8641d/sbc8641d.c +326 -0

326 lines not on this page · raw message

board/sbc8641d/u-boot.lds +136 -0

136 lines not on this page · raw message

config.mk +1 -1
diff -uprN -X dontdiff u-boot/config.mk u-boot-esi/config.mk
@@ -134,7 +134,7 @@ ARFLAGS = crv
 endif
 RELFLAGS= $(PLATFORM_RELFLAGS)
 DBGFLAGS= -g # -DDEBUG
-OPTFLAGS= -Os #-fomit-frame-pointer
+OPTFLAGS= -O1 #-fomit-frame-pointer
 ifndef LDSCRIPT
 #LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug
 ifeq ($(CONFIG_NAND_U_BOOT),y)
NAK
#1 lore raw

PATCH 1/2 Updated patch to add SBC8641D

Quoted 5 lines · In message <1186410455.22362.7.camel@server> you wrote:

Add support for Wind River's SBC8641D reference board.

Resend to add fixes per JDL.

Signed-off by: Joe Hamman <[email protected]>

NAK.

I reject this patch because you are modifying global files
(config.mk) without mentioning it at all, and in a way that is (1) unrelated to your patch and (2) contra-rpoductive on most systems. Please don't try again to sneak in code changes this way.

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
A Vulcan can  no  sooner  be  disloyal  than  he  can  exist  without
breathing.
	-- Kirk, "The Menagerie", stardate 3012.4
author
#2 lore raw

PATCH 1/2 Updated patch to add SBC8641D

Hi Wolfgang,

Quoted 12 lines

-----Original Message-----
From: wd at denx.de [mailto:wd at denx.de]
Sent: Monday, August 06, 2007 10:39 AM
To: joe.hamman at embeddedspecialties.com
Cc: jdl at freescale.com; u-boot-users at lists.sourceforge.net
Subject: Re: [U-Boot-Users] [PATCH 1/2] Updated patch to add SBC8641D

Quoted 4 lines · In message <1186410455.22362.7.camel@server> you wrote:

Add support for Wind River's SBC8641D reference board.

Resend to add fixes per JDL.

Quoted 8 lines
Quoted 1 line

Signed-off by: Joe Hamman <[email protected]>

NAK.

I reject this patch because you are modifying global files
(config.mk) without mentioning it at all, and in a way that is (1) unrelated to your patch and (2) contra-rpoductive on most systems. Please don't try again to sneak in code changes this way.

Thanks for catching this. It was left over from a debugging session and I never intended it to be submitted.

I'll be more careful in the future.

Regards,
Joe

#3 lore raw

PATCH 1/2 Updated patch to add SBC8641D

In reply to Joe Hamman
Quoted 3 lines · Joe Hamman

Add support for Wind River's SBC8641D reference board.

Resend to add fixes per JDL.

Thanks.

Quoted 32 lines

diff -uprN -X dontdiff u-boot/board/sbc8641d/sbc8641d.c u-boot-esi/board/sbc8641d/sbc8641d.c

board/sbc8641d/sbc8641d.c +27 -0
@@ -0,0 +1,326 @@
 
+
+int checkboard (void)
+{
+	puts ("Board: Wind River SBC8641D\n");
+
+#ifdef CONFIG_PCI
+
+	volatile immap_t *immap = (immap_t *) CFG_CCSRBAR;
+	volatile ccsr_gur_t *gur = &immap->im_gur;
+	volatile ccsr_pex_t *pex1 = &immap->im_pex1;
+
+	uint devdisr = gur->devdisr;
+	uint io_sel = (gur->pordevsr & MPC86xx_PORDEVSR_IO_SEL) >> 16;
+	uint host1_agent = (gur->porbmsr & MPC86xx_PORBMSR_HA) >> 17;
+	uint pex1_agent = (host1_agent == 0) || (host1_agent == 1);
+
+	if ((io_sel == 2 || io_sel == 3 || io_sel == 5
+	     || io_sel == 6 || io_sel == 7 || io_sel == 0xF)
+	    && !(devdisr & MPC86xx_DEVDISR_PCIEX1)) {
+		debug ("PCI-EXPRESS 1: %s \n", pex1_agent ? "Agent" : "Host");
+		debug ("0x%08x=0x%08x ", &pex1->pme_msg_det, pex1->pme_msg_det);
+		if (pex1->pme_msg_det) {
+			pex1->pme_msg_det = 0xffffffff;
+			debug (" with errors.  Clearing.  Now 0x%08x",
+			       pex1->pme_msg_det);
+		}
+		debug ("\n");

board/sbc8641d/sbc8641d.c line 94

Quoted 10 lines
board/sbc8641d/sbc8641d.c +10 -0
+	} else {
+		puts ("PCI-EXPRESS 1: Disabled in hardware\n");
+	}
+
+#else
+	puts ("PCI-EXPRESS1: Disabled in configuration\n");
+#endif
+
+	return 0;
+}

Urg. Sorry to do this to you, Joe... I just realized you haven't adjusted for the new, common PCI/PCI-E effort underway here at FSL for the 86xx and 85xx boards.

I'm not exactly sure what your PCI config will end up looking like, or what it needs to be, but this initialization sequence will need to be adjusted some, I suspect.

With any luck, you really can just cut most of this out, and simply adopt the code has it recently was pulled into mainline just a few hours ago. (Yes, even as we speak, I'm working on bringing the -mpc86xx custodian tree up to date WRT that still.)

Sorry.

Quoted 35 lines
board/sbc8641d/sbc8641d.c +35 -0
+
+SECTIONS
+{
+
+  /* Read-only sections, merged into text segment: */
+  .interp : { *(.interp) }
+  .hash          : { *(.hash)		}
+  .dynsym        : { *(.dynsym)		}
+  .dynstr        : { *(.dynstr)		}
+  .rel.text      : { *(.rel.text)		}
+  .rela.text     : { *(.rela.text) 	}
+  .rel.data      : { *(.rel.data)		}
+  .rela.data     : { *(.rela.data) 	}
+  .rel.rodata    : { *(.rel.rodata) 	}
+  .rela.rodata   : { *(.rela.rodata) 	}
+  .rel.got       : { *(.rel.got)		}
+  .rela.got      : { *(.rela.got)		}
+  .rel.ctors     : { *(.rel.ctors)	}
+  .rela.ctors    : { *(.rela.ctors)	}
+  .rel.dtors     : { *(.rel.dtors)	}
+  .rela.dtors    : { *(.rela.dtors)	}
+  .rel.bss       : { *(.rel.bss)		}
+  .rela.bss      : { *(.rela.bss)		}
+  .rel.plt       : { *(.rel.plt)		}
+  .rela.plt      : { *(.rela.plt)		}
+  .init          : { *(.init)	}
+  .plt : { *(.plt) }
+  .text      :
+  {
+    cpu/mpc86xx/start.o	(.text)
+    board/sbc8641d/init.o (.bootpg)
+    cpu/mpc86xx/traps.o (.text)
+    cpu/mpc86xx/interrupts.o (.text)
+    cpu/mpc86xx/cpu_init.o (.text)
+    cpu/mpc86xx/cpu.o (.text)

board/sbc8641d/sbc8641d.c

Quoted 10 lines
board/sbc8641d/sbc8641d.c +10 -0
+    cpu/mpc86xx/speed.o (.text)
+    cpu/mpc86xx/pci.o (.text)
+    common/dlmalloc.o (.text)
+    lib_generic/crc32.o (.text)
+    lib_ppc/extable.o (.text)
+    lib_generic/zlib.o (.text)
+    *(.text)
+    *(.fixup)
+    *(.got1)
+   }

I confess, I haven't had a chance to look yet, but just while we're here..... Does the above loader script work in the new way that all of Grant's loader-script changes introduced?

config.mk ARFLAGS = crv · line 140

Quoted 12 lines

diff -uprN -X dontdiff u-boot/config.mk u-boot-esi/config.mk

config.mk +1 -1
@@ -134,7 +134,7 @@ ARFLAGS = crv
 endif
 RELFLAGS= $(PLATFORM_RELFLAGS)
 DBGFLAGS= -g # -DDEBUG
-OPTFLAGS= -Os #-fomit-frame-pointer
+OPTFLAGS= -O1 #-fomit-frame-pointer
 ifndef LDSCRIPT
 #LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug
 ifeq ($(CONFIG_NAND_U_BOOT),y)

Erg. Yeah, as Wolfgang indicated. :-)

jdl