| Submitter | Warren Turkal |
|---|---|
| Date | 2010-09-28 06:35:28 |
| Message ID | <1285655728-17107-1-git-send-email-wt@penguintechs.org> |
| Download | mbox | patch |
| Permalink | /patch/2000/ |
| State | New |
| Headers | show |
Comments
I haven't gotten any feedback on this one. As it stands, the patch should be a functional no-op, but it would be nice to get someone with access to the machines listed below to see if we can collapse the configuration even more. Since this patch is a functional no-op, can I please get an ack so that I can commit? Thanks, wt On Mon, Sep 27, 2010 at 11:35 PM, Warren Turkal <wt@penguintechs.org> wrote: > Does anyone have access to the machines for which I needed override > configurations that are listed in the patch message below? I would like > to test these with the DCACHE_* items removed from their mainboard > Kconfig files to see if they work so that the CAR settings for socket > 940 systems can be completely unified. > > Thanks, > wt > 8<---------------------------------------------------------------------- > For the a number of the socket 940 based machines, I collapsed their CAR > configurations into the socket config. > > However, I have kept a number of overrides in place for the following > machines: > * broadcom/blast > * ibm/e32{5,6} > * newisys/khepri > * sunw/ultra40 > * tyan/s488{0,2} > > These machines used different setting than the defaults for socket 940 > systems. > > Signed-off-by: Warren Turkal <wt@penguintechs.org> > --- > src/cpu/amd/model_fxx/Kconfig | 22 ---------------------- > src/cpu/amd/socket_940/Kconfig | 26 ++++++++++++++++++++++++-- > src/mainboard/arima/hdama/Kconfig | 1 - > src/mainboard/broadcom/blast/Kconfig | 1 - > src/mainboard/ibm/e325/Kconfig | 1 - > src/mainboard/ibm/e326/Kconfig | 1 - > src/mainboard/iwill/dk8_htx/Kconfig | 13 ------------- > src/mainboard/iwill/dk8s2/Kconfig | 13 ------------- > src/mainboard/iwill/dk8x/Kconfig | 13 ------------- > src/mainboard/newisys/khepri/Kconfig | 1 - > src/mainboard/sunw/ultra40/Kconfig | 1 - > src/mainboard/tyan/s4880/Kconfig | 1 - > src/mainboard/tyan/s4882/Kconfig | 1 - > 13 files changed, 24 insertions(+), 71 deletions(-) > > diff --git a/src/cpu/amd/model_fxx/Kconfig b/src/cpu/amd/model_fxx/Kconfig > index 21fc1ab..139b96a 100644 > --- a/src/cpu/amd/model_fxx/Kconfig > +++ b/src/cpu/amd/model_fxx/Kconfig > @@ -1,31 +1,9 @@ > config CPU_AMD_MODEL_FXX > bool > - select CACHE_AS_RAM > select MMX > select SSE > select SSE2 > > -config CPU_ADDR_BITS > - int > - default 40 > - depends on CPU_AMD_MODEL_FXX > - > -config DCACHE_RAM_BASE > - hex > - default 0xc8000 > - depends on CPU_AMD_MODEL_FXX > - > -config DCACHE_RAM_SIZE > - hex > - default 0x08000 > - depends on CPU_AMD_MODEL_FXX > - > -config DCACHE_RAM_GLOBAL_VAR_SIZE > - hex > - default 0x01000 > - depends on CPU_AMD_MODEL_FXX > - > - > config UDELAY_IO > bool > default n > diff --git a/src/cpu/amd/socket_940/Kconfig b/src/cpu/amd/socket_940/Kconfig > index c17a85f..6c3a929 100644 > --- a/src/cpu/amd/socket_940/Kconfig > +++ b/src/cpu/amd/socket_940/Kconfig > @@ -1,14 +1,36 @@ > config CPU_AMD_SOCKET_940 > bool > + > +if CPU_AMD_SOCKET_940 > + > +config SOCKET_SPECIFIC_OPTIONS > + def_bool y > select K8_HT_FREQ_1G_SUPPORT > select CPU_AMD_MODEL_FXX > + select CACHE_AS_RAM > > config CPU_SOCKET_TYPE > hex > default 0x0 > - depends on CPU_AMD_SOCKET_940 > > config DIMM_SUPPORT > hex > default 0x108 > - depends on CPU_AMD_SOCKET_940 > + > +config CPU_ADDR_BITS > + int > + default 40 > + > +config DCACHE_RAM_BASE > + hex > + default 0xc8000 > + > +config DCACHE_RAM_SIZE > + hex > + default 0x08000 > + > +config DCACHE_RAM_GLOBAL_VAR_SIZE > + hex > + default 0x01000 > + > +endif # CPU_AMD_SOCKET_940 > diff --git a/src/mainboard/arima/hdama/Kconfig b/src/mainboard/arima/hdama/Kconfig > index 3f89162..664b260 100644 > --- a/src/mainboard/arima/hdama/Kconfig > +++ b/src/mainboard/arima/hdama/Kconfig > @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy > select HAVE_PIRQ_TABLE > select HAVE_OPTION_TABLE > select HAVE_MP_TABLE > - select CACHE_AS_RAM > select HAVE_HARD_RESET > select SB_HT_CHAIN_UNITID_OFFSET_ONLY > select BOARD_ROMSIZE_KB_512 > diff --git a/src/mainboard/broadcom/blast/Kconfig b/src/mainboard/broadcom/blast/Kconfig > index 2c14b0a..b9d2548 100644 > --- a/src/mainboard/broadcom/blast/Kconfig > +++ b/src/mainboard/broadcom/blast/Kconfig > @@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy > select HAVE_OPTION_TABLE > select HAVE_PIRQ_TABLE > select HAVE_MP_TABLE > - select CACHE_AS_RAM > select HAVE_HARD_RESET > select BOARD_ROMSIZE_KB_512 > select SB_HT_CHAIN_UNITID_OFFSET_ONLY > diff --git a/src/mainboard/ibm/e325/Kconfig b/src/mainboard/ibm/e325/Kconfig > index 143618f..c0fc3bf 100644 > --- a/src/mainboard/ibm/e325/Kconfig > +++ b/src/mainboard/ibm/e325/Kconfig > @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy > select HAVE_OPTION_TABLE > select HAVE_PIRQ_TABLE > select HAVE_MP_TABLE > - select CACHE_AS_RAM > select HAVE_HARD_RESET > select SB_HT_CHAIN_UNITID_OFFSET_ONLY > select WAIT_BEFORE_CPUS_INIT > diff --git a/src/mainboard/ibm/e326/Kconfig b/src/mainboard/ibm/e326/Kconfig > index 147f379..10f7557 100644 > --- a/src/mainboard/ibm/e326/Kconfig > +++ b/src/mainboard/ibm/e326/Kconfig > @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy > select HAVE_OPTION_TABLE > select HAVE_PIRQ_TABLE > select HAVE_MP_TABLE > - select CACHE_AS_RAM > select HAVE_HARD_RESET > select SB_HT_CHAIN_UNITID_OFFSET_ONLY > select WAIT_BEFORE_CPUS_INIT > diff --git a/src/mainboard/iwill/dk8_htx/Kconfig b/src/mainboard/iwill/dk8_htx/Kconfig > index 5232b70..78bd169 100644 > --- a/src/mainboard/iwill/dk8_htx/Kconfig > +++ b/src/mainboard/iwill/dk8_htx/Kconfig > @@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy > select HAVE_OPTION_TABLE > select HAVE_PIRQ_TABLE > select HAVE_MP_TABLE > - select CACHE_AS_RAM > select HAVE_HARD_RESET > select LIFT_BSP_APIC_ID > select SB_HT_CHAIN_UNITID_OFFSET_ONLY > @@ -26,18 +25,6 @@ config MAINBOARD_DIR > string > default iwill/dk8_htx > > -config DCACHE_RAM_BASE > - hex > - default 0xc8000 > - > -config DCACHE_RAM_SIZE > - hex > - default 0x08000 > - > -config DCACHE_RAM_GLOBAL_VAR_SIZE > - hex > - default 0x01000 > - > config APIC_ID_OFFSET > hex > default 0x10 > diff --git a/src/mainboard/iwill/dk8s2/Kconfig b/src/mainboard/iwill/dk8s2/Kconfig > index 4d40847..e5ba7c3 100644 > --- a/src/mainboard/iwill/dk8s2/Kconfig > +++ b/src/mainboard/iwill/dk8s2/Kconfig > @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy > select HAVE_PIRQ_TABLE > select HAVE_OPTION_TABLE > select HAVE_MP_TABLE > - select CACHE_AS_RAM > select HAVE_HARD_RESET > select SB_HT_CHAIN_UNITID_OFFSET_ONLY > select WAIT_BEFORE_CPUS_INIT > @@ -23,18 +22,6 @@ config MAINBOARD_DIR > string > default iwill/dk8s2 > > -config DCACHE_RAM_BASE > - hex > - default 0xc8000 > - > -config DCACHE_RAM_SIZE > - hex > - default 0x08000 > - > -config DCACHE_RAM_GLOBAL_VAR_SIZE > - hex > - default 0x01000 > - > config APIC_ID_OFFSET > hex > default 0x0 > diff --git a/src/mainboard/iwill/dk8x/Kconfig b/src/mainboard/iwill/dk8x/Kconfig > index 315a743..9676503 100644 > --- a/src/mainboard/iwill/dk8x/Kconfig > +++ b/src/mainboard/iwill/dk8x/Kconfig > @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy > select HAVE_OPTION_TABLE > select HAVE_PIRQ_TABLE > select HAVE_MP_TABLE > - select CACHE_AS_RAM > select HAVE_HARD_RESET > select SB_HT_CHAIN_UNITID_OFFSET_ONLY > select WAIT_BEFORE_CPUS_INIT > @@ -22,18 +21,6 @@ config MAINBOARD_DIR > string > default iwill/dk8x > > -config DCACHE_RAM_BASE > - hex > - default 0xc8000 > - > -config DCACHE_RAM_SIZE > - hex > - default 0x08000 > - > -config DCACHE_RAM_GLOBAL_VAR_SIZE > - hex > - default 0x01000 > - > config APIC_ID_OFFSET > hex > default 0x0 > diff --git a/src/mainboard/newisys/khepri/Kconfig b/src/mainboard/newisys/khepri/Kconfig > index 31f705d..5fcb011 100644 > --- a/src/mainboard/newisys/khepri/Kconfig > +++ b/src/mainboard/newisys/khepri/Kconfig > @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy > select HAVE_OPTION_TABLE > select HAVE_PIRQ_TABLE > select HAVE_MP_TABLE > - select CACHE_AS_RAM > select HAVE_HARD_RESET > select BOARD_ROMSIZE_KB_512 > select SB_HT_CHAIN_UNITID_OFFSET_ONLY > diff --git a/src/mainboard/sunw/ultra40/Kconfig b/src/mainboard/sunw/ultra40/Kconfig > index 4cd5800..7d521fc 100644 > --- a/src/mainboard/sunw/ultra40/Kconfig > +++ b/src/mainboard/sunw/ultra40/Kconfig > @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy > select HAVE_BUS_CONFIG > select HAVE_PIRQ_TABLE > select HAVE_MP_TABLE > - select CACHE_AS_RAM > select HAVE_HARD_RESET > select BOARD_ROMSIZE_KB_1024 > > diff --git a/src/mainboard/tyan/s4880/Kconfig b/src/mainboard/tyan/s4880/Kconfig > index faff037..78c98df 100644 > --- a/src/mainboard/tyan/s4880/Kconfig > +++ b/src/mainboard/tyan/s4880/Kconfig > @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy > select HAVE_OPTION_TABLE > select HAVE_PIRQ_TABLE > select HAVE_MP_TABLE > - select CACHE_AS_RAM > select HAVE_HARD_RESET > select BOARD_ROMSIZE_KB_512 > select SB_HT_CHAIN_UNITID_OFFSET_ONLY > diff --git a/src/mainboard/tyan/s4882/Kconfig b/src/mainboard/tyan/s4882/Kconfig > index 866aec0..54c0327 100644 > --- a/src/mainboard/tyan/s4882/Kconfig > +++ b/src/mainboard/tyan/s4882/Kconfig > @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy > select HAVE_OPTION_TABLE > select HAVE_PIRQ_TABLE > select HAVE_MP_TABLE > - select CACHE_AS_RAM > select HAVE_HARD_RESET > select BOARD_ROMSIZE_KB_512 > select SB_HT_CHAIN_UNITID_OFFSET_ONLY > -- > 1.7.1 > >
For the record, I checked a representative set of the boards to make sure they generate the same .config before and after this change. The testing I want is to unify the rest of the 940 CAR settings. I realize that it may not happen, but I wanted to try. :) wt On Wed, Sep 29, 2010 at 6:49 PM, Warren Turkal <wt@penguintechs.org> wrote: > I haven't gotten any feedback on this one. As it stands, the patch > should be a functional no-op, but it would be nice to get someone with > access to the machines listed below to see if we can collapse the > configuration even more. > > Since this patch is a functional no-op, can I please get an ack so > that I can commit? > > Thanks, > wt > > On Mon, Sep 27, 2010 at 11:35 PM, Warren Turkal <wt@penguintechs.org> wrote: >> Does anyone have access to the machines for which I needed override >> configurations that are listed in the patch message below? I would like >> to test these with the DCACHE_* items removed from their mainboard >> Kconfig files to see if they work so that the CAR settings for socket >> 940 systems can be completely unified. >> >> Thanks, >> wt >> 8<---------------------------------------------------------------------- >> For the a number of the socket 940 based machines, I collapsed their CAR >> configurations into the socket config. >> >> However, I have kept a number of overrides in place for the following >> machines: >> * broadcom/blast >> * ibm/e32{5,6} >> * newisys/khepri >> * sunw/ultra40 >> * tyan/s488{0,2} >> >> These machines used different setting than the defaults for socket 940 >> systems. >> >> Signed-off-by: Warren Turkal <wt@penguintechs.org> >> --- >> src/cpu/amd/model_fxx/Kconfig | 22 ---------------------- >> src/cpu/amd/socket_940/Kconfig | 26 ++++++++++++++++++++++++-- >> src/mainboard/arima/hdama/Kconfig | 1 - >> src/mainboard/broadcom/blast/Kconfig | 1 - >> src/mainboard/ibm/e325/Kconfig | 1 - >> src/mainboard/ibm/e326/Kconfig | 1 - >> src/mainboard/iwill/dk8_htx/Kconfig | 13 ------------- >> src/mainboard/iwill/dk8s2/Kconfig | 13 ------------- >> src/mainboard/iwill/dk8x/Kconfig | 13 ------------- >> src/mainboard/newisys/khepri/Kconfig | 1 - >> src/mainboard/sunw/ultra40/Kconfig | 1 - >> src/mainboard/tyan/s4880/Kconfig | 1 - >> src/mainboard/tyan/s4882/Kconfig | 1 - >> 13 files changed, 24 insertions(+), 71 deletions(-) >> >> diff --git a/src/cpu/amd/model_fxx/Kconfig b/src/cpu/amd/model_fxx/Kconfig >> index 21fc1ab..139b96a 100644 >> --- a/src/cpu/amd/model_fxx/Kconfig >> +++ b/src/cpu/amd/model_fxx/Kconfig >> @@ -1,31 +1,9 @@ >> config CPU_AMD_MODEL_FXX >> bool >> - select CACHE_AS_RAM >> select MMX >> select SSE >> select SSE2 >> >> -config CPU_ADDR_BITS >> - int >> - default 40 >> - depends on CPU_AMD_MODEL_FXX >> - >> -config DCACHE_RAM_BASE >> - hex >> - default 0xc8000 >> - depends on CPU_AMD_MODEL_FXX >> - >> -config DCACHE_RAM_SIZE >> - hex >> - default 0x08000 >> - depends on CPU_AMD_MODEL_FXX >> - >> -config DCACHE_RAM_GLOBAL_VAR_SIZE >> - hex >> - default 0x01000 >> - depends on CPU_AMD_MODEL_FXX >> - >> - >> config UDELAY_IO >> bool >> default n >> diff --git a/src/cpu/amd/socket_940/Kconfig b/src/cpu/amd/socket_940/Kconfig >> index c17a85f..6c3a929 100644 >> --- a/src/cpu/amd/socket_940/Kconfig >> +++ b/src/cpu/amd/socket_940/Kconfig >> @@ -1,14 +1,36 @@ >> config CPU_AMD_SOCKET_940 >> bool >> + >> +if CPU_AMD_SOCKET_940 >> + >> +config SOCKET_SPECIFIC_OPTIONS >> + def_bool y >> select K8_HT_FREQ_1G_SUPPORT >> select CPU_AMD_MODEL_FXX >> + select CACHE_AS_RAM >> >> config CPU_SOCKET_TYPE >> hex >> default 0x0 >> - depends on CPU_AMD_SOCKET_940 >> >> config DIMM_SUPPORT >> hex >> default 0x108 >> - depends on CPU_AMD_SOCKET_940 >> + >> +config CPU_ADDR_BITS >> + int >> + default 40 >> + >> +config DCACHE_RAM_BASE >> + hex >> + default 0xc8000 >> + >> +config DCACHE_RAM_SIZE >> + hex >> + default 0x08000 >> + >> +config DCACHE_RAM_GLOBAL_VAR_SIZE >> + hex >> + default 0x01000 >> + >> +endif # CPU_AMD_SOCKET_940 >> diff --git a/src/mainboard/arima/hdama/Kconfig b/src/mainboard/arima/hdama/Kconfig >> index 3f89162..664b260 100644 >> --- a/src/mainboard/arima/hdama/Kconfig >> +++ b/src/mainboard/arima/hdama/Kconfig >> @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy >> select HAVE_PIRQ_TABLE >> select HAVE_OPTION_TABLE >> select HAVE_MP_TABLE >> - select CACHE_AS_RAM >> select HAVE_HARD_RESET >> select SB_HT_CHAIN_UNITID_OFFSET_ONLY >> select BOARD_ROMSIZE_KB_512 >> diff --git a/src/mainboard/broadcom/blast/Kconfig b/src/mainboard/broadcom/blast/Kconfig >> index 2c14b0a..b9d2548 100644 >> --- a/src/mainboard/broadcom/blast/Kconfig >> +++ b/src/mainboard/broadcom/blast/Kconfig >> @@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy >> select HAVE_OPTION_TABLE >> select HAVE_PIRQ_TABLE >> select HAVE_MP_TABLE >> - select CACHE_AS_RAM >> select HAVE_HARD_RESET >> select BOARD_ROMSIZE_KB_512 >> select SB_HT_CHAIN_UNITID_OFFSET_ONLY >> diff --git a/src/mainboard/ibm/e325/Kconfig b/src/mainboard/ibm/e325/Kconfig >> index 143618f..c0fc3bf 100644 >> --- a/src/mainboard/ibm/e325/Kconfig >> +++ b/src/mainboard/ibm/e325/Kconfig >> @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy >> select HAVE_OPTION_TABLE >> select HAVE_PIRQ_TABLE >> select HAVE_MP_TABLE >> - select CACHE_AS_RAM >> select HAVE_HARD_RESET >> select SB_HT_CHAIN_UNITID_OFFSET_ONLY >> select WAIT_BEFORE_CPUS_INIT >> diff --git a/src/mainboard/ibm/e326/Kconfig b/src/mainboard/ibm/e326/Kconfig >> index 147f379..10f7557 100644 >> --- a/src/mainboard/ibm/e326/Kconfig >> +++ b/src/mainboard/ibm/e326/Kconfig >> @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy >> select HAVE_OPTION_TABLE >> select HAVE_PIRQ_TABLE >> select HAVE_MP_TABLE >> - select CACHE_AS_RAM >> select HAVE_HARD_RESET >> select SB_HT_CHAIN_UNITID_OFFSET_ONLY >> select WAIT_BEFORE_CPUS_INIT >> diff --git a/src/mainboard/iwill/dk8_htx/Kconfig b/src/mainboard/iwill/dk8_htx/Kconfig >> index 5232b70..78bd169 100644 >> --- a/src/mainboard/iwill/dk8_htx/Kconfig >> +++ b/src/mainboard/iwill/dk8_htx/Kconfig >> @@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy >> select HAVE_OPTION_TABLE >> select HAVE_PIRQ_TABLE >> select HAVE_MP_TABLE >> - select CACHE_AS_RAM >> select HAVE_HARD_RESET >> select LIFT_BSP_APIC_ID >> select SB_HT_CHAIN_UNITID_OFFSET_ONLY >> @@ -26,18 +25,6 @@ config MAINBOARD_DIR >> string >> default iwill/dk8_htx >> >> -config DCACHE_RAM_BASE >> - hex >> - default 0xc8000 >> - >> -config DCACHE_RAM_SIZE >> - hex >> - default 0x08000 >> - >> -config DCACHE_RAM_GLOBAL_VAR_SIZE >> - hex >> - default 0x01000 >> - >> config APIC_ID_OFFSET >> hex >> default 0x10 >> diff --git a/src/mainboard/iwill/dk8s2/Kconfig b/src/mainboard/iwill/dk8s2/Kconfig >> index 4d40847..e5ba7c3 100644 >> --- a/src/mainboard/iwill/dk8s2/Kconfig >> +++ b/src/mainboard/iwill/dk8s2/Kconfig >> @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy >> select HAVE_PIRQ_TABLE >> select HAVE_OPTION_TABLE >> select HAVE_MP_TABLE >> - select CACHE_AS_RAM >> select HAVE_HARD_RESET >> select SB_HT_CHAIN_UNITID_OFFSET_ONLY >> select WAIT_BEFORE_CPUS_INIT >> @@ -23,18 +22,6 @@ config MAINBOARD_DIR >> string >> default iwill/dk8s2 >> >> -config DCACHE_RAM_BASE >> - hex >> - default 0xc8000 >> - >> -config DCACHE_RAM_SIZE >> - hex >> - default 0x08000 >> - >> -config DCACHE_RAM_GLOBAL_VAR_SIZE >> - hex >> - default 0x01000 >> - >> config APIC_ID_OFFSET >> hex >> default 0x0 >> diff --git a/src/mainboard/iwill/dk8x/Kconfig b/src/mainboard/iwill/dk8x/Kconfig >> index 315a743..9676503 100644 >> --- a/src/mainboard/iwill/dk8x/Kconfig >> +++ b/src/mainboard/iwill/dk8x/Kconfig >> @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy >> select HAVE_OPTION_TABLE >> select HAVE_PIRQ_TABLE >> select HAVE_MP_TABLE >> - select CACHE_AS_RAM >> select HAVE_HARD_RESET >> select SB_HT_CHAIN_UNITID_OFFSET_ONLY >> select WAIT_BEFORE_CPUS_INIT >> @@ -22,18 +21,6 @@ config MAINBOARD_DIR >> string >> default iwill/dk8x >> >> -config DCACHE_RAM_BASE >> - hex >> - default 0xc8000 >> - >> -config DCACHE_RAM_SIZE >> - hex >> - default 0x08000 >> - >> -config DCACHE_RAM_GLOBAL_VAR_SIZE >> - hex >> - default 0x01000 >> - >> config APIC_ID_OFFSET >> hex >> default 0x0 >> diff --git a/src/mainboard/newisys/khepri/Kconfig b/src/mainboard/newisys/khepri/Kconfig >> index 31f705d..5fcb011 100644 >> --- a/src/mainboard/newisys/khepri/Kconfig >> +++ b/src/mainboard/newisys/khepri/Kconfig >> @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy >> select HAVE_OPTION_TABLE >> select HAVE_PIRQ_TABLE >> select HAVE_MP_TABLE >> - select CACHE_AS_RAM >> select HAVE_HARD_RESET >> select BOARD_ROMSIZE_KB_512 >> select SB_HT_CHAIN_UNITID_OFFSET_ONLY >> diff --git a/src/mainboard/sunw/ultra40/Kconfig b/src/mainboard/sunw/ultra40/Kconfig >> index 4cd5800..7d521fc 100644 >> --- a/src/mainboard/sunw/ultra40/Kconfig >> +++ b/src/mainboard/sunw/ultra40/Kconfig >> @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy >> select HAVE_BUS_CONFIG >> select HAVE_PIRQ_TABLE >> select HAVE_MP_TABLE >> - select CACHE_AS_RAM >> select HAVE_HARD_RESET >> select BOARD_ROMSIZE_KB_1024 >> >> diff --git a/src/mainboard/tyan/s4880/Kconfig b/src/mainboard/tyan/s4880/Kconfig >> index faff037..78c98df 100644 >> --- a/src/mainboard/tyan/s4880/Kconfig >> +++ b/src/mainboard/tyan/s4880/Kconfig >> @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy >> select HAVE_OPTION_TABLE >> select HAVE_PIRQ_TABLE >> select HAVE_MP_TABLE >> - select CACHE_AS_RAM >> select HAVE_HARD_RESET >> select BOARD_ROMSIZE_KB_512 >> select SB_HT_CHAIN_UNITID_OFFSET_ONLY >> diff --git a/src/mainboard/tyan/s4882/Kconfig b/src/mainboard/tyan/s4882/Kconfig >> index 866aec0..54c0327 100644 >> --- a/src/mainboard/tyan/s4882/Kconfig >> +++ b/src/mainboard/tyan/s4882/Kconfig >> @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy >> select HAVE_OPTION_TABLE >> select HAVE_PIRQ_TABLE >> select HAVE_MP_TABLE >> - select CACHE_AS_RAM >> select HAVE_HARD_RESET >> select BOARD_ROMSIZE_KB_512 >> select SB_HT_CHAIN_UNITID_OFFSET_ONLY >> -- >> 1.7.1 >> >> >
Warren Turkal wrote: > For the a number of the socket 940 based machines, I collapsed their CAR > configurations into the socket config. > > However, I have kept a number of overrides in place for the following > machines: > * broadcom/blast > * ibm/e32{5,6} > * newisys/khepri > * sunw/ultra40 > * tyan/s488{0,2} > > These machines used different setting than the defaults for socket 940 > systems. > > Signed-off-by: Warren Turkal <wt@penguintechs.org> Acked-by: Peter Stuge <peter@stuge.se>
> For the record, I checked a representative set of the boards to make > sure they generate the same .config before and after this change. Since it's relatively easy to check, I think it's worthwhile to make sure that no .config settings are changed when cleaning up settings. 1. ./util/abuild/abuild -C -a 2. grep CACHE coreboot-builds/*/config.h > before.txt 3. Apply your patch 4. grep CACHE coreboot-builds/*/config.h > after.txt 5. diff before.txt after.txt abuild -C is "configure-only mode", and runs relatively quickly. Thanks, Myles
Patch
diff --git a/src/cpu/amd/model_fxx/Kconfig b/src/cpu/amd/model_fxx/Kconfig index 21fc1ab..139b96a 100644 --- a/src/cpu/amd/model_fxx/Kconfig +++ b/src/cpu/amd/model_fxx/Kconfig @@ -1,31 +1,9 @@ config CPU_AMD_MODEL_FXX bool - select CACHE_AS_RAM select MMX select SSE select SSE2 -config CPU_ADDR_BITS - int - default 40 - depends on CPU_AMD_MODEL_FXX - -config DCACHE_RAM_BASE - hex - default 0xc8000 - depends on CPU_AMD_MODEL_FXX - -config DCACHE_RAM_SIZE - hex - default 0x08000 - depends on CPU_AMD_MODEL_FXX - -config DCACHE_RAM_GLOBAL_VAR_SIZE - hex - default 0x01000 - depends on CPU_AMD_MODEL_FXX - - config UDELAY_IO bool default n diff --git a/src/cpu/amd/socket_940/Kconfig b/src/cpu/amd/socket_940/Kconfig index c17a85f..6c3a929 100644 --- a/src/cpu/amd/socket_940/Kconfig +++ b/src/cpu/amd/socket_940/Kconfig @@ -1,14 +1,36 @@ config CPU_AMD_SOCKET_940 bool + +if CPU_AMD_SOCKET_940 + +config SOCKET_SPECIFIC_OPTIONS + def_bool y select K8_HT_FREQ_1G_SUPPORT select CPU_AMD_MODEL_FXX + select CACHE_AS_RAM config CPU_SOCKET_TYPE hex default 0x0 - depends on CPU_AMD_SOCKET_940 config DIMM_SUPPORT hex default 0x108 - depends on CPU_AMD_SOCKET_940 + +config CPU_ADDR_BITS + int + default 40 + +config DCACHE_RAM_BASE + hex + default 0xc8000 + +config DCACHE_RAM_SIZE + hex + default 0x08000 + +config DCACHE_RAM_GLOBAL_VAR_SIZE + hex + default 0x01000 + +endif # CPU_AMD_SOCKET_940 diff --git a/src/mainboard/arima/hdama/Kconfig b/src/mainboard/arima/hdama/Kconfig index 3f89162..664b260 100644 --- a/src/mainboard/arima/hdama/Kconfig +++ b/src/mainboard/arima/hdama/Kconfig @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_PIRQ_TABLE select HAVE_OPTION_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY select BOARD_ROMSIZE_KB_512 diff --git a/src/mainboard/broadcom/blast/Kconfig b/src/mainboard/broadcom/blast/Kconfig index 2c14b0a..b9d2548 100644 --- a/src/mainboard/broadcom/blast/Kconfig +++ b/src/mainboard/broadcom/blast/Kconfig @@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select BOARD_ROMSIZE_KB_512 select SB_HT_CHAIN_UNITID_OFFSET_ONLY diff --git a/src/mainboard/ibm/e325/Kconfig b/src/mainboard/ibm/e325/Kconfig index 143618f..c0fc3bf 100644 --- a/src/mainboard/ibm/e325/Kconfig +++ b/src/mainboard/ibm/e325/Kconfig @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY select WAIT_BEFORE_CPUS_INIT diff --git a/src/mainboard/ibm/e326/Kconfig b/src/mainboard/ibm/e326/Kconfig index 147f379..10f7557 100644 --- a/src/mainboard/ibm/e326/Kconfig +++ b/src/mainboard/ibm/e326/Kconfig @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY select WAIT_BEFORE_CPUS_INIT diff --git a/src/mainboard/iwill/dk8_htx/Kconfig b/src/mainboard/iwill/dk8_htx/Kconfig index 5232b70..78bd169 100644 --- a/src/mainboard/iwill/dk8_htx/Kconfig +++ b/src/mainboard/iwill/dk8_htx/Kconfig @@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select LIFT_BSP_APIC_ID select SB_HT_CHAIN_UNITID_OFFSET_ONLY @@ -26,18 +25,6 @@ config MAINBOARD_DIR string default iwill/dk8_htx -config DCACHE_RAM_BASE - hex - default 0xc8000 - -config DCACHE_RAM_SIZE - hex - default 0x08000 - -config DCACHE_RAM_GLOBAL_VAR_SIZE - hex - default 0x01000 - config APIC_ID_OFFSET hex default 0x10 diff --git a/src/mainboard/iwill/dk8s2/Kconfig b/src/mainboard/iwill/dk8s2/Kconfig index 4d40847..e5ba7c3 100644 --- a/src/mainboard/iwill/dk8s2/Kconfig +++ b/src/mainboard/iwill/dk8s2/Kconfig @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_PIRQ_TABLE select HAVE_OPTION_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY select WAIT_BEFORE_CPUS_INIT @@ -23,18 +22,6 @@ config MAINBOARD_DIR string default iwill/dk8s2 -config DCACHE_RAM_BASE - hex - default 0xc8000 - -config DCACHE_RAM_SIZE - hex - default 0x08000 - -config DCACHE_RAM_GLOBAL_VAR_SIZE - hex - default 0x01000 - config APIC_ID_OFFSET hex default 0x0 diff --git a/src/mainboard/iwill/dk8x/Kconfig b/src/mainboard/iwill/dk8x/Kconfig index 315a743..9676503 100644 --- a/src/mainboard/iwill/dk8x/Kconfig +++ b/src/mainboard/iwill/dk8x/Kconfig @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY select WAIT_BEFORE_CPUS_INIT @@ -22,18 +21,6 @@ config MAINBOARD_DIR string default iwill/dk8x -config DCACHE_RAM_BASE - hex - default 0xc8000 - -config DCACHE_RAM_SIZE - hex - default 0x08000 - -config DCACHE_RAM_GLOBAL_VAR_SIZE - hex - default 0x01000 - config APIC_ID_OFFSET hex default 0x0 diff --git a/src/mainboard/newisys/khepri/Kconfig b/src/mainboard/newisys/khepri/Kconfig index 31f705d..5fcb011 100644 --- a/src/mainboard/newisys/khepri/Kconfig +++ b/src/mainboard/newisys/khepri/Kconfig @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select BOARD_ROMSIZE_KB_512 select SB_HT_CHAIN_UNITID_OFFSET_ONLY diff --git a/src/mainboard/sunw/ultra40/Kconfig b/src/mainboard/sunw/ultra40/Kconfig index 4cd5800..7d521fc 100644 --- a/src/mainboard/sunw/ultra40/Kconfig +++ b/src/mainboard/sunw/ultra40/Kconfig @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select BOARD_ROMSIZE_KB_1024 diff --git a/src/mainboard/tyan/s4880/Kconfig b/src/mainboard/tyan/s4880/Kconfig index faff037..78c98df 100644 --- a/src/mainboard/tyan/s4880/Kconfig +++ b/src/mainboard/tyan/s4880/Kconfig @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select BOARD_ROMSIZE_KB_512 select SB_HT_CHAIN_UNITID_OFFSET_ONLY diff --git a/src/mainboard/tyan/s4882/Kconfig b/src/mainboard/tyan/s4882/Kconfig index 866aec0..54c0327 100644 --- a/src/mainboard/tyan/s4882/Kconfig +++ b/src/mainboard/tyan/s4882/Kconfig @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select BOARD_ROMSIZE_KB_512 select SB_HT_CHAIN_UNITID_OFFSET_ONLY
Does anyone have access to the machines for which I needed override configurations that are listed in the patch message below? I would like to test these with the DCACHE_* items removed from their mainboard Kconfig files to see if they work so that the CAR settings for socket 940 systems can be completely unified. Thanks, wt 8<---------------------------------------------------------------------- For the a number of the socket 940 based machines, I collapsed their CAR configurations into the socket config. However, I have kept a number of overrides in place for the following machines: * broadcom/blast * ibm/e32{5,6} * newisys/khepri * sunw/ultra40 * tyan/s488{0,2} These machines used different setting than the defaults for socket 940 systems. Signed-off-by: Warren Turkal <wt@penguintechs.org> --- src/cpu/amd/model_fxx/Kconfig | 22 ---------------------- src/cpu/amd/socket_940/Kconfig | 26 ++++++++++++++++++++++++-- src/mainboard/arima/hdama/Kconfig | 1 - src/mainboard/broadcom/blast/Kconfig | 1 - src/mainboard/ibm/e325/Kconfig | 1 - src/mainboard/ibm/e326/Kconfig | 1 - src/mainboard/iwill/dk8_htx/Kconfig | 13 ------------- src/mainboard/iwill/dk8s2/Kconfig | 13 ------------- src/mainboard/iwill/dk8x/Kconfig | 13 ------------- src/mainboard/newisys/khepri/Kconfig | 1 - src/mainboard/sunw/ultra40/Kconfig | 1 - src/mainboard/tyan/s4880/Kconfig | 1 - src/mainboard/tyan/s4882/Kconfig | 1 - 13 files changed, 24 insertions(+), 71 deletions(-)