[ANDROID KERNEL PATCH 2/2] Modify makefile for Android support

[Michael Trimarchi]

Modify compilation makefile and Kconfig for the new android support

Signed-off-by: Michael Trimarchi <michael at panicking.kicks-ass.org>
---
 drivers/android/Kconfig  |  126 +++++++++++++++++++++++++++++++++-------------
 drivers/android/Makefile |   16 ++++--
 2 files changed, 101 insertions(+), 41 deletions(-)

diff --git a/drivers/android/Kconfig b/drivers/android/Kconfig
index dac94bc..75c13bf 100644
--- a/drivers/android/Kconfig
+++ b/drivers/android/Kconfig
@@ -1,92 +1,148 @@
 menu "Android"
+config HAS_WAKELOCK
+	bool
 
-config ANDROID_BINDER_IPC
-	tristate "Binder IPC Driver"
-	default y
+config HAS_EARLYSUSPEND
+	bool
 
-config ANDROID_POWER
-	bool "Android power driver"
+config WAKELOCK
+	bool "Wake lock"
 	depends on PM && RTC_CLASS
 	default n
+	select HAS_WAKELOCK
+	---help---
+	  Enable wakelocks. When user space request a sleep state the
+	  sleep request will be delayed until no wake locks are held.
+
+config WAKELOCK_STAT
+	bool "Wake lock stats"
+	depends on WAKELOCK
+	default y
+	---help---
+	  Report wake lock stats in /proc/wakelocks
 
-config ANDROID_POWER_STAT
-	bool "Android power driver lock stats"
-	depends on ANDROID_POWER
+config USER_WAKELOCK
+	bool "Userspace wake locks"
+	depends on WAKELOCK
+	default y
+	---help---
+	  User-space wake lock api. Write "lockname" or "lockname timeout"
+	  to /sys/power/wake_lock lock and if needed create a wake lock.
+	  Write "lockname" to /sys/power/wake_unlock to unlock a user wake
+	  lock.
+
+config EARLYSUSPEND
+	bool "Early suspend"
+	depends on WAKELOCK
+	default y
+	select HAS_EARLYSUSPEND
+	---help---
+	  Call early suspend handlers when the user requested sleep state
+	  changes.
+
+choice
+	prompt "User-space screen access"
+	default FB_EARLYSUSPEND if !FRAMEBUFFER_CONSOLE
+	default CONSOLE_EARLYSUSPEND
+	depends on HAS_EARLYSUSPEND
+
+	config NO_USER_SPACE_SCREEN_ACCESS_CONTROL
+		bool "None"
+
+	config CONSOLE_EARLYSUSPEND
+		bool "Console switch on early-suspend"
+		depends on HAS_EARLYSUSPEND && VT
+		---help---
+		  Register early suspend handler to perform a console switch to
+		  when user-space should stop drawing to the screen and a switch
+		  back when it should resume.
+
+	config FB_EARLYSUSPEND
+		bool "Sysfs interface"
+		depends on HAS_EARLYSUSPEND
+		---help---
+		  Register early suspend handler that notifies and waits for
+		  user-space through sysfs when user-space should stop drawing
+		  to the screen and notifies user-space when it should resume.
+endchoice
+
+config BINDER_IPC
+	tristate "Binder IPC Driver"
 	default y
 
-config ANDROID_POWER_ALARM
+config POWER_ALARM
 	bool "Android alarm driver"
-	depends on ANDROID_POWER
+	depends on WAKELOCK
 	default y
 
-config ANDROID_LOGGER
+config LOGGER
 	bool "Android log driver"
 	default y
 
-config ANDROID_RAM_CONSOLE
+config RAM_CONSOLE
 	bool "RAM buffer console"
 	default n
 
-config ANDROID_RAM_CONSOLE_ENABLE_VERBOSE
+config RAM_CONSOLE_ENABLE_VERBOSE
 	bool "Enable verbose console messages"
 	default y
-	depends on ANDROID_RAM_CONSOLE
+	depends on RAM_CONSOLE
 
-menuconfig ANDROID_RAM_CONSOLE_ERROR_CORRECTION
+menuconfig RAM_CONSOLE_ERROR_CORRECTION
 	bool "Enable error correction"
 	default n
-	depends on ANDROID_RAM_CONSOLE
+	depends on RAM_CONSOLE
 	select REED_SOLOMON
 	select REED_SOLOMON_ENC8
 	select REED_SOLOMON_DEC8
 
-if ANDROID_RAM_CONSOLE_ERROR_CORRECTION
+if RAM_CONSOLE_ERROR_CORRECTION
 
-config ANDROID_RAM_CONSOLE_ERROR_CORRECTION_DATA_SIZE
+config RAM_CONSOLE_ERROR_CORRECTION_DATA_SIZE
 	int "Data data size"
 	default 128
 	help
 	  Must be a power of 2.
 
-config ANDROID_RAM_CONSOLE_ERROR_CORRECTION_ECC_SIZE
+config RAM_CONSOLE_ERROR_CORRECTION_ECC_SIZE
 	int "ECC size"
 	default 16
 
-config ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE
+config RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE
 	int "Symbol size"
 	default 8
 
-config ANDROID_RAM_CONSOLE_ERROR_CORRECTION_POLYNOMIAL
+config RAM_CONSOLE_ERROR_CORRECTION_POLYNOMIAL
 	hex "Polynomial"
-	default 0x19 if (ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE = 4)
-	default 0x29 if (ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE = 5)
-	default 0x61 if (ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE = 6)
-	default 0x89 if (ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE = 7)
-	default 0x11d if (ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE = 8)
+	default 0x19 if (RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE = 4)
+	default 0x29 if (RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE = 5)
+	default 0x61 if (RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE = 6)
+	default 0x89 if (RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE = 7)
+	default 0x11d if (RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE = 8)
 	
-endif #ANDROID_RAM_CONSOLE_ERROR_CORRECTION
+endif #RAM_CONSOLE_ERROR_CORRECTION
 
-config ANDROID_RAM_CONSOLE_EARLY_INIT
+config RAM_CONSOLE_EARLY_INIT
 	bool "Start ram console early"
 	default n
-	depends on ANDROID_RAM_CONSOLE
+	depends on RAM_CONSOLE
 
-config ANDROID_RAM_CONSOLE_EARLY_ADDR
+config RAM_CONSOLE_EARLY_ADDR
 	hex "RAM console virtual address"
 	default 0
-	depends on ANDROID_RAM_CONSOLE_EARLY_INIT
+	depends on RAM_CONSOLE_EARLY_INIT
 
-config ANDROID_RAM_CONSOLE_EARLY_SIZE
+config RAM_CONSOLE_EARLY_SIZE
 	hex "RAM console buffer size"
 	default 0
-	depends on ANDROID_RAM_CONSOLE_EARLY_INIT
+	depends on RAM_CONSOLE_EARLY_INIT
 
-config ANDROID_TIMED_GPIO
+config TIMED_GPIO
 	bool "Android timed gpio driver"
 	depends on GENERIC_GPIO
 	default y
 
-config ANDROID_PARANOID_NETWORK
+config PARANOID_NETWORK
 	bool "Only allow certain groups to create sockets"
 	default y
 
diff --git a/drivers/android/Makefile b/drivers/android/Makefile
index 178d243..85d273c 100644
--- a/drivers/android/Makefile
+++ b/drivers/android/Makefile
@@ -1,6 +1,10 @@
-obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder.o
-obj-$(CONFIG_ANDROID_POWER)		+= power.o
-obj-$(CONFIG_ANDROID_POWER_ALARM)		+= alarm.o
-obj-$(CONFIG_ANDROID_LOGGER)		+= logger.o
-obj-$(CONFIG_ANDROID_RAM_CONSOLE)	+= ram_console.o
-obj-$(CONFIG_ANDROID_TIMED_GPIO)	+= timed_gpio.o
+obj-$(CONFIG_BINDER_IPC)		+= binder.o
+obj-$(CONFIG_POWER_ALARM)		+= alarm.o
+obj-$(CONFIG_LOGGER)			+= logger.o
+obj-$(CONFIG_RAM_CONSOLE)		+= ram_console.o
+obj-$(CONFIG_TIMED_GPIO)		+= timed_gpio.o
+obj-$(CONFIG_WAKELOCK)			+= wakelock.o
+obj-$(CONFIG_USER_WAKELOCK)		+= userwakelock.o
+obj-$(CONFIG_EARLYSUSPEND)		+= earlysuspend.o
+obj-$(CONFIG_CONSOLE_EARLYSUSPEND)	+= consoleearlysuspend.o
+obj-$(CONFIG_FB_EARLYSUSPEND)		+= fbearlysuspend.o
-- 
1.5.6.5