Patchwork Another Kconfig patch

login
register
about
Submitter Myles Watson
Date 2009-09-22 21:18:56
Message ID <2831fecf0909221418m733e8112o1deca881cb4e331e@mail.gmail.com>
Download mbox | patch
Permalink /patch/276/
State Accepted
Headers show

Comments

Myles Watson - 2009-09-22 21:18:56
This one lets me boot my s2895 to Linux.  The problem was that the AMD 8131
southbridge Makefile.inc depended on a typo and never got built.

This patch changes a few things that may be controversial, thanks for
reviewing.

src/Kconfig: Remove HT-specific options.
src/cpu/amd/socket_F/Kconfig: Remove second occurrence of CPU_SOCKET_TYPE.
src/mainboard/amd/serengeti_cheetah/Kconfig: Add HT_CHAIN_UNITID_BASE here,
since it is board specific.
src/mainboard/tyan/s289X/Kconfig: Fix typo and change APIC_ID_OFFSET to
match old config.
src/devices/Kconfig: Change default value of *_PLUGIN_SUPPORT to match old
config.
src/southbridge/amd/amd8131/Makefile.inc: Remove check since it was a typo,
and the correct variable is checked in the parent directory.
src/Makefile:Use devicetree.cb instead of Config.lb to generate static.c.

Signed-off-by: Myles Watson <mylesgw@gmail.com>

Thanks,
Myles
ron minnich - 2009-09-22 21:23:16
On Tue, Sep 22, 2009 at 2:18 PM, Myles Watson <mylesgw@gmail.com> wrote:
> This one lets me boot my s2895 to Linux.  The problem was that the AMD 8131
> southbridge Makefile.inc depended on a typo and never got built.
>
> This patch changes a few things that may be controversial, thanks for
> reviewing.
>
> src/Kconfig: Remove HT-specific options.

Good!

> src/cpu/amd/socket_F/Kconfig: Remove second occurrence of CPU_SOCKET_TYPE.

good.

> src/mainboard/amd/serengeti_cheetah/Kconfig: Add HT_CHAIN_UNITID_BASE here,
> since it is board specific.

makes sense. There seems to be no reasonable default.

> src/mainboard/tyan/s289X/Kconfig: Fix typo and change APIC_ID_OFFSET to
> match old config.

fine.

> src/devices/Kconfig: Change default value of *_PLUGIN_SUPPORT to match old
> config.

fine.

> src/southbridge/amd/amd8131/Makefile.inc: Remove check since it was a typo,
> and the correct variable is checked in the parent directory.

yes, I thought we had killed all these; guess not.

> src/Makefile:Use devicetree.cb instead of Config.lb to generate static.c.
>

oops.

Acked-by: Ronald G. Minnich <rminnich@gmail.com>

Thanks

ron
Myles Watson - 2009-09-22 21:31:31
> > src/southbridge/amd/amd8131/Makefile.inc: Remove check since it was a
> typo,
> > and the correct variable is checked in the parent directory.
>
> yes, I thought we had killed all these; guess not.
>
I looked and can't find any more.

Acked-by: Ronald G. Minnich <rminnich@gmail.com>
>
Rev 4657.

Thanks,
Myles

Patch

Index: svn/src/Kconfig
===================================================================
--- svn.orig/src/Kconfig
+++ svn/src/Kconfig
@@ -84,14 +84,6 @@  config PCI_ROM_RUN
 	bool
 	default n
 
-config HT_CHAIN_UNITID_BASE
-	hex
-	default 1
-
-config HT_CHAIN_END_UNITID_BASE
-	hex
-	default 0x20
-
 config HEAP_SIZE
 	hex
 	default 0x2000
Index: svn/src/cpu/amd/socket_F/Kconfig
===================================================================
--- svn.orig/src/cpu/amd/socket_F/Kconfig
+++ svn/src/cpu/amd/socket_F/Kconfig
@@ -24,8 +24,3 @@  config DIMM_SUPPORT
 	default 0x0104
 	depends on CPU_AMD_SOCKET_F
 
-config CPU_SOCKET_TYPE
-	hex
-	default 0x10
-	depends on CPU_AMD_SOCKET_F
-
Index: svn/src/mainboard/amd/serengeti_cheetah/Kconfig
===================================================================
--- svn.orig/src/mainboard/amd/serengeti_cheetah/Kconfig
+++ svn/src/mainboard/amd/serengeti_cheetah/Kconfig
@@ -119,6 +119,11 @@  config HT_CHAIN_END_UNITID_BASE
 	default 0x6
 	depends on BOARD_AMD_SERENGETI_CHEETAH
 
+config HT_CHAIN_UNITID_BASE
+	hex
+	default 0x1
+	depends on BOARD_AMD_SERENGETI_CHEETAH
+
 config USE_INIT
 	bool
 	default n
Index: svn/src/mainboard/tyan/s2891/Kconfig
===================================================================
--- svn.orig/src/mainboard/tyan/s2891/Kconfig
+++ svn/src/mainboard/tyan/s2891/Kconfig
@@ -17,7 +17,7 @@  config MAINBOARD_DIR
 
 config APIC_ID_OFFSET
 	hex
-	default 8
+	default 0x10
 	depends on BOARD_TYAN_S2891
 
 config SB_HT_CHAIN_ON_BUS0
@@ -40,7 +40,7 @@  config MAINBOARD_PART_NUMBER
 	default "s2891"
 	depends on BOARD_TYAN_S2891
 
-config CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x2891
 	depends on BOARD_TYAN_S2891
Index: svn/src/mainboard/tyan/s2892/Kconfig
===================================================================
--- svn.orig/src/mainboard/tyan/s2892/Kconfig
+++ svn/src/mainboard/tyan/s2892/Kconfig
@@ -17,7 +17,7 @@  config MAINBOARD_DIR
 
 config APIC_ID_OFFSET
 	hex
-	default 8
+	default 0x10
 	depends on BOARD_TYAN_S2892
 
 config SB_HT_CHAIN_ON_BUS0
@@ -40,7 +40,7 @@  config MAINBOARD_PART_NUMBER
 	default "s2892"
 	depends on BOARD_TYAN_S2892
 
-config CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x2892
 	depends on BOARD_TYAN_S2892
Index: svn/src/mainboard/tyan/s2895/Kconfig
===================================================================
--- svn.orig/src/mainboard/tyan/s2895/Kconfig
+++ svn/src/mainboard/tyan/s2895/Kconfig
@@ -17,7 +17,7 @@  config MAINBOARD_DIR
 
 config APIC_ID_OFFSET
 	hex
-	default 8
+	default 0x10
 	depends on BOARD_TYAN_S2895
 
 config SB_HT_CHAIN_ON_BUS0
@@ -40,7 +40,7 @@  config MAINBOARD_PART_NUMBER
 	default "s2895"
 	depends on BOARD_TYAN_S2895
 
-config CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x2895
 	depends on BOARD_TYAN_S2895
Index: svn/src/devices/Kconfig
===================================================================
--- svn.orig/src/devices/Kconfig
+++ svn/src/devices/Kconfig
@@ -79,20 +79,20 @@  config PCI_64BIT_PREF_MEM
 
 config HYPERTRANSPORT_PLUGIN_SUPPORT
 	bool
-	default n
+	default y
 
 config PCIX_PLUGIN_SUPPORT
 	bool
-	default n
+	default y
 
 config PCIEXP_PLUGIN_SUPPORT
 	bool
-	default n
+	default y
 
 config AGP_PLUGIN_SUPPORT
 	bool
-	default n
+	default y
 
 config CARDBUS_PLUGIN_SUPPORT
 	bool
-	default n
+	default y
Index: svn/src/southbridge/amd/amd8131/Makefile.inc
===================================================================
--- svn.orig/src/southbridge/amd/amd8131/Makefile.inc
+++ svn/src/southbridge/amd/amd8131/Makefile.inc
@@ -1 +1 @@ 
-driver-$(SOUTHBRIDGE_AMD_AMD8131) += amd8131_bridge.o
\ No newline at end of file
+driver-y += amd8131_bridge.o
Index: svn/Makefile
===================================================================
--- svn.orig/Makefile
+++ svn/Makefile
@@ -111,7 +111,7 @@  $(obj)/mainboard/$(MAINBOARDDIR)/config.
 
 # needed objects that every mainboard uses 
 # Creation of these is architecture and mainboard independent
-$(obj)/mainboard/$(MAINBOARDDIR)/static.c: $(src)/mainboard/$(MAINBOARDDIR)/Config.lb  $(obj)/mainboard/$(MAINBOARDDIR)/config.py
+$(obj)/mainboard/$(MAINBOARDDIR)/static.c: $(src)/mainboard/$(MAINBOARDDIR)/devicetree.cb  $(obj)/mainboard/$(MAINBOARDDIR)/config.py
 	mkdir -p $(obj)/mainboard/$(MAINBOARDDIR)
 	(cd $(obj)/mainboard/$(MAINBOARDDIR) ; PYTHONPATH=$(top)/util/sconfig export PYTHONPATH; python config.py  $(MAINBOARDDIR) $(top) $(obj)/mainboard/$(MAINBOARDDIR))