[Buildroot] [PATCH v2 1/2] fmc: added powerpc e6500 support

[Buildroot] [PATCH v2 1/2] fmc: added powerpc e6500 support

[Matt Weber]

Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
Signed-off-by: Ronak Desai <ronak.desai@rockwellcollins.com>
--

v1 -> v2

package/fmc/fmc.mk
 - Added missing sed of Makefile to set PLATFORM

(Suggested by Thomas)
package/fmc/Config.in
 - Removed extra space in powerpc64 if
 - Appended to MAKE_OPTS instead of creating new variable
---
 package/fmc/Config.in | 6 +++---
 package/fmc/fmc.mk    | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/package/fmc/Config.in b/package/fmc/Config.in
index a50f80d..b7398e2 100644
--- 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 49c5fe8..fb38cd0 100644
--- a/package/fmc/fmc.mk
+++ b/package/fmc/fmc.mk
@@ -1,3 +1,4 @@
+
 ################################################################################
 #
 # fmc
@@ -18,7 +19,12 @@ 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
+
 define FMC_BUILD_CMDS
+	$(SED) "s:P4080:$(FMLIB_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
-- 
1.9.1

[Buildroot] [PATCH v2 2/2] fmlib: add powerpc e6500 support

[Matt Weber]

Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
Signed-off-by: Ronak Desai <ronak.desai@rockwellcollins.com>
--
v1 -> v2

package/fmlib/fmlib.mk
 - Added missing sed of Makefile to set the PLATFORM

(Suggested by Thomas)
package/fmlib/Config.in
 - Newlines
 - Have kconfig handle selection for ARCHTYPE and PLATFORM
 - Removed default choice for QORIQ family selection
package/fmlib/fmlib.mk
 - Use new ARCHTYPE and PLATFORM instead of conditional
   selection
---
 package/fmlib/Config.in | 38 ++++++++++++++++++++++++++++++++++++--
 package/fmlib/fmlib.mk  |  6 ++++++
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/package/fmlib/Config.in b/package/fmlib/Config.in
index 3cc6a2b..7525112 100644
--- a/package/fmlib/Config.in
+++ b/package/fmlib/Config.in
@@ -1,10 +1,10 @@
 comment "fmlib 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_FMLIB
 	bool "fmlib"
-	depends on BR2_powerpc_e500mc
+	depends on BR2_powerpc_e500mc || BR2_powerpc_e6500
 	depends on BR2_LINUX_KERNEL
 	help
 	  The Frame Manager library provides Freescale PowerPC platforms an
@@ -13,3 +13,37 @@ config BR2_PACKAGE_FMLIB
 	  parameters and PCD (parse - classify - distribute) rules.
 
 	  http://git.freescale.com/git/cgit.cgi/ppc/sdk/fmlib.git/tree/README
+
+if BR2_PACKAGE_FMLIB
+choice
+	prompt "QORIQ Target Family"
+	help
+	  Select the family of QORIQ processor.
+
+config BR2_FMLIB_QORIQ_FAMILY_P4080
+	bool "p40xx"
+	depends on BR2_powerpc_e500mc
+
+config BR2_FMLIB_QORIQ_FAMILY_T4240
+	bool "t42xx"
+	depends on BR2_powerpc_e500mc
+
+config BR2_FMLIB_QORIQ_FAMILY_T2080
+	bool "t208x"
+	depends on BR2_powerpc_e6500
+
+endchoice
+
+config BR2_PACKAGE_FMLIB_ARCHTYPE
+	string
+	default "e500mc" if BR2_powerpc_e500mc
+	default "ppc64e6500" if BR2_powerpc_e6500 && BR2_powerpc64
+	default "ppc32e6500" if BR2_powerpc_e6500 && BR2_powerpc
+
+config BR2_PACKAGE_FMLIB_PLATFORM
+	string
+	default "P4080" if BR2_FMLIB_QORIQ_FAMILY_P4080
+	default "T4240" if BR2_FMLIB_QORIQ_FAMILY_T4240
+	default "FMAN_V3H" if BR2_FMLIB_QORIQ_FAMILY_T2080
+
+endif
diff --git a/package/fmlib/fmlib.mk b/package/fmlib/fmlib.mk
index 978810b..5655608 100644
--- a/package/fmlib/fmlib.mk
+++ b/package/fmlib/fmlib.mk
@@ -25,11 +25,17 @@ ifeq ($(BR2_powerpc_e500mc),y)
 FMLIB_ARCHTYPE = ppce500mc
 endif
 
+FMLIB_ARCHTYPE = $(call qstrip,$(BR2_PACKAGE_FMLIB_ARCHTYPE))
+
+FMLIB_PLATFORM=$(call qstrip,$(BR2_PACKAGE_FMLIB_PLATFORM))
+
 define FMLIB_BUILD_CMDS
+	$(SED) "s:P4080:$(FMLIB_PLATFORM):g" $(@D)/Makefile
 	$(TARGET_MAKE_ENV) $(MAKE) $(FMLIB_MAKE_OPTS) -C $(@D) libfm-$(FMLIB_ARCHTYPE).a
 endef
 
 define FMLIB_INSTALL_STAGING_CMDS
+	rm $(STAGING_DIR)/usr/lib/libfm.a -f
 	$(FMLIB_MAKE_ENV) $(MAKE) $(FMLIB_MAKE_OPTS) -C $(@D) install-libfm-$(FMLIB_ARCHTYPE)
 endef
 
-- 
1.9.1

[Buildroot] [PATCH v2 2/2] fmlib: add powerpc e6500 support

[Thomas Petazzoni]

Hello,

On Wed, 18 May 2016 08:41:26 -0500, Matt Weber wrote:
> Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
> Signed-off-by: Ronak Desai <ronak.desai@rockwellcollins.com>

Why is this patch 2/2, when it is in fact a dependency of patch 1/2 ?
Patch 1/2 uses FMLIB_PLATFORM, which doesn't exist until patch 2/2 is
merged.


> +if BR2_PACKAGE_FMLIB
> +choice
> +	prompt "QORIQ Target Family"

The correct spelling is QorIQ according to Freescale's website.


> diff --git a/package/fmlib/fmlib.mk b/package/fmlib/fmlib.mk
> index 978810b..5655608 100644
> --- a/package/fmlib/fmlib.mk
> +++ b/package/fmlib/fmlib.mk
> @@ -25,11 +25,17 @@ ifeq ($(BR2_powerpc_e500mc),y)
>  FMLIB_ARCHTYPE = ppce500mc

So you're keeping the old definition of FMLIB_ARCHTYPE...

>  endif
>  
> +FMLIB_ARCHTYPE = $(call qstrip,$(BR2_PACKAGE_FMLIB_ARCHTYPE))

... and defining it again.

I've merged, after fixing those issues.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH v2 1/2] fmc: added powerpc e6500 support

[Thomas Petazzoni]

Hello,

On Wed, 18 May 2016 08:41:25 -0500, Matt Weber wrote:

> @@ -18,7 +19,12 @@ 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

We don't indent such definitions, so I've removed the tab here.

> +endif
> +
>  define FMC_BUILD_CMDS
> +	$(SED) "s:P4080:$(FMLIB_PLATFORM):g" $(@D)/source/Makefile

I don't like when accessing variables defined by other packages, so
I've instead defined FMC_PLATFORM, which re-calculates the value from
BR2_PACKAGE_FMLIB_PLATFORM.

Applied with those two minor things changed.

Don't hesitate to make a build test again to make sure everything is
still working fine.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH v2 1/2] fmc: added powerpc e6500 support

[Matthew Weber]

On Jun 12, 2016 3:25 PM, "Thomas Petazzoni" <
thomas.petazzoni@free-electrons.com> wrote:
>
> Hello,
>
> On Wed, 18 May 2016 08:41:25 -0500, Matt Weber wrote:
>
> > @@ -18,7 +19,12 @@ 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
>
> We don't indent such definitions, so I've removed the tab here.
>
> > +endif
> > +
> >  define FMC_BUILD_CMDS
> > +     $(SED) "s:P4080:$(FMLIB_PLATFORM):g" $(@D)/source/Makefile
>
> I don't like when accessing variables defined by other packages, so
> I've instead defined FMC_PLATFORM, which re-calculates the value from
> BR2_PACKAGE_FMLIB_PLATFORM.
>
> Applied with those two minor things changed.
>
> Don't hesitate to make a build test again to make sure everything is
> still working fine.
>
> Thanks!

I appreciate the feedback!
Matt
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20160613/bf23f390/attachment.html>