linux-openmoko: enable 01's battery class only for 01, likewise for 02's battery...

diff --git a/packages/linux/linux-openmoko-devel_git.bb b/packages/linux/linux-openmoko-devel_git.bb
index 73ce09a2ee4f64797f02710a2f1d6de2736b1bcc..a1b91e5425d867ee1e4e5dc3912ee95404978c74 100644 (file)
--- a/packages/linux/linux-openmoko-devel_git.bb
+++ b/packages/linux/linux-openmoko-devel_git.bb
@@ -18,6 +18,6 @@ SRC_URI = "\
 S = "${WORKDIR}/git"
 
 do_configure_prepend() {
-       install -m 644 cp ./arch/arm/configs/gta02_defconfig ${WORKDIR}/defconfig-oe 
+       install -m 644 ./arch/arm/configs/gta02-moredrivers-defconfig ${WORKDIR}/defconfig-oe 
 }
 

diff --git a/packages/linux/linux-openmoko.inc b/packages/linux/linux-openmoko.inc
index 3a6589791ee10fe222e83b8d02dc20595b472080..781579be93fe290dbf2ece7d14a9eeb2f18304a7 100644 (file)
--- a/packages/linux/linux-openmoko.inc
+++ b/packages/linux/linux-openmoko.inc
@@ -38,8 +38,16 @@ do_configure_prepend() {
                 echo -n "fixing up configuration for Openmoko GTA01..."
                 sed -i -e s,CONFIG_S3C_LOWLEVEL_UART_PORT=2,CONFIG_S3C_LOWLEVEL_UART_PORT=0, ${WORKDIR}/defconfig
                 sed -i -e s,CONFIG_DEBUG_S3C_UART=2,CONFIG_DEBUG_S3C_UART=0, ${WORKDIR}/defconfig
+                echo "# CONFIG_BATTERY_BQ27000_HDQ is not set" >>${WORKDIR}/defconfig
+                echo "CONFIG_BATTERY_GTA01=y" >>${WORKDIR}/defconfig
                 echo "done"
         fi
+        if [ ${MACHINE} == "om-gta02" ]; then
+                echo -n "fixing up configuration for Openmoko GTA02..."
+                echo "CONFIG_BATTERY_BQ27000_HDQ=y" >>${WORKDIR}/defconfig
+                echo "# CONFIG_BATTERY_GTA01 is not set" >>${WORKDIR}/defconfig
+                echo "done"
+        fi                                                                       
 }
 
 # symlink the latest uImage (should go to linux.inc IMO)

diff --git a/packages/linux/linux-openmoko/defconfig-oe b/packages/linux/linux-openmoko/defconfig-oe
index 30cf97adc9e2b8396743ce915616c989d043c992..5b8fb3776abc52dd92b7cfd202740e1add00c6c4 100644 (file)
--- a/packages/linux/linux-openmoko/defconfig-oe
+++ b/packages/linux/linux-openmoko/defconfig-oe
@@ -1023,8 +1023,9 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_PDA_POWER is not set
 # CONFIG_APM_POWER is not set
 # CONFIG_BATTERY_DS2760 is not set
-CONFIG_BATTERY_BQ27000_HDQ=y
+### override CONFIG_BATTERY_BQ27000_HDQ=y
 CONFIG_GTA02_HDQ=y
+### override CONFIG_BATTERY_GTA01=y
 # CONFIG_HWMON is not set
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set

diff --git a/packages/linux/linux-openmoko_2.6.24+git.bb b/packages/linux/linux-openmoko_2.6.24+git.bb
index 7e00f6ab186a1cf7f6f58112aeaa7b72945c1b5f..134542a43d023d8b64b3d0daefa4d3143f2a89ec 100644 (file)
--- a/packages/linux/linux-openmoko_2.6.24+git.bb
+++ b/packages/linux/linux-openmoko_2.6.24+git.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "The Linux kernel for the Openmoko devices GTA01 (Neo1973) and GTA
 KERNEL_RELEASE = "2.6.24"
 KERNEL_VERSION = "${KERNEL_RELEASE}"
 
-OEV = "oe1"
+OEV = "oe2"
 PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}"
 PR = "r0"