diff options
| author | Abdoulaye Walsimou Gaye <walsimou@walsimou.com> | 2009-07-18 11:56:11 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <walsimou@walsimou.com> | 2009-07-18 11:56:11 +0200 |
| commit | 8d88e05806bd6b7ef365297dc78f09b9a27d20f2 (patch) | |
| tree | fd833c5fcd99f87830c83648dd7aa3618770d886 | |
| parent | a132ac7114981f51e23564fee6f7534d8e8785fd (diff) | |
| download | embtoolkit-8d88e05806bd6b7ef365297dc78f09b9a27d20f2.tar.gz embtoolkit-8d88e05806bd6b7ef365297dc78f09b9a27d20f2.tar.bz2 embtoolkit-8d88e05806bd6b7ef365297dc78f09b9a27d20f2.tar.xz | |
Embtk: Create EMBTK_MCU_FLAG env var to help build of multiple toolchain within Embtk
Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | mk/arm-arch.mk | 1 | ||||
| -rw-r--r-- | mk/initialpath.mk | 14 | ||||
| -rw-r--r-- | mk/mips-arch.mk | 2 | ||||
| -rw-r--r-- | mk/rootfs.mk | 12 |
5 files changed, 17 insertions, 14 deletions
@@ -167,5 +167,5 @@ help: @echo distclean: clean - $(Q)rm -rf dl/* src/eglibc* host-tools .config.old + $(Q)rm -rf dl/* src/eglibc* host-tools* .config.old diff --git a/mk/arm-arch.mk b/mk/arm-arch.mk index 2a3701c..534b6e0 100644 --- a/mk/arm-arch.mk +++ b/mk/arm-arch.mk @@ -36,6 +36,7 @@ endif #GCC configure options GCC_WITH_CPU := --with-cpu=$(subst ",,$(strip $(CONFIG_EMBTK_ARM_MCU_STRING))) +EMBTK_MCU_FLAG := $(subst ",,$(strip $(CONFIG_EMBTK_ARM_MCU_STRING))) #GCC extra configure options for arm ifeq ($(CONFIG_EMBTK_GCC_LANGUAGE_JAVA),y) diff --git a/mk/initialpath.mk b/mk/initialpath.mk index 79400ff..751082c 100644 --- a/mk/initialpath.mk +++ b/mk/initialpath.mk @@ -23,12 +23,12 @@ # \date May 2009 ######################################################################################### -SYSROOT := $(EMBTK_ROOT)/sysroot-$(GNU_TARGET)-$(GNU_TARGET_ARCH) -TOOLS := $(EMBTK_ROOT)/tools-$(GNU_TARGET)-$(GNU_TARGET_ARCH) -TOOLS_BUILD := $(EMBTK_ROOT)/tools_build-$(GNU_TARGET)-$(GNU_TARGET_ARCH) -PACKAGES_BUILD := $(EMBTK_ROOT)/packages_build-$(GNU_TARGET)-$(GNU_TARGET_ARCH) -ROOTFS := $(EMBTK_ROOT)/rootfs-$(GNU_TARGET)-$(GNU_TARGET_ARCH) -HOSTTOOLS :=$(EMBTK_ROOT)/host-tools +SYSROOT:=$(EMBTK_ROOT)/sysroot-$(GNU_TARGET)-$(EMBTK_MCU_FLAG) +TOOLS:=$(EMBTK_ROOT)/tools-$(GNU_TARGET)-$(EMBTK_MCU_FLAG) +TOOLS_BUILD:=$(EMBTK_ROOT)/build/tools_build-$(GNU_TARGET)-$(EMBTK_MCU_FLAG) +PACKAGES_BUILD:=$(EMBTK_ROOT)/build/packages_build-$(GNU_TARGET)-$(EMBTK_MCU_FLAG) +ROOTFS:=$(EMBTK_ROOT)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG) +HOSTTOOLS :=$(EMBTK_ROOT)/host-tools-$(EMBTK_MCU_FLAG) export SYSROOT TOOLS TOOLS_BUILD PACKAGES_BUILD ROOTFS HOSTTOOLS @@ -49,5 +49,5 @@ ifeq ($(CONFIG_EMBTK_HAVE_ROOTFS),y) endif rmallpath: - @rm -Rf packages_build-* rootfs-* sysroot-* tools_build-* tools-* + @rm -Rf build rootfs-* sysroot-* tools-* diff --git a/mk/mips-arch.mk b/mk/mips-arch.mk index 06e48b9..b48fee2 100644 --- a/mk/mips-arch.mk +++ b/mk/mips-arch.mk @@ -113,6 +113,8 @@ STRICT_GNU_TARGET := mipsisa64r2-unknown-linux-gnu GNU_TARGET_ARCH := mips64r2 endif +EMBTK_MCU_FLAG := $(GNU_TARGET_ARCH) + #GCC configure options GCC_WITH_ARCH := --with-arch=$(GNU_TARGET_ARCH) export GCC_WITH_ARCH diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 97623b6..cf2313e 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -54,17 +54,17 @@ endif $(MAKEDEVS_DIR)/makedevs \ -d $(EMBTK_ROOT)/src/devices_table.txt $(ROOTFS) cd $(ROOTFS) ; $(FAKEROOT_BIN) -i $(EMBTK_ROOT)/.fakeroot.001 -- \ - tar cjf rootfs-$(STRICT_GNU_TARGET).tar.bz2 * ; \ - mv rootfs-$(STRICT_GNU_TARGET).tar.bz2 $(EMBTK_ROOT) + tar cjf rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG).tar.bz2 * ; \ + mv rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG).tar.bz2 $(EMBTK_ROOT) ifeq ($(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2),y) $(FAKEROOT_BIN) -i $(EMBTK_ROOT)/.fakeroot.001 -- \ $(HOSTTOOLS)/usr/sbin/mkfs.jffs2 -n -e 128 -r $(ROOTFS) \ - -o $(EMBTK_ROOT)/rootfs-$(STRICT_GNU_TARGET).jffs2.temp + -o $(EMBTK_ROOT)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG).jffs2.temp $(FAKEROOT_BIN) -i $(EMBTK_ROOT)/.fakeroot.001 -- \ $(HOSTTOOLS)/usr/sbin/sumtool -n -e 128 \ - -i $(EMBTK_ROOT)/rootfs-$(STRICT_GNU_TARGET).jffs2.temp \ - -o $(EMBTK_ROOT)/rootfs-$(STRICT_GNU_TARGET).jffs2 - rm -rf $(EMBTK_ROOT)/rootfs-$(STRICT_GNU_TARGET).jffs2.temp + -i $(EMBTK_ROOT)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG).jffs2.temp \ + -o $(EMBTK_ROOT)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG).jffs2 + rm -rf $(EMBTK_ROOT)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG).jffs2.temp endif rootfs_clean: $(HOSTTOOLS_COMPONENTS_CLEAN) $(ROOTFS_COMPONENTS_CLEAN) |