Patchwork Move VIA C7 board CAR config to VIA C7 instead of boards.

login
register
about
Submitter Warren Turkal
Date 2010-09-27 22:04:44
Message ID <1285625084-9812-1-git-send-email-wt@penguintechs.org>
Download mbox | patch
Permalink /patch/1999/
State Accepted
Commit r5882
Headers show

Comments

Warren Turkal - 2010-09-27 22:04:44
This patch needs to be tested on the following board for complete
coverage:
* bcom/winnetp680
* jetway/j7f24
* via/epia-m700
* via/epia-cn
* via/pc2500e (patrickg?)

Thanks,
wt
8<------------------------------------------------------
This change is somewhat dangerous as it enables CAR for some boards that
it was not enabled for before.

Signed-off-by: Warren Turkal <wt@penguintechs.org>
---
 src/cpu/via/model_c7/Kconfig      |    8 +++++++-
 src/mainboard/via/vt8454c/Kconfig |    1 -
 2 files changed, 7 insertions(+), 2 deletions(-)
Jonathan A. Kollasch - 2010-09-28 00:15:05
On Mon, Sep 27, 2010 at 03:04:44PM -0700, Warren Turkal wrote:
> This patch needs to be tested on the following board for complete
> coverage:
> * bcom/winnetp680
> * jetway/j7f24
> * via/epia-m700
> * via/epia-cn
> * via/pc2500e (patrickg?)
> 

Seems to get my pc2500e running seabios.

	Jonathan Kollasch
Warren Turkal - 2010-09-28 00:17:10
In light of this news, I think that we should go ahead and commit. I
think that other boards are probably likely to work as well. Thoughts?

Thanks,
wt

On Mon, Sep 27, 2010 at 5:15 PM, Jonathan A. Kollasch
<jakllsch@kollasch.net> wrote:
> On Mon, Sep 27, 2010 at 03:04:44PM -0700, Warren Turkal wrote:
>> This patch needs to be tested on the following board for complete
>> coverage:
>> * bcom/winnetp680
>> * jetway/j7f24
>> * via/epia-m700
>> * via/epia-cn
>> * via/pc2500e (patrickg?)
>>
>
> Seems to get my pc2500e running seabios.
>
>        Jonathan Kollasch
>
Stefan Reinauer - 2010-09-28 08:30:59
On 9/28/10 12:04 AM, Warren Turkal wrote:
> This patch needs to be tested on the following board for complete
> coverage:
> * bcom/winnetp680
> * jetway/j7f24
> * via/epia-m700
> * via/epia-cn
> * via/pc2500e (patrickg?)
>
> Thanks,
> wt
> 8<------------------------------------------------------
> This change is somewhat dangerous as it enables CAR for some boards that
> it was not enabled for before.
>
> Signed-off-by: Warren Turkal <wt@penguintechs.org>

Acked-by: Stefan Reinauer <stepan@coresystems.de>

> ---
>  src/cpu/via/model_c7/Kconfig      |    8 +++++++-
>  src/mainboard/via/vt8454c/Kconfig |    1 -
>  2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/src/cpu/via/model_c7/Kconfig b/src/cpu/via/model_c7/Kconfig
> index 57fe4e9..8e6f0e8 100644
> --- a/src/cpu/via/model_c7/Kconfig
> +++ b/src/cpu/via/model_c7/Kconfig
> @@ -1,8 +1,14 @@
>  config CPU_VIA_C7
>  	bool
> +
> +if CPU_VIA_C7
> +
> +config CPU_SPECFIC_OPTIONS
> +	def_bool y
>  	select UDELAY_TSC
>  	select MMX
>  	select SSE2
> +	select CACHE_AS_RAM
>  
>  config DCACHE_RAM_BASE
>  	hex
> @@ -14,4 +20,4 @@ config DCACHE_RAM_SIZE
>  	default 0x8000
>  	depends on CPU_VIA_C7
>  
> -
> +endif # CPU_VIA_C7
> diff --git a/src/mainboard/via/vt8454c/Kconfig b/src/mainboard/via/vt8454c/Kconfig
> index 1e882eb..6c08007 100644
> --- a/src/mainboard/via/vt8454c/Kconfig
> +++ b/src/mainboard/via/vt8454c/Kconfig
> @@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
>  	select HAVE_HARD_RESET
>  	select HAVE_ACPI_TABLES
>  	select BOARD_ROMSIZE_KB_512
> -	select CACHE_AS_RAM
>  	select TINY_BOOTBLOCK
>  
>  config MAINBOARD_DIR
Stefan Reinauer - 2010-09-28 08:32:39
On 9/28/10 12:04 AM, Warren Turkal wrote:
> This change is somewhat dangerous as it enables CAR for some boards that
> it was not enabled for before.
Make sure that none of them calls early_mtrr_setup() in romstage.c as
that will crash on CAR systems.
It can just be removed as the CAR code automatically does the right MTRR
setup already.

Stefan
Warren Turkal - 2010-09-30 01:47:31
wt@mediakitchen:~/projects/coreboot/coreboot-svn/src/mainboard$ rgrep
early_mtrr_setup bcom/winnetp680 jetway/j7f24 via/epia-m700
via/epia-cn via/pc2500e
wt@mediakitchen:~/projects/coreboot/coreboot-svn/src/mainboard$

I think this is in shape to commit. Any objections?

Thanks,
wt

On Tue, Sep 28, 2010 at 1:32 AM, Stefan Reinauer
<stefan.reinauer@coresystems.de> wrote:
>  On 9/28/10 12:04 AM, Warren Turkal wrote:
>> This change is somewhat dangerous as it enables CAR for some boards that
>> it was not enabled for before.
> Make sure that none of them calls early_mtrr_setup() in romstage.c as
> that will crash on CAR systems.
> It can just be removed as the CAR code automatically does the right MTRR
> setup already.
>
> Stefan
>
> --
> coreboot mailing list: coreboot@coreboot.org
> http://www.coreboot.org/mailman/listinfo/coreboot
>
Peter Stuge - 2010-09-30 01:57:19
Warren Turkal wrote:
> wt@mediakitchen:~/projects/coreboot/coreboot-svn/src/mainboard$ rgrep
> early_mtrr_setup bcom/winnetp680 jetway/j7f24 via/epia-m700
> via/epia-cn via/pc2500e
> wt@mediakitchen:~/projects/coreboot/coreboot-svn/src/mainboard$
> 
> I think this is in shape to commit. Any objections?

Go for it! If there's any fallout it can always be solved.


//Peter

Patch

diff --git a/src/cpu/via/model_c7/Kconfig b/src/cpu/via/model_c7/Kconfig
index 57fe4e9..8e6f0e8 100644
--- a/src/cpu/via/model_c7/Kconfig
+++ b/src/cpu/via/model_c7/Kconfig
@@ -1,8 +1,14 @@ 
 config CPU_VIA_C7
 	bool
+
+if CPU_VIA_C7
+
+config CPU_SPECFIC_OPTIONS
+	def_bool y
 	select UDELAY_TSC
 	select MMX
 	select SSE2
+	select CACHE_AS_RAM
 
 config DCACHE_RAM_BASE
 	hex
@@ -14,4 +20,4 @@  config DCACHE_RAM_SIZE
 	default 0x8000
 	depends on CPU_VIA_C7
 
-
+endif # CPU_VIA_C7
diff --git a/src/mainboard/via/vt8454c/Kconfig b/src/mainboard/via/vt8454c/Kconfig
index 1e882eb..6c08007 100644
--- a/src/mainboard/via/vt8454c/Kconfig
+++ b/src/mainboard/via/vt8454c/Kconfig
@@ -14,7 +14,6 @@  config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_HARD_RESET
 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_512
-	select CACHE_AS_RAM
 	select TINY_BOOTBLOCK
 
 config MAINBOARD_DIR