diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-03-03 12:51:40 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-03-03 12:51:40 +0100 |
| commit | 674873f18dd885ddb0e9fc40ada3a81850c9284f (patch) | |
| tree | a30b0236d1b356679d1e89c8e13eb3eb6b0c99ea | |
| parent | 80b41b7159fc37d8e0eb55a8aacf8b83c6a98974 (diff) | |
| download | ptxdist-674873f18dd885ddb0e9fc40ada3a81850c9284f.tar.gz ptxdist-674873f18dd885ddb0e9fc40ada3a81850c9284f.tar.xz | |
[templates] cleanup & fix strellaris template
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/templates/src-stellaris/Makefile.in | 3 | ||||
| -rw-r--r-- | rules/templates/src-stellaris/configure.ac | 2 | ||||
| -rw-r--r-- | rules/templates/template-src-stellaris-make | 22 |
3 files changed, 16 insertions, 11 deletions
diff --git a/rules/templates/src-stellaris/Makefile.in b/rules/templates/src-stellaris/Makefile.in index 32679ee6a..d4d9dad36 100644 --- a/rules/templates/src-stellaris/Makefile.in +++ b/rules/templates/src-stellaris/Makefile.in @@ -29,6 +29,9 @@ endif all: $(TARGETS_ALL) +install: $(TARGETS_ALL) + install -D $(TARGETS_ALL) $(DESTDIR)/ + @name@.elf: @name@.o startup_gcc.o .PHONY: clean diff --git a/rules/templates/src-stellaris/configure.ac b/rules/templates/src-stellaris/configure.ac index fba11d440..2397aaad2 100644 --- a/rules/templates/src-stellaris/configure.ac +++ b/rules/templates/src-stellaris/configure.ac @@ -19,7 +19,7 @@ CFLAGS="${CFLAGS} -pedantic -DPART_${PART}" # workaround for newlib toolchain: place this before AC_PROG_CC, even if # LDFLAGS are not AC_SUBSTed LDFLAGS="-Wl,--entry -Wl,main -Wl,--gc-sections" -AC_PROG_CC +AC_CHECK_TOOLS([CC],[gcc cc]) AC_CHECK_TOOL(OBJCOPY,objcopy) diff --git a/rules/templates/template-src-stellaris-make b/rules/templates/template-src-stellaris-make index ed9874974..4a63dd42b 100644 --- a/rules/templates/template-src-stellaris-make +++ b/rules/templates/template-src-stellaris-make @@ -62,10 +62,11 @@ endif # # autoconf # +@PACKAGE@_CONF_ENV := CC=$(PTXCONF_STELLARIS_CC) @PACKAGE@_CONF_TOOL := autoconf @PACKAGE@_CONF_OPT := \ - --host=arm-cortexm3-eabi \ - --build=i686-unknown-linux-gnu \ + --host=$(PTXCONF_STELLARIS_GNU_TARGET) \ + --build=$(GNU_HOST) \ --with-stellaris-sdk=$(SW_EK_LM3S3748_DIR) \ --with-dfuwrap=$(SW_EK_LM3S3748_DIR)/tools/dfuwrap/dfuwrap @@ -87,9 +88,10 @@ endif # Install # ---------------------------------------------------------------------------- -$(STATEDIR)/@package@.install: - @$(call targetinfo) - @$(call touch) +#$(STATEDIR)/@package@.install: +# @$(call targetinfo) +# @$(call world/install, @PACKAGE@) +# @$(call touch) # ---------------------------------------------------------------------------- # Target-Install @@ -108,7 +110,7 @@ $(STATEDIR)/@package@.targetinstall: @$(call install_fixup, @package@, DESCRIPTION, missing) @$(call install_copy, @package@, 0, 0, 0644, \ - $(@PACKAGE@_DIR)/@package@.dfu, \ + $(@PACKAGE@_PKGDIR)/@package@.dfu, \ /lib/firmware/@package@.dfu) @$(call install_finish, @package@) @@ -119,9 +121,9 @@ $(STATEDIR)/@package@.targetinstall: # Clean # ---------------------------------------------------------------------------- -@package@_clean: - rm -rf $(STATEDIR)/@package@.* - rm -rf $(PKGDIR)/@package@_* - rm -rf $(@PACKAGE@_DIR) +#$(STATEDIR)/@package@.clean: +# @$(call targetinfo) +# @$(call clean_pkg, @PACKAGE@) + # vim: syntax=make |