Author: stepan Date: 2009-11-07 00:08:22 +0000 (Sat, 07 Nov 2009) New Revision: 4926
Added: branches/coreboot-v1/src/arch/alpha/init/ branches/coreboot-v1/src/arch/i386/init/ branches/coreboot-v1/src/arch/ppc/init/ Removed: branches/coreboot-v1/src/arch/alpha/config/ branches/coreboot-v1/src/arch/i386/config/ branches/coreboot-v1/src/arch/ppc/config/ Modified: branches/coreboot-v1/src/arch/alpha/init/make.base branches/coreboot-v1/src/arch/i386/init/make.base branches/coreboot-v1/src/arch/ppc/init/make.base branches/coreboot-v1/src/config/Config branches/coreboot-v1/src/lib/clog2.c branches/coreboot-v1/util/config/NLBConfig.py Log: 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
Modified: branches/coreboot-v1/src/arch/alpha/init/make.base =================================================================== --- branches/coreboot-v1/src/arch/alpha/config/make.base 2009-11-06 23:42:26 UTC (rev 4925) +++ branches/coreboot-v1/src/arch/alpha/init/make.base 2009-11-07 00:08:22 UTC (rev 4926) @@ -2,7 +2,7 @@ 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
Modified: branches/coreboot-v1/src/arch/i386/init/make.base =================================================================== --- branches/coreboot-v1/src/arch/i386/config/make.base 2009-11-06 23:42:26 UTC (rev 4925) +++ branches/coreboot-v1/src/arch/i386/init/make.base 2009-11-07 00:08:22 UTC (rev 4926) @@ -13,7 +13,7 @@ # 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.
Modified: branches/coreboot-v1/src/arch/ppc/init/make.base =================================================================== --- branches/coreboot-v1/src/arch/ppc/config/make.base 2009-11-06 23:42:26 UTC (rev 4925) +++ branches/coreboot-v1/src/arch/ppc/init/make.base 2009-11-07 00:08:22 UTC (rev 4926) @@ -5,7 +5,7 @@ # Reserve 8K for each stack option STACK_SIZE=0x2000
-ldscript arch/ppc/config/ldscript.base +ldscript arch/ppc/init/ldscript.base
dir /src/config
Modified: branches/coreboot-v1/src/config/Config =================================================================== --- branches/coreboot-v1/src/config/Config 2009-11-06 23:42:26 UTC (rev 4925) +++ branches/coreboot-v1/src/config/Config 2009-11-07 00:08:22 UTC (rev 4926) @@ -55,7 +55,7 @@ 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)
Modified: branches/coreboot-v1/src/lib/clog2.c =================================================================== --- branches/coreboot-v1/src/lib/clog2.c 2009-11-06 23:42:26 UTC (rev 4925) +++ branches/coreboot-v1/src/lib/clog2.c 2009-11-07 00:08:22 UTC (rev 4926) @@ -7,8 +7,8 @@ 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--)
Modified: branches/coreboot-v1/util/config/NLBConfig.py =================================================================== --- branches/coreboot-v1/util/config/NLBConfig.py 2009-11-06 23:42:26 UTC (rev 4925) +++ branches/coreboot-v1/util/config/NLBConfig.py 2009-11-07 00:08:22 UTC (rev 4926) @@ -261,7 +261,7 @@ 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 @@
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 @@ # 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...