From be94db890bf90b8ec7a70e89e490a958aee1659e Mon Sep 17 00:00:00 2001 From: "giwoong.kim" Date: Thu, 16 Feb 2012 14:54:02 +0900 Subject: [PATCH] [Title] add maru folder [Type] [Module] [Priority] [Jira#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] Change-Id: I8ef58163d53dc21b5a64e4e9216812ef91392c46 --- arch/x86/configs/i386_emul_defconfig | 8 ++++++-- drivers/Kconfig | 2 +- drivers/Makefile | 2 +- drivers/maru/Kconfig | 16 ++++++++++++++++ drivers/maru/Makefile | 4 ++++ drivers/{samsung => maru}/avcodec.h | 0 drivers/{samsung => maru}/avformat.h | 0 drivers/{samsung => maru}/avio.h | 0 drivers/{samsung => maru}/avutil.h | 0 drivers/{samsung => maru}/log.h | 0 .../{samsung/emul_codec.c => maru/maru_codec.c} | 0 drivers/{samsung/emul_lcd.c => maru/maru_lcd.c} | 0 drivers/maru/maru_touchscreen.c | 0 drivers/{samsung => maru}/opt.h | 0 drivers/{samsung => maru}/pixfmt.h | 0 drivers/samsung/Kconfig | 12 ------------ drivers/samsung/Makefile | 3 --- 17 files changed, 28 insertions(+), 19 deletions(-) create mode 100755 drivers/maru/Kconfig create mode 100755 drivers/maru/Makefile rename drivers/{samsung => maru}/avcodec.h (100%) rename drivers/{samsung => maru}/avformat.h (100%) rename drivers/{samsung => maru}/avio.h (100%) rename drivers/{samsung => maru}/avutil.h (100%) rename drivers/{samsung => maru}/log.h (100%) rename drivers/{samsung/emul_codec.c => maru/maru_codec.c} (100%) rename drivers/{samsung/emul_lcd.c => maru/maru_lcd.c} (100%) mode change 100755 => 100644 drivers/maru/maru_touchscreen.c rename drivers/{samsung => maru}/opt.h (100%) rename drivers/{samsung => maru}/pixfmt.h (100%) delete mode 100755 drivers/samsung/Kconfig delete mode 100755 drivers/samsung/Makefile diff --git a/arch/x86/configs/i386_emul_defconfig b/arch/x86/configs/i386_emul_defconfig index 9f96af8c9b6d..9f0d6c5a3c7b 100644 --- a/arch/x86/configs/i386_emul_defconfig +++ b/arch/x86/configs/i386_emul_defconfig @@ -2167,8 +2167,12 @@ CONFIG_ANDROID_TIMED_OUTPUT=y # # Virtual device drivers for emulator # -CONFIG_EMUL_LCD=y -CONFIG_EMUL_CODEC=y +CONFIG_MARU=y +CONFIG_MARU_LCD=y +CONFIG_MARU_CODEC=y +CONFIG_MARU_TOUCHSCREEN=y + + CONFIG_X86_PLATFORM_DEVICES=y # CONFIG_ACER_WMI is not set # CONFIG_ASUS_LAPTOP is not set diff --git a/drivers/Kconfig b/drivers/Kconfig index 1b32632e2c31..c3ecbbd46c70 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -112,7 +112,7 @@ source "drivers/xen/Kconfig" source "drivers/staging/Kconfig" -source "drivers/samsung/Kconfig" +source "drivers/maru/Kconfig" source "drivers/platform/Kconfig" endmenu diff --git a/drivers/Makefile b/drivers/Makefile index 60ad57adc9d8..ace2231bfd34 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -115,4 +115,4 @@ obj-y += jack/ obj-y += usb_mode/ obj-y += usb_mass_storage/ -obj-$(CONFIG_EMUL_LCD) += samsung/ +obj-$(CONFIG_MARU) += maru/ diff --git a/drivers/maru/Kconfig b/drivers/maru/Kconfig new file mode 100755 index 000000000000..bfec10119dd9 --- /dev/null +++ b/drivers/maru/Kconfig @@ -0,0 +1,16 @@ +menuconfig MARU + tristate "MARU virtual device drivers for emulator" + default n + +config MARU_LCD + tristate "MARU LCD driver" + depends on MARU != n + +config MARU_CODEC + tristate "MARU codec driver" + depends on MARU != n + +config MARU_TOUCHSCREEN + tristate "MARU touchscreen driver" + depends on MARU != n + diff --git a/drivers/maru/Makefile b/drivers/maru/Makefile new file mode 100755 index 000000000000..a8da6ca1a1fe --- /dev/null +++ b/drivers/maru/Makefile @@ -0,0 +1,4 @@ +obj-$(CONFIG_MARU_LCD) += MARU_lcd.o +obj-$(CONFIG_MARU_CODEC) += MARU_codec.o +obj-$(CONFIG_MARU_TOUCHSCREEN) += MARU_touchscreen.o + diff --git a/drivers/samsung/avcodec.h b/drivers/maru/avcodec.h similarity index 100% rename from drivers/samsung/avcodec.h rename to drivers/maru/avcodec.h diff --git a/drivers/samsung/avformat.h b/drivers/maru/avformat.h similarity index 100% rename from drivers/samsung/avformat.h rename to drivers/maru/avformat.h diff --git a/drivers/samsung/avio.h b/drivers/maru/avio.h similarity index 100% rename from drivers/samsung/avio.h rename to drivers/maru/avio.h diff --git a/drivers/samsung/avutil.h b/drivers/maru/avutil.h similarity index 100% rename from drivers/samsung/avutil.h rename to drivers/maru/avutil.h diff --git a/drivers/samsung/log.h b/drivers/maru/log.h similarity index 100% rename from drivers/samsung/log.h rename to drivers/maru/log.h diff --git a/drivers/samsung/emul_codec.c b/drivers/maru/maru_codec.c similarity index 100% rename from drivers/samsung/emul_codec.c rename to drivers/maru/maru_codec.c diff --git a/drivers/samsung/emul_lcd.c b/drivers/maru/maru_lcd.c similarity index 100% rename from drivers/samsung/emul_lcd.c rename to drivers/maru/maru_lcd.c diff --git a/drivers/maru/maru_touchscreen.c b/drivers/maru/maru_touchscreen.c old mode 100755 new mode 100644 diff --git a/drivers/samsung/opt.h b/drivers/maru/opt.h similarity index 100% rename from drivers/samsung/opt.h rename to drivers/maru/opt.h diff --git a/drivers/samsung/pixfmt.h b/drivers/maru/pixfmt.h similarity index 100% rename from drivers/samsung/pixfmt.h rename to drivers/maru/pixfmt.h diff --git a/drivers/samsung/Kconfig b/drivers/samsung/Kconfig deleted file mode 100755 index 141978aeef92..000000000000 --- a/drivers/samsung/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -menu "Virtual device drivers for emulator" - -config EMUL_LCD - tristate "Samsung emulator LCD driver" - default n - -config EMUL_CODEC - tristate "Samsung virtual codec driver for emulator" - default n - -endmenu - diff --git a/drivers/samsung/Makefile b/drivers/samsung/Makefile deleted file mode 100755 index 71ca74faf7c7..000000000000 --- a/drivers/samsung/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -obj-$(CONFIG_EMUL_LCD) += emul_lcd.o -obj-$(CONFIG_EMUL_CODEC) += emul_codec.o - -- 2.34.1