Patrick Georgi wrote: > Am 01.10.2010 01:33, schrieb Peter Stuge: > > would it work to simply make these options be > > NORTHBRIDGE_INTEL_I945GC and _I945GM .. > Thought about it - why I didn't do that: It significantly changes > the design of that part of the code. > The change above simply moves stuff around.
Patrick Georgi wrote: > > Acked-by: Peter Stuge <[email protected]> > Thanks, r5891 > > The help texts are cleaned up, and the chipset variant setting isn't > user visible anymore (I think - tested in "make config" only) Attached is the patch to remove the separate variant setting and put the info in the NORTHBRIDGE_ option. Build tested on Getac (GM) and d945gclf (GC). //Peter
Split NORTHBRIDGE_INTEL_I945 into more precise _I945GC and _I945GM Both chipsets use the src/northbridge/intel/i945 code but that code needs to know which chipset is actually used. Having separate NORTHBRIDGE_ options allows the I945GC/I945GM choice to be removed since code can test the NORTHBRIDGE_ option directly. Signed-off-by: Peter Stuge <[email protected]> Index: src/mainboard/getac/p470/Kconfig =================================================================== --- src/mainboard/getac/p470/Kconfig (revision 5891) +++ src/mainboard/getac/p470/Kconfig (working copy) @@ -23,7 +23,7 @@ select ARCH_X86 select CPU_INTEL_CORE select CPU_INTEL_SOCKET_MFCPGA478 - select NORTHBRIDGE_INTEL_I945 + select NORTHBRIDGE_INTEL_I945GM select SOUTHBRIDGE_INTEL_I82801GX select SOUTHBRIDGE_TI_PCIXX12 select SUPERIO_SMSC_FDC37N972 @@ -43,7 +43,6 @@ select CACHE_AS_RAM select GFXUMA select TINY_BOOTBLOCK - select I945GM select CHANNEL_XOR_RANDOMIZATION config MAINBOARD_DIR Index: src/mainboard/kontron/986lcd-m/Kconfig =================================================================== --- src/mainboard/kontron/986lcd-m/Kconfig (revision 5891) +++ src/mainboard/kontron/986lcd-m/Kconfig (working copy) @@ -5,7 +5,7 @@ select ARCH_X86 select CPU_INTEL_CORE select CPU_INTEL_SOCKET_MFCPGA478 - select NORTHBRIDGE_INTEL_I945 + select NORTHBRIDGE_INTEL_I945GM select SOUTHBRIDGE_INTEL_I82801GX select SUPERIO_WINBOND_W83627THG select BOARD_HAS_FADT @@ -21,7 +21,6 @@ select GFXUMA select TINY_BOOTBLOCK select CHANNEL_XOR_RANDOMIZATION - select I945GM select OVERRIDE_CLOCK_DISABLE config MAINBOARD_DIR Index: src/mainboard/ibase/mb899/Kconfig =================================================================== --- src/mainboard/ibase/mb899/Kconfig (revision 5891) +++ src/mainboard/ibase/mb899/Kconfig (working copy) @@ -5,7 +5,7 @@ select ARCH_X86 select CPU_INTEL_CORE select CPU_INTEL_SOCKET_MFCPGA478 - select NORTHBRIDGE_INTEL_I945 + select NORTHBRIDGE_INTEL_I945GM select SOUTHBRIDGE_INTEL_I82801GX select SUPERIO_WINBOND_W83627EHG select BOARD_HAS_FADT @@ -20,7 +20,6 @@ select CACHE_AS_RAM select GFXUMA select TINY_BOOTBLOCK - select I945GM select CHANNEL_XOR_RANDOMIZATION config MAINBOARD_DIR Index: src/mainboard/roda/rk886ex/Kconfig =================================================================== --- src/mainboard/roda/rk886ex/Kconfig (revision 5891) +++ src/mainboard/roda/rk886ex/Kconfig (working copy) @@ -5,7 +5,7 @@ select ARCH_X86 select CPU_INTEL_CORE select CPU_INTEL_SOCKET_MFCPGA478 - select NORTHBRIDGE_INTEL_I945 + select NORTHBRIDGE_INTEL_I945GM select SOUTHBRIDGE_INTEL_I82801GX select SOUTHBRIDGE_TI_PCI7420 select SUPERIO_SMSC_LPC47N227 @@ -19,7 +19,6 @@ select HAVE_ACPI_TABLES select HAVE_ACPI_RESUME select BOARD_ROMSIZE_KB_1024 - select I945GM select CHANNEL_XOR_RANDOMIZATION config MAINBOARD_DIR Index: src/mainboard/intel/d945gclf/Kconfig =================================================================== --- src/mainboard/intel/d945gclf/Kconfig (revision 5891) +++ src/mainboard/intel/d945gclf/Kconfig (working copy) @@ -22,7 +22,7 @@ def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_441 - select NORTHBRIDGE_INTEL_I945 + select NORTHBRIDGE_INTEL_I945GC select SOUTHBRIDGE_INTEL_I82801GX select SUPERIO_SMSC_LPC47M15X select BOARD_HAS_FADT @@ -40,7 +40,6 @@ select BOARD_ROMSIZE_KB_512 select GFXUMA select TINY_BOOTBLOCK - select I945GC select CHANNEL_XOR_RANDOMIZATION config MAINBOARD_DIR Index: src/northbridge/intel/Makefile.inc =================================================================== --- src/northbridge/intel/Makefile.inc (revision 5891) +++ src/northbridge/intel/Makefile.inc (working copy) @@ -7,4 +7,5 @@ subdirs-$(CONFIG_NORTHBRIDGE_INTEL_I82810) += i82810 subdirs-$(CONFIG_NORTHBRIDGE_INTEL_I82830) += i82830 subdirs-$(CONFIG_NORTHBRIDGE_INTEL_I855) += i855 -subdirs-$(CONFIG_NORTHBRIDGE_INTEL_I945) += i945 +subdirs-$(CONFIG_NORTHBRIDGE_INTEL_I945GC) += i945 +subdirs-$(CONFIG_NORTHBRIDGE_INTEL_I945GM) += i945 Index: src/northbridge/intel/i945/Kconfig =================================================================== --- src/northbridge/intel/i945/Kconfig (revision 5891) +++ src/northbridge/intel/i945/Kconfig (working copy) @@ -17,38 +17,27 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -config NORTHBRIDGE_INTEL_I945 +config NORTHBRIDGE_INTEL_I945GC bool select HAVE_DEBUG_RAM_SETUP +config NORTHBRIDGE_INTEL_I945GM + bool + select HAVE_DEBUG_RAM_SETUP + +if NORTHBRIDGE_INTEL_I945GC || NORTHBRIDGE_INTEL_I945GM + config FALLBACK_VGA_BIOS_ID string default "8086,27a2" - depends on NORTHBRIDGE_INTEL_I945 -choice - default I945GM - depends on NORTHBRIDGE_INTEL_I945 - help - Different i945 variants require slightly different setup. - -config I945GM - bool "i945GM (Mobile) chipset" - -config I945GC - bool "i945GC chipset" - -endchoice - config CHANNEL_XOR_RANDOMIZATION bool default n - depends on NORTHBRIDGE_INTEL_I945 config OVERRIDE_CLOCK_DISABLE bool default n - depends on NORTHBRIDGE_INTEL_I945 help Usually system firmware turns off system memory clock signals to unused SO-DIMM slots to reduce EMI and power @@ -59,8 +48,9 @@ config MAXIMUM_SUPPORTED_FREQUENCY int default 0 - depends on NORTHBRIDGE_INTEL_I945 help If non-zero, this designates the maximum DDR frequency the board supports, despite what the chipset should be capable of. + +endif Index: src/northbridge/intel/i945/raminit.c =================================================================== --- src/northbridge/intel/i945/raminit.c (revision 5891) +++ src/northbridge/intel/i945/raminit.c (working copy) @@ -90,7 +90,7 @@ static int memclk(void) { int offset = 0; -#if CONFIG_I945GM +#if defined(CONFIG_NORTHBRIDGE_INTEL_I945GM) offset++; #endif switch (((MCHBAR32(CLKCFG) >> 4) & 7) - offset) { @@ -102,7 +102,7 @@ return -1; } -#if CONFIG_I945GM +#if defined(CONFIG_NORTHBRIDGE_INTEL_I945GM) static int fsbclk(void) { switch (MCHBAR32(CLKCFG) & 7) { @@ -113,8 +113,7 @@ } return -1; } -#endif -#if CONFIG_I945GC +#elif defined(CONFIG_NORTHBRIDGE_INTEL_I945GC) static int fsbclk(void) { switch (MCHBAR32(CLKCFG) & 7) { @@ -1045,7 +1044,7 @@ return nc; } -#if CONFIG_I945GM +#if defined(CONFIG_NORTHBRIDGE_INTEL_I945GM) /* Strength multiplier tables */ static const u8 dual_channel_strength_multiplier[] = { 0x44, 0x11, 0x11, 0x11, 0x44, 0x44, 0x44, 0x11, @@ -1100,8 +1099,7 @@ 0x33, 0x00, 0x00, 0x11, 0x00, 0x44, 0x33, 0x11, 0x33, 0x00, 0x11, 0x00, 0x44, 0x44, 0x33, 0x11 }; -#endif -#if CONFIG_I945GC +#elif defined(CONFIG_NORTHBRIDGE_INTEL_I945GC) static const u8 dual_channel_strength_multiplier[] = { 0x44, 0x22, 0x00, 0x00, 0x44, 0x44, 0x44, 0x22, 0x44, 0x22, 0x00, 0x00, 0x44, 0x44, 0x44, 0x22, @@ -2155,7 +2153,7 @@ /** * We add the indices according to our clocks from CLKCFG. */ -#if CONFIG_I945GM +#if defined(CONFIG_NORTHBRIDGE_INTEL_I945GM) static const u32 data_clock_crossing[] = { 0x00100401, 0x00000000, /* DDR400 FSB400 */ 0xffffffff, 0xffffffff, /* nonexistant */ @@ -2200,8 +2198,7 @@ 0xffffffff, 0xffffffff, /* nonexistant */ }; -#endif -#if CONFIG_I945GC +#elif defined(CONFIG_NORTHBRIDGE_INTEL_I945GC) /* i945 G/P */ static const u32 data_clock_crossing[] = { 0xffffffff, 0xffffffff, /* nonexistant */ @@ -2792,10 +2789,9 @@ { u8 clocks[2] = { 0, 0 }; -#if CONFIG_I945GM +#if defined(CONFIG_NORTHBRIDGE_INTEL_I945GM) #define CLOCKS_WIDTH 2 -#endif -#if CONFIG_I945GC +#elif defined(CONFIG_NORTHBRIDGE_INTEL_I945GC) #define CLOCKS_WIDTH 3 #endif if (sysinfo->dimm[0] != SYSINFO_DIMM_NOT_POPULATED)
-- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
