riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8032 from cladmi/pr/cpu/mips_cleanup_modules

Browse Source 
cpu/mips: make `mips32r2_common` only a common cpu and remove cpu/periph module duplicate names.
This commit is contained in:
neiljay 2017-11-28 13:34:30 +00:00 committed by GitHub
commit 5ccfe68f1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 47 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/mips-malta/Makefile.include
View File

@ -1,4 +1,4 @@
export CPU = mips32r2_common
export CPU = mips32r2_generic
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/
#export USE_HARD_FLOAT = 1
export USE_DSP = 1

9
cpu/mips32r2_common/Makefile
View File

@ -1,4 +1,9 @@
MODULE = cpu
DIRS = periph newlib_syscalls_mips_uhi
MODULE = mips32r2_common
DIRS = periph
ifneq (,$(filter newlib_syscalls_mips_uhi,$(USEMODULE)))
DIRS += newlib_syscalls_mips_uhi
endif
include $(RIOTBASE)/Makefile.base

12
cpu/mips32r2_common/Makefile.include
View File

@ -1,10 +1,7 @@
export MEMORY_BASE=0x80000000
export MEMORY_SIZE=1M
export APP_START=0x80000000
export INCLUDES += -I$(RIOTCPU)/mips32r2_common/include
include $(RIOTMAKE)/arch/mips.inc.mk
export USEMODULE += periph
export USEMODULE += mips32r2_common
export USEMODULE += mips32r2_common_periph
export USEMODULE += periph_common
export USEMODULE += newlib
@ -13,10 +10,9 @@ export USEMODULE += periph_timer
ifeq ($(USE_UHI_SYSCALLS),1)
#Use UHI to handle syscalls
export LINKFLAGS += -luhi -Tuhi32.ld
export LINKFLAGS += -luhi
export USEMODULE += newlib_syscalls_mips_uhi
else
#Use RIOT to handle syscalls (default)
export LINKFLAGS += -Tuhi32.ld
export USEMODULE += newlib_syscalls_default
endif

2
cpu/mips32r2_common/periph/Makefile
View File

@ -1 +1,3 @@
MODULE = mips32r2_common_periph
include $(RIOTMAKE)/periph.mk

2
cpu/mips32r2_common/periph/timer.c
View File

@ -35,7 +35,7 @@
#include <sys/time.h>
#ifdef EIC_IRQ
#include "../include/eic_irq.h"
#include "eic_irq.h"
#endif
/*

5
cpu/mips32r2_generic/Makefile Normal file
View File

@ -0,0 +1,5 @@
MODULE = cpu
DIRS += $(RIOTCPU)/mips32r2_common
include $(RIOTBASE)/Makefile.base

1
cpu/mips32r2_generic/Makefile.features Normal file
View File

@ -0,0 +1 @@
-include $(RIOTCPU)/mips32r2_common/Makefile.features

8
cpu/mips32r2_generic/Makefile.include Normal file
View File

@ -0,0 +1,8 @@
export MEMORY_BASE=0x80000000
export MEMORY_SIZE=1M
export APP_START=0x80000000
include $(RIOTMAKE)/arch/mips.inc.mk
include $(RIOTCPU)/mips32r2_common/Makefile.include
export LINKFLAGS += -Tuhi32.ld

2
cpu/mips32r2_common/include/cpu.h → cpu/mips32r2_generic/include/cpu.h
View File

@ -7,7 +7,7 @@
*/
/**
* @defgroup cpu_mips32r2_commom Imagination Technologies MIPS32R2 Common
* @defgroup cpu_mips32r2_generic Imagination Technologies MIPS32R2 Common
* @ingroup cpu
* @brief Imagination Technologies MIPS32R2 common
* @{

2
cpu/mips32r2_common/include/cpu_conf.h → cpu/mips32r2_generic/include/cpu_conf.h
View File

@ -7,7 +7,7 @@
*/
/**
* @ingroup cpu_mips32r2_commom
* @ingroup cpu_mips32r2_generic
* @{
*
* @file

6
cpu/mips32r2_common/include/periph_cpu.h → cpu/mips32r2_generic/include/periph_cpu.h
View File

@ -10,12 +10,6 @@
/* No peripherals I/O via JTAG or Bootloader using UHI */
/*
* Note mips32r2_common can be selected in its own right as a CPU
* for testing on PFGA systems (like BOARD=mips-malta) with limited
* or no peripherals
*/
#ifndef PERIPH_CPU_H
#define PERIPH_CPU_H

6
cpu/mips_pic32_common/Makefile.include
View File

@ -1,5 +1,7 @@
export INCLUDES += -I$(RIOTCPU)/mips32r2_common/include \
-I$(RIOTCPU)/mips_pic32_common/include
export INCLUDES += -I$(RIOTCPU)/mips_pic32_common/include
USEMODULE += mips_pic32_common
USEMODULE += mips_pic32_common_periph
USEMODULE += periph_common
USEMODULE += periph_hwrng

2
cpu/mips_pic32_common/periph/Makefile
View File

@ -1 +1,3 @@
MODULE = mips_pic32_common_periph
include $(RIOTMAKE)/periph.mk

6
cpu/mips_pic32mx/Makefile
View File

@ -1,8 +1,6 @@
MODULE = cpu
USEMODULE += mips_pic32_common
USEMODULE += mips32r2_common
DIRS += $(RIOTCPU)/mips_pic32_common $(RIOTCPU)/mips32r2_common
DIRS += $(RIOTCPU)/mips_pic32_common
DIRS += $(RIOTCPU)/mips32r2_common
include $(RIOTBASE)/Makefile.base

1
cpu/mips_pic32mx/Makefile.features
View File

@ -1 +1,2 @@
-include $(RIOTCPU)/mips_pic32_common/Makefile.features
-include $(RIOTCPU)/mips32r2_common/Makefile.features

15
cpu/mips_pic32mx/Makefile.include
View File

@ -2,24 +2,11 @@ export ROMABLE = 1
include $(RIOTMAKE)/arch/mips.inc.mk
include $(RIOTCPU)/mips_pic32_common/Makefile.include
include $(RIOTCPU)/mips32r2_common/Makefile.include
# define build specific options
export CFLAGS += -march=m4k -DSKIP_COPY_TO_RAM
export USEMODULE += mips_pic32_common
export USEMODULE += periph
export USEMODULE += periph_common
export USEMODULE += newlib
ifeq ($(USE_UHI_SYSCALLS),1)
#Use UHI to handle syscalls
export LINKFLAGS += -luhi
export USEMODULE += newlib_syscalls_mips_uhi
else
#Use RIOT to handle syscalls (default)
export USEMODULE += newlib_syscalls_default
endif
export LINKFLAGS += -Wl,--defsym,__use_excpt_boot=0 $(CFLAGS)
export LINKFLAGS += -Tpic32mx512_12_128_uhi.ld

2
cpu/mips_pic32mx/eic_pic32mx.c
View File

@ -10,7 +10,7 @@
#include <assert.h>
#include "board.h"
#include "../mips32r2_common/include/eic_irq.h"
#include "eic_irq.h"
void eic_irq_configure(int irq_num)
{

6
cpu/mips_pic32mz/Makefile
View File

@ -1,8 +1,6 @@
MODULE = cpu
USEMODULE += mips_pic32_common
USEMODULE += mips32r2_common
DIRS += $(RIOTCPU)/mips_pic32_common $(RIOTCPU)/mips32r2_common
DIRS += $(RIOTCPU)/mips_pic32_common
DIRS += $(RIOTCPU)/mips32r2_common
include $(RIOTBASE)/Makefile.base

1
cpu/mips_pic32mz/Makefile.features
View File

@ -1,3 +1,4 @@
FEATURES_PROVIDED += periph_hwrng
-include $(RIOTCPU)/mips_pic32_common/Makefile.features
-include $(RIOTCPU)/mips32r2_common/Makefile.features

16
cpu/mips_pic32mz/Makefile.include
View File

@ -2,26 +2,12 @@ export ROMABLE = 1
include $(RIOTMAKE)/arch/mips.inc.mk
include $(RIOTCPU)/mips_pic32_common/Makefile.include
include $(RIOTCPU)/mips32r2_common/Makefile.include
# define build specific options
export CFLAGS += -march=m5101 -mmicromips -DSKIP_COPY_TO_RAM
export CFLAGS += -DMIPS_MICROMIPS
export USEMODULE += mips_pic32_common
export USEMODULE += periph
export USEMODULE += periph_common
export USEMODULE += newlib
ifeq ($(USE_UHI_SYSCALLS),1)
#Use UHI to handle syscalls
export LINKFLAGS += -luhi
export USEMODULE += newlib_syscalls_mips_uhi
else
#Use RIOT to handle syscalls (default)
export USEMODULE += newlib_syscalls_default
endif
export LINKFLAGS += -Wl,--defsym,__use_excpt_boot=0 $(CFLAGS)
export LINKFLAGS += -Tpic32mz2048_uhi.ld

2
cpu/mips_pic32mz/eic_pic32mz.c
View File

@ -10,7 +10,7 @@
#include <assert.h>
#include "board.h"
#include "../mips32r2_common/include/eic_irq.h"
#include "eic_irq.h"
void eic_irq_configure(int irq_num)
{