Patchwork Trying to add Kconfig support for M57SLI - builderror

login
register
about
Submitter Harald Gutmann
Date 2009-08-21 18:33:25
Message ID <200908212033.25303.harald.gutmann@gmx.net>
Download mbox | patch
Permalink /patch/166/
State Accepted
Headers show

Comments

Harald Gutmann - 2009-08-21 18:33:25
On Friday 21 August 2009 20:21:27 Myles Watson wrote:
> > > OK, I am going to apply Cristi's patch, and, if it looks good, commit.
> > > Then we can do nvidia south.
> >
> > Okay, sounds good.
>
> Lets not create a new CONFIG variable SOUTHBRIDGE_NVIDIA_MCP55.  I think
> that whole file can go.  And the files that source it.
> Index: nvidia/mcp55/Kconfig
> Index: nvidia/Kconfig

Are you sure that this will work as in the mainboard/{vendor}/{model}/Kconfig 
it is used to select which sb is used. (Maybe I'm wrong with this, but I used 
the amd_serengeti target as starting point, and there it's done the same way.)

For example here on my board it looks like:
config BOARD_GIGABYTE_M57SLI
        bool "M57SLI"
        select ARCH_X86
        select CPU_AMD_K8
        select CPU_AMD_SOCKET_AM2
        select NORTHBRIDGE_AMD_AMDK8
        select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
        select SOUTHBRIDGE_NVIDIA_MCP55
        select SUPERIO_WINBOND_IT8716F
        select PIRQ_TABLE
        select USE_PRINTK_IN_CAR
        help
        Gigabyte M57SLI mainboard
endchoice

>
> I'd rather you didn't remove the ck804 references, since my patch will have
> to put them back.
Done.

> +driver-$(CONFIG_HAVE_ACPI_TABLES) += mcp55_fadt.o
> I think you mean obj here.
Yes.

v2 of the patch attached, with some more (little) modifications.

> Thanks,
> Myles

Thanks,
Harald
Myles Watson - 2009-08-21 19:14:14
On Fri, Aug 21, 2009 at 12:33 PM, Harald Gutmann<harald.gutmann@gmx.net> wrote:
> On Friday 21 August 2009 20:21:27 Myles Watson wrote:
>> > > OK, I am going to apply Cristi's patch, and, if it looks good, commit.
>> > > Then we can do nvidia south.
>> >
>> > Okay, sounds good.
>>
>> Lets not create a new CONFIG variable SOUTHBRIDGE_NVIDIA_MCP55.  I think
>> that whole file can go.  And the files that source it.
>> Index: nvidia/mcp55/Kconfig
>> Index: nvidia/Kconfig
>
> Are you sure that this will work as in the mainboard/{vendor}/{model}/Kconfig
> it is used to select which sb is used. (Maybe I'm wrong with this, but I used
> the amd_serengeti target as starting point, and there it's done the same way.)
You're right.  The reason I was questioning it was that I grepped the
tree and didn't find any CONFIG_SOUTHBRIDGE_NVIDIA*

I think the correct fix for that problem is to change
src/southbridge/nvidia/Makefile.inc
subdirs-y should be subdirs-$(CONFIG_SOUTHBRIDGE_NVIDIA_MCP55).

Does that sound better?

>> I'd rather you didn't remove the ck804 references, since my patch will have
>> to put them back.
> Done.
>
>> +driver-$(CONFIG_HAVE_ACPI_TABLES) += mcp55_fadt.o
>> I think you mean obj here.
> Yes.
>
> v2 of the patch attached, with some more (little) modifications.
Thanks,
Myles
ron minnich - 2009-08-21 20:41:40
On Fri, Aug 21, 2009 at 12:14 PM, Myles Watson<mylesgw@gmail.com> wrote:

> I think the correct fix for that problem is to change
> src/southbridge/nvidia/Makefile.inc
> subdirs-y should be subdirs-$(CONFIG_SOUTHBRIDGE_NVIDIA_MCP55).
>

yes!

This is the general rule. It's even in my small Kconfig.tex doco :-)

ron
Myles Watson - 2009-08-21 21:22:12
On Fri, Aug 21, 2009 at 2:41 PM, ron minnich<rminnich@gmail.com> wrote:
> On Fri, Aug 21, 2009 at 12:14 PM, Myles Watson<mylesgw@gmail.com> wrote:
>
>> I think the correct fix for that problem is to change
>> src/southbridge/nvidia/Makefile.inc
>> subdirs-y should be subdirs-$(CONFIG_SOUTHBRIDGE_NVIDIA_MCP55).
>>
>
> yes!
>
> This is the general rule. It's even in my small Kconfig.tex doco :-)

Unfortunately it fits into the category of "the tree speaks louder
than the docs."  We shouldn't have missed it, but we did.

Myles

Patch

Index: Kconfig
===================================================================
--- Kconfig	(revision 4559)
+++ Kconfig	(working copy)
@@ -1,7 +1,7 @@ 
 source src/southbridge/amd/Kconfig
 #source src/southbridge/broadcom/Kconfig
 source src/southbridge/intel/Kconfig
-#source src/southbridge/nvidia/Kconfig
+source src/southbridge/nvidia/Kconfig
 #source src/southbridge/ricoh/Kconfig
 #source src/southbridge/sis/Kconfig
 source src/southbridge/via/Kconfig
Index: Makefile.inc
===================================================================
--- Makefile.inc	(revision 4559)
+++ Makefile.inc	(working copy)
@@ -1,7 +1,7 @@ 
 subdirs-y += amd
 #subdirs-y += broadcom
 subdirs-y += intel
-#subdirs-y += nvidia
+subdirs-y += nvidia
 #subdirs-y += ricoh
 #subdirs-y += sis
 subdirs-y += via
Index: nvidia/mcp55/Kconfig
===================================================================
--- nvidia/mcp55/Kconfig	(revision 0)
+++ nvidia/mcp55/Kconfig	(revision 0)
@@ -0,0 +1,22 @@ 
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2008-2009 coresystems GmbH
+##
+## 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; version 2 of the License.
+##
+## 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+##
+
+config SOUTHBRIDGE_NVIDIA_MCP55
+	bool
+	default n
Index: nvidia/mcp55/Makefile.inc
===================================================================
--- nvidia/mcp55/Makefile.inc	(revision 0)
+++ nvidia/mcp55/Makefile.inc	(revision 0)
@@ -0,0 +1,20 @@ 
+driver-y += mcp55.o
+driver-y += mcp55_aza.o
+#driver-y += mcp55_early_ctrl.o
+#driver-y += mcp55_early_setup_car.o
+#driver-y += mcp55_early_smbus.o
+#driver-y += mcp55_enable_rom.o
+driver-$(CONFIG_USB_DEBUG_DIRECT) += mcp55_enable_usbdebug_direct.o
+driver-y += mcp55_ht.o
+driver-y += mcp55_ide.o
+driver-y += mcp55_lpc.o
+driver-y += mcp55_nic.o
+driver-y += mcp55_pci.o
+driver-y += mcp55_pcie.o
+driver-y += mcp55_sata.o
+driver-y += mcp55_smbus.o
+driver-y += mcp55_usb2.o
+driver-y += mcp55_usb.o
+obj-$(CONFIG_HAVE_ACPI_TABLES) += mcp55_fadt.o
+
+obj-y += mcp55_reset.o