[Title] camera module move & init camera module

[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/Makefile.objs b/Makefile.objs
index 7df3b59..3b52e33 100644 (file)
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -264,10 +264,6 @@ hw-obj-$(CONFIG_DP8393X) += dp8393x.o
 hw-obj-$(CONFIG_DS1225Y) += ds1225y.o
 hw-obj-$(CONFIG_MIPSNET) += mipsnet.o
 
-hw-obj-$(CONFIG_PCI) += svcamera_pci.o
-hw-obj-$(CONFIG_LINUX) += svcamera_linux.o
-hw-obj-$(CONFIG_WIN32) += svcamera_win32.o
-
 # Sound
 sound-obj-y =
 sound-obj-$(CONFIG_SB16) += sb16.o

diff --git a/Makefile.target b/Makefile.target
index c66e2ed..9fd41e9 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -356,6 +356,9 @@ obj-i386-y += tizen-board.o
 obj-i386-y += tizen-ac97.o
 obj-i386-y += overlay.o
 obj-i386-y += brightness.o
+obj-i386-$(CONFIG_PCI) += svcamera_pci.o
+obj-i386-$(CONFIG_LINUX) += svcamera_linux.o
+obj-i386-$(CONFIG_WIN32) += svcamera_win32.o
 
 ifdef CONFIG_FFMPEG
 obj-i386-y += tizen-codec.o

diff --git a/hw/svcamera.h b/tizen/hw/svcamera.h
similarity index 100%
rename from hw/svcamera.h
rename to tizen/hw/svcamera.h

diff --git a/hw/svcamera_linux.c b/tizen/hw/svcamera_linux.c
similarity index 100%
rename from hw/svcamera_linux.c
rename to tizen/hw/svcamera_linux.c

diff --git a/hw/svcamera_pci.c b/tizen/hw/svcamera_pci.c
similarity index 100%
rename from hw/svcamera_pci.c
rename to tizen/hw/svcamera_pci.c

diff --git a/hw/svcamera_win32.c b/tizen/hw/svcamera_win32.c
similarity index 100%
rename from hw/svcamera_win32.c
rename to tizen/hw/svcamera_win32.c

diff --git a/tizen/hw/tizen-board.c b/tizen/hw/tizen-board.c
index d21e77b..669a027 100644 (file)
--- a/tizen/hw/tizen-board.c
+++ b/tizen/hw/tizen-board.c
@@ -168,7 +168,7 @@ static void tizen_x86_machine_init(ram_addr_t ram_size,
 
 // TIZEN-specialized device init...
     if (pci_enabled) {
-//        svcamera_pci_init(pci_bus);
+               svcamera_pci_init(pci_bus);
                tizen_ac97_init(pci_bus);
     }