Re: Syncin with Git
Jamie Lenehan <lenehan <at> twibble.org>
2006-10-05 02:51:39 GMT
On Tue, Oct 03, 2006 at 04:51:21PM +0900, Paul Mundt wrote:
[...]
> You can either clone this or Linus's tree directly and then pull from
> mine, or setup a branch for it or whatever else. Though I'm not
> intending that people use the sh-2.6.git tree in the general case, as
> about the only time I'll be updating it will be when I have new changes
> to merge in to current git via the pull tree.
Yep, I went with a clone of Linus's tree, which I think makes more
sense to follow in general. Anyway, we have a new problem today:
sh4-linux-gcc -Wp,-MD,arch/sh/drivers/pci/.pci-sh7751.o.d -nostdinc -isystem
/data/oe/build/titan-glibc-24/tmp/cross/lib/gcc/sh4-linux/3.4.4/include -D__KERNEL__
-Iinclude -Iinclude2 -I/usr/src/git/linux-2.6/include -include include/linux/autoconf.h
-I/usr/src/git/linux-2.6/arch/sh/drivers/pci -Iarch/sh/drivers/pci -Wall -Wundef
-Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -O2 -pipe -ml -Wa,-isa=sh4
-m4 -m4-nofpu -fomit-frame-pointer -Wdeclaration-after-statement -D"KBUILD_STR(s)=#s"
-D"KBUILD_BASENAME=KBUILD_STR(pci_sh7751)" -D"KBUILD_MODNAME=KBUILD_STR(pci_sh7751)" -c -o
arch/sh/drivers/pci/pci-sh7751.o /usr/src/git/linux-2.6/arch/sh/drivers/pci/pci-sh7751.c
/usr/src/git/linux-2.6/arch/sh/drivers/pci/pci-sh7751.c: In function `sh7751_pcic_init':
/usr/src/git/linux-2.6/arch/sh/drivers/pci/pci-sh7751.c:158: error: `SH4_PCI_IO_BASE'
undeclared (first use in this function)
/usr/src/git/linux-2.6/arch/sh/drivers/pci/pci-sh7751.c:158: error: (Each undeclared
identifier is reported only once
/usr/src/git/linux-2.6/arch/sh/drivers/pci/pci-sh7751.c:158: error: for each function it appears in.)
make[3]: *** [arch/sh/drivers/pci/pci-sh7751.o] Error 1
make[2]: *** [arch/sh/drivers/pci] Error 2
make[1]: *** [arch/sh/drivers] Error 2
make: *** [_all] Error 2
SH4_PCI_IO_BASE isn't defined anywhere. Previously pr_debug was
defined as an emtpy macro but that was changed by this:
commit 8b2a1fd1b394c60eaa2587716102dd5e9b4e5990
Author: Zach Brown <zach.brown <at> oracle.com>
Date: Tue Oct 3 01:16:15 2006 -0700
[PATCH] pr_debug: check pr_debug() arguments
check pr_debug() arguments
When DEBUG isn't defined pr_debug() is defined away as an empty macro. By
throwing away the arguments we allow completely incorrect code to build.
Instead let's make it an empty inline which checks arguments and mark it so gcc
can check the format specification.
...
I just changed this to SH7751_PCI_IO_BASE since this is in pci-sh7751.c:
diff --git a/arch/sh/drivers/pci/pci-sh7751.c b/arch/sh/drivers/pci/pci-sh7751.c
index dbe8378..85e1ee2 100644
--- a/arch/sh/drivers/pci/pci-sh7751.c
+++ b/arch/sh/drivers/pci/pci-sh7751.c
<at> <at> -155,7 +155,7 <at> <at> int __init sh7751_pcic_init(struct sh4_p
*/
pr_debug("PCI: Mapping IO address 0x%x - 0x%x to base 0x%x\n",
PCIBIOS_MIN_IO, (64 << 10),
- SH4_PCI_IO_BASE + PCIBIOS_MIN_IO);
+ SH7751_PCI_IO_BASE + PCIBIOS_MIN_IO);
/*
* XXX: For now, leave this board-specific. In the event we have other
<at> <at> -163,7 +163,7 <at> <at> int __init sh7751_pcic_init(struct sh4_p
*/
#ifdef CONFIG_SH_BIGSUR
bigsur_port_map(PCIBIOS_MIN_IO, (64 << 10),
- SH4_PCI_IO_BASE + PCIBIOS_MIN_IO, 0);
+ SH7751_PCI_IO_BASE + PCIBIOS_MIN_IO, 0);
#endif
/* Make sure the MSB's of IO window are set to access PCI space
With that it builds and boots fine.
--
--
Jamie Lenehan <lenehan <at> twibble.org>
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV