diff options
Diffstat (limited to 'rtems/config/rtems-bsp.cfg')
-rw-r--r-- | rtems/config/rtems-bsp.cfg | 42 |
1 files changed, 30 insertions, 12 deletions
diff --git a/rtems/config/rtems-bsp.cfg b/rtems/config/rtems-bsp.cfg index 8e1c12a..404ad6a 100644 --- a/rtems/config/rtems-bsp.cfg +++ b/rtems/config/rtems-bsp.cfg @@ -32,18 +32,16 @@ %endif # -# The target is used by compilers or Cxc builds. -# -%if %{_target} != %{nil} - %error RTEMS BSP builds use --host and not --target -%endif - -# # We need a host from the user to specifiy the RTEMS architecture and major -# version. +# version. It can be defined in rtems_host. # -%if %{_host} == %{nil} && %{rtems_bsp_error} - %error No RTEMS host or BSP specified: --host=<arch>-rtems<ver> +%if %{defined rtems_host} + %define _host %{rtems_host} +%endif +%if %{rtems_bsp_error} + %if %{_host} == %{nil} || %{_host} == %{_build} + %error No RTEMS host or BSP specified: --host=<arch>-rtems<ver> + %endif %endif # @@ -51,7 +49,7 @@ # %ifn %{defined with_rtems_bsp} %if %{rtems_bsp_error} - %error No RTEMS BSP specified: --rtems-bsp=arch/bsp (or --with-rtems-bsp=bsp) + %error No RTEMS BSP specified: --with-rtems-bsp=bsp %endif %define with_rtems_bsp sparc/erc32 %endif @@ -61,10 +59,16 @@ # %ifn %{defined with_tools} %define with_tools %{_prefix} + %define rtems_waf_tools %{nil} +%else + %define rtems_waf_tools --rtems-tools=%{with_tools} %endif %ifn %{defined with_rtems} %define with_rtems %{_prefix} + %define rtems_waf_rtems %{nil} +%else + %define rtems_waf_rtems --rtems=%{with_rtems} %endif # @@ -91,7 +95,7 @@ %define rtems_bsp_libs %{pkgconfig libs %{_host}-%{rtems_bsp}} %if %{rtems_bsp_cflags} == %{nil} && %{rtems_bsp_error} - %error No RTEMS BSP CFLAGS found; Please check the --rtems-bsp option. + %error No RTEMS BSP CFLAGS found; Please check the --with-rtems-bsp option. %endif %if %{rtems_bsp_ccflags} == %{nil} @@ -99,6 +103,11 @@ %endif # +# The RTEMS BSP architecture/bsp. +# +%define rtems_bsp_arch_bsp %{_host_arch}/%{rtems_bsp} + +# # RTEMS BSP paths # %define rtems_bsp_cc %{_host}-gcc @@ -156,3 +165,12 @@ %define host_cxxflags %{rtems_bsp_ccflags} %define host_ldflags %{rtems_bsp_ldflags} %define host_libs %{rtems_bsp_libs} + +# +# Handle the Waf install root. +# +%ifos win32 mingw ming32 + %define rtems_waf_build_root_suffix %{waf_build_root_suffix} +%else + %define rtems_waf_build_root_suffix %{nil} +%endif |