Author: myles Date: 2009-10-28 19:51:47 +0100 (Wed, 28 Oct 2009) New Revision: 4882
Added: trunk/coreboot-v2/src/superio/smsc/lpc47m15x/Makefile.inc trunk/coreboot-v2/targets/intel/d945gclf/Config.lb Modified: trunk/coreboot-v2/src/cpu/intel/Makefile.inc trunk/coreboot-v2/src/cpu/intel/model_106cx/Config.lb trunk/coreboot-v2/src/mainboard/intel/d945gclf/Kconfig trunk/coreboot-v2/src/superio/smsc/Kconfig trunk/coreboot-v2/src/superio/smsc/Makefile.inc trunk/coreboot-v2/src/superio/smsc/lpc47m15x/superio.c Log: Make d945gclf build.
Signed-off-by: Myles Watson mylesgw@gmail.com Acked-by: Myles Watson mylesgw@gmail.com
Modified: trunk/coreboot-v2/src/cpu/intel/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/cpu/intel/Makefile.inc 2009-10-28 17:36:11 UTC (rev 4881) +++ trunk/coreboot-v2/src/cpu/intel/Makefile.inc 2009-10-28 18:51:47 UTC (rev 4882) @@ -3,6 +3,7 @@ # # Therefore: ONLY include Makefile.inc from socket directories!
+subdirs-$(CONFIG_CPU_INTEL_SOCKET_411) += socket_411 subdirs-$(CONFIG_CPU_INTEL_SOCKET_BGA956) += bga956 subdirs-$(CONFIG_CPU_INTEL_EP80579) += ep80579 subdirs-$(CONFIG_CPU_INTEL_SOCKET_MFCPGA478) += socket_mFCPGA478
Modified: trunk/coreboot-v2/src/cpu/intel/model_106cx/Config.lb =================================================================== --- trunk/coreboot-v2/src/cpu/intel/model_106cx/Config.lb 2009-10-28 17:36:11 UTC (rev 4881) +++ trunk/coreboot-v2/src/cpu/intel/model_106cx/Config.lb 2009-10-28 18:51:47 UTC (rev 4882) @@ -22,8 +22,6 @@
dir /cpu/x86/tsc dir /cpu/x86/mtrr -dir /cpu/x86/fpu -dir /cpu/x86/sse dir /cpu/x86/lapic dir /cpu/x86/cache dir /cpu/x86/smm
Modified: trunk/coreboot-v2/src/mainboard/intel/d945gclf/Kconfig =================================================================== --- trunk/coreboot-v2/src/mainboard/intel/d945gclf/Kconfig 2009-10-28 17:36:11 UTC (rev 4881) +++ trunk/coreboot-v2/src/mainboard/intel/d945gclf/Kconfig 2009-10-28 18:51:47 UTC (rev 4882) @@ -21,18 +21,18 @@ bool "D945GCLF" select ARCH_X86 select CPU_INTEL_CORE - select CPU_INTEL_SOCKET_MFCPGA478 + select CPU_INTEL_SOCKET_411 select NORTHBRIDGE_INTEL_I945 select SOUTHBRIDGE_INTEL_I82801GX - select SUPERIO_WINBOND_W83627THG + select SUPERIO_SMSC_LPC47M15X select HAVE_PIRQ_TABLE select HAVE_MP_TABLE 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 HAVE_ACPI_TABLES + #select HAVE_SMI_HANDLER select BOARD_ROMSIZE_KB_1024
config MAINBOARD_DIR @@ -79,3 +79,8 @@ int default 2 depends on BOARD_INTEL_D945GCLF + +config HAVE_INIT_TIMER + bool + default n + depends on BOARD_INTEL_D945GCLF
Modified: trunk/coreboot-v2/src/superio/smsc/Kconfig =================================================================== --- trunk/coreboot-v2/src/superio/smsc/Kconfig 2009-10-28 17:36:11 UTC (rev 4881) +++ trunk/coreboot-v2/src/superio/smsc/Kconfig 2009-10-28 18:51:47 UTC (rev 4882) @@ -6,6 +6,8 @@ bool config SUPERIO_SMSC_LPC47M10X bool +config SUPERIO_SMSC_LPC47M15X + bool config SUPERIO_SMSC_LPC47N217 bool config SUPERIO_SMSC_SMSCSUPERIO
Modified: trunk/coreboot-v2/src/superio/smsc/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/superio/smsc/Makefile.inc 2009-10-28 17:36:11 UTC (rev 4881) +++ trunk/coreboot-v2/src/superio/smsc/Makefile.inc 2009-10-28 18:51:47 UTC (rev 4882) @@ -2,5 +2,6 @@ subdirs-y += lpc47b272 subdirs-y += lpc47b397 subdirs-y += lpc47m10x +subdirs-y += lpc47m15x subdirs-y += lpc47n217 subdirs-y += smscsuperio
Copied: trunk/coreboot-v2/src/superio/smsc/lpc47m15x/Makefile.inc (from rev 4881, trunk/coreboot-v2/src/superio/smsc/lpc47m10x/Makefile.inc) =================================================================== --- trunk/coreboot-v2/src/superio/smsc/lpc47m15x/Makefile.inc (rev 0) +++ trunk/coreboot-v2/src/superio/smsc/lpc47m15x/Makefile.inc 2009-10-28 18:51:47 UTC (rev 4882) @@ -0,0 +1,2 @@ +#config chip.h +obj-$(CONFIG_SUPERIO_SMSC_LPC47M15X) += superio.o
Property changes on: trunk/coreboot-v2/src/superio/smsc/lpc47m15x/Makefile.inc ___________________________________________________________________ Added: svn:mergeinfo +
Modified: trunk/coreboot-v2/src/superio/smsc/lpc47m15x/superio.c =================================================================== --- trunk/coreboot-v2/src/superio/smsc/lpc47m15x/superio.c 2009-10-28 17:36:11 UTC (rev 4881) +++ trunk/coreboot-v2/src/superio/smsc/lpc47m15x/superio.c 2009-10-28 18:51:47 UTC (rev 4882) @@ -35,7 +35,6 @@ // Forward declarations static void enable_dev(device_t dev); void lpc47m15x_pnp_set_resources(device_t dev); -void lpc47m15x_pnp_set_resources(device_t dev); void lpc47m15x_pnp_enable_resources(device_t dev); void lpc47m15x_pnp_enable(device_t dev); static void lpc47m15x_init(device_t dev); @@ -121,7 +120,7 @@ case LPC47M15X_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - pc_keyboard_init(&conf->keyboard); + init_pc_keyboard(0x60, 0x64, &conf->keyboard); break; } }
Copied: trunk/coreboot-v2/targets/intel/d945gclf/Config.lb (from rev 4881, trunk/coreboot-v2/targets/kontron/986lcd-m/Config.lb) =================================================================== --- trunk/coreboot-v2/targets/intel/d945gclf/Config.lb (rev 0) +++ trunk/coreboot-v2/targets/intel/d945gclf/Config.lb 2009-10-28 18:51:47 UTC (rev 4882) @@ -0,0 +1,10 @@ +target d945gclf +mainboard intel/d945gclf + +romimage "fallback" + option CONFIG_USE_FALLBACK_IMAGE = 1 + payload ../payload.elf +end + +buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback" +
Property changes on: trunk/coreboot-v2/targets/intel/d945gclf/Config.lb ___________________________________________________________________ Added: svn:mergeinfo +