Skip to contentSkip to conversation

linux-wandboard (3.10.17): Bump SRCREV to 95f32b7 and change SRCBRANCH

PATCH Superseded John Weber 3 participants 7 messages Feb 28, 2014

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

John Weber

author
#0 lore raw

PATCH 1/2 linux-wandboard (3.10.17): Bump SRCREV to 95f32b7 and change SRCBRANCH

The following changes are made:
- Update SRCREV to 95f32b7
- Switch SRCBRANCH to the _test branch
- Set the git URI in WANDBOARD_GITHUB_MIRROR to allow overide in local.conf

squash this

---
 recipes-kernel/linux/linux-wandboard.inc        |    6 +++++-
 recipes-kernel/linux/linux-wandboard_3.10.17.bb |    4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)
recipes-kernel/linux/linux-wandboard.inc +5 -1
index 57e5517..8a6e011 100644
@@ -13,8 +13,12 @@ SCMVERSION ?= "y"
 
 SRCBRANCH ??= "master"
 
+# Allow override of WANDBOARD_GITHUB_MIRROR to make use of
+# local repository easier
+WANDBOARD_GITHUB_MIRROR ?= "git://github.com/wandboard-org/linux.git"
+
 # SRC_URI for wandboard kernel
-SRC_URI = "git://github.com/wandboard-org/linux.git;branch=${SRCBRANCH} \
+SRC_URI = "${WANDBOARD_GITHUB_MIRROR};branch=${SRCBRANCH} \
            file://defconfig \
 "
 
recipes-kernel/linux/linux-wandboard_3.10.17.bb +2 -2
index 71365e6..db54972 100644
@@ -7,8 +7,8 @@ require recipes-kernel/linux/linux-dtb.inc
 DEPENDS += "lzop-native bc-native"
 
 # Wandboard branch - based on 3.10.17_1.0.0_beta from Freescale git
-SRCBRANCH = "wandboard_imx_3.10.17_1.0.0_beta"
-SRCREV = "319845263e5483ee2fd2b3ddcf4e969cbbb5ffd4"
+SRCBRANCH = "wandboard_imx_3.10.17_1.0.0_beta_test"
+SRCREV = "95f32b732fa4a1f5a497494ea2ba7d2e3b65d6c0"
 LOCALVERSION = "-1.0.0-wandboard"
 
 
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 2/2 linux-wandboard (3.10.17): defconfig changes

Several changes to defconfig including:
- Add CONFIG_CFLAGS and CONFIG_FHANDLE to allow for systemd support
- Enable Broadcom drivers by default
- Enable RFKILL support in kernel, this is necessary for Broadcom driver
- Enable user-space view of device tree in /proc/device-tree

---
 .../linux/linux-wandboard-3.10.17/defconfig        |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)
recipes-kernel/linux/linux-wandboard-3.10.17/defconfig +12 -5
index 7d847c8..b7e7b45 100644
@@ -1,5 +1,7 @@
+CONFIG_LOCALVERSION="-1.0.0-wandboard"
 CONFIG_KERNEL_LZO=y
 CONFIG_SYSVIPC=y
+CONFIG_FHANDLE=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_IKCONFIG=y
@@ -8,9 +10,8 @@ CONFIG_LOG_BUF_SHIFT=18
 CONFIG_CGROUPS=y
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_EXPERT=y
+CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
-# CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
@@ -26,12 +27,15 @@ CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
 CONFIG_SOC_VF610=y
+CONFIG_WAND_RFKILL=y
 # CONFIG_SWP_EMULATE is not set
 CONFIG_SMP=y
 CONFIG_VMSPLIT_2G=y
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y
@@ -65,6 +69,8 @@ CONFIG_CAN_FLEXCAN=y
 CONFIG_CFG80211=y
 CONFIG_CFG80211_WEXT=y
 CONFIG_MAC80211=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_GPIO=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
@@ -88,6 +94,7 @@ CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_GPMI_NAND=y
 CONFIG_MTD_NAND_MXC=y
 CONFIG_MTD_UBI=y
+CONFIG_PROC_DEVICETREE=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=65536
@@ -119,9 +126,9 @@ CONFIG_SMC91X=y
 CONFIG_SMC911X=y
 CONFIG_SMSC911X=y
 # CONFIG_NET_VENDOR_STMICRO is not set
-CONFIG_ATH_CARDS=y
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
+CONFIG_USB_HSO=y
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMDBG=y
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_EVBUG=m
Signature · 1 line
1.7.9.5
#2 lore raw
In reply to John Weber
Quoted 7 lines · John Weber

The following changes are made:
- Update SRCREV to 95f32b7
- Switch SRCBRANCH to the _test branch
- Set the git URI in WANDBOARD_GITHUB_MIRROR to allow overide in local.conf

squash this

Squash this! ;-)

Why to use a _test branch? It might be better to merge it in the 3.10.17-1.0.0-beta branch and drop the test suffix.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
author
#3 lore raw

Well, looks like I was rebase-ing a little too quickly... :-)

Quoted 13 lines · Otavio Salvador
Quoted 7 lines · John Weber

The following changes are made:
- Update SRCREV to 95f32b7
- Switch SRCBRANCH to the _test branch
- Set the git URI in WANDBOARD_GITHUB_MIRROR to allow overide in local.conf

squash this

Squash this! ;-)

Why to use a _test branch? It might be better to merge it in the 3.10.17-1.0.0-beta branch and drop the test suffix.

#4 lore raw
In reply to John Weber
Quoted 10 lines

-----Original Message-----
From: [email protected] [mailto:meta-freescale- [email protected]] On Behalf Of John Weber
Sent: Thursday, February 27, 2014 11:38 PM
To: [email protected]
Subject: [meta-freescale] [meta-fsl-arm-extra][PATCH 1/2] linux-wandboard (3.10.17): Bump SRCREV to 95f32b7 and change SRCBRANCH

Quoted 7 lines

The following changes are made:
- Update SRCREV to 95f32b7
- Switch SRCBRANCH to the _test branch
- Set the git URI in WANDBOARD_GITHUB_MIRROR to allow overide in local.conf

squash this

Squash this?

Quoted 13 lines
---
 recipes-kernel/linux/linux-wandboard.inc        |    6 +++++-
 recipes-kernel/linux/linux-wandboard_3.10.17.bb |    4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)
recipes- renamed from recipes-kernel/linux/linux-wandboard.inc +0 -0

kernel/linux/linux-wandboard.inc
index 57e5517..8a6e011 100644

recipes-kernel/linux/linux-wandboard.inc SCMVERSION ?= "y" · line 19

Quoted 7 lines
recipes-kernel/linux/linux-wandboard.inc +4 -0
@@ -13,8 +13,12 @@ SCMVERSION ?= "y"
 
 SRCBRANCH ??= "master"
 
+# Allow override of WANDBOARD_GITHUB_MIRROR to make use of # local
+repository easier WANDBOARD_GITHUB_MIRROR ?=
+"git://github.com/wandboard-org/linux.git"
+

I hope these lines are messed because I´m using outlook.

Where is WANDBOARD_GITHUB_MIRROR defined? (I hope in next patch)

Daiane

Quoted 30 lines
recipes-kernel/linux/linux-wandboard.inc +1 -1
 # SRC_URI for wandboard kernel
-SRC_URI = "git://github.com/wandboard-org/linux.git;branch=${SRCBRANCH} \
+SRC_URI = "${WANDBOARD_GITHUB_MIRROR};branch=${SRCBRANCH} \
            file://defconfig \
 "
 
recipes- renamed from recipes-kernel/linux/linux-wandboard_3.10.17.bb +0 -0

kernel/linux/linux-wandboard_3.10.17.bb
index 71365e6..db54972 100644

recipes-kernel/linux/linux-wandboard_3.10.17.bb +0 -0
@@ -7,8 +7,8 @@ require recipes-kernel/linux/linux-dtb.inc
 DEPENDS += "lzop-native bc-native"
 
 # Wandboard branch - based on 3.10.17_1.0.0_beta from Freescale git -

SRCBRANCH = "wandboard_imx_3.10.17_1.0.0_beta"

recipes-kernel/linux/linux-wandboard_3.10.17.bb +2 -2
-SRCREV = "319845263e5483ee2fd2b3ddcf4e969cbbb5ffd4"
+SRCBRANCH = "wandboard_imx_3.10.17_1.0.0_beta_test"
+SRCREV = "95f32b732fa4a1f5a497494ea2ba7d2e3b65d6c0"
 LOCALVERSION = "-1.0.0-wandboard"
 
 
--

1.7.9.5

_______________________________________________
meta-freescale mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-freescale

author
#5 lore raw
Quoted 9 lines · On 2/28/14, 6:49 AM, [email protected] wrote:
Quoted 9 lines

-----Original Message-----
From: [email protected] [mailto:meta-freescale- [email protected]] On Behalf Of John Weber
Sent: Thursday, February 27, 2014 11:38 PM
To: [email protected]
Subject: [meta-freescale] [meta-fsl-arm-extra][PATCH 1/2] linux-wandboard (3.10.17): Bump SRCREV to 95f32b7 and change SRCBRANCH

Quoted 8 lines
Quoted 7 lines

The following changes are made:
- Update SRCREV to 95f32b7
- Switch SRCBRANCH to the _test branch
- Set the git URI in WANDBOARD_GITHUB_MIRROR to allow overide in local.conf

squash this

Squash this?

Otavio caught this as well. I missed this when squashing patches using rebase -i. I'll fix in V2.

Quoted 16 lines
Quoted 16 lines
---
  recipes-kernel/linux/linux-wandboard.inc        |    6 +++++-
  recipes-kernel/linux/linux-wandboard_3.10.17.bb |    4 ++--
  2 files changed, 7 insertions(+), 3 deletions(-)
recipes- renamed from recipes-kernel/linux/linux-wandboard.inc +0 -0

kernel/linux/linux-wandboard.inc
index 57e5517..8a6e011 100644

recipes-kernel/linux/linux-wandboard.inc +0 -0
@@ -13,8 +13,12 @@ SCMVERSION ?= "y"
 
  SRCBRANCH ??= "master"
 
Quoted 8 lines

recipes-kernel/linux/linux-wandboard.inc SCMVERSION ?= "y" · line 19

Quoted 4 lines
recipes-kernel/linux/linux-wandboard.inc +4 -0
+# Allow override of WANDBOARD_GITHUB_MIRROR to make use of # local
+repository easier WANDBOARD_GITHUB_MIRROR ?=
+"git://github.com/wandboard-org/linux.git"
+

I hope these lines are messed because I´m using outlook.

Where is WANDBOARD_GITHUB_MIRROR defined? (I hope in next patch)

Here is the change that is in the patch:

+# Allow override of WANDBOARD_GITHUB_MIRROR to make use of +# local repository easier
+WANDBOARD_GITHUB_MIRROR ?="git://github.com/wandboard-org/linux.git" +

Not sure how this was changed in your email reader?

Quoted 32 lines

Daiane

Quoted 30 lines
recipes-kernel/linux/linux-wandboard.inc +1 -1
  # SRC_URI for wandboard kernel
-SRC_URI = "git://github.com/wandboard-org/linux.git;branch=${SRCBRANCH} \
+SRC_URI = "${WANDBOARD_GITHUB_MIRROR};branch=${SRCBRANCH} \
             file://defconfig \
  "
 
recipes- renamed from recipes-kernel/linux/linux-wandboard_3.10.17.bb +0 -0

kernel/linux/linux-wandboard_3.10.17.bb
index 71365e6..db54972 100644

recipes-kernel/linux/linux-wandboard_3.10.17.bb +0 -0
@@ -7,8 +7,8 @@ require recipes-kernel/linux/linux-dtb.inc
  DEPENDS += "lzop-native bc-native"
 
  # Wandboard branch - based on 3.10.17_1.0.0_beta from Freescale git -

SRCBRANCH = "wandboard_imx_3.10.17_1.0.0_beta"

recipes-kernel/linux/linux-wandboard_3.10.17.bb +2 -2
-SRCREV = "319845263e5483ee2fd2b3ddcf4e969cbbb5ffd4"
+SRCBRANCH = "wandboard_imx_3.10.17_1.0.0_beta_test"
+SRCREV = "95f32b732fa4a1f5a497494ea2ba7d2e3b65d6c0"
  LOCALVERSION = "-1.0.0-wandboard"
 
 
--

1.7.9.5

_______________________________________________
meta-freescale mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-freescale

#6 lore raw
Quoted 57 lines

-----Original Message-----
From: John Weber [mailto:[email protected]]
Sent: Friday, February 28, 2014 9:57 AM
To: Angolini Daiane-B19406; [email protected]
Subject: Re: [meta-freescale] [meta-fsl-arm-extra][PATCH 1/2] linux- wandboard (3.10.17): Bump SRCREV to 95f32b7 and change SRCBRANCH

Quoted 10 lines · On 2/28/14, 6:49 AM, [email protected] wrote:
Quoted 10 lines

-----Original Message-----
From: [email protected] [mailto:meta-freescale- [email protected]] On Behalf Of John Weber
Sent: Thursday, February 27, 2014 11:38 PM
To: [email protected]
Subject: [meta-freescale] [meta-fsl-arm-extra][PATCH 1/2] linux-wandboard
(3.10.17): Bump SRCREV to 95f32b7 and change SRCBRANCH

Quoted 8 lines
Quoted 7 lines

The following changes are made:
- Update SRCREV to 95f32b7
- Switch SRCBRANCH to the _test branch
- Set the git URI in WANDBOARD_GITHUB_MIRROR to allow overide in local.conf

squash this

Squash this?

Otavio caught this as well. I missed this when squashing patches using rebase -i. I'll fix in V2.

Quoted 15 lines
Quoted 15 lines
---
  recipes-kernel/linux/linux-wandboard.inc        |    6 +++++-
  recipes-kernel/linux/linux-wandboard_3.10.17.bb |    4 ++--
  2 files changed, 7 insertions(+), 3 deletions(-)
recipes- renamed from recipes-kernel/linux/linux-wandboard.inc +0 -0

kernel/linux/linux-wandboard.inc index 57e5517..8a6e011 100644

recipes-kernel/linux/linux-wandboard.inc +0 -0
@@ -13,8 +13,12 @@ SCMVERSION ?= "y"
 
  SRCBRANCH ??= "master"
 
Quoted 8 lines

recipes-kernel/linux/linux-wandboard.inc SCMVERSION ?= "y" · line 19

Quoted 4 lines
recipes-kernel/linux/linux-wandboard.inc +4 -0
+# Allow override of WANDBOARD_GITHUB_MIRROR to make use of # local
+repository easier WANDBOARD_GITHUB_MIRROR ?=
+"git://github.com/wandboard-org/linux.git"
+

I hope these lines are messed because I´m using outlook.

Where is WANDBOARD_GITHUB_MIRROR defined? (I hope in next patch)

Here is the change that is in the patch:

Review

Quoted 4 lines
(quoted diff) +4 -0
+# Allow override of WANDBOARD_GITHUB_MIRROR to make use of # local
+repository easier WANDBOARD_GITHUB_MIRROR
+?="git://github.com/wandboard-org/linux.git"
+

Outlook is super reliable! (#not)

This is true patch:
+# Allow override of WANDBOARD_GITHUB_MIRROR to make use of +# local repository easier
+WANDBOARD_GITHUB_MIRROR ?= "git://github.com/wandboard-org/linux.git" +

And now I see the variable definition ;)

Daiane

Quoted 36 lines

Not sure how this was changed in your email reader?

Quoted 33 lines

Daiane

Quoted 31 lines
recipes-kernel/linux/linux-wandboard.inc +1 -1
  # SRC_URI for wandboard kernel
-SRC_URI =
 "git://github.com/wandboard-org/linux.git;branch=${SRCBRANCH} \
+SRC_URI = "${WANDBOARD_GITHUB_MIRROR};branch=${SRCBRANCH} \
             file://defconfig \
  "
(quoted diff) +0 -0

b/recipes- kernel/linux/linux-wandboard_3.10.17.bb index 71365e6..db54972 100644

recipes-kernel/linux/linux-wandboard_3.10.17.bb +2 -3
@@ -7,8 +7,8 @@ require recipes-kernel/linux/linux-dtb.inc
  DEPENDS += "lzop-native bc-native"
 
  # Wandboard branch - based on 3.10.17_1.0.0_beta from Freescale git
- SRCBRANCH = "wandboard_imx_3.10.17_1.0.0_beta"
-SRCREV = "319845263e5483ee2fd2b3ddcf4e969cbbb5ffd4"
+SRCBRANCH = "wandboard_imx_3.10.17_1.0.0_beta_test"
+SRCREV = "95f32b732fa4a1f5a497494ea2ba7d2e3b65d6c0"
  LOCALVERSION = "-1.0.0-wandboard"
 
 
--

1.7.9.5

_______________________________________________
meta-freescale mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-freescale