[LinuxBIOS] r440 - in LinuxBIOSv3: . northbridge northbridge/amd northbridge/amd/geodelx northbridge/intel northbridge/intel/i440bxemulation southbridge southbridge/amd southbridge/amd/cs5536 southbridge/intel southbridge/intel/i82371eb superio superio/winbond superio/winbond/w83627hf

Author: uwe
Date: 2007-07-10 14:14:36 +0200 (Tue, 10 Jul 2007)
New Revision: 440

Removed:
   LinuxBIOSv3/northbridge/Makefile
   LinuxBIOSv3/northbridge/amd/Makefile
   LinuxBIOSv3/northbridge/intel/Makefile
   LinuxBIOSv3/southbridge/Makefile
   LinuxBIOSv3/southbridge/amd/Makefile
   LinuxBIOSv3/southbridge/intel/Makefile
   LinuxBIOSv3/superio/Makefile
   LinuxBIOSv3/superio/winbond/Makefile
Modified:
   LinuxBIOSv3/Makefile
   LinuxBIOSv3/northbridge/amd/geodelx/Makefile
   LinuxBIOSv3/northbridge/intel/i440bxemulation/Makefile
   LinuxBIOSv3/southbridge/amd/cs5536/Makefile
   LinuxBIOSv3/southbridge/intel/i82371eb/Makefile
   LinuxBIOSv3/superio/winbond/w83627hf/Makefile
Log:
Drop a bunch of almost-empty Makefiles which are of no real use.

Instead unconditionally include _all_ northbridge/southbridge/superio
Makefiles, but put 'ifeq's in each of them to guard against including
unwanted contents.

This may sound like it's very slow when there are many Makefiles, but in
practice the speed difference is neglectable. A few ad hoc tests I did
showed no measurable speed differences at all (I used 30 or 40 sample
Makefiles).

Signed-off-by: Uwe Hermann 
Acked-by: Stefan Reinauer

Modified: LinuxBIOSv3/Makefile
===================================================================
--- LinuxBIOSv3/Makefile	2007-07-08 00:19:26 UTC (rev 439)
+++ LinuxBIOSv3/Makefile	2007-07-10 12:14:36 UTC (rev 440)
@@ -109,9 +109,9 @@
 include lib/Makefile
 include device/Makefile
 include mainboard/$(MAINBOARDDIR)/Makefile
-include northbridge/Makefile
-include southbridge/Makefile
-include superio/Makefile
+include northbridge/*/*/Makefile
+include southbridge/*/*/Makefile
+include superio/*/*/Makefile
 include arch/$(ARCH)/Makefile

endif

Deleted: LinuxBIOSv3/northbridge/Makefile
===================================================================
--- LinuxBIOSv3/northbridge/Makefile	2007-07-08 00:19:26 UTC (rev 439)
+++ LinuxBIOSv3/northbridge/Makefile	2007-07-10 12:14:36 UTC (rev 440)
@@ -1,24 +0,0 @@
-##
-## This file is part of the LinuxBIOS project.
-##
-## Copyright (C) 2007 coresystems GmbH
-## (Written by Stefan Reinauer  for 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; 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
-##
-
-include $(src)/northbridge/amd/Makefile
-include $(src)/northbridge/intel/Makefile
-

Deleted: LinuxBIOSv3/northbridge/amd/Makefile
===================================================================
--- LinuxBIOSv3/northbridge/amd/Makefile	2007-07-08 00:19:26 UTC (rev 439)
+++ LinuxBIOSv3/northbridge/amd/Makefile	2007-07-10 12:14:36 UTC (rev 440)
@@ -1,25 +0,0 @@
-##
-## This file is part of the LinuxBIOS project.
-##
-## Copyright (C) 2007 coresystems GmbH
-## (Written by Stefan Reinauer  for 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; 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
-##
-
-ifeq ($(CONFIG_NORTHBRIDGE_AMD_GEODELX),y)
-	include $(src)/northbridge/amd/geodelx/Makefile
-endif
-

Modified: LinuxBIOSv3/northbridge/amd/geodelx/Makefile
===================================================================
--- LinuxBIOSv3/northbridge/amd/geodelx/Makefile	2007-07-08 00:19:26 UTC (rev 439)
+++ LinuxBIOSv3/northbridge/amd/geodelx/Makefile	2007-07-10 12:14:36 UTC (rev 440)
@@ -19,10 +19,15 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

-STAGE2_CHIPSET_OBJ += $(obj)/northbridge/amd/geodelx/geodelx.o $(obj)/northbridge/amd/geodelx/geodelxinit.o
+ifeq ($(CONFIG_NORTHBRIDGE_AMD_GEODELX),y)

-$(obj)/northbridge/amd/geodelx/%.o: $(src)/northbridge/amd/geodelx/%.c $(obj)/statictree.h
+STAGE2_CHIPSET_OBJ += $(obj)/northbridge/amd/geodelx/geodelx.o \
+		      $(obj)/northbridge/amd/geodelx/geodelxinit.o
+
+$(obj)/northbridge/amd/geodelx/%.o: $(src)/northbridge/amd/geodelx/%.c \
+				    $(obj)/statictree.h
    $(Q)mkdir -p $(obj)/northbridge/amd/geodelx
    $(Q)printf "  CC      $(subst $(shell pwd)/,,$(@))\n"
    $(Q)$(CC) $(INITCFLAGS) -c $< -o $@

+endif

Deleted: LinuxBIOSv3/northbridge/intel/Makefile
===================================================================
--- LinuxBIOSv3/northbridge/intel/Makefile	2007-07-08 00:19:26 UTC (rev 439)
+++ LinuxBIOSv3/northbridge/intel/Makefile	2007-07-10 12:14:36 UTC (rev 440)
@@ -1,25 +0,0 @@
-##
-## This file is part of the LinuxBIOS project.
-##
-## Copyright (C) 2007 coresystems GmbH
-## (Written by Stefan Reinauer  for 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; 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
-##
-
-ifeq ($(CONFIG_NORTHBRIDGE_INTEL_I440BXEMULATION),y)
-	include $(src)/northbridge/intel/i440bxemulation/Makefile
-endif
-

Modified: LinuxBIOSv3/northbridge/intel/i440bxemulation/Makefile
===================================================================
--- LinuxBIOSv3/northbridge/intel/i440bxemulation/Makefile	2007-07-08 00:19:26 UTC (rev 439)
+++ LinuxBIOSv3/northbridge/intel/i440bxemulation/Makefile	2007-07-10 12:14:36 UTC (rev 440)
@@ -19,6 +19,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+ifeq ($(CONFIG_NORTHBRIDGE_INTEL_I440BXEMULATION),y)
+
 STAGE2_CHIPSET_OBJ += $(obj)/northbridge/intel/i440bxemulation/i440bx.o

$(obj)/northbridge/intel/i440bxemulation/%.o: $(src)/northbridge/intel/i440bxemulation/%.c $(obj)/statictree.h
@@ -26,3 +28,4 @@
    $(Q)printf "  CC      $(subst $(shell pwd)/,,$(@))\n"
    $(Q)$(CC) $(INITCFLAGS) -c $< -o $@

+endif

Deleted: LinuxBIOSv3/southbridge/Makefile
===================================================================
--- LinuxBIOSv3/southbridge/Makefile	2007-07-08 00:19:26 UTC (rev 439)
+++ LinuxBIOSv3/southbridge/Makefile	2007-07-10 12:14:36 UTC (rev 440)
@@ -1,24 +0,0 @@
-##
-## This file is part of the LinuxBIOS project.
-##
-## Copyright (C) 2007 coresystems GmbH
-## (Written by Stefan Reinauer  for 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; 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
-##
-
-include $(src)/southbridge/amd/Makefile
-include $(src)/southbridge/intel/Makefile
-

Deleted: LinuxBIOSv3/southbridge/amd/Makefile
===================================================================
--- LinuxBIOSv3/southbridge/amd/Makefile	2007-07-08 00:19:26 UTC (rev 439)
+++ LinuxBIOSv3/southbridge/amd/Makefile	2007-07-10 12:14:36 UTC (rev 440)
@@ -1,26 +0,0 @@
-##
-## This file is part of the LinuxBIOS project.
-##
-## Copyright (C) 2007 coresystems GmbH
-## (Written by Stefan Reinauer  for 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; 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
-##
-
-# One entry like the below for each supported AMD southbridge.
-ifeq ($(CONFIG_SOUTHBRIDGE_AMD_CS5536),y)
-	include $(src)/southbridge/amd/cs5536/Makefile
-endif
-

Modified: LinuxBIOSv3/southbridge/amd/cs5536/Makefile
===================================================================
--- LinuxBIOSv3/southbridge/amd/cs5536/Makefile	2007-07-08 00:19:26 UTC (rev 439)
+++ LinuxBIOSv3/southbridge/amd/cs5536/Makefile	2007-07-10 12:14:36 UTC (rev 440)
@@ -19,10 +19,14 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+ifeq ($(CONFIG_SOUTHBRIDGE_AMD_CS5536),y)
+
 STAGE2_CHIPSET_OBJ += $(obj)/southbridge/amd/cs5536/cs5536.o

-$(obj)/southbridge/amd/cs5536/%.o: $(src)/southbridge/amd/cs5536/%.c $(obj)/statictree.h
+$(obj)/southbridge/amd/cs5536/%.o: $(src)/southbridge/amd/cs5536/%.c \
+				   $(obj)/statictree.h
    $(Q)mkdir -p $(obj)/southbridge/amd/cs5536/
    $(Q)printf "  CC      $(subst $(shell pwd)/,,$(@))\n"
    $(Q)$(CC) $(INITCFLAGS) -c $< -o $@

+endif

Deleted: LinuxBIOSv3/southbridge/intel/Makefile
===================================================================
--- LinuxBIOSv3/southbridge/intel/Makefile	2007-07-08 00:19:26 UTC (rev 439)
+++ LinuxBIOSv3/southbridge/intel/Makefile	2007-07-10 12:14:36 UTC (rev 440)
@@ -1,26 +0,0 @@
-##
-## This file is part of the LinuxBIOS project.
-##
-## Copyright (C) 2007 coresystems GmbH
-## (Written by Stefan Reinauer  for 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; 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
-##
-
-# One entry like the below for each supported Intel southbridge.
-ifeq ($(CONFIG_SOUTHBRIDGE_INTEL_I82371EB),y)
-	include $(src)/southbridge/intel/i82371eb/Makefile
-endif
-

Modified: LinuxBIOSv3/southbridge/intel/i82371eb/Makefile
===================================================================
--- LinuxBIOSv3/southbridge/intel/i82371eb/Makefile	2007-07-08 00:19:26 UTC (rev 439)
+++ LinuxBIOSv3/southbridge/intel/i82371eb/Makefile	2007-07-10 12:14:36 UTC (rev 440)
@@ -18,10 +18,14 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+ifeq ($(CONFIG_SOUTHBRIDGE_INTEL_I82371EB),y)
+
 STAGE2_CHIPSET_OBJ += $(obj)/southbridge/intel/i82371eb/i82371eb.o

-$(obj)/southbridge/intel/i82371eb/%.o: $(src)/southbridge/intel/i82371eb/%.c $(obj)/statictree.h
+$(obj)/southbridge/intel/i82371eb/%.o: $(src)/southbridge/intel/i82371eb/%.c \
+				       $(obj)/statictree.h
    $(Q)mkdir -p $(obj)/southbridge/intel/i82371eb/
    $(Q)printf "  CC      $(subst $(shell pwd)/,,$(@))\n"
    $(Q)$(CC) $(INITCFLAGS) -c $< -o $@

+endif

Deleted: LinuxBIOSv3/superio/Makefile
===================================================================
--- LinuxBIOSv3/superio/Makefile	2007-07-08 00:19:26 UTC (rev 439)
+++ LinuxBIOSv3/superio/Makefile	2007-07-10 12:14:36 UTC (rev 440)
@@ -1,23 +0,0 @@
-##
-## This file is part of the LinuxBIOS project.
-##
-## Copyright (C) 2007 coresystems GmbH
-## (Written by Stefan Reinauer  for 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; 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
-##
-
-include $(src)/superio/winbond/Makefile
-

Deleted: LinuxBIOSv3/superio/winbond/Makefile
===================================================================
--- LinuxBIOSv3/superio/winbond/Makefile	2007-07-08 00:19:26 UTC (rev 439)
+++ LinuxBIOSv3/superio/winbond/Makefile	2007-07-10 12:14:36 UTC (rev 440)
@@ -1,25 +0,0 @@
-##
-## This file is part of the LinuxBIOS project.
-##
-## Copyright (C) 2007 coresystems GmbH
-## (Written by Stefan Reinauer  for 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; 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
-##
-
-ifeq ($(CONFIG_SUPERIO_WINBOND_W83627HF),y)
-	include $(src)/superio/winbond/w83627hf/Makefile
-endif
-

Modified: LinuxBIOSv3/superio/winbond/w83627hf/Makefile
===================================================================
--- LinuxBIOSv3/superio/winbond/w83627hf/Makefile	2007-07-08 00:19:26 UTC (rev 439)
+++ LinuxBIOSv3/superio/winbond/w83627hf/Makefile	2007-07-10 12:14:36 UTC (rev 440)
@@ -19,6 +19,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+ifeq ($(CONFIG_SUPERIO_WINBOND_W83627HF),y)
+
 # Always add to variables, as there could be more than one Super I/O.
 STAGE2_CHIPSET_OBJ += $(obj)/superio/winbond/w83627hf/superio.o

@@ -27,3 +29,4 @@
    $(Q)printf "  CC      $(subst $(shell pwd)/,,$(@))\n"
    $(Q)$(CC) $(INITCFLAGS) -c $< -o $@

+endif