Patchwork some more kconfig

login
register
about
Submitter Patrick Georgi
Date 2009-12-18 15:55:07
Message ID <4B2BA5DB.1040103@georgi-clan.de>
Download mbox | patch
Permalink /patch/668/
State Accepted
Commit r4985
Headers show

Comments

Patrick Georgi - 2009-12-18 15:55:07
Hi,

attached patch cleans up amd/dbm690t and kontron/986lcd-m some more (not
fully). It also fixes the kconfig build for HAVE_ACPI_RESUME.

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
ron minnich - 2009-12-18 16:00:06
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
Peter Stuge - 2009-12-18 16:56:54
Patrick Georgi wrote:
> +++ src/mainboard/kontron/986lcd-m/Kconfig	(working copy)
> @@ -6,15 +6,22 @@
>  	select NORTHBRIDGE_INTEL_I945
>  	select SOUTHBRIDGE_INTEL_I82801GX
>  	select SUPERIO_WINBOND_W83627THG
> -	select HAVE_PIRQ_TABLE
> -	select HAVE_MP_TABLE
> +	select GENERATE_ACPI_TABLES
> +	select GENERATE_PIRQ_TABLE
> +	select GENERATE_MP_TABLE

Hmm? Shouldn't GENERATE_ be set by the user.. ?


//Peter
Stefan Reinauer - 2009-12-18 18:43:07
On 12/18/09 5:56 PM, Peter Stuge wrote:
> Patrick Georgi wrote:
>   
>> +++ src/mainboard/kontron/986lcd-m/Kconfig	(working copy)
>> @@ -6,15 +6,22 @@
>>  	select NORTHBRIDGE_INTEL_I945
>>  	select SOUTHBRIDGE_INTEL_I82801GX
>>  	select SUPERIO_WINBOND_W83627THG
>> -	select HAVE_PIRQ_TABLE
>> -	select HAVE_MP_TABLE
>> +	select GENERATE_ACPI_TABLES
>> +	select GENERATE_PIRQ_TABLE
>> +	select GENERATE_MP_TABLE
>>     
> Hmm? Shouldn't GENERATE_ be set by the user.. ?
>
>   
The user should never have to worry about that stuff.
We should not expect the user to manually enable ACPI and PIRQ before he
has a chance to get a bootable system with coreboot.

Stefan
Myles Watson - 2009-12-18 18:50:17
On Fri, Dec 18, 2009 at 11:43 AM, Stefan Reinauer <stepan@coresystems.de>wrote:

> On 12/18/09 5:56 PM, Peter Stuge wrote:
> > Patrick Georgi wrote:
> >
> >> +++ src/mainboard/kontron/986lcd-m/Kconfig   (working copy)
> >> @@ -6,15 +6,22 @@
> >>      select NORTHBRIDGE_INTEL_I945
> >>      select SOUTHBRIDGE_INTEL_I82801GX
> >>      select SUPERIO_WINBOND_W83627THG
> >> -    select HAVE_PIRQ_TABLE
> >> -    select HAVE_MP_TABLE
> >> +    select GENERATE_ACPI_TABLES
> >> +    select GENERATE_PIRQ_TABLE
> >> +    select GENERATE_MP_TABLE
> >>
> > Hmm? Shouldn't GENERATE_ be set by the user.. ?
> >
> >
> The user should never have to worry about that stuff.
> We should not expect the user to manually enable ACPI and PIRQ before he
> has a chance to get a bootable system with coreboot.
>
As long as the user doesn't touch it, GENERATE_ was set by default as long
as the board has HAVE_* set.  What this patch did was make it so that the
user can't build without ACPI tables.  I don't think that is what's wanted.
Now to remove the MP_TABLE, the user would have to edit the Kconfig file.

Thanks,
Myles
Patrick Georgi - 2009-12-18 21:25:09
Am 18.12.2009 19:50, schrieb Myles Watson:
> As long as the user doesn't touch it, GENERATE_ was set by default as
> long as the board has HAVE_* set.  What this patch did was make it so
> that the user can't build without ACPI tables.  I don't think that is
> what's wanted.  Now to remove the MP_TABLE, the user would have to
> edit the Kconfig file.
What's the right approach to them now? I somewhat missed the
introduction of GENERATE and thus its rules, and just went with what
gave me a pretty result in compareboard.


Patrick
Myles Watson - 2009-12-21 15:07:59
> Am 18.12.2009 19:50, schrieb Myles Watson:
> > As long as the user doesn't touch it, GENERATE_ was set by default as
> > long as the board has HAVE_* set.  What this patch did was make it so
> > that the user can't build without ACPI tables.  I don't think that is
> > what's wanted.  Now to remove the MP_TABLE, the user would have to
> > edit the Kconfig file.
> What's the right approach to them now? I somewhat missed the
> introduction of GENERATE and thus its rules, and just went with what
> gave me a pretty result in compareboard.

All the HAVE_* were supposed to be the same as newconfig, and the GENERATE_*
were supposed to default to the same as HAVE_*, but be ignored by the
comparison script, since they are not in newconfig.

Thanks,
Myles

Patch

Index: src/mainboard/kontron/986lcd-m/Kconfig
===================================================================
--- src/mainboard/kontron/986lcd-m/Kconfig	(revision 4982)
+++ src/mainboard/kontron/986lcd-m/Kconfig	(working copy)
@@ -6,15 +6,22 @@ 
 	select NORTHBRIDGE_INTEL_I945
 	select SOUTHBRIDGE_INTEL_I82801GX
 	select SUPERIO_WINBOND_W83627THG
-	select HAVE_PIRQ_TABLE
-	select HAVE_MP_TABLE
+	select GENERATE_ACPI_TABLES
+	select GENERATE_PIRQ_TABLE
+	select GENERATE_MP_TABLE
+	select HAVE_ACPI_RESUME
+	select HAVE_HARD_RESET
+	select HAVE_MAINBOARD_RESOURCES
 	select MMCONF_SUPPORT
 	select USE_PRINTK_IN_CAR
 	select AP_IN_SIPI_WAIT
 	select UDELAY_LAPIC
-	select HAVE_ACPI_TABLES
 	select HAVE_SMI_HANDLER
 	select BOARD_ROMSIZE_KB_1024
+	select IOAPIC
+	select USE_DCACHE_RAM
+	select GFXUMA
+	select HAVE_MOVNTI
 
 config MAINBOARD_DIR
 	string
@@ -66,3 +73,7 @@ 
 	default "amipci_01.20"
 	depends on BOARD_KONTRON_986LCD_M
 
+config HAVE_ACPI_SLIC
+	bool
+	default n
+	depends on BOARD_KONTRON_986LCD_M
Index: src/mainboard/amd/dbm690t/Kconfig
===================================================================
--- src/mainboard/amd/dbm690t/Kconfig	(revision 4982)
+++ src/mainboard/amd/dbm690t/Kconfig	(working copy)
@@ -7,15 +7,15 @@ 
 	select SOUTHBRIDGE_AMD_RS690
 	select SOUTHBRIDGE_AMD_SB600
 	select SUPERIO_ITE_IT8712F
-	select HAVE_PIRQ_TABLE
-	select HAVE_MP_TABLE
+	select GENERATE_ACPI_TABLES
+	select GENERATE_MP_TABLE
+	select GENERATE_PIRQ_TABLE
+	select HAVE_MAINBOARD_RESOURCES
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select IOAPIC
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	select WAIT_BEFORE_CPUS_INIT
-	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR
@@ -23,6 +23,16 @@ 
 	default amd/dbm690t
 	depends on BOARD_AMD_DBM690T
 
+config HAVE_HIGH_TABLES
+	bool
+	default n
+	depends on BOARD_AMD_DBM690T
+
+config HAVE_OPTION_TABLE
+	bool
+	default n
+	depends on BOARD_AMD_DBM690T
+
 config DCACHE_RAM_BASE
 	hex
 	default 0xc8000
@@ -40,7 +50,7 @@ 
 
 config APIC_ID_OFFSET
 	hex
-	default 0x8
+	default 0x0
 	depends on BOARD_AMD_DBM690T
 
 config LB_CKS_RANGE_END
@@ -80,17 +90,17 @@ 
 
 config SB_HT_CHAIN_ON_BUS0
 	int
-	default 2
+	default 1
 	depends on BOARD_AMD_DBM690T
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
-	default 0x6
+	default 0x1
 	depends on BOARD_AMD_DBM690T
 
 config HT_CHAIN_UNITID_BASE
 	hex
-	default 0xa
+	default 0x0
 	depends on BOARD_AMD_DBM690T
 
 config USE_INIT
Index: src/arch/i386/boot/Makefile.inc
===================================================================
--- src/arch/i386/boot/Makefile.inc	(revision 4982)
+++ src/arch/i386/boot/Makefile.inc	(working copy)
@@ -6,5 +6,5 @@ 
 obj-$(CONFIG_GENERATE_PIRQ_TABLE) += pirq_routing.o
 obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.o
 obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpigen.o
-obj-$(CONFIG_HAVE_ACPI_RESUME) += wakeup.S
+obj-$(CONFIG_HAVE_ACPI_RESUME) += wakeup.o