fmc: added powerpc e6500 support

Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
Signed-off-by: Ronak Desai <ronak.desai@rockwellcollins.com>
[Thomas:
 - remove useless indentation.]
 - calculate FMC_PLATFORM from BR2_PACKAGE_FMLIB_PLATFORM.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/fmc/Config.in b/package/fmc/Config.in
index a50f80da69738484dd387881fa51a26fcd78861a..b7398e2bf6b3adf4d40ab7fb943b08b82bec42d4 100644 (file)
--- a/package/fmc/Config.in
+++ b/package/fmc/Config.in
@@ -1,14 +1,14 @@
 comment "fmc needs a toolchain w/ C++"
-       depends on BR2_powerpc_e500mc
+       depends on BR2_powerpc_e500mc || BR2_powerpc_e6500
        depends on !BR2_INSTALL_LIBSTDCPP
 
 comment "fmc needs a Linux kernel to be built"
-       depends on BR2_powerpc_e500mc
+       depends on BR2_powerpc_e500mc || BR2_powerpc_e6500
        depends on !BR2_LINUX_KERNEL
 
 config BR2_PACKAGE_FMC
        bool "fmc"
-       depends on BR2_powerpc_e500mc
+       depends on BR2_powerpc_e500mc || BR2_powerpc_e6500
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_LINUX_KERNEL # fmlib
        select BR2_PACKAGE_TCLAP

diff --git a/package/fmc/fmc.mk b/package/fmc/fmc.mk
index 2146bc2f27e0981ef509d3a535d20696e3d2df74..0a2e4886eb30bc6e6138d7dd82bf97467aa9f6d0 100644 (file)
--- a/package/fmc/fmc.mk
+++ b/package/fmc/fmc.mk
@@ -1,3 +1,4 @@
+
 ################################################################################
 #
 # fmc
@@ -18,7 +19,15 @@ FMC_MAKE_OPTS = \
        LIBXML2_HEADER_PATH="$(STAGING_DIR)/usr/include/libxml2" \
        TCLAP_HEADER_PATH="$(STAGING_DIR)/usr/include"
 
+ifeq ($(BR2_powerpc64),y)
+FMC_MAKE_OPTS += M64BIT=1
+endif
+
+# fmc's platform is the same as fmlib's.
+FMC_PLATFORM = $(call qstrip,$(BR2_PACKAGE_FMLIB_PLATFORM))
+
 define FMC_BUILD_CMDS
+       $(SED) "s:P4080:$(FMC_PLATFORM):g" $(@D)/source/Makefile
        # The linking step has dependency issues so using MAKE1
        $(TARGET_MAKE_ENV) $(MAKE1) $(FMC_MAKE_OPTS) -C $(@D)/source
 endef