summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/i386
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2010-03-26 02:21:20 +0000
committerChris Johns <chrisj@rtems.org>2010-03-26 02:21:20 +0000
commitf3d3fd28e4a73a765b91f28042ae0d7067aa74ec (patch)
tree30013afa3e5316503875342f45d11f18986df0dc /c/src/lib/libbsp/i386
parent2010-03-26 Chris Johns <chrisj@rtems.org> (diff)
downloadrtems-f3d3fd28e4a73a765b91f28042ae0d7067aa74ec.tar.bz2
2010-03-26 Chris Johns <chrisj@rtems.org>
* make/custom/pc386.cfg: Revert the PR1495 change.
Diffstat (limited to 'c/src/lib/libbsp/i386')
-rw-r--r--c/src/lib/libbsp/i386/pc386/ChangeLog4
-rw-r--r--c/src/lib/libbsp/i386/pc386/make/custom/pc386.cfg24
2 files changed, 16 insertions, 12 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog
index e2841b4d34..81c896786b 100644
--- a/c/src/lib/libbsp/i386/pc386/ChangeLog
+++ b/c/src/lib/libbsp/i386/pc386/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-26 Chris Johns <chrisj@rtems.org>
+
+ * make/custom/pc386.cfg: Revert the PR1495 change.
+
2010-03-10 Gedare Bloom <gedare@gwu.edu>
PR 1495/bsp
diff --git a/c/src/lib/libbsp/i386/pc386/make/custom/pc386.cfg b/c/src/lib/libbsp/i386/pc386/make/custom/pc386.cfg
index d0492da4d9..f904f25d6e 100644
--- a/c/src/lib/libbsp/i386/pc386/make/custom/pc386.cfg
+++ b/c/src/lib/libbsp/i386/pc386/make/custom/pc386.cfg
@@ -22,7 +22,7 @@ endif
# optimize flag: typically -O2
CFLAGS_OPTIMIZE_V = -O2 -g
-# Here is the rule to actually build a $(ARCH)/foo.exe
+# Here is the rule to actually build a $(ARCH)/foo$(EXEEXT)
# It also builds $(ARCH)/foo.sr and $(ARCH)/foo.nm
# Usage ref: src/tests/sptest/sp1/Makefile
@@ -43,17 +43,17 @@ HEADERADDR=0x00097E00
LDFLAGS += -Wl,-Ttext,$(RELOCADDR)
-#define bsp-post-link
-# $(default-bsp-post-link)
-# $(OBJCOPY) -O elf32-i386 \
-# --remove-section=.comment \
-# --remove-section=.note \
-# --strip-unneeded $(basename $@).exe $(basename $@).nxe
-# $(OBJCOPY) -O binary $(basename $@).nxe $(basename $@).bin
-# $(PROJECT_TOOLS)/bin2boot -v $(basename $@)$(DOWNEXT) $(HEADERADDR)\
-# $(START16FILE) $(START16ADDR) 0 $(basename $@).bin $(RELOCADDR) 0
-# rm -f $(basename $@).nxe
-#endef
+define bsp-post-link
+ $(default-bsp-post-link)
+ $(OBJCOPY) -O elf32-i386 \
+ --remove-section=.comment \
+ --remove-section=.note \
+ --strip-unneeded $(basename $@)$(EXEEXT) $(basename $@).nxe
+ $(OBJCOPY) -O binary $(basename $@).nxe $(basename $@).bin
+ $(PROJECT_TOOLS)/bin2boot -v $(basename $@)$(DOWNEXT) $(HEADERADDR)\
+ $(START16FILE) $(START16ADDR) 0 $(basename $@).bin $(RELOCADDR) 0
+ rm -f $(basename $@).nxe
+endef
# BSP-specific tools
BIN2BOOT=$(PROJECT_TOOLS)/bin2boot