minor fixes

diff --git a/conf/Makefile.common b/conf/Makefile.common
index db3c13c7396f62ae71208dff3a9561b9b324dc2e..47067596b34073bbdc0f580b6f8e935d2d724aca 100644 (file)
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -28,7 +28,7 @@ endif
 
 # Other options
 
-CPPFLAGS_DEFAULT = -DGRUB_FILE=\"`basename $<`\"
+CPPFLAGS_DEFAULT = -DGRUB_FILE=\"`echo $< | sed "s@$(top_srcdir)/@@g"`\"
 CPPFLAGS_DEFAULT += -I$(builddir)
 CPPFLAGS_DEFAULT += -I$(srcdir)
 CPPFLAGS_DEFAULT += -I$(top_builddir)
@@ -42,6 +42,7 @@ CFLAGS_KERNEL = $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
 LDFLAGS_KERNEL = $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib -Wl,-N -static-libgcc
 CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
 CCASFLAGS_KERNEL = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
+STRIPFLAGS_KERNEL = -R .rel.dyn -R .reginfo -R .note -R .comment
 
 CFLAGS_MODULE = $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
 LDFLAGS_MODULE = $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib -Wl,-N,-r,-d

diff --git a/gentpl.py b/gentpl.py
index eb790751cf70bc64253602f33d648f23bf08b987..632b4c13ec348e6ff0acf404b671171ca440f11b 100644 (file)
--- a/gentpl.py
+++ b/gentpl.py
@@ -100,7 +100,7 @@ def if_platform_tagged(platform, tag, snippet_if, snippet_else=None):
     for group in RMAP[platform]:
         r += "[+ = \"" + group + "\" +]" + snippet_if
 
-    if snippet_else != None: r += "[+ * +]" + snippet_if
+    if snippet_else != None: r += "[+ * +]" + snippet_else
     r += "[+ ESAC +][+ ENDFOR +]"
 
     if snippet_else == None: