From f67f7f1c33aee1535d2633f9b0da66bf7a8cd26d Mon Sep 17 00:00:00 2001
From: Stefan Reinauer <stefan.reinauer@coreboot.org>
Date: Sat, 7 Nov 2009 00:08:22 +0000
Subject: [PATCH] Some operating systems, such as Windows and Mac OS X use case
 insensitive filesystems per default. On those systems checking out coreboot
 v1 would fail because in src/arch/<ARCH> there's a file Config and a
 directory config.

I renamed the directory to init. The name is not good, but it's the same name
that is used for those files in v2.

Also change __FUNCTION__ to __func__ and print it via %s so that I could test
my changes by building the v1 Epia target on an OpenSUSE 11.1

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
---
 src/arch/alpha/{config => init}/crt0.base     | 0
 src/arch/alpha/{config => init}/ldscript.base | 0
 src/arch/alpha/{config => init}/make.base     | 2 +-
 src/arch/i386/{config => init}/crt0.base      | 0
 src/arch/i386/{config => init}/ldscript.base  | 0
 src/arch/i386/{config => init}/make.base      | 2 +-
 src/arch/ppc/{config => init}/crt0.base       | 0
 src/arch/ppc/{config => init}/ldscript.base   | 0
 src/arch/ppc/{config => init}/make.base       | 2 +-
 src/config/Config                             | 2 +-
 src/lib/clog2.c                               | 4 ++--
 util/config/NLBConfig.py                      | 6 +++---
 12 files changed, 9 insertions(+), 9 deletions(-)
 rename src/arch/alpha/{config => init}/crt0.base (100%)
 rename src/arch/alpha/{config => init}/ldscript.base (100%)
 rename src/arch/alpha/{config => init}/make.base (91%)
 rename src/arch/i386/{config => init}/crt0.base (100%)
 rename src/arch/i386/{config => init}/ldscript.base (100%)
 rename src/arch/i386/{config => init}/make.base (97%)
 rename src/arch/ppc/{config => init}/crt0.base (100%)
 rename src/arch/ppc/{config => init}/ldscript.base (100%)
 rename src/arch/ppc/{config => init}/make.base (97%)

diff --git a/src/arch/alpha/config/crt0.base b/src/arch/alpha/init/crt0.base
similarity index 100%
rename from src/arch/alpha/config/crt0.base
rename to src/arch/alpha/init/crt0.base
diff --git a/src/arch/alpha/config/ldscript.base b/src/arch/alpha/init/ldscript.base
similarity index 100%
rename from src/arch/alpha/config/ldscript.base
rename to src/arch/alpha/init/ldscript.base
diff --git a/src/arch/alpha/config/make.base b/src/arch/alpha/init/make.base
similarity index 91%
rename from src/arch/alpha/config/make.base
rename to src/arch/alpha/init/make.base
index a7c2be044e..da422a94f8 100644
--- a/src/arch/alpha/config/make.base
+++ b/src/arch/alpha/init/make.base
@@ -2,7 +2,7 @@ biosbase 0
 rambase 0x8000
 
 option USE_DEFAULT_LAYOUT=1
-ldscript arch/alpha/config/ldscript.base USE_DEFAULT_LAYOUT
+ldscript arch/alpha/init/ldscript.base USE_DEFAULT_LAYOUT
 
 option MAX_CPUS=1
 
diff --git a/src/arch/i386/config/crt0.base b/src/arch/i386/init/crt0.base
similarity index 100%
rename from src/arch/i386/config/crt0.base
rename to src/arch/i386/init/crt0.base
diff --git a/src/arch/i386/config/ldscript.base b/src/arch/i386/init/ldscript.base
similarity index 100%
rename from src/arch/i386/config/ldscript.base
rename to src/arch/i386/init/ldscript.base
diff --git a/src/arch/i386/config/make.base b/src/arch/i386/init/make.base
similarity index 97%
rename from src/arch/i386/config/make.base
rename to src/arch/i386/init/make.base
index 66e9eb858c..7858e5585d 100644
--- a/src/arch/i386/config/make.base
+++ b/src/arch/i386/init/make.base
@@ -13,7 +13,7 @@ option STACK_SIZE=0x2000
 # By default on x86 we have a memory hole between 640K and 1MB
 option MEMORY_HOLE=1
 
-ldscript arch/i386/config/ldscript.base
+ldscript arch/i386/init/ldscript.base
 
 # How do I add -mprefered-stack-boundary=2 if the compiler supports it?
 # On x86 tt results in a code size reduction.
diff --git a/src/arch/ppc/config/crt0.base b/src/arch/ppc/init/crt0.base
similarity index 100%
rename from src/arch/ppc/config/crt0.base
rename to src/arch/ppc/init/crt0.base
diff --git a/src/arch/ppc/config/ldscript.base b/src/arch/ppc/init/ldscript.base
similarity index 100%
rename from src/arch/ppc/config/ldscript.base
rename to src/arch/ppc/init/ldscript.base
diff --git a/src/arch/ppc/config/make.base b/src/arch/ppc/init/make.base
similarity index 97%
rename from src/arch/ppc/config/make.base
rename to src/arch/ppc/init/make.base
index 4e17cb5c5c..712e000bd0 100644
--- a/src/arch/ppc/config/make.base
+++ b/src/arch/ppc/init/make.base
@@ -5,7 +5,7 @@ option HEAP_SIZE=0x40000
 # Reserve 8K for each stack
 option STACK_SIZE=0x2000
 
-ldscript arch/ppc/config/ldscript.base
+ldscript arch/ppc/init/ldscript.base
 
 dir /src/config
 
diff --git a/src/config/Config b/src/config/Config
index 30c55d9844..32dc506751 100644
--- a/src/config/Config
+++ b/src/config/Config
@@ -55,7 +55,7 @@ addaction linuxbios $(CROSS_COMPILE)nm -n linuxbios | sort > linuxbios.map
 makerule linuxbios.a : $(OBJECTS-1) ; rm -f linuxbios.a
 addaction linuxbios.a ar cr linuxbios.a $(OBJECTS-1)
 
-option CRT0=$(TOP)/src/arch/$(ARCH)/config/crt0.base
+option CRT0=$(TOP)/src/arch/$(ARCH)/init/crt0.base
 makerule crt0.S: $(CRT0) ; cp $< $@
 
 # Force crt0.s (which has build time version code in it to rebuild every time)
diff --git a/src/lib/clog2.c b/src/lib/clog2.c
index b6a16db5a4..c739f816a1 100644
--- a/src/lib/clog2.c
+++ b/src/lib/clog2.c
@@ -7,8 +7,8 @@ static inline unsigned long log2(unsigned long x)
         unsigned long pow = sizeof(x) * 8 - 1;
 
         if (! x) {
-                printk_emerg(__FUNCTION__ 
-                        " called with invalid parameter of 0\n");
+                printk_emerg("%s called with invalid parameter of 0\n",
+				__func__);
                 return -1;
         }
         for(; i > x; i >>= 1, pow--)
diff --git a/util/config/NLBConfig.py b/util/config/NLBConfig.py
index aaacb5bc40..35af27bd36 100644
--- a/util/config/NLBConfig.py
+++ b/util/config/NLBConfig.py
@@ -261,7 +261,7 @@ def common_command_action(dir, type, name):
 def set_arch(dir, my_arch):
 	global arch, makebase
 	arch = my_arch
-	configpath = os.path.join(treetop, "src/arch/", my_arch, "config")
+	configpath = os.path.join(treetop, "src/arch/", my_arch, "init")
 	makebase = os.path.join(configpath, "make.base")
 	print "Now Process the ", my_arch, " base files"
 	if (debug):
@@ -1135,7 +1135,7 @@ CPUFLAGS := $(foreach _var_,$(VARIABLES),$(call D_item,$(_var_)))
 
 	for depfile in [ '%s' % top_config_file,    # This a duplicate, remove?
 			'$(TOP)/util/config/NLBConfig.py',
-			'$(TOP)/src/arch/$(ARCH)/config/make.base' ]:
+			'$(TOP)/src/arch/$(ARCH)/init/make.base' ]:
 		file.write("$(GENERATED): %s\n" % depfile)
 
 	file.write("$(GENERATED):\n")
@@ -1180,7 +1180,7 @@ treetop = os.path.abspath(sys.argv[2])
 	
 # Set the default locations for config files.
 makebase = os.path.join(treetop, "util/config/make.base")
-crt0base = os.path.join(treetop, "arch/i386/config/crt0.base")
+crt0base = os.path.join(treetop, "arch/i386/init/crt0.base")
 doxyscriptbase = os.path.join(treetop, "src/config/doxyscript.base")
 
 # Now read in the customizing script...