From 8463dd9db0dc2ce02423775d0eb62e28aa01e9f9 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Thu, 30 Sep 2010 16:55:02 +0000 Subject: Rename build system variables to be more intuitive, and at the same time let the user specify sources instead of object files: - objs becomes ramstage-srcs - initobjs becomes romstage-srcs - driver becomes driver-srcs - smmobj becomes smm-srcs The user servicable parts are named accordingly: ramstage-y, romstage-y, driver-y, smm-y Also, the object file names are properly renamed now, using .ramstage.o, .romstage.o, .driver.o, .smm.o suffixes consistently. Remove stubbed out via/epia-m700 dsdt/ssdt files - they didn't easily fit in the build system and aren't useful anyway. Signed-off-by: Patrick Georgi Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5886 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/amd/serengeti_cheetah/Makefile.inc | 2 +- .../amd/serengeti_cheetah_fam10/Makefile.inc | 2 +- src/mainboard/broadcom/blast/Makefile.inc | 2 +- src/mainboard/emulation/qemu-x86/Makefile.inc | 2 +- src/mainboard/getac/p470/Makefile.inc | 6 +++--- src/mainboard/gigabyte/m57sli/Makefile.inc | 2 +- src/mainboard/hp/dl145_g1/Makefile.inc | 2 +- src/mainboard/ibase/mb899/Makefile.inc | 4 ++-- src/mainboard/intel/d945gclf/Makefile.inc | 4 ++-- src/mainboard/kontron/986lcd-m/Makefile.inc | 4 ++-- src/mainboard/msi/ms9282/Makefile.inc | 4 ++-- src/mainboard/rca/rm4100/Makefile.inc | 2 +- src/mainboard/roda/rk886ex/Makefile.inc | 8 ++++---- src/mainboard/supermicro/h8dme/Makefile.inc | 2 +- src/mainboard/supermicro/x6dhe_g/Makefile.inc | 2 +- src/mainboard/supermicro/x6dhe_g2/Makefile.inc | 2 +- src/mainboard/technexion/tim5690/Makefile.inc | 6 +++--- src/mainboard/thomson/ip1000/Makefile.inc | 2 +- src/mainboard/tyan/s2881/Makefile.inc | 2 +- src/mainboard/tyan/s2892/Makefile.inc | 2 +- src/mainboard/via/epia-m700/Kconfig | 1 - src/mainboard/via/epia-m700/Makefile.inc | 2 +- src/mainboard/via/epia-m700/dsdt.c | 24 ---------------------- src/mainboard/via/epia-m700/ssdt.c | 24 ---------------------- 24 files changed, 32 insertions(+), 81 deletions(-) delete mode 100644 src/mainboard/via/epia-m700/dsdt.c delete mode 100644 src/mainboard/via/epia-m700/ssdt.c (limited to 'src/mainboard') diff --git a/src/mainboard/amd/serengeti_cheetah/Makefile.inc b/src/mainboard/amd/serengeti_cheetah/Makefile.inc index 8f4424e622..b8cdba5a94 100644 --- a/src/mainboard/amd/serengeti_cheetah/Makefile.inc +++ b/src/mainboard/amd/serengeti_cheetah/Makefile.inc @@ -17,4 +17,4 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-y += ../../../drivers/i2c/i2cmux/i2cmux.o +ramstage-y += ../../../drivers/i2c/i2cmux/i2cmux.c diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc b/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc index 78e805d268..70b429d9e6 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc +++ b/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc @@ -17,4 +17,4 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o +ramstage-y += ../../../drivers/i2c/i2cmux2/i2cmux2.c diff --git a/src/mainboard/broadcom/blast/Makefile.inc b/src/mainboard/broadcom/blast/Makefile.inc index 76c3bf16d8..9e76151ebc 100644 --- a/src/mainboard/broadcom/blast/Makefile.inc +++ b/src/mainboard/broadcom/blast/Makefile.inc @@ -1,4 +1,4 @@ # Needed by irq_tables and mptable and acpi_tables. -obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o +ramstage-y += ../../../drivers/i2c/i2cmux2/i2cmux2.c diff --git a/src/mainboard/emulation/qemu-x86/Makefile.inc b/src/mainboard/emulation/qemu-x86/Makefile.inc index 20ca9771ab..5ba0d144d4 100644 --- a/src/mainboard/emulation/qemu-x86/Makefile.inc +++ b/src/mainboard/emulation/qemu-x86/Makefile.inc @@ -1,3 +1,3 @@ ROMCCFLAGS := -mcpu=i386 -O -obj-y += northbridge.o +ramstage-y += northbridge.c diff --git a/src/mainboard/getac/p470/Makefile.inc b/src/mainboard/getac/p470/Makefile.inc index fd280d75ee..3b90bf8b7c 100644 --- a/src/mainboard/getac/p470/Makefile.inc +++ b/src/mainboard/getac/p470/Makefile.inc @@ -17,7 +17,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += rtl8168.o -obj-$(CONFIG_HAVE_ACPI_SLIC) += acpi_slic.o +driver-y += rtl8168.c +ramstage-$(CONFIG_HAVE_ACPI_SLIC) += acpi_slic.c -smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o +smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c diff --git a/src/mainboard/gigabyte/m57sli/Makefile.inc b/src/mainboard/gigabyte/m57sli/Makefile.inc index 36be8066fa..2329bbd70f 100644 --- a/src/mainboard/gigabyte/m57sli/Makefile.inc +++ b/src/mainboard/gigabyte/m57sli/Makefile.inc @@ -17,4 +17,4 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-$(CONFIG_SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL) += fanctl.o +ramstage-$(CONFIG_SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL) += fanctl.c diff --git a/src/mainboard/hp/dl145_g1/Makefile.inc b/src/mainboard/hp/dl145_g1/Makefile.inc index f3c44cf415..d3097a13ea 100644 --- a/src/mainboard/hp/dl145_g1/Makefile.inc +++ b/src/mainboard/hp/dl145_g1/Makefile.inc @@ -1 +1 @@ -obj-y += ../../../drivers/i2c/i2cmux/i2cmux.o \ No newline at end of file +ramstage-y += ../../../drivers/i2c/i2cmux/i2cmux.c \ No newline at end of file diff --git a/src/mainboard/ibase/mb899/Makefile.inc b/src/mainboard/ibase/mb899/Makefile.inc index b6a23660c8..0d229275c7 100644 --- a/src/mainboard/ibase/mb899/Makefile.inc +++ b/src/mainboard/ibase/mb899/Makefile.inc @@ -17,6 +17,6 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-y += rtl8168.o +ramstage-y += rtl8168.c -smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o +smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c diff --git a/src/mainboard/intel/d945gclf/Makefile.inc b/src/mainboard/intel/d945gclf/Makefile.inc index 4c6642f003..eb0139931f 100644 --- a/src/mainboard/intel/d945gclf/Makefile.inc +++ b/src/mainboard/intel/d945gclf/Makefile.inc @@ -17,6 +17,6 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += rtl8168.o +driver-y += rtl8168.c -smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o +smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c diff --git a/src/mainboard/kontron/986lcd-m/Makefile.inc b/src/mainboard/kontron/986lcd-m/Makefile.inc index 591d064848..8ca1aeb792 100644 --- a/src/mainboard/kontron/986lcd-m/Makefile.inc +++ b/src/mainboard/kontron/986lcd-m/Makefile.inc @@ -17,6 +17,6 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += rtl8168.o +driver-y += rtl8168.c -smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o +smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c diff --git a/src/mainboard/msi/ms9282/Makefile.inc b/src/mainboard/msi/ms9282/Makefile.inc index e94ce3fd0e..e8d9af1b7f 100644 --- a/src/mainboard/msi/ms9282/Makefile.inc +++ b/src/mainboard/msi/ms9282/Makefile.inc @@ -18,6 +18,6 @@ ## # FIXME drivers should be selected through Kconfig -obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o -obj-y += ../../../drivers/i2c/adm1027/adm1027.o +ramstage-y += ../../../drivers/i2c/i2cmux2/i2cmux2.c +ramstage-y += ../../../drivers/i2c/adm1027/adm1027.c diff --git a/src/mainboard/rca/rm4100/Makefile.inc b/src/mainboard/rca/rm4100/Makefile.inc index 6c034c0e1f..3a3371a19c 100644 --- a/src/mainboard/rca/rm4100/Makefile.inc +++ b/src/mainboard/rca/rm4100/Makefile.inc @@ -1,2 +1,2 @@ -smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o +smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c diff --git a/src/mainboard/roda/rk886ex/Makefile.inc b/src/mainboard/roda/rk886ex/Makefile.inc index f92043d7ab..e36824cce1 100644 --- a/src/mainboard/roda/rk886ex/Makefile.inc +++ b/src/mainboard/roda/rk886ex/Makefile.inc @@ -17,8 +17,8 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-y += m3885.o -obj-y += ec.o -driver-y += rtl8168.o +ramstage-y += m3885.c +ramstage-y += ec.c +driver-y += rtl8168.c -smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o +smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c diff --git a/src/mainboard/supermicro/h8dme/Makefile.inc b/src/mainboard/supermicro/h8dme/Makefile.inc index 132161309d..765096de91 100644 --- a/src/mainboard/supermicro/h8dme/Makefile.inc +++ b/src/mainboard/supermicro/h8dme/Makefile.inc @@ -17,6 +17,6 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o +ramstage-y += ../../../drivers/i2c/i2cmux2/i2cmux2.c # Needed by irq_tables and mptable and acpi_tables. diff --git a/src/mainboard/supermicro/x6dhe_g/Makefile.inc b/src/mainboard/supermicro/x6dhe_g/Makefile.inc index 3c5bdbde53..30eacbd955 100644 --- a/src/mainboard/supermicro/x6dhe_g/Makefile.inc +++ b/src/mainboard/supermicro/x6dhe_g/Makefile.inc @@ -19,4 +19,4 @@ ## ROMCCFLAGS=-mcpu=p4 -O2 -obj-y += ../../../drivers/generic/debug/debug_dev.o +ramstage-y += ../../../drivers/generic/debug/debug_dev.c diff --git a/src/mainboard/supermicro/x6dhe_g2/Makefile.inc b/src/mainboard/supermicro/x6dhe_g2/Makefile.inc index 3c5bdbde53..30eacbd955 100644 --- a/src/mainboard/supermicro/x6dhe_g2/Makefile.inc +++ b/src/mainboard/supermicro/x6dhe_g2/Makefile.inc @@ -19,4 +19,4 @@ ## ROMCCFLAGS=-mcpu=p4 -O2 -obj-y += ../../../drivers/generic/debug/debug_dev.o +ramstage-y += ../../../drivers/generic/debug/debug_dev.c diff --git a/src/mainboard/technexion/tim5690/Makefile.inc b/src/mainboard/technexion/tim5690/Makefile.inc index cc78a0000b..d9e804645f 100644 --- a/src/mainboard/technexion/tim5690/Makefile.inc +++ b/src/mainboard/technexion/tim5690/Makefile.inc @@ -20,7 +20,7 @@ # Needed by irq_tables and mptable and acpi_tables. # This is debug message for products of Technexion. -obj-y += tn_post_code.o +ramstage-y += tn_post_code.c -obj-y += speaker.o -obj-y += vgabios.o +ramstage-y += speaker.c +ramstage-y += vgabios.c diff --git a/src/mainboard/thomson/ip1000/Makefile.inc b/src/mainboard/thomson/ip1000/Makefile.inc index 6c034c0e1f..3a3371a19c 100644 --- a/src/mainboard/thomson/ip1000/Makefile.inc +++ b/src/mainboard/thomson/ip1000/Makefile.inc @@ -1,2 +1,2 @@ -smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o +smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c diff --git a/src/mainboard/tyan/s2881/Makefile.inc b/src/mainboard/tyan/s2881/Makefile.inc index 31bfe0fecf..1de4a6c49c 100644 --- a/src/mainboard/tyan/s2881/Makefile.inc +++ b/src/mainboard/tyan/s2881/Makefile.inc @@ -1 +1 @@ -obj-y += ../../../drivers/i2c/adt7463/adt7463.o +ramstage-y += ../../../drivers/i2c/adt7463/adt7463.c diff --git a/src/mainboard/tyan/s2892/Makefile.inc b/src/mainboard/tyan/s2892/Makefile.inc index 3094c13658..c371ad0d2d 100644 --- a/src/mainboard/tyan/s2892/Makefile.inc +++ b/src/mainboard/tyan/s2892/Makefile.inc @@ -1,2 +1,2 @@ -obj-y += ../../../drivers/i2c/adm1027/adm1027.o +ramstage-y += ../../../drivers/i2c/adm1027/adm1027.c diff --git a/src/mainboard/via/epia-m700/Kconfig b/src/mainboard/via/epia-m700/Kconfig index 89434edd05..a633b2efae 100644 --- a/src/mainboard/via/epia-m700/Kconfig +++ b/src/mainboard/via/epia-m700/Kconfig @@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SUPERIO_WINBOND_W83697HF select BOARD_HAS_FADT select HAVE_OPTION_TABLE - select HAVE_ACPI_TABLES select BOARD_ROMSIZE_KB_512 config MAINBOARD_DIR diff --git a/src/mainboard/via/epia-m700/Makefile.inc b/src/mainboard/via/epia-m700/Makefile.inc index 761c07a300..0308491b88 100644 --- a/src/mainboard/via/epia-m700/Makefile.inc +++ b/src/mainboard/via/epia-m700/Makefile.inc @@ -22,5 +22,5 @@ # This code is unused and should be replaced by the generic resume code # completely. If anyone works on wakeup for this chipset/board, delete # wakeup.c when you are done. -# obj-y += wakeup.o +# ramstage-y += wakeup.c diff --git a/src/mainboard/via/epia-m700/dsdt.c b/src/mainboard/via/epia-m700/dsdt.c deleted file mode 100644 index 953e1f3ee8..0000000000 --- a/src/mainboard/via/epia-m700/dsdt.c +++ /dev/null @@ -1,24 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2009 One Laptop per Child, Association, Inc. - * - * 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; either version 2 of the License, or - * (at your option) any later version. - * - * 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 - */ - -unsigned char AmlCode_dsdt[] = { - 0x44, 0x53, 0x44, 0x54, 0x0F, 0x3C, 0x00, 0x00, - /* Removed for lincense issue. See get_dsdt script. */ -}; diff --git a/src/mainboard/via/epia-m700/ssdt.c b/src/mainboard/via/epia-m700/ssdt.c deleted file mode 100644 index 7c1e087a3d..0000000000 --- a/src/mainboard/via/epia-m700/ssdt.c +++ /dev/null @@ -1,24 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2009 One Laptop per Child, Association, Inc. - * - * 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; either version 2 of the License, or - * (at your option) any later version. - * - * 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 - */ - -unsigned char AmlCode_ssdt[] = { - 0x53, 0x53, 0x44, 0x54, 0xA7, 0x01, 0x00, 0x00, - /* Removed for licese issue. */ -}; -- cgit v1.2.3