Author: uwe Date: 2009-10-24 21:17:24 +0200 (Sat, 24 Oct 2009) New Revision: 4849
Removed: trunk/coreboot-v2/src/mainboard/via/vt8454c/reset.c Modified: trunk/coreboot-v2/src/mainboard/Makefile.romccboard.inc trunk/coreboot-v2/src/mainboard/amd/dbm690t/Config.lb trunk/coreboot-v2/src/mainboard/amd/norwich/Config.lb trunk/coreboot-v2/src/mainboard/amd/pistachio/Config.lb trunk/coreboot-v2/src/mainboard/amd/rumba/Config.lb trunk/coreboot-v2/src/mainboard/artecgroup/dbe61/Config.lb trunk/coreboot-v2/src/mainboard/asus/a8v-e_se/Config.lb trunk/coreboot-v2/src/mainboard/asus/mew-vm/Config.lb trunk/coreboot-v2/src/mainboard/broadcom/blast/Config.lb trunk/coreboot-v2/src/mainboard/dell/s1850/Config.lb trunk/coreboot-v2/src/mainboard/dell/s1850/Makefile.inc trunk/coreboot-v2/src/mainboard/dell/s1850/auto.c trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Config.lb trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Kconfig trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/auto.c trunk/coreboot-v2/src/mainboard/digitallogic/msm586seg/Config.lb trunk/coreboot-v2/src/mainboard/digitallogic/msm586seg/auto.c trunk/coreboot-v2/src/mainboard/eaglelion/5bcm/Config.lb trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Config.lb trunk/coreboot-v2/src/mainboard/gigabyte/ga_2761gxdk/Config.lb trunk/coreboot-v2/src/mainboard/gigabyte/m57sli/Config.lb trunk/coreboot-v2/src/mainboard/ibm/e325/Config.lb trunk/coreboot-v2/src/mainboard/ibm/e326/Config.lb trunk/coreboot-v2/src/mainboard/iei/juki-511p/Config.lb trunk/coreboot-v2/src/mainboard/iei/nova4899r/Config.lb trunk/coreboot-v2/src/mainboard/intel/eagleheights/Config.lb trunk/coreboot-v2/src/mainboard/intel/eagleheights/Makefile.inc trunk/coreboot-v2/src/mainboard/intel/jarrell/Config.lb trunk/coreboot-v2/src/mainboard/intel/jarrell/Makefile.inc trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Config.lb trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Makefile.inc trunk/coreboot-v2/src/mainboard/iwill/dk8s2/Config.lb trunk/coreboot-v2/src/mainboard/iwill/dk8x/Config.lb trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Config.lb trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Makefile.inc trunk/coreboot-v2/src/mainboard/kontron/kt690/Config.lb trunk/coreboot-v2/src/mainboard/lippert/frontrunner/Config.lb trunk/coreboot-v2/src/mainboard/msi/ms6178/Config.lb trunk/coreboot-v2/src/mainboard/msi/ms7260/Config.lb trunk/coreboot-v2/src/mainboard/msi/ms9282/Config.lb trunk/coreboot-v2/src/mainboard/nec/powermate2000/Config.lb trunk/coreboot-v2/src/mainboard/newisys/khepri/Config.lb trunk/coreboot-v2/src/mainboard/nvidia/l1_2pvv/Config.lb trunk/coreboot-v2/src/mainboard/olpc/btest/Config.lb trunk/coreboot-v2/src/mainboard/olpc/rev_a/Config.lb trunk/coreboot-v2/src/mainboard/rca/rm4100/Config.lb trunk/coreboot-v2/src/mainboard/sunw/ultra40/Config.lb trunk/coreboot-v2/src/mainboard/supermicro/h8dme/Config.lb trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Config.lb trunk/coreboot-v2/src/mainboard/supermicro/h8dmr_fam10/Config.lb trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Config.lb trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Makefile.inc trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Config.lb trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Makefile.inc trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/auto.c trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Config.lb trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Makefile.inc trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/auto.c trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/auto.updated.c trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Config.lb trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Makefile.inc trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/auto.c trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Config.lb trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Makefile.inc trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/auto.c trunk/coreboot-v2/src/mainboard/technexion/tim5690/Config.lb trunk/coreboot-v2/src/mainboard/technexion/tim8690/Config.lb trunk/coreboot-v2/src/mainboard/technologic/ts5300/Config.lb trunk/coreboot-v2/src/mainboard/thomson/ip1000/Config.lb trunk/coreboot-v2/src/mainboard/tyan/s2735/Config.lb trunk/coreboot-v2/src/mainboard/tyan/s2735/Makefile.inc trunk/coreboot-v2/src/mainboard/tyan/s2735/cache_as_ram_auto.c trunk/coreboot-v2/src/mainboard/tyan/s2735/reset.c trunk/coreboot-v2/src/mainboard/tyan/s2891/Config.lb trunk/coreboot-v2/src/mainboard/tyan/s2892/Config.lb trunk/coreboot-v2/src/mainboard/tyan/s2895/Config.lb trunk/coreboot-v2/src/mainboard/tyan/s2912/Config.lb trunk/coreboot-v2/src/mainboard/tyan/s2912_fam10/Config.lb trunk/coreboot-v2/src/mainboard/via/epia-m/Config.lb trunk/coreboot-v2/src/mainboard/via/epia/Config.lb Log: Major cleanups of the hard_reset() code and config in coreboot. - Drop unused "#object reset.o" entries. - Use CONFIG_HAVE_HARD_RESET for all "object reset.o" entries. - Drop dead/commented code, i.e. useless hard_reset() from: - supermicro/x6dhe_g/auto.c - supermicro/x6dhe_g2/auto.c - supermicro/x6dhe_g2/auto.updated.c - supermicro/x6dhr_ig/auto.c - supermicro/x6dhr_ig2/auto.c - digitallogic/msm586seg/auto.c - dell/s1850/auto.c - Add "obj-$(CONFIG_HAVE_HARD_RESET) += reset.o" to kconfig files of boards that actually have a reset.c file. Signed-off-by: Uwe Hermann <[email protected]> Acked-by: Myles Watson <[email protected]> Modified: trunk/coreboot-v2/src/mainboard/Makefile.romccboard.inc =================================================================== --- trunk/coreboot-v2/src/mainboard/Makefile.romccboard.inc 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/Makefile.romccboard.inc 2009-10-24 19:17:24 UTC (rev 4849) @@ -45,6 +45,7 @@ obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o +obj-$(CONFIG_HAVE_HARD_RESET) += reset.o ifdef POST_EVALUATION Modified: trunk/coreboot-v2/src/mainboard/amd/dbm690t/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/amd/dbm690t/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/amd/dbm690t/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -50,8 +50,6 @@ object ./dsdt.o end -#object reset.o - if CONFIG_USE_INIT makerule ./cache_as_ram_auto.o Modified: trunk/coreboot-v2/src/mainboard/amd/norwich/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/amd/norwich/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/amd/norwich/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -18,8 +18,6 @@ object irq_tables.o end -#object reset.o - #compile cache_as_ram.c to auto.inc makerule ./cache_as_ram_auto.inc depends "$(CONFIG_MAINBOARD)/cache_as_ram_auto.c option_table.h" Modified: trunk/coreboot-v2/src/mainboard/amd/pistachio/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/amd/pistachio/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/amd/pistachio/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -50,8 +50,6 @@ object ./dsdt.o end -#object reset.o - if CONFIG_USE_INIT makerule ./cache_as_ram_auto.o Modified: trunk/coreboot-v2/src/mainboard/amd/rumba/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/amd/rumba/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/amd/rumba/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -15,7 +15,6 @@ driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o ## ## Romcc output Modified: trunk/coreboot-v2/src/mainboard/artecgroup/dbe61/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/artecgroup/dbe61/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/artecgroup/dbe61/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -15,7 +15,6 @@ driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o #compile cache_as_ram.c to auto.inc makerule ./cache_as_ram_auto.inc Modified: trunk/coreboot-v2/src/mainboard/asus/a8v-e_se/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/asus/a8v-e_se/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/asus/a8v-e_se/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -39,7 +39,6 @@ end if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -# object reset.o if CONFIG_USE_INIT makerule ./cache_as_ram_auto.o Modified: trunk/coreboot-v2/src/mainboard/asus/mew-vm/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/asus/mew-vm/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/asus/mew-vm/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -15,7 +15,6 @@ driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o ## ## Romcc output Modified: trunk/coreboot-v2/src/mainboard/broadcom/blast/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/broadcom/blast/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/broadcom/blast/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -18,8 +18,6 @@ object irq_tables.o end -#object reset.o - if CONFIG_USE_INIT makerule ./cache_as_ram_auto.o Modified: trunk/coreboot-v2/src/mainboard/dell/s1850/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/dell/s1850/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/dell/s1850/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -20,7 +20,7 @@ driver mainboard.o if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -object reset.o +if CONFIG_HAVE_HARD_RESET object reset.o end ## ## Romcc output Modified: trunk/coreboot-v2/src/mainboard/dell/s1850/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/mainboard/dell/s1850/Makefile.inc 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/dell/s1850/Makefile.inc 2009-10-24 19:17:24 UTC (rev 4849) @@ -42,6 +42,7 @@ obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o +obj-$(CONFIG_HAVE_HARD_RESET) += reset.o ifdef POST_EVALUATION Modified: trunk/coreboot-v2/src/mainboard/dell/s1850/auto.c =================================================================== --- trunk/coreboot-v2/src/mainboard/dell/s1850/auto.c 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/dell/s1850/auto.c 2009-10-24 19:17:24 UTC (rev 4849) @@ -42,16 +42,6 @@ #define RECVENA_CONFIG 0x0808090a #define RECVENB_CONFIG 0x0808090a -#if 0 -static void hard_reset(void) -{ - /* enable cf9 */ - pci_write_config8(PCI_DEV(0, 0x04, 3), 0x41, 0xf1); - /* reset */ - outb(0x0e, 0x0cf9); -} -#endif - static inline void activate_spd_rom(const struct mem_controller *ctrl) { /* nothing to do */ Modified: trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -14,7 +14,6 @@ driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o ## ## Romcc output Modified: trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Kconfig =================================================================== --- trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Kconfig 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Kconfig 2009-10-24 19:17:24 UTC (rev 4849) @@ -8,6 +8,7 @@ select HAVE_PIRQ_TABLE select UDELAY_TSC select BOARD_ROMSIZE_KB_1024 + select HAVE_HARD_RESET config MAINBOARD_DIR string Modified: trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/auto.c =================================================================== --- trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/auto.c 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/auto.c 2009-10-24 19:17:24 UTC (rev 4849) @@ -31,7 +31,6 @@ #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) - static void hard_reset(void) { outb(0x0e, 0x0cf9); Modified: trunk/coreboot-v2/src/mainboard/digitallogic/msm586seg/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/digitallogic/msm586seg/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/digitallogic/msm586seg/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -16,7 +16,6 @@ driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -# object reset.o ## ## Romcc output Modified: trunk/coreboot-v2/src/mainboard/digitallogic/msm586seg/auto.c =================================================================== --- trunk/coreboot-v2/src/mainboard/digitallogic/msm586seg/auto.c 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/digitallogic/msm586seg/auto.c 2009-10-24 19:17:24 UTC (rev 4849) @@ -50,10 +50,6 @@ int i; }; -static void hard_reset(void) -{ -} - static void memreset_setup(void) { } Modified: trunk/coreboot-v2/src/mainboard/eaglelion/5bcm/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/eaglelion/5bcm/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/eaglelion/5bcm/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -15,7 +15,6 @@ driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o ## ## Romcc output Modified: trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -35,7 +35,6 @@ driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o ## ALL dependencies for CONFIG_USE_DCACHE_RAM go here. Modified: trunk/coreboot-v2/src/mainboard/gigabyte/ga_2761gxdk/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/gigabyte/ga_2761gxdk/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/gigabyte/ga_2761gxdk/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -37,7 +37,6 @@ if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o if CONFIG_USE_INIT makerule ./cache_as_ram_auto.o Modified: trunk/coreboot-v2/src/mainboard/gigabyte/m57sli/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/gigabyte/m57sli/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/gigabyte/m57sli/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -35,7 +35,6 @@ if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o if CONFIG_USE_INIT makerule ./cache_as_ram_auto.o Modified: trunk/coreboot-v2/src/mainboard/ibm/e325/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/ibm/e325/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/ibm/e325/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -15,7 +15,6 @@ driver mainboard.o if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o if CONFIG_USE_INIT Modified: trunk/coreboot-v2/src/mainboard/ibm/e326/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/ibm/e326/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/ibm/e326/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -15,7 +15,6 @@ driver mainboard.o if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o if CONFIG_USE_INIT Modified: trunk/coreboot-v2/src/mainboard/iei/juki-511p/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/iei/juki-511p/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/iei/juki-511p/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -32,7 +32,6 @@ driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o ## ## Romcc output Modified: trunk/coreboot-v2/src/mainboard/iei/nova4899r/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/iei/nova4899r/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/iei/nova4899r/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -16,7 +16,6 @@ driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o ## ## Romcc output Modified: trunk/coreboot-v2/src/mainboard/intel/eagleheights/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/intel/eagleheights/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/intel/eagleheights/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -57,7 +57,7 @@ object ./dsdt.o end -object reset.o +if CONFIG_HAVE_HARD_RESET object reset.o end if CONFIG_USE_INIT Modified: trunk/coreboot-v2/src/mainboard/intel/eagleheights/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/mainboard/intel/eagleheights/Makefile.inc 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/intel/eagleheights/Makefile.inc 2009-10-24 19:17:24 UTC (rev 4849) @@ -4,7 +4,7 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o -obj-y += reset.o +obj-$(CONFIG_HAVE_HARD_RESET) += reset.o # This is part of the conversion to init-obj and away from included code. Modified: trunk/coreboot-v2/src/mainboard/intel/jarrell/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/intel/jarrell/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/intel/jarrell/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -20,7 +20,7 @@ driver mainboard.o if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -object reset.o +if CONFIG_HAVE_HARD_RESET object reset.o end ## ## Romcc output Modified: trunk/coreboot-v2/src/mainboard/intel/jarrell/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/mainboard/intel/jarrell/Makefile.inc 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/intel/jarrell/Makefile.inc 2009-10-24 19:17:24 UTC (rev 4849) @@ -1,4 +1,4 @@ -obj-y += reset.o +obj-$(CONFIG_HAVE_HARD_RESET) += reset.o ROMCCFLAGS := -mcpu=p4 -O2 include $(src)/mainboard/Makefile.romccboard.inc Modified: trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -12,7 +12,7 @@ if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end if CONFIG_GENERATE_ACPI_TABLES object acpi_tables.o end -object reset.o +if CONFIG_HAVE_HARD_RESET object reset.o end ## ## Romcc output Modified: trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Makefile.inc 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Makefile.inc 2009-10-24 19:17:24 UTC (rev 4849) @@ -1,4 +1,5 @@ ROMCCFLAGS := -mcpu=p4 -O2 obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o +obj-$(CONFIG_HAVE_HARD_RESET) += reset.o include $(src)/mainboard/Makefile.romccboard.inc Modified: trunk/coreboot-v2/src/mainboard/iwill/dk8s2/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/iwill/dk8s2/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/iwill/dk8s2/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -15,7 +15,6 @@ driver mainboard.o if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o ## ATI Rage XL framebuffering graphics driver dir /drivers/ati/ragexl Modified: trunk/coreboot-v2/src/mainboard/iwill/dk8x/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/iwill/dk8x/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/iwill/dk8x/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -15,7 +15,6 @@ driver mainboard.o if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o if CONFIG_USE_INIT Modified: trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -61,7 +61,7 @@ object ./dsdt.o end -object reset.o +if CONFIG_HAVE_HARD_RESET object reset.o end if CONFIG_USE_INIT Modified: trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Makefile.inc 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Makefile.inc 2009-10-24 19:17:24 UTC (rev 4849) @@ -32,6 +32,7 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o +obj-$(CONFIG_HAVE_HARD_RESET) += reset.o smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o Modified: trunk/coreboot-v2/src/mainboard/kontron/kt690/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/kontron/kt690/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/kontron/kt690/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -50,8 +50,6 @@ object ./dsdt.o end -#object reset.o - if CONFIG_USE_INIT makerule ./cache_as_ram_auto.o Modified: trunk/coreboot-v2/src/mainboard/lippert/frontrunner/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/lippert/frontrunner/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/lippert/frontrunner/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -15,7 +15,6 @@ driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o ## ## Romcc output Modified: trunk/coreboot-v2/src/mainboard/msi/ms6178/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/msi/ms6178/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/msi/ms6178/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -25,7 +25,6 @@ arch i386 end driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -# object reset.o makerule ./failover.E depends "$(CONFIG_MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc" action "../romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(CONFIG_MAINBOARD)/../../../arch/i386/lib/failover.c -o $@" Modified: trunk/coreboot-v2/src/mainboard/msi/ms7260/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/msi/ms7260/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/msi/ms7260/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -28,7 +28,6 @@ object get_bus_conf.o # Needed by irq_tables and mptable (and acpi_tables). if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -# object reset.o if CONFIG_USE_INIT makerule ./cache_as_ram_auto.o Modified: trunk/coreboot-v2/src/mainboard/msi/ms9282/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/msi/ms9282/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/msi/ms9282/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -43,7 +43,6 @@ if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o if CONFIG_USE_INIT Modified: trunk/coreboot-v2/src/mainboard/nec/powermate2000/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/nec/powermate2000/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/nec/powermate2000/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -25,7 +25,6 @@ arch i386 end driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -# object reset.o makerule ./failover.E depends "$(CONFIG_MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc" action "../romcc -E -O2 -mcpu=p2 --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(CONFIG_MAINBOARD)/../../../arch/i386/lib/failover.c -o $@" Modified: trunk/coreboot-v2/src/mainboard/newisys/khepri/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/newisys/khepri/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/newisys/khepri/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -15,7 +15,6 @@ driver mainboard.o if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o if CONFIG_USE_INIT Modified: trunk/coreboot-v2/src/mainboard/nvidia/l1_2pvv/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/nvidia/l1_2pvv/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/nvidia/l1_2pvv/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -35,7 +35,6 @@ if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o if CONFIG_GENERATE_ACPI_TABLES object acpi_tables.o Modified: trunk/coreboot-v2/src/mainboard/olpc/btest/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/olpc/btest/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/olpc/btest/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -15,7 +15,6 @@ driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o ## ## Romcc output Modified: trunk/coreboot-v2/src/mainboard/olpc/rev_a/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/olpc/rev_a/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/olpc/rev_a/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -15,7 +15,6 @@ driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o ## ## Romcc output Modified: trunk/coreboot-v2/src/mainboard/rca/rm4100/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/rca/rm4100/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/rca/rm4100/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -25,7 +25,6 @@ arch i386 end driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -# object reset.o if CONFIG_GENERATE_ACPI_TABLES object fadt.o object dsdt.o Modified: trunk/coreboot-v2/src/mainboard/sunw/ultra40/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/sunw/ultra40/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/sunw/ultra40/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -16,7 +16,6 @@ if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o if CONFIG_USE_INIT makerule ./auto.o depends "$(CONFIG_MAINBOARD)/cache_as_ram_auto.c option_table.h" Modified: trunk/coreboot-v2/src/mainboard/supermicro/h8dme/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/supermicro/h8dme/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/supermicro/h8dme/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -32,7 +32,6 @@ if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o if CONFIG_USE_INIT makerule ./auto.o Modified: trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -35,7 +35,6 @@ if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o if CONFIG_USE_INIT makerule ./auto.o Modified: trunk/coreboot-v2/src/mainboard/supermicro/h8dmr_fam10/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/supermicro/h8dmr_fam10/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/supermicro/h8dmr_fam10/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -37,7 +37,6 @@ if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o if CONFIG_USE_INIT makerule ./auto.o Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -20,7 +20,7 @@ driver mainboard.o if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -object reset.o +if CONFIG_HAVE_HARD_RESET object reset.o end ## ## Romcc output Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Makefile.inc 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Makefile.inc 2009-10-24 19:17:24 UTC (rev 4849) @@ -19,6 +19,6 @@ ## ROMCCFLAGS=-mcpu=p4 -O2 - +obj-$(CONFIG_HAVE_HARD_RESET) += reset.o include $(src)/mainboard/Makefile.romccboard.inc Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -19,7 +19,7 @@ driver mainboard.o if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -object reset.o +if CONFIG_HAVE_HARD_RESET object reset.o end ## ## Romcc output Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Makefile.inc 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Makefile.inc 2009-10-24 19:17:24 UTC (rev 4849) @@ -19,6 +19,6 @@ ## ROMCCFLAGS=-mcpu=p4 -O2 - +obj-$(CONFIG_HAVE_HARD_RESET) += reset.o include $(src)/mainboard/Makefile.romccboard.inc Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/auto.c =================================================================== --- trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/auto.c 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/auto.c 2009-10-24 19:17:24 UTC (rev 4849) @@ -43,16 +43,6 @@ #define RECVENA_CONFIG 0x0808090a #define RECVENB_CONFIG 0x0808090a -#if 0 -static void hard_reset(void) -{ - /* enable cf9 */ - pci_write_config8(PCI_DEV(0, 0x04, 3), 0x41, 0xf1); - /* reset */ - outb(0x0e, 0x0cf9); -} -#endif - static inline void activate_spd_rom(const struct mem_controller *ctrl) { /* nothing to do */ Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -19,7 +19,7 @@ driver mainboard.o if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -object reset.o +if CONFIG_HAVE_HARD_RESET object reset.o end ## ## Romcc output Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Makefile.inc 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Makefile.inc 2009-10-24 19:17:24 UTC (rev 4849) @@ -19,6 +19,6 @@ ## ROMCCFLAGS=-mcpu=p4 -O2 - +obj-$(CONFIG_HAVE_HARD_RESET) += reset.o include $(src)/mainboard/Makefile.romccboard.inc Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/auto.c =================================================================== --- trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/auto.c 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/auto.c 2009-10-24 19:17:24 UTC (rev 4849) @@ -43,16 +43,6 @@ #define RECVENA_CONFIG 0x0708090a #define RECVENB_CONFIG 0x0708090a -#if 0 -static void hard_reset(void) -{ - /* enable cf9 */ - pci_write_config8(PCI_DEV(0, 0x04, 3), 0x41, 0xf1); - /* reset */ - outb(0x0e, 0x0cf9); -} -#endif - static inline void activate_spd_rom(const struct mem_controller *ctrl) { /* nothing to do */ Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/auto.updated.c =================================================================== --- trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/auto.updated.c 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/auto.updated.c 2009-10-24 19:17:24 UTC (rev 4849) @@ -43,16 +43,6 @@ #define RECVENA_CONFIG 0x0708090a #define RECVENB_CONFIG 0x0708090a -#if 0 -static void hard_reset(void) -{ - /* enable cf9 */ - pci_write_config8(PCI_DEV(0, 0x04, 3), 0x41, 0xf1); - /* reset */ - outb(0x0e, 0x0cf9); -} -#endif - static inline void activate_spd_rom(const struct mem_controller *ctrl) { /* nothing to do */ Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -20,7 +20,7 @@ driver mainboard.o if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -object reset.o +if CONFIG_HAVE_HARD_RESET object reset.o end ## ## Romcc output Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Makefile.inc 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Makefile.inc 2009-10-24 19:17:24 UTC (rev 4849) @@ -19,6 +19,6 @@ ## ROMCCFLAGS=-mcpu=p4 -O2 - +obj-$(CONFIG_HAVE_HARD_RESET) += reset.o include $(src)/mainboard/Makefile.romccboard.inc Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/auto.c =================================================================== --- trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/auto.c 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/auto.c 2009-10-24 19:17:24 UTC (rev 4849) @@ -44,16 +44,6 @@ #define RECVENA_CONFIG 0x0808090a #define RECVENB_CONFIG 0x0808090a -#if 0 -static void hard_reset(void) -{ - /* enable cf9 */ - pci_write_config8(PCI_DEV(0, 0x04, 3), 0x41, 0xf1); - /* reset */ - outb(0x0e, 0x0cf9); -} -#endif - static inline void activate_spd_rom(const struct mem_controller *ctrl) { /* nothing to do */ Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -20,7 +20,7 @@ driver mainboard.o if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -object reset.o +if CONFIG_HAVE_HARD_RESET object reset.o end ## ## Romcc output Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Makefile.inc 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Makefile.inc 2009-10-24 19:17:24 UTC (rev 4849) @@ -19,6 +19,6 @@ ## ROMCCFLAGS=-mcpu=p4 -O2 - +obj-$(CONFIG_HAVE_HARD_RESET) += reset.o include $(src)/mainboard/Makefile.romccboard.inc Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/auto.c =================================================================== --- trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/auto.c 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/auto.c 2009-10-24 19:17:24 UTC (rev 4849) @@ -44,16 +44,6 @@ #define RECVENA_CONFIG 0x0808090a #define RECVENB_CONFIG 0x0808090a -#if 0 -static void hard_reset(void) -{ - /* enable cf9 */ - pci_write_config8(PCI_DEV(0, 0x04, 3), 0x41, 0xf1); - /* reset */ - outb(0x0e, 0x0cf9); -} -#endif - static inline void activate_spd_rom(const struct mem_controller *ctrl) { /* nothing to do */ Modified: trunk/coreboot-v2/src/mainboard/technexion/tim5690/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/technexion/tim5690/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/technexion/tim5690/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -50,8 +50,6 @@ object ./dsdt.o end -#object reset.o - if CONFIG_USE_INIT makerule ./cache_as_ram_auto.o Modified: trunk/coreboot-v2/src/mainboard/technexion/tim8690/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/technexion/tim8690/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/technexion/tim8690/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -50,8 +50,6 @@ object ./dsdt.o end -#object reset.o - if CONFIG_USE_INIT makerule ./cache_as_ram_auto.o Modified: trunk/coreboot-v2/src/mainboard/technologic/ts5300/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/technologic/ts5300/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/technologic/ts5300/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -17,7 +17,6 @@ driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -# object reset.o ## ## Romcc output Modified: trunk/coreboot-v2/src/mainboard/thomson/ip1000/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/thomson/ip1000/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/thomson/ip1000/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -25,7 +25,6 @@ arch i386 end driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -# object reset.o if CONFIG_GENERATE_ACPI_TABLES object fadt.o object dsdt.o Modified: trunk/coreboot-v2/src/mainboard/tyan/s2735/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/tyan/s2735/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/tyan/s2735/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -12,7 +12,7 @@ driver mainboard.o if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -object reset.o +if CONFIG_HAVE_HARD_RESET object reset.o end if CONFIG_USE_INIT makerule ./auto.o Modified: trunk/coreboot-v2/src/mainboard/tyan/s2735/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/mainboard/tyan/s2735/Makefile.inc 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/tyan/s2735/Makefile.inc 2009-10-24 19:17:24 UTC (rev 4849) @@ -27,6 +27,7 @@ obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o +obj-$(CONFIG_HAVE_HARD_RESET) += reset.o #driver-y += ../../../drivers/i2c/i2cmux/i2cmux.o Modified: trunk/coreboot-v2/src/mainboard/tyan/s2735/cache_as_ram_auto.c =================================================================== --- trunk/coreboot-v2/src/mainboard/tyan/s2735/cache_as_ram_auto.c 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/tyan/s2735/cache_as_ram_auto.c 2009-10-24 19:17:24 UTC (rev 4849) @@ -37,6 +37,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) +// FIXME: There's another hard_reset() in reset.c. Why? static void hard_reset(void) { /* full reset */ Modified: trunk/coreboot-v2/src/mainboard/tyan/s2735/reset.c =================================================================== --- trunk/coreboot-v2/src/mainboard/tyan/s2735/reset.c 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/tyan/s2735/reset.c 2009-10-24 19:17:24 UTC (rev 4849) @@ -1,5 +1,6 @@ void i82801er_hard_reset(void); +/* FIXME: There's another hard_reset() in cache_as_ram_auto.c. Why? */ void hard_reset(void) { i82801er_hard_reset(); Modified: trunk/coreboot-v2/src/mainboard/tyan/s2891/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/tyan/s2891/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/tyan/s2891/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -18,7 +18,6 @@ if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o if CONFIG_GENERATE_ACPI_TABLES object acpi_tables.o Modified: trunk/coreboot-v2/src/mainboard/tyan/s2892/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/tyan/s2892/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/tyan/s2892/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -19,7 +19,6 @@ if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o if CONFIG_GENERATE_ACPI_TABLES object acpi_tables.o Modified: trunk/coreboot-v2/src/mainboard/tyan/s2895/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/tyan/s2895/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/tyan/s2895/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -14,7 +14,6 @@ if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o if CONFIG_GENERATE_ACPI_TABLES object acpi_tables.o Modified: trunk/coreboot-v2/src/mainboard/tyan/s2912/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/tyan/s2912/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/tyan/s2912/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -35,7 +35,6 @@ if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o if CONFIG_USE_INIT makerule ./cache_as_ram_auto.o Modified: trunk/coreboot-v2/src/mainboard/tyan/s2912_fam10/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/tyan/s2912_fam10/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/tyan/s2912_fam10/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -35,7 +35,6 @@ if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o if CONFIG_USE_INIT makerule ./cache_as_ram_auto.o Modified: trunk/coreboot-v2/src/mainboard/via/epia/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/via/epia/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/via/epia/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -14,7 +14,6 @@ driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o ## ## Romcc output Modified: trunk/coreboot-v2/src/mainboard/via/epia-m/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/via/epia-m/Config.lb 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/via/epia-m/Config.lb 2009-10-24 19:17:24 UTC (rev 4849) @@ -15,7 +15,6 @@ driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o object vgabios.o if CONFIG_GENERATE_ACPI_TABLES Deleted: trunk/coreboot-v2/src/mainboard/via/vt8454c/reset.c =================================================================== --- trunk/coreboot-v2/src/mainboard/via/vt8454c/reset.c 2009-10-24 19:07:05 UTC (rev 4848) +++ trunk/coreboot-v2/src/mainboard/via/vt8454c/reset.c 2009-10-24 19:17:24 UTC (rev 4849) @@ -1,28 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007-2009 coresystems GmbH - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; version 2 of - * the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - * MA 02110-1301 USA - */ - -#include "arch/romcc_io.h" - -void hard_reset(void) -{ - set_bios_reset(); - outb(0x06, 0x0cf9); -} -- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
