Makefile.var: Whitespace fixes

[pes-rpp/rpp-lib.git] / Makefile.var

diff --git a/Makefile.var b/Makefile.var
index 54aaaed9e40aa8e3aab882f43d3c7f208ef9493d..e01785892a037dde366f1d846453c28a6175ccea 100644 (file)
--- a/Makefile.var
+++ b/Makefile.var
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015 Czech Technical University in Prague
+# Copyright (C) 2013-2015, 2019 Czech Technical University in Prague
 #
 # Authors:
 #     - Michal Sojka <sojkam1@fel.cvut.cz>
@@ -12,7 +12,7 @@
 # Abstract:
 #      Definitions of variables used by Makefile
 
-rpp_lib_OS ?= 7.0.2
+rpp_lib_OS ?= 8.2.2
 
 rpp_lib_SOURCES =                                                              \
        rpp/src/rpp/rpp.c                                               \
@@ -33,22 +33,23 @@ rpp_lib_SOURCES += \
 target_or_common = $(if $(wildcard ../../../$(dir $(1))/_$(TARGET)/$(notdir $(1))),$(dir $(1))/_$(TARGET)/$(notdir $(1)),$(1))
 
 rpp_lib_SOURCES +=                                                             \
-       rpp/src/rpp/_$(TARGET)/adc.c                            \
+       $(lwip_SOURCES)                                                 \
+       rpp/src/rpp/adc.c                                               \
        rpp/src/rpp/can.c                                               \
        rpp/src/rpp/gio.c                                               \
        rpp/src/rpp/sci.c                                               \
-       rpp/src/drv/_$(TARGET)/adc.c                            \
+       rpp/src/drv/adc.c                                               \
+       rpp/src/rpp/eth.c                                               \
+       rpp/src/drv/_$(TARGET)/port_def.c               \
+       rpp/src/drv/gio.c                                               \
+       rpp/src/drv/gio_tab.c                                   \
        rpp/src/drv/sci.c                                               \
-       rpp/src/hal/gpio.c                                              \
-       rpp/src/hal/_$(TARGET)/gpio_def.c               \
-       rpp/src/hal/_$(TARGET)/port_def.c               \
-       rpp/src/hal/port_gpio.c                                 \
        rpp/src/sys/asm/dabort.asm                              \
        rpp/src/sys/asm/sys_core.asm                            \
        rpp/src/sys/asm/sys_intvecs.asm                 \
        rpp/src/sys/asm/sys_mpu.asm                             \
        rpp/src/sys/asm/sys_pmu.asm                             \
-       rpp/src/sys/_$(TARGET)/notification.c   \
+       $(call target_or_common,rpp/src/sys/notification.c)     \
        rpp/src/sys/phy_dp83848h.c                              \
        rpp/src/sys/sys_phantom.c                               \
        $(call target_or_common,rpp/src/sys/sys_pinmux.c) \
@@ -62,7 +63,7 @@ rpp_lib_SOURCES +=                                                            \
        rpp/src/sys/ti_drv_esm.c                                        \
        rpp/src/sys/ti_drv_gio.c                                        \
        rpp/src/sys/ti_drv_het.c                                        \
-       rpp/src/sys/ti_drv_het2.c                \
+       rpp/src/sys/ti_drv_het2.c                               \
        rpp/src/sys/ti_drv_i2c.c                                        \
        rpp/src/sys/ti_drv_mdio.c                               \
        rpp/src/sys/ti_drv_mibspi.c                             \
@@ -140,12 +141,17 @@ lwip_SOURCES = \
 rpp_lib_SOURCES_y =
 rpp_lib_SOURCES_$(TARGET_HAS_DMM) += rpp/src/sys/ti_drv_dmm.c
 
+rpp_lib_SOURCES_$(TARGET_HAS_SPI) +=                   \
+       rpp/src/drv/spi.c                                               \
+       rpp/src/drv/spi_tms570.c                                        \
+       rpp/src/drv/_$(TARGET)/spi_def.c                        \
+       rpp/src/rpp/spi.c                                               \
+
 rpp_lib_SOURCES_posix = \
        os/$(rpp_lib_OS)/src/rpp/sci_posix.c
 
 
 rpp_lib_SOURCES_tms570_rpp =                                   \
-          $(lwip_SOURCES)                                                      \
        rpp/src/drv/dac.c                                               \
        rpp/src/drv/din.c                                               \
        rpp/src/drv/emac.c                                              \
@@ -155,14 +161,8 @@ rpp_lib_SOURCES_tms570_rpp =                                       \
        rpp/src/drv/hout.c                                              \
        rpp/src/drv/lout.c                                              \
        rpp/src/drv/mout.c                                              \
-       rpp/src/hal/pom_vect_remap.c                            \
-       rpp/src/drv/spi.c                                               \
-       rpp/src/drv/spi_tms570.c                                        \
-       rpp/src/hal/port_spi.c                                  \
-       rpp/src/hal/spi_resp_transl.c                   \
        rpp/src/rpp/dac.c                                               \
        rpp/src/rpp/din.c                                               \
-       rpp/src/rpp/eth.c                                               \
        rpp/src/rpp/fr.c                                                        \
        rpp/src/rpp/hbr.c                                               \
        rpp/src/rpp/hout.c                                              \
@@ -172,6 +172,7 @@ rpp_lib_SOURCES_tms570_rpp =                                        \
        rpp/src/rpp/mout.c                                              \
        rpp/src/rpp/sdc.c                                               \
        rpp/src/rpp/sdr.c                                               \
+       rpp/src/sys/pom_vect_remap.c                            \
        rpp/src/sys/ti_drv_lin.c
 
 # Add target specific and conditional sources to the list of sources
@@ -180,8 +181,8 @@ rpp_lib_SOURCES += $(rpp_lib_SOURCES_$(TARGET))
 rpp_lib_SOURCES += $(rpp_lib_SOURCES_y)
 
 rpp_lib_INCLUDES =                                                             \
-          lwip/src/include                                                     \
-          lwip/src/include/ipv4                                        \
-          lwip/src/include/ipv6                                        \
+       lwip/src/include                                                        \
+       lwip/src/include/ipv4                                   \
+       lwip/src/include/ipv6                                   \
        os/$(rpp_lib_OS)/include                                        \
        rpp/include