diff options
| author | - supermicro/x6dhe_g/auto.c <- supermicro/x6dhe_g/auto.c> | 2009-10-24 19:17:24 +0000 |
|---|---|---|
| committer | Uwe Hermann <uwe@hermann-uwe.de> | 2009-10-24 19:17:24 +0000 |
| commit | d1327ce9639645f84024ddd66d2b11f57619d8e6 (patch) | |
| tree | 3cc499edbe6fc9a91235f466514f34485bfd68b3 /src/mainboard/intel | |
| parent | 8d2ddff011700744d2374a95f8c807dbdfb85603 (diff) | |
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 <uwe@hermann-uwe.de>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4849 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/intel')
| -rw-r--r-- | src/mainboard/intel/eagleheights/Config.lb | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/eagleheights/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/jarrell/Config.lb | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/jarrell/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/xe7501devkit/Config.lb | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/xe7501devkit/Makefile.inc | 1 |
6 files changed, 6 insertions, 5 deletions
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 |