Patchwork smm files in top directory

login
register
about
Submitter Myles Watson
Date 2009-10-27 15:20:42
Message ID <2831fecf0910270820n772b759bs4b8ab534e17170f0@mail.gmail.com>
Download mbox | patch
Permalink /patch/497/
State Accepted
Commit r4872
Headers show

Comments

Myles Watson - 2009-10-27 15:20:42
Add $(obj) paths for a couple of smm files so they don't end up in the top
directory.

Signed-off-by: Myles Watson <mylesgw@gmail.com>

Thanks,
Myles
ron minnich - 2009-10-27 15:51:00
On Tue, Oct 27, 2009 at 8:20 AM, Myles Watson <mylesgw@gmail.com> wrote:
> Add $(obj) paths for a couple of smm files so they don't end up in the top
> directory.
>
> Signed-off-by: Myles Watson <mylesgw@gmail.com>

Acked-by: Ronald G. Minnich <rminnich@gmail.com>
Myles Watson - 2009-10-27 15:53:51
On Tue, Oct 27, 2009 at 9:51 AM, ron minnich <rminnich@gmail.com> wrote:

> On Tue, Oct 27, 2009 at 8:20 AM, Myles Watson <mylesgw@gmail.com> wrote:
> > Add $(obj) paths for a couple of smm files so they don't end up in the
> top
> > directory.
> >
> > Signed-off-by: Myles Watson <mylesgw@gmail.com>
>
> Acked-by: Ronald G. Minnich <rminnich@gmail.com>
>
Rev 4872.

Thanks,
Myles

Patch

Index: svn/src/cpu/x86/smm/Makefile.inc
===================================================================
--- svn.orig/src/cpu/x86/smm/Makefile.inc
+++ svn/src/cpu/x86/smm/Makefile.inc
@@ -33,12 +33,12 @@  $(obj)/cpu/x86/smm/smm.o: $(smmobjs) $(o
 	$(CC) $(LDFLAGS) -nostdlib -r -o $@ $^
 
 $(obj)/cpu/x86/smm/smm: $(obj)/cpu/x86/smm/smm.o $(src)/cpu/x86/smm/smm.ld $(obj)/ldoptions
-	$(CC) $(LDFLAGS) -nostdlib -nostartfiles -static -o smm.elf -T $(src)/cpu/x86/smm/smm.ld $(obj)/cpu/x86/smm/smm.o
-	$(CONFIG_CROSS_COMPILE)nm -n smm.elf | sort > smm.map
-	$(OBJCOPY) -O binary smm.elf smm
+	$(CC) $(LDFLAGS) -nostdlib -nostartfiles -static -o $(obj)/cpu/x86/smm/smm.elf -T $(src)/cpu/x86/smm/smm.ld $(obj)/cpu/x86/smm/smm.o
+	$(CONFIG_CROSS_COMPILE)nm -n $(obj)/cpu/x86/smm/smm.elf | sort > $(obj)/cpu/x86/smm/smm.map
+	$(OBJCOPY) -O binary $(obj)/cpu/x86/smm/smm.elf $(obj)/cpu/x86/smm/smm
 
 $(obj)/cpu/x86/smm/smm_bin.c: $(obj)/cpu/x86/smm/smm
-	(echo 'unsigned char smm[] = {'; od -vtx1 smm | sed -e 's,^[0-9]* *,,' -e 's:[0-9a-f][0-9a-f] :0x&,:g' -e 's:[0-9a-f][0-9a-f]$$:0x&,:'; echo '}; unsigned int smm_len = '; wc -c smm |awk '{print $$1;}' ; echo ';')  > $@
+	(echo 'unsigned char smm[] = {'; od -vtx1 $(obj)/cpu/x86/smm/smm | sed -e 's,^[0-9]* *,,' -e 's:[0-9a-f][0-9a-f] :0x&,:g' -e 's:[0-9a-f][0-9a-f]$$:0x&,:'; echo '}; unsigned int smm_len = '; wc -c $(obj)/cpu/x86/smm/smm |awk '{print $$1;}' ; echo ';')  > $@
 
 endif