From e4bc1a1e8ccaaa60017788cb1f42898fde3ac5c6 Mon Sep 17 00:00:00 2001
From: Jesus Sanchez-Palencia <jesus.sanchez-palencia@intel.com>
Date: Thu, 2 Jul 2015 20:13:53 -0300
Subject: [PATCH] x86: Add init folder and move code accordingly

The x86/init/common/ folder holds all cpu initialization
code - idt and gdt setup, interrupts and cpu initialization.

On this folder will also sit any SoC specific implementation of
the functions called from cpu_init().
---
 cpu/x86/Makefile.x86_common           | 2 +-
 cpu/x86/{ => init/common}/cpu.c       | 0
 cpu/x86/{ => init/common}/cpu.h       | 0
 cpu/x86/{ => init/common}/gdt.c       | 0
 cpu/x86/{ => init/common}/gdt.h       | 0
 cpu/x86/{ => init/common}/idt.c       | 0
 cpu/x86/{ => init/common}/idt.h       | 0
 cpu/x86/{ => init/common}/interrupt.h | 0
 8 files changed, 1 insertion(+), 1 deletion(-)
 rename cpu/x86/{ => init/common}/cpu.c (100%)
 rename cpu/x86/{ => init/common}/cpu.h (100%)
 rename cpu/x86/{ => init/common}/gdt.c (100%)
 rename cpu/x86/{ => init/common}/gdt.h (100%)
 rename cpu/x86/{ => init/common}/idt.c (100%)
 rename cpu/x86/{ => init/common}/idt.h (100%)
 rename cpu/x86/{ => init/common}/interrupt.h (100%)

diff --git a/cpu/x86/Makefile.x86_common b/cpu/x86/Makefile.x86_common
index ca14d0c96..b5ea26271 100644
--- a/cpu/x86/Makefile.x86_common
+++ b/cpu/x86/Makefile.x86_common
@@ -1,4 +1,4 @@
-CONTIKI_CPU_DIRS += .
+CONTIKI_CPU_DIRS += . init/common
 
 CONTIKI_SOURCEFILES += gdt.c helpers.S idt.c cpu.c
 
diff --git a/cpu/x86/cpu.c b/cpu/x86/init/common/cpu.c
similarity index 100%
rename from cpu/x86/cpu.c
rename to cpu/x86/init/common/cpu.c
diff --git a/cpu/x86/cpu.h b/cpu/x86/init/common/cpu.h
similarity index 100%
rename from cpu/x86/cpu.h
rename to cpu/x86/init/common/cpu.h
diff --git a/cpu/x86/gdt.c b/cpu/x86/init/common/gdt.c
similarity index 100%
rename from cpu/x86/gdt.c
rename to cpu/x86/init/common/gdt.c
diff --git a/cpu/x86/gdt.h b/cpu/x86/init/common/gdt.h
similarity index 100%
rename from cpu/x86/gdt.h
rename to cpu/x86/init/common/gdt.h
diff --git a/cpu/x86/idt.c b/cpu/x86/init/common/idt.c
similarity index 100%
rename from cpu/x86/idt.c
rename to cpu/x86/init/common/idt.c
diff --git a/cpu/x86/idt.h b/cpu/x86/init/common/idt.h
similarity index 100%
rename from cpu/x86/idt.h
rename to cpu/x86/init/common/idt.h
diff --git a/cpu/x86/interrupt.h b/cpu/x86/init/common/interrupt.h
similarity index 100%
rename from cpu/x86/interrupt.h
rename to cpu/x86/init/common/interrupt.h