[oe-commits] org.oe.dev linux-openmoko-devel: clean up a bit, compute defconfig for om-gta01 and om-gta02 out of one defconfig,

[mickeyl commit]

linux-openmoko-devel: clean up a bit, compute defconfig for om-gta01 and om-gta02 out of one defconfig,
enable IKCONFIG in defconfig, disable APM_POWER in defconfig.

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: d39fcbb20e8ed63ddeb563f8bcffc41b528163cd
ViewMTN: http://monotone.openembedded.org/revision/info/d39fcbb20e8ed63ddeb563f8bcffc41b528163cd
Files:
1
packages/linux/linux-openmoko-devel/defconfig-om-gta01
packages/linux/linux-openmoko-devel/del-hardcoded-led-behaviour.patch
packages/linux/linux-openmoko-devel/fix-defconfig-gta01.patch
packages/linux/linux-openmoko-devel/defconfig-om-gta02
packages/linux/linux-openmoko-devel/defconfig-oe
packages/linux/linux-openmoko-devel_git.bb
packages/linux/linux-openmoko_2.6.24+git.bb
Diffs:

#
# mt diff -r93d087e4fb9dfb9c630aa53851359ee3a6462a4f -rd39fcbb20e8ed63ddeb563f8bcffc41b528163cd
#
#
#
# delete "packages/linux/linux-openmoko-devel/defconfig-om-gta01"
# 
# delete "packages/linux/linux-openmoko-devel/del-hardcoded-led-behaviour.patch"
# 
# delete "packages/linux/linux-openmoko-devel/fix-defconfig-gta01.patch"
# 
# rename "packages/linux/linux-openmoko-devel/defconfig-om-gta02"
#     to "packages/linux/linux-openmoko-devel/defconfig-oe"
# 
# patch "packages/linux/linux-openmoko-devel/defconfig-oe"
#  from [720ccf8d31848113663470173d1e4ca94d2e448d]
#    to [2718a78fdc1b4bb16308b28db21353815d3900c9]
# 
# patch "packages/linux/linux-openmoko-devel_git.bb"
#  from [97d07044ee9d02e743567f439f5ef24e85e8ad6f]
#    to [a558ba890553e9ff9d3cb9f68b07df41b7dea683]
# 
# patch "packages/linux/linux-openmoko_2.6.24+git.bb"
#  from [f6554c25cbdf6ca9464d300be87c1ba691ea7a92]
#    to [919295f566a486fe805a50645eab20b1f4744037]
#
============================================================
--- packages/linux/linux-openmoko-devel/defconfig-om-gta02	720ccf8d31848113663470173d1e4ca94d2e448d
+++ packages/linux/linux-openmoko-devel/defconfig-oe	2718a78fdc1b4bb16308b28db21353815d3900c9
@@ -33,8 +33,8 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_LOCALVERSION="oe"
+CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
@@ -44,7 +44,8 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_USER_NS is not set
 # CONFIG_PID_NS is not set
 # CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_CGROUPS is not set
 # CONFIG_FAIR_GROUP_SCHED is not set
@@ -1020,7 +1021,7 @@ CONFIG_POWER_SUPPLY=y
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 # CONFIG_PDA_POWER is not set
-CONFIG_APM_POWER=y
+# CONFIG_APM_POWER is not set
 # CONFIG_BATTERY_DS2760 is not set
 CONFIG_BATTERY_BQ27000_HDQ=y
 CONFIG_GTA02_HDQ=y
============================================================
--- packages/linux/linux-openmoko-devel_git.bb	97d07044ee9d02e743567f439f5ef24e85e8ad6f
+++ packages/linux/linux-openmoko-devel_git.bb	a558ba890553e9ff9d3cb9f68b07df41b7dea683
@@ -14,14 +14,13 @@ UBOOT_ENTRYPOINT = "30008000"
 KERNEL_IMAGETYPE = "uImage"
 UBOOT_ENTRYPOINT = "30008000"
 
-SRC_URI = "git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy"
+SRC_URI = "\
+  git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy \
+  file://defconfig-oe"
 S = "${WORKDIR}/git"
 
-SRC_URI_append-om-gta02 = " file://del-hardcoded-led-behaviour.patch;patch=1"
-SRC_URI += "file://defconfig-${MACHINE}"
-
 ##############################################################
-# kernel image resides on a seperate flash partition (for now)
+# kernel image resides on a seperate flash partition
 #
 FILES_kernel-image = ""
 ALLOW_EMPTY = "1"
@@ -45,6 +44,11 @@ do_configure_prepend() {
 module_autoload_s3cmci = "s3cmci"
 
 do_configure_prepend() {
-	cp ${WORKDIR}/defconfig-${MACHINE} ${WORKDIR}/defconfig
+	install -m 0644 ${WORKDIR}/defconfig-oe ${WORKDIR}/defconfig
+	if [ ${MACHINE} == "om-gta01" ]; then
+		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 "done"
+	fi
 }
-
============================================================
--- packages/linux/linux-openmoko_2.6.24+git.bb	f6554c25cbdf6ca9464d300be87c1ba691ea7a92
+++ packages/linux/linux-openmoko_2.6.24+git.bb	919295f566a486fe805a50645eab20b1f4744037
@@ -3,8 +3,7 @@ DESCRIPTION = "Linux 2.6.x (development)
 
 DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ Openmoko"
 
-PE = "1"
-PV = "${KERNEL_RELEASE}+git${SRCREV}"
+PV = "${KERNEL_RELEASE}+gitr${SRCREV}"
 PR = "r0"
 
 SRC_URI = "git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable"