diff options
81 files changed, 26 insertions, 164 deletions
diff --git a/src/mainboard/Makefile.romccboard.inc b/src/mainboard/Makefile.romccboard.inc index 717f511f8d..fa9aff2c0b 100644 --- a/src/mainboard/Makefile.romccboard.inc +++ b/src/mainboard/Makefile.romccboard.inc @@ -45,6 +45,7 @@ driver-y += mainboard.o 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 diff --git a/src/mainboard/amd/dbm690t/Config.lb b/src/mainboard/amd/dbm690t/Config.lb index 98ff2dd0f7..69e3467123 100644 --- a/src/mainboard/amd/dbm690t/Config.lb +++ b/src/mainboard/amd/dbm690t/Config.lb @@ -50,8 +50,6 @@ if CONFIG_GENERATE_ACPI_TABLES object ./dsdt.o end -#object reset.o - if CONFIG_USE_INIT makerule ./cache_as_ram_auto.o diff --git a/src/mainboard/amd/norwich/Config.lb b/src/mainboard/amd/norwich/Config.lb index 6f9845ef10..5f0dc33d7b 100644 --- a/src/mainboard/amd/norwich/Config.lb +++ b/src/mainboard/amd/norwich/Config.lb @@ -18,8 +18,6 @@ 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 depends "$(CONFIG_MAINBOARD)/cache_as_ram_auto.c option_table.h" diff --git a/src/mainboard/amd/pistachio/Config.lb b/src/mainboard/amd/pistachio/Config.lb index b0f82b21c7..6ada7d636e 100644 --- a/src/mainboard/amd/pistachio/Config.lb +++ b/src/mainboard/amd/pistachio/Config.lb @@ -50,8 +50,6 @@ if CONFIG_GENERATE_ACPI_TABLES object ./dsdt.o end -#object reset.o - if CONFIG_USE_INIT makerule ./cache_as_ram_auto.o diff --git a/src/mainboard/amd/rumba/Config.lb b/src/mainboard/amd/rumba/Config.lb index 0dd6367b82..9083949f44 100644 --- a/src/mainboard/amd/rumba/Config.lb +++ b/src/mainboard/amd/rumba/Config.lb @@ -15,7 +15,6 @@ arch i386 end driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o ## ## Romcc output diff --git a/src/mainboard/artecgroup/dbe61/Config.lb b/src/mainboard/artecgroup/dbe61/Config.lb index 1287301915..e3cc41b135 100644 --- a/src/mainboard/artecgroup/dbe61/Config.lb +++ b/src/mainboard/artecgroup/dbe61/Config.lb @@ -15,7 +15,6 @@ arch i386 end 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 diff --git a/src/mainboard/asus/a8v-e_se/Config.lb b/src/mainboard/asus/a8v-e_se/Config.lb index 0b10bb91b1..308a1fecef 100644 --- a/src/mainboard/asus/a8v-e_se/Config.lb +++ b/src/mainboard/asus/a8v-e_se/Config.lb @@ -39,7 +39,6 @@ if CONFIG_GENERATE_ACPI_TABLES 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 diff --git a/src/mainboard/asus/mew-vm/Config.lb b/src/mainboard/asus/mew-vm/Config.lb index 599806ee86..4d51c9971e 100644 --- a/src/mainboard/asus/mew-vm/Config.lb +++ b/src/mainboard/asus/mew-vm/Config.lb @@ -15,7 +15,6 @@ arch i386 end driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o ## ## Romcc output diff --git a/src/mainboard/broadcom/blast/Config.lb b/src/mainboard/broadcom/blast/Config.lb index 38375626e8..e400b958e2 100644 --- a/src/mainboard/broadcom/blast/Config.lb +++ b/src/mainboard/broadcom/blast/Config.lb @@ -18,8 +18,6 @@ if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o - if CONFIG_USE_INIT makerule ./cache_as_ram_auto.o diff --git a/src/mainboard/dell/s1850/Config.lb b/src/mainboard/dell/s1850/Config.lb index 58f55c644a..cc0edc6a8b 100644 --- a/src/mainboard/dell/s1850/Config.lb +++ b/src/mainboard/dell/s1850/Config.lb @@ -20,7 +20,7 @@ arch i386 end 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 diff --git a/src/mainboard/dell/s1850/Makefile.inc b/src/mainboard/dell/s1850/Makefile.inc index 61fcddf7d5..204487a139 100644 --- a/src/mainboard/dell/s1850/Makefile.inc +++ b/src/mainboard/dell/s1850/Makefile.inc @@ -42,6 +42,7 @@ driver-y += mainboard.o 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 diff --git a/src/mainboard/dell/s1850/auto.c b/src/mainboard/dell/s1850/auto.c index 16b564b02c..a7b2b925cb 100644 --- a/src/mainboard/dell/s1850/auto.c +++ b/src/mainboard/dell/s1850/auto.c @@ -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 */ diff --git a/src/mainboard/digitallogic/adl855pc/Config.lb b/src/mainboard/digitallogic/adl855pc/Config.lb index 2a97f08669..c20323109f 100644 --- a/src/mainboard/digitallogic/adl855pc/Config.lb +++ b/src/mainboard/digitallogic/adl855pc/Config.lb @@ -14,7 +14,6 @@ arch i386 end driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o ## ## Romcc output diff --git a/src/mainboard/digitallogic/adl855pc/Kconfig b/src/mainboard/digitallogic/adl855pc/Kconfig index e53f6833bc..ff7092ca01 100644 --- a/src/mainboard/digitallogic/adl855pc/Kconfig +++ b/src/mainboard/digitallogic/adl855pc/Kconfig @@ -8,6 +8,7 @@ config BOARD_DIGITALLOGIC_ADL855PC select HAVE_PIRQ_TABLE select UDELAY_TSC select BOARD_ROMSIZE_KB_1024 + select HAVE_HARD_RESET config MAINBOARD_DIR string diff --git a/src/mainboard/digitallogic/adl855pc/auto.c b/src/mainboard/digitallogic/adl855pc/auto.c index ad75c37cce..069aba077a 100644 --- a/src/mainboard/digitallogic/adl855pc/auto.c +++ b/src/mainboard/digitallogic/adl855pc/auto.c @@ -31,7 +31,6 @@ #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) - static void hard_reset(void) { outb(0x0e, 0x0cf9); diff --git a/src/mainboard/digitallogic/msm586seg/Config.lb b/src/mainboard/digitallogic/msm586seg/Config.lb index c50b3b736a..f223884883 100644 --- a/src/mainboard/digitallogic/msm586seg/Config.lb +++ b/src/mainboard/digitallogic/msm586seg/Config.lb @@ -16,7 +16,6 @@ arch i386 end driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -# object reset.o ## ## Romcc output diff --git a/src/mainboard/digitallogic/msm586seg/auto.c b/src/mainboard/digitallogic/msm586seg/auto.c index aeddc24fd7..6b284a850b 100644 --- a/src/mainboard/digitallogic/msm586seg/auto.c +++ b/src/mainboard/digitallogic/msm586seg/auto.c @@ -50,10 +50,6 @@ struct mem_controller { int i; }; -static void hard_reset(void) -{ -} - static void memreset_setup(void) { } diff --git a/src/mainboard/eaglelion/5bcm/Config.lb b/src/mainboard/eaglelion/5bcm/Config.lb index 2d44747c29..64e833f938 100644 --- a/src/mainboard/eaglelion/5bcm/Config.lb +++ b/src/mainboard/eaglelion/5bcm/Config.lb @@ -15,7 +15,6 @@ arch i386 end driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o ## ## Romcc output diff --git a/src/mainboard/emulation/qemu-x86/Config.lb b/src/mainboard/emulation/qemu-x86/Config.lb index 6dd45c9ca7..7357648411 100644 --- a/src/mainboard/emulation/qemu-x86/Config.lb +++ b/src/mainboard/emulation/qemu-x86/Config.lb @@ -35,7 +35,6 @@ arch i386 end 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. diff --git a/src/mainboard/gigabyte/ga_2761gxdk/Config.lb b/src/mainboard/gigabyte/ga_2761gxdk/Config.lb index 1cb39c685d..17223bd430 100644 --- a/src/mainboard/gigabyte/ga_2761gxdk/Config.lb +++ b/src/mainboard/gigabyte/ga_2761gxdk/Config.lb @@ -37,7 +37,6 @@ object get_bus_conf.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 makerule ./cache_as_ram_auto.o diff --git a/src/mainboard/gigabyte/m57sli/Config.lb b/src/mainboard/gigabyte/m57sli/Config.lb index b4757df52b..50ecab2ab4 100644 --- a/src/mainboard/gigabyte/m57sli/Config.lb +++ b/src/mainboard/gigabyte/m57sli/Config.lb @@ -35,7 +35,6 @@ object get_bus_conf.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 makerule ./cache_as_ram_auto.o diff --git a/src/mainboard/ibm/e325/Config.lb b/src/mainboard/ibm/e325/Config.lb index dbf896a732..ad37abadd2 100644 --- a/src/mainboard/ibm/e325/Config.lb +++ b/src/mainboard/ibm/e325/Config.lb @@ -15,7 +15,6 @@ arch i386 end 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 diff --git a/src/mainboard/ibm/e326/Config.lb b/src/mainboard/ibm/e326/Config.lb index 0020fe3a3b..c21a315acd 100644 --- a/src/mainboard/ibm/e326/Config.lb +++ b/src/mainboard/ibm/e326/Config.lb @@ -15,7 +15,6 @@ arch i386 end 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 diff --git a/src/mainboard/iei/juki-511p/Config.lb b/src/mainboard/iei/juki-511p/Config.lb index db780ebf07..c87ea5c70e 100644 --- a/src/mainboard/iei/juki-511p/Config.lb +++ b/src/mainboard/iei/juki-511p/Config.lb @@ -32,7 +32,6 @@ arch i386 end driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o ## ## Romcc output diff --git a/src/mainboard/iei/nova4899r/Config.lb b/src/mainboard/iei/nova4899r/Config.lb index ca477781e4..3fd6ce70dd 100644 --- a/src/mainboard/iei/nova4899r/Config.lb +++ b/src/mainboard/iei/nova4899r/Config.lb @@ -16,7 +16,6 @@ arch i386 end driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o ## ## Romcc output diff --git a/src/mainboard/intel/eagleheights/Config.lb b/src/mainboard/intel/eagleheights/Config.lb index 9dac1fc76b..8346682908 100644 --- a/src/mainboard/intel/eagleheights/Config.lb +++ b/src/mainboard/intel/eagleheights/Config.lb @@ -57,7 +57,7 @@ if CONFIG_GENERATE_ACPI_TABLES object ./dsdt.o end -object reset.o +if CONFIG_HAVE_HARD_RESET object reset.o end if CONFIG_USE_INIT diff --git a/src/mainboard/intel/eagleheights/Makefile.inc b/src/mainboard/intel/eagleheights/Makefile.inc index 3421755c12..4f4d38c6ec 100644 --- a/src/mainboard/intel/eagleheights/Makefile.inc +++ b/src/mainboard/intel/eagleheights/Makefile.inc @@ -4,7 +4,7 @@ obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o 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. diff --git a/src/mainboard/intel/jarrell/Config.lb b/src/mainboard/intel/jarrell/Config.lb index 7dd2af1f61..722ba4027b 100644 --- a/src/mainboard/intel/jarrell/Config.lb +++ b/src/mainboard/intel/jarrell/Config.lb @@ -20,7 +20,7 @@ arch i386 end 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 diff --git a/src/mainboard/intel/jarrell/Makefile.inc b/src/mainboard/intel/jarrell/Makefile.inc index e74807fd22..80249df044 100644 --- a/src/mainboard/intel/jarrell/Makefile.inc +++ b/src/mainboard/intel/jarrell/Makefile.inc @@ -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 diff --git a/src/mainboard/intel/xe7501devkit/Config.lb b/src/mainboard/intel/xe7501devkit/Config.lb index 37c4f1750d..bad246a0df 100644 --- a/src/mainboard/intel/xe7501devkit/Config.lb +++ b/src/mainboard/intel/xe7501devkit/Config.lb @@ -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 if CONFIG_GENERATE_ACPI_TABLES object acpi_tables.o end -object reset.o +if CONFIG_HAVE_HARD_RESET object reset.o end ## ## Romcc output diff --git a/src/mainboard/intel/xe7501devkit/Makefile.inc b/src/mainboard/intel/xe7501devkit/Makefile.inc index cd66339206..0b1acdc242 100644 --- a/src/mainboard/intel/xe7501devkit/Makefile.inc +++ b/src/mainboard/intel/xe7501devkit/Makefile.inc @@ -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 diff --git a/src/mainboard/iwill/dk8s2/Config.lb b/src/mainboard/iwill/dk8s2/Config.lb index 19fc42afa9..a5fee1b9ee 100644 --- a/src/mainboard/iwill/dk8s2/Config.lb +++ b/src/mainboard/iwill/dk8s2/Config.lb @@ -15,7 +15,6 @@ arch i386 end 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 diff --git a/src/mainboard/iwill/dk8x/Config.lb b/src/mainboard/iwill/dk8x/Config.lb index 1bd1cf198d..478074e0fc 100644 --- a/src/mainboard/iwill/dk8x/Config.lb +++ b/src/mainboard/iwill/dk8x/Config.lb @@ -15,7 +15,6 @@ arch i386 end 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 diff --git a/src/mainboard/kontron/986lcd-m/Config.lb b/src/mainboard/kontron/986lcd-m/Config.lb index 4f9607685a..0dc004055c 100644 --- a/src/mainboard/kontron/986lcd-m/Config.lb +++ b/src/mainboard/kontron/986lcd-m/Config.lb @@ -61,7 +61,7 @@ if CONFIG_GENERATE_ACPI_TABLES object ./dsdt.o end -object reset.o +if CONFIG_HAVE_HARD_RESET object reset.o end if CONFIG_USE_INIT diff --git a/src/mainboard/kontron/986lcd-m/Makefile.inc b/src/mainboard/kontron/986lcd-m/Makefile.inc index b719b5836d..61acbe68ca 100644 --- a/src/mainboard/kontron/986lcd-m/Makefile.inc +++ b/src/mainboard/kontron/986lcd-m/Makefile.inc @@ -32,6 +32,7 @@ obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o 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 diff --git a/src/mainboard/kontron/kt690/Config.lb b/src/mainboard/kontron/kt690/Config.lb index 1fb667deb9..f1b4215aa4 100644 --- a/src/mainboard/kontron/kt690/Config.lb +++ b/src/mainboard/kontron/kt690/Config.lb @@ -50,8 +50,6 @@ if CONFIG_GENERATE_ACPI_TABLES object ./dsdt.o end -#object reset.o - if CONFIG_USE_INIT makerule ./cache_as_ram_auto.o diff --git a/src/mainboard/lippert/frontrunner/Config.lb b/src/mainboard/lippert/frontrunner/Config.lb index 46eb11cef2..06147ed82f 100644 --- a/src/mainboard/lippert/frontrunner/Config.lb +++ b/src/mainboard/lippert/frontrunner/Config.lb @@ -15,7 +15,6 @@ arch i386 end driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o ## ## Romcc output diff --git a/src/mainboard/msi/ms6178/Config.lb b/src/mainboard/msi/ms6178/Config.lb index c5448e0732..d8cea81e89 100644 --- a/src/mainboard/msi/ms6178/Config.lb +++ b/src/mainboard/msi/ms6178/Config.lb @@ -25,7 +25,6 @@ include /config/nofailovercalculation.lb 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 $@" diff --git a/src/mainboard/msi/ms7260/Config.lb b/src/mainboard/msi/ms7260/Config.lb index 24e803934c..b4600611fd 100644 --- a/src/mainboard/msi/ms7260/Config.lb +++ b/src/mainboard/msi/ms7260/Config.lb @@ -28,7 +28,6 @@ driver mainboard.o 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 diff --git a/src/mainboard/msi/ms9282/Config.lb b/src/mainboard/msi/ms9282/Config.lb index af320ea189..c5a82d3ad4 100644 --- a/src/mainboard/msi/ms9282/Config.lb +++ b/src/mainboard/msi/ms9282/Config.lb @@ -43,7 +43,6 @@ object get_bus_conf.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 diff --git a/src/mainboard/nec/powermate2000/Config.lb b/src/mainboard/nec/powermate2000/Config.lb index 80de887a04..02be04a21b 100644 --- a/src/mainboard/nec/powermate2000/Config.lb +++ b/src/mainboard/nec/powermate2000/Config.lb @@ -25,7 +25,6 @@ include /config/nofailovercalculation.lb 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 $@" diff --git a/src/mainboard/newisys/khepri/Config.lb b/src/mainboard/newisys/khepri/Config.lb index 72ded47327..913f34a424 100644 --- a/src/mainboard/newisys/khepri/Config.lb +++ b/src/mainboard/newisys/khepri/Config.lb @@ -15,7 +15,6 @@ arch i386 end 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 diff --git a/src/mainboard/nvidia/l1_2pvv/Config.lb b/src/mainboard/nvidia/l1_2pvv/Config.lb index eab69e6114..0b1bfb0ac1 100644 --- a/src/mainboard/nvidia/l1_2pvv/Config.lb +++ b/src/mainboard/nvidia/l1_2pvv/Config.lb @@ -35,7 +35,6 @@ object get_bus_conf.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_GENERATE_ACPI_TABLES object acpi_tables.o diff --git a/src/mainboard/olpc/btest/Config.lb b/src/mainboard/olpc/btest/Config.lb index efd329f93c..9edcbd066b 100644 --- a/src/mainboard/olpc/btest/Config.lb +++ b/src/mainboard/olpc/btest/Config.lb @@ -15,7 +15,6 @@ arch i386 end driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o ## ## Romcc output diff --git a/src/mainboard/olpc/rev_a/Config.lb b/src/mainboard/olpc/rev_a/Config.lb index efd329f93c..9edcbd066b 100644 --- a/src/mainboard/olpc/rev_a/Config.lb +++ b/src/mainboard/olpc/rev_a/Config.lb @@ -15,7 +15,6 @@ arch i386 end driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o ## ## Romcc output diff --git a/src/mainboard/rca/rm4100/Config.lb b/src/mainboard/rca/rm4100/Config.lb index 58d6de9c7a..87d96df2e1 100644 --- a/src/mainboard/rca/rm4100/Config.lb +++ b/src/mainboard/rca/rm4100/Config.lb @@ -25,7 +25,6 @@ include /config/nofailovercalculation.lb 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 diff --git a/src/mainboard/sunw/ultra40/Config.lb b/src/mainboard/sunw/ultra40/Config.lb index 908b9774d1..6fedd3a7ed 100644 --- a/src/mainboard/sunw/ultra40/Config.lb +++ b/src/mainboard/sunw/ultra40/Config.lb @@ -16,7 +16,6 @@ object get_bus_conf.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 makerule ./auto.o depends "$(CONFIG_MAINBOARD)/cache_as_ram_auto.c option_table.h" diff --git a/src/mainboard/supermicro/h8dme/Config.lb b/src/mainboard/supermicro/h8dme/Config.lb index 330980514e..b9f14ea4c9 100644 --- a/src/mainboard/supermicro/h8dme/Config.lb +++ b/src/mainboard/supermicro/h8dme/Config.lb @@ -32,7 +32,6 @@ object get_bus_conf.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 makerule ./auto.o diff --git a/src/mainboard/supermicro/h8dmr/Config.lb b/src/mainboard/supermicro/h8dmr/Config.lb index 05f4514ed2..a93c3051c3 100644 --- a/src/mainboard/supermicro/h8dmr/Config.lb +++ b/src/mainboard/supermicro/h8dmr/Config.lb @@ -35,7 +35,6 @@ object get_bus_conf.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 makerule ./auto.o diff --git a/src/mainboard/supermicro/h8dmr_fam10/Config.lb b/src/mainboard/supermicro/h8dmr_fam10/Config.lb index d3d8fa83ac..945662d135 100644 --- a/src/mainboard/supermicro/h8dmr_fam10/Config.lb +++ b/src/mainboard/supermicro/h8dmr_fam10/Config.lb @@ -37,7 +37,6 @@ object get_bus_conf.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 makerule ./auto.o diff --git a/src/mainboard/supermicro/x6dai_g/Config.lb b/src/mainboard/supermicro/x6dai_g/Config.lb index 9f94fb494e..17096f5da4 100644 --- a/src/mainboard/supermicro/x6dai_g/Config.lb +++ b/src/mainboard/supermicro/x6dai_g/Config.lb @@ -20,7 +20,7 @@ arch i386 end 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 diff --git a/src/mainboard/supermicro/x6dai_g/Makefile.inc b/src/mainboard/supermicro/x6dai_g/Makefile.inc index e697040c94..455da185cf 100644 --- a/src/mainboard/supermicro/x6dai_g/Makefile.inc +++ b/src/mainboard/supermicro/x6dai_g/Makefile.inc @@ -19,6 +19,6 @@ ## ROMCCFLAGS=-mcpu=p4 -O2 - +obj-$(CONFIG_HAVE_HARD_RESET) += reset.o include $(src)/mainboard/Makefile.romccboard.inc diff --git a/src/mainboard/supermicro/x6dhe_g/Config.lb b/src/mainboard/supermicro/x6dhe_g/Config.lb index 29ffeba85e..866042b548 100644 --- a/src/mainboard/supermicro/x6dhe_g/Config.lb +++ b/src/mainboard/supermicro/x6dhe_g/Config.lb @@ -19,7 +19,7 @@ arch i386 end 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 diff --git a/src/mainboard/supermicro/x6dhe_g/Makefile.inc b/src/mainboard/supermicro/x6dhe_g/Makefile.inc index e697040c94..455da185cf 100644 --- a/src/mainboard/supermicro/x6dhe_g/Makefile.inc +++ b/src/mainboard/supermicro/x6dhe_g/Makefile.inc @@ -19,6 +19,6 @@ ## ROMCCFLAGS=-mcpu=p4 -O2 - +obj-$(CONFIG_HAVE_HARD_RESET) += reset.o include $(src)/mainboard/Makefile.romccboard.inc diff --git a/src/mainboard/supermicro/x6dhe_g/auto.c b/src/mainboard/supermicro/x6dhe_g/auto.c index 5d80f1e4db..c5725d751f 100644 --- a/src/mainboard/supermicro/x6dhe_g/auto.c +++ b/src/mainboard/supermicro/x6dhe_g/auto.c @@ -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 */ diff --git a/src/mainboard/supermicro/x6dhe_g2/Config.lb b/src/mainboard/supermicro/x6dhe_g2/Config.lb index 19e210530e..11569d9a5b 100644 --- a/src/mainboard/supermicro/x6dhe_g2/Config.lb +++ b/src/mainboard/supermicro/x6dhe_g2/Config.lb @@ -19,7 +19,7 @@ arch i386 end 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 diff --git a/src/mainboard/supermicro/x6dhe_g2/Makefile.inc b/src/mainboard/supermicro/x6dhe_g2/Makefile.inc index e697040c94..455da185cf 100644 --- a/src/mainboard/supermicro/x6dhe_g2/Makefile.inc +++ b/src/mainboard/supermicro/x6dhe_g2/Makefile.inc @@ -19,6 +19,6 @@ ## ROMCCFLAGS=-mcpu=p4 -O2 - +obj-$(CONFIG_HAVE_HARD_RESET) += reset.o include $(src)/mainboard/Makefile.romccboard.inc diff --git a/src/mainboard/supermicro/x6dhe_g2/auto.c b/src/mainboard/supermicro/x6dhe_g2/auto.c index d8eee227b2..d03d29ed91 100644 --- a/src/mainboard/supermicro/x6dhe_g2/auto.c +++ b/src/mainboard/supermicro/x6dhe_g2/auto.c @@ -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 */ diff --git a/src/mainboard/supermicro/x6dhe_g2/auto.updated.c b/src/mainboard/supermicro/x6dhe_g2/auto.updated.c index a9509cd5c5..83180ab83d 100644 --- a/src/mainboard/supermicro/x6dhe_g2/auto.updated.c +++ b/src/mainboard/supermicro/x6dhe_g2/auto.updated.c @@ -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 */ diff --git a/src/mainboard/supermicro/x6dhr_ig/Config.lb b/src/mainboard/supermicro/x6dhr_ig/Config.lb index 8103171028..dc2dd1265f 100644 --- a/src/mainboard/supermicro/x6dhr_ig/Config.lb +++ b/src/mainboard/supermicro/x6dhr_ig/Config.lb @@ -20,7 +20,7 @@ arch i386 end 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 diff --git a/src/mainboard/supermicro/x6dhr_ig/Makefile.inc b/src/mainboard/supermicro/x6dhr_ig/Makefile.inc index e697040c94..455da185cf 100644 --- a/src/mainboard/supermicro/x6dhr_ig/Makefile.inc +++ b/src/mainboard/supermicro/x6dhr_ig/Makefile.inc @@ -19,6 +19,6 @@ ## ROMCCFLAGS=-mcpu=p4 -O2 - +obj-$(CONFIG_HAVE_HARD_RESET) += reset.o include $(src)/mainboard/Makefile.romccboard.inc diff --git a/src/mainboard/supermicro/x6dhr_ig/auto.c b/src/mainboard/supermicro/x6dhr_ig/auto.c index ee2b7717be..1c152ae624 100644 --- a/src/mainboard/supermicro/x6dhr_ig/auto.c +++ b/src/mainboard/supermicro/x6dhr_ig/auto.c @@ -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 */ diff --git a/src/mainboard/supermicro/x6dhr_ig2/Config.lb b/src/mainboard/supermicro/x6dhr_ig2/Config.lb index 5e7b3a300b..9e8ce1427a 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/Config.lb +++ b/src/mainboard/supermicro/x6dhr_ig2/Config.lb @@ -20,7 +20,7 @@ arch i386 end 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 diff --git a/src/mainboard/supermicro/x6dhr_ig2/Makefile.inc b/src/mainboard/supermicro/x6dhr_ig2/Makefile.inc index e697040c94..455da185cf 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/Makefile.inc +++ b/src/mainboard/supermicro/x6dhr_ig2/Makefile.inc @@ -19,6 +19,6 @@ ## ROMCCFLAGS=-mcpu=p4 -O2 - +obj-$(CONFIG_HAVE_HARD_RESET) += reset.o include $(src)/mainboard/Makefile.romccboard.inc diff --git a/src/mainboard/supermicro/x6dhr_ig2/auto.c b/src/mainboard/supermicro/x6dhr_ig2/auto.c index fb5da2a6a8..652c9f518d 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/auto.c +++ b/src/mainboard/supermicro/x6dhr_ig2/auto.c @@ -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 */ diff --git a/src/mainboard/technexion/tim5690/Config.lb b/src/mainboard/technexion/tim5690/Config.lb index 3e69acc0ff..d46aa3ba61 100644 --- a/src/mainboard/technexion/tim5690/Config.lb +++ b/src/mainboard/technexion/tim5690/Config.lb @@ -50,8 +50,6 @@ if CONFIG_GENERATE_ACPI_TABLES object ./dsdt.o end -#object reset.o - if CONFIG_USE_INIT makerule ./cache_as_ram_auto.o diff --git a/src/mainboard/technexion/tim8690/Config.lb b/src/mainboard/technexion/tim8690/Config.lb index 904958fb2d..e69d01df60 100644 --- a/src/mainboard/technexion/tim8690/Config.lb +++ b/src/mainboard/technexion/tim8690/Config.lb @@ -50,8 +50,6 @@ if CONFIG_GENERATE_ACPI_TABLES object ./dsdt.o end -#object reset.o - if CONFIG_USE_INIT makerule ./cache_as_ram_auto.o diff --git a/src/mainboard/technologic/ts5300/Config.lb b/src/mainboard/technologic/ts5300/Config.lb index 28358a39e2..9f9e341784 100644 --- a/src/mainboard/technologic/ts5300/Config.lb +++ b/src/mainboard/technologic/ts5300/Config.lb @@ -17,7 +17,6 @@ arch i386 end driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -# object reset.o ## ## Romcc output diff --git a/src/mainboard/thomson/ip1000/Config.lb b/src/mainboard/thomson/ip1000/Config.lb index a9acf77e74..00c913cfcc 100644 --- a/src/mainboard/thomson/ip1000/Config.lb +++ b/src/mainboard/thomson/ip1000/Config.lb @@ -25,7 +25,6 @@ include /config/nofailovercalculation.lb 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 diff --git a/src/mainboard/tyan/s2735/Config.lb b/src/mainboard/tyan/s2735/Config.lb index c15d0917a3..ae5de634e8 100644 --- a/src/mainboard/tyan/s2735/Config.lb +++ b/src/mainboard/tyan/s2735/Config.lb @@ -12,7 +12,7 @@ arch i386 end 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 diff --git a/src/mainboard/tyan/s2735/Makefile.inc b/src/mainboard/tyan/s2735/Makefile.inc index 3b05dac815..40b008effb 100644 --- a/src/mainboard/tyan/s2735/Makefile.inc +++ b/src/mainboard/tyan/s2735/Makefile.inc @@ -27,6 +27,7 @@ driver-y += mainboard.o 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 diff --git a/src/mainboard/tyan/s2735/cache_as_ram_auto.c b/src/mainboard/tyan/s2735/cache_as_ram_auto.c index 31856fec39..8656d3dd5d 100644 --- a/src/mainboard/tyan/s2735/cache_as_ram_auto.c +++ b/src/mainboard/tyan/s2735/cache_as_ram_auto.c @@ -37,6 +37,7 @@ static void post_code(uint8_t value) { #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 */ diff --git a/src/mainboard/tyan/s2735/reset.c b/src/mainboard/tyan/s2735/reset.c index 4b2ab0daae..bffb0389a8 100644 --- a/src/mainboard/tyan/s2735/reset.c +++ b/src/mainboard/tyan/s2735/reset.c @@ -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(); diff --git a/src/mainboard/tyan/s2891/Config.lb b/src/mainboard/tyan/s2891/Config.lb index 3f051a0da4..53da12bcaf 100644 --- a/src/mainboard/tyan/s2891/Config.lb +++ b/src/mainboard/tyan/s2891/Config.lb @@ -18,7 +18,6 @@ object get_bus_conf.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_GENERATE_ACPI_TABLES object acpi_tables.o diff --git a/src/mainboard/tyan/s2892/Config.lb b/src/mainboard/tyan/s2892/Config.lb index 9dcb7dae55..35328e5446 100644 --- a/src/mainboard/tyan/s2892/Config.lb +++ b/src/mainboard/tyan/s2892/Config.lb @@ -19,7 +19,6 @@ object get_bus_conf.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_GENERATE_ACPI_TABLES object acpi_tables.o diff --git a/src/mainboard/tyan/s2895/Config.lb b/src/mainboard/tyan/s2895/Config.lb index c4f24f4e8d..e4946de971 100644 --- a/src/mainboard/tyan/s2895/Config.lb +++ b/src/mainboard/tyan/s2895/Config.lb @@ -14,7 +14,6 @@ object get_bus_conf.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_GENERATE_ACPI_TABLES object acpi_tables.o diff --git a/src/mainboard/tyan/s2912/Config.lb b/src/mainboard/tyan/s2912/Config.lb index a52a70b235..08f824b347 100644 --- a/src/mainboard/tyan/s2912/Config.lb +++ b/src/mainboard/tyan/s2912/Config.lb @@ -35,7 +35,6 @@ object get_bus_conf.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 makerule ./cache_as_ram_auto.o diff --git a/src/mainboard/tyan/s2912_fam10/Config.lb b/src/mainboard/tyan/s2912_fam10/Config.lb index 84f6d1cde5..799931c521 100644 --- a/src/mainboard/tyan/s2912_fam10/Config.lb +++ b/src/mainboard/tyan/s2912_fam10/Config.lb @@ -35,7 +35,6 @@ object get_bus_conf.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 makerule ./cache_as_ram_auto.o diff --git a/src/mainboard/via/epia-m/Config.lb b/src/mainboard/via/epia-m/Config.lb index d6924bd782..011ce5ad24 100644 --- a/src/mainboard/via/epia-m/Config.lb +++ b/src/mainboard/via/epia-m/Config.lb @@ -15,7 +15,6 @@ arch i386 end driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o object vgabios.o if CONFIG_GENERATE_ACPI_TABLES diff --git a/src/mainboard/via/epia/Config.lb b/src/mainboard/via/epia/Config.lb index d32b39b982..fdde8b3116 100644 --- a/src/mainboard/via/epia/Config.lb +++ b/src/mainboard/via/epia/Config.lb @@ -14,7 +14,6 @@ arch i386 end driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o ## ## Romcc output diff --git a/src/mainboard/via/vt8454c/reset.c b/src/mainboard/via/vt8454c/reset.c deleted file mode 100644 index e1d879fa5a..0000000000 --- a/src/mainboard/via/vt8454c/reset.c +++ /dev/null @@ -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); -} |