Skip to content

cpu/atmega: cleanup dependencies handling #12489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benpicco merged 1 commit into from
Oct 18, 2019
Merged

cpu/atmega: cleanup dependencies handling #12489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions cpu/atmega1281/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# expand atmega_pcint for additional PCINTs of atmega1281
ifneq (,$(filter atmega_pcint,$(USEMODULE)))
USEMODULE += atmega_pcint1 atmega_pcint2
endif

include $(RIOTCPU)/atmega_common/Makefile.dep
8 changes: 0 additions & 8 deletions cpu/atmega1281/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
# tell the build system that the CPU depends on the atmega common files
USEMODULE += atmega_common

RAM_LEN = 8K
ROM_LEN = 128K

# expand atmega_pcint for additional PCINTs of atmega1281
ifneq (,$(filter atmega_pcint,$(USEMODULE)))
USEMODULE += atmega_pcint1 atmega_pcint2
endif

# CPU depends on the atmega common module, so include it
include $(RIOTCPU)/atmega_common/Makefile.include
8 changes: 0 additions & 8 deletions cpu/atmega1284p/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
# tell the build system that the CPU depends on the atmega common files
USEMODULE += atmega_common

RAM_LEN = 16K
ROM_LEN = 128K

# expand atmega_pcint for atmega1284p
ifneq (,$(filter atmega_pcint,$(USEMODULE)))
USEMODULE += atmega_pcint1 atmega_pcint2 atmega_pcint3
endif

# CPU depends on the atmega common module, so include it
include $(RIOTCPU)/atmega_common/Makefile.include
8 changes: 0 additions & 8 deletions cpu/atmega128rfa1/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
# tell the build system that the CPU depends on the atmega common files
USEMODULE += atmega_common

RAM_LEN = 16K
ROM_LEN = 128K

# expand atmega_pcint for atmega128rfa1
ifneq (,$(filter atmega_pcint,$(USEMODULE)))
USEMODULE += atmega_pcint1
endif

# CPU depends on the atmega common module, so include it
include $(RIOTCPU)/atmega_common/Makefile.include
8 changes: 0 additions & 8 deletions cpu/atmega2560/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
# tell the build system that the CPU depends on the atmega common files
USEMODULE += atmega_common

RAM_LEN = 8K
ROM_LEN = 256K

# expand atmega_pcint with additional PCINTs for atmega2560
ifneq (,$(filter atmega_pcint,$(USEMODULE)))
USEMODULE += atmega_pcint1 atmega_pcint2
endif

# CPU depends on the atmega common module, so include it
include $(RIOTCPU)/atmega_common/Makefile.include
8 changes: 0 additions & 8 deletions cpu/atmega256rfr2/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
# tell the build system that the CPU depends on the atmega common files
USEMODULE += atmega_common

RAM_LEN = 32K
ROM_LEN = 256K

# expand atmega_pcint for atmega256rfr2
ifneq (,$(filter atmega_pcint,$(USEMODULE)))
USEMODULE += atmega_pcint1
endif

# CPU depends on the atmega common module, so include it
include $(RIOTCPU)/atmega_common/Makefile.include
6 changes: 6 additions & 0 deletions cpu/atmega328p/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# additional PCINTs for atmega328p
ifneq (,$(filter atmega_pcint,$(USEMODULE)))
USEMODULE += atmega_pcint1 atmega_pcint2
endif

include $(RIOTCPU)/atmega_common/Makefile.dep
8 changes: 0 additions & 8 deletions cpu/atmega328p/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
# tell the build system that the CPU depends on the atmega common files
USEMODULE += atmega_common

RAM_LEN = 2K
ROM_LEN = 32K

# additional PCINTs for atmega328p
ifneq (,$(filter atmega_pcint,$(USEMODULE)))
USEMODULE += atmega_pcint1 atmega_pcint2
endif

# CPU depends on the atmega common module, so include it
include $(RIOTCPU)/atmega_common/Makefile.include
3 changes: 0 additions & 3 deletions cpu/atmega32u4/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# this CPU implementation is using the new core/CPU interface
CFLAGS += -DCOREIF_NG=1

# tell the build system that the CPU depends on the atmega common files
USEMODULE += atmega_common

# define path to atmega common module, which is needed for this CPU
export ATMEGA_COMMON = $(RIOTCPU)/atmega_common/

Expand Down
3 changes: 3 additions & 0 deletions cpu/atmega_common/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# tell the build system to build the atmega common files
USEMODULE += atmega_common

# expand atmega_pcint module
ifneq (,$(filter atmega_pcint,$(USEMODULE)))
USEMODULE += atmega_pcint0
Expand Down
27 changes: 0 additions & 27 deletions cpu/atmega_common/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,4 @@ USEMODULE += avr_libc_extra
PSEUDOMODULES += atmega_pcint
PSEUDOMODULES += atmega_pcint%

# expand atmega_pcint module
# atmega16u4 only features atmega_pcint0, therefore additional pseudomodules
# are activated in each CPU's Makefile.include
ifneq (,$(filter atmega_pcint,$(USEMODULE)))
USEMODULE += atmega_pcint0
endif

# feature for atmega_pcint0 module
ifneq (,$(filter atmega_pcint0,$(USEMODULE)))
FEATURES_REQUIRED += atmega_pcint0
endif

# feature for atmega_pcint1 module
ifneq (,$(filter atmega_pcint1,$(USEMODULE)))
FEATURES_REQUIRED += atmega_pcint1
endif

# feature for atmega_pcint2 module
ifneq (,$(filter atmega_pcint2,$(USEMODULE)))
FEATURES_REQUIRED += atmega_pcint2
endif

# feature for atmega_pcint3 module
ifneq (,$(filter atmega_pcint3,$(USEMODULE)))
FEATURES_REQUIRED += atmega_pcint3
endif

include $(RIOTMAKE)/arch/atmega.inc.mk