From 40f6b1a2ba12b2f58c4e3bfe04144ba752ab54a5 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Sat, 24 Mar 2018 21:17:32 +0000
Subject: [PATCH] Rename files to resolve filename conflicts

---
 arch/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx | 2 +-
 arch/cpu/cc26xx-cc13xx/{putchar.c => dbg.c}   | 0
 arch/cpu/nrf52832/Makefile.nrf52832           | 2 +-
 arch/cpu/nrf52832/{putchar.c => dbg.c}        | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename arch/cpu/cc26xx-cc13xx/{putchar.c => dbg.c} (100%)
 rename arch/cpu/nrf52832/{putchar.c => dbg.c} (100%)

diff --git a/arch/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx b/arch/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
index 979d7f5e4..f5543bbc0 100644
--- a/arch/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
+++ b/arch/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
@@ -30,7 +30,7 @@ CONTIKI_CPU_DIRS += . dev rf-core rf-core/api rf-core/ble-hal $(TI_XXWARE_STARTU
 ### CPU-dependent source files
 CONTIKI_CPU_SOURCEFILES += clock.c rtimer-arch.c soc-rtc.c uart.c
 CONTIKI_CPU_SOURCEFILES += contiki-watchdog.c aux-ctrl.c
-CONTIKI_CPU_SOURCEFILES += putchar.c ieee-addr.c batmon-sensor.c adc-sensor.c
+CONTIKI_CPU_SOURCEFILES += dbg.c ieee-addr.c batmon-sensor.c adc-sensor.c
 CONTIKI_CPU_SOURCEFILES += slip-arch.c slip.c cc26xx-uart.c lpm.c
 CONTIKI_CPU_SOURCEFILES += gpio-interrupt.c gpio-hal-arch.c oscillators.c
 CONTIKI_CPU_SOURCEFILES += rf-core.c rf-ble.c ieee-mode.c
diff --git a/arch/cpu/cc26xx-cc13xx/putchar.c b/arch/cpu/cc26xx-cc13xx/dbg.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/putchar.c
rename to arch/cpu/cc26xx-cc13xx/dbg.c
diff --git a/arch/cpu/nrf52832/Makefile.nrf52832 b/arch/cpu/nrf52832/Makefile.nrf52832
index c2bdbbf81..5e0db414d 100644
--- a/arch/cpu/nrf52832/Makefile.nrf52832
+++ b/arch/cpu/nrf52832/Makefile.nrf52832
@@ -54,7 +54,7 @@ remduplicates = $(strip $(if $1,$(firstword $1) $(call remduplicates,$(filter-ou
 CONTIKI_CPU_DIRS += . dev ble #compat
 
 ### CPU-dependent source files
-CONTIKI_CPU_SOURCEFILES += clock.c rtimer-arch.c uart0.c putchar.c watchdog.c
+CONTIKI_CPU_SOURCEFILES += clock.c rtimer-arch.c uart0.c dbg.c watchdog.c
 CONTIKI_CPU_SOURCEFILES += int-master.c
 
 ifneq ($(NRF52_WITHOUT_SOFTDEVICE),1)
diff --git a/arch/cpu/nrf52832/putchar.c b/arch/cpu/nrf52832/dbg.c
similarity index 100%
rename from arch/cpu/nrf52832/putchar.c
rename to arch/cpu/nrf52832/dbg.c