diff options
| author | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2008-12-14 14:36:11 +0100 |
|---|---|---|
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2008-12-14 14:36:11 +0100 |
| commit | c825f1e82e8af34f46a1de34a3acf49c85927e13 (patch) | |
| tree | 64aff4c46d52c0db1dd8e1a176b414be2a4a9084 | |
| parent | 7eb235c8a93d0b7a0d043c6f6247a006407e1202 (diff) | |
linux-openmoko 2.6.24: solve the sysfs battery clash differently as it lead to nonworking builds
(too many implicit cross-module dependencies :/)
| -rw-r--r-- | packages/linux/linux-openmoko.inc | 4 | ||||
| -rw-r--r-- | packages/linux/linux-openmoko/defconfig-oe | 4 | ||||
| -rw-r--r-- | packages/linux/linux-openmoko/gta01-fix-battery-class-name.patch | 13 | ||||
| -rw-r--r-- | packages/linux/linux-openmoko_2.6.24+git.bb | 3 |
4 files changed, 17 insertions, 7 deletions
diff --git a/packages/linux/linux-openmoko.inc b/packages/linux/linux-openmoko.inc index 781579be93..c986975851 100644 --- a/packages/linux/linux-openmoko.inc +++ b/packages/linux/linux-openmoko.inc @@ -38,14 +38,10 @@ 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 } diff --git a/packages/linux/linux-openmoko/defconfig-oe b/packages/linux/linux-openmoko/defconfig-oe index 5b8fb3776a..e3714b735e 100644 --- a/packages/linux/linux-openmoko/defconfig-oe +++ b/packages/linux/linux-openmoko/defconfig-oe @@ -1023,9 +1023,9 @@ CONFIG_POWER_SUPPLY=y # CONFIG_PDA_POWER is not set # CONFIG_APM_POWER is not set # CONFIG_BATTERY_DS2760 is not set -### override CONFIG_BATTERY_BQ27000_HDQ=y +CONFIG_BATTERY_BQ27000_HDQ=y CONFIG_GTA02_HDQ=y -### override CONFIG_BATTERY_GTA01=y +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/gta01-fix-battery-class-name.patch b/packages/linux/linux-openmoko/gta01-fix-battery-class-name.patch new file mode 100644 index 0000000000..6e8692c37d --- /dev/null +++ b/packages/linux/linux-openmoko/gta01-fix-battery-class-name.patch @@ -0,0 +1,13 @@ +Index: git/drivers/power/gta01_battery.c +=================================================================== +--- git.orig/drivers/power/gta01_battery.c ++++ git/drivers/power/gta01_battery.c +@@ -70,7 +70,7 @@ static int __init gta01_bat_init(void) + { + int ret; + +- bat_pdev = platform_device_register_simple("bat", 0, NULL, 0); ++ bat_pdev = platform_device_register_simple("bat-th-gta01", 0, NULL, 0); + if (IS_ERR(bat_pdev)) + return PTR_ERR(bat_pdev); + diff --git a/packages/linux/linux-openmoko_2.6.24+git.bb b/packages/linux/linux-openmoko_2.6.24+git.bb index 134542a43d..6f62b3dbdf 100644 --- 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 = "oe2" +OEV = "oe3" PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}" PR = "r0" @@ -20,6 +20,7 @@ SRC_URI = "\ file://0005-squashfs-Makefile.patch;patch=1 \ \ file://openwrt-ledtrig-netdev.patch;patch=1 \ + file://gta01-fix-battery-class-name.patch;patch=1 \ \ file://defconfig-oe \ " |