| Message ID | 1283199662-17651-1-git-send-email-ricardo.salveti@canonical.com |
|---|---|
| State | Accepted |
| Delegated to: | Leann Ogasawara |
| Headers | show |
On 08/30/2010 02:21 PM, Ricardo Salveti de Araujo wrote: > Most Omap based boards use the heartbeat trigger as one of their main > leds (like beagleboard). The trigger architecture doesn't automatically > load the board's default trigger modules, so when we compile heartbeat > as module it'll only be used when the user manually loads it. > As it'd be good to have it properly loaded since the boot start, > changing it to built-in will make the led to work right after loading > the kernel. > > Having a hartbeat LED is very useful during development, as we can > easily notice if the board is still working after a temporary hang, so > using it as default sounds a good idea. > > Patch for current Maverick master tree. > > Ignore: yes > > Signed-off-by: Ricardo Salveti de Araujo<ricardo.salveti@canonical.com> > --- > debian.master/config/amd64/config.common.amd64 | 2 ++ > debian.master/config/armel/config.flavour.omap | 2 ++ > .../config/armel/config.flavour.versatile | 2 ++ > debian.master/config/config.common.ubuntu | 2 -- > debian.master/config/i386/config.common.i386 | 2 ++ > 5 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 > index 3997244..374f404 100644 > --- a/debian.master/config/amd64/config.common.amd64 > +++ b/debian.master/config/amd64/config.common.amd64 > @@ -86,6 +86,8 @@ CONFIG_KSM=y > # CONFIG_KTIME_SCALAR is not set > CONFIG_LAPB=m > CONFIG_LAPBETHER=m > +CONFIG_LEDS_CLASS=m > +CONFIG_LEDS_TRIGGER_HEARTBEAT=m > CONFIG_LIBERTAS_MESH=y > CONFIG_LLC=y > CONFIG_LLC2=m > diff --git a/debian.master/config/armel/config.flavour.omap b/debian.master/config/armel/config.flavour.omap > index 6585996..2405a19 100644 > --- a/debian.master/config/armel/config.flavour.omap > +++ b/debian.master/config/armel/config.flavour.omap > @@ -52,6 +52,8 @@ CONFIG_KEYBOARD_SUNKBD=m > CONFIG_KEYBOARD_XTKBD=m > # CONFIG_KSM is not set > CONFIG_LAPB=m > +CONFIG_LEDS_CLASS=y > +CONFIG_LEDS_TRIGGER_HEARTBEAT=y > # CONFIG_LIBERTAS_MESH is not set > CONFIG_LLC=m > CONFIG_LLC2=m > diff --git a/debian.master/config/armel/config.flavour.versatile b/debian.master/config/armel/config.flavour.versatile > index 33da43e..fe78875 100644 > --- a/debian.master/config/armel/config.flavour.versatile > +++ b/debian.master/config/armel/config.flavour.versatile > @@ -52,6 +52,8 @@ CONFIG_IWMC3200TOP_DEBUGFS=y > # CONFIG_KEYBOARD_XTKBD is not set > CONFIG_KSM=y > # CONFIG_LAPB is not set > +CONFIG_LEDS_CLASS=m > +CONFIG_LEDS_TRIGGER_HEARTBEAT=m > CONFIG_LIBERTAS_MESH=y > CONFIG_LLC=y > # CONFIG_LLC2 is not set > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu > index 86962b4..06d9711 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -2328,7 +2328,6 @@ CONFIG_LEDS_88PM860X=m > CONFIG_LEDS_ADP5520=m > CONFIG_LEDS_ALIX2=m > CONFIG_LEDS_BD2802=m > -CONFIG_LEDS_CLASS=m > # CONFIG_LEDS_CLEVO_MAIL is not set > CONFIG_LEDS_CPU=y > CONFIG_LEDS_DA903X=m > @@ -2349,7 +2348,6 @@ CONFIG_LEDS_TRIGGERS=y > CONFIG_LEDS_TRIGGER_BACKLIGHT=m > CONFIG_LEDS_TRIGGER_DEFAULT_ON=m > CONFIG_LEDS_TRIGGER_GPIO=m > -CONFIG_LEDS_TRIGGER_HEARTBEAT=m > CONFIG_LEDS_TRIGGER_TIMER=m > CONFIG_LEDS_WM831X_STATUS=m > CONFIG_LEDS_WM8350=m > diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 > index 5b512b3..ab5ef95 100644 > --- a/debian.master/config/i386/config.common.i386 > +++ b/debian.master/config/i386/config.common.i386 > @@ -88,6 +88,8 @@ CONFIG_KSM=y > CONFIG_KTIME_SCALAR=y > CONFIG_LAPB=m > CONFIG_LAPBETHER=m > +CONFIG_LEDS_CLASS=m > +CONFIG_LEDS_TRIGGER_HEARTBEAT=m > CONFIG_LIBERTAS_MESH=y > CONFIG_LLC=y > CONFIG_LLC2=m Acked-by: Tim Gardner <tim.gardner@canonical.com>
Applied to Maverick linux master. Thanks, Leann On Mon, 2010-08-30 at 17:21 -0300, Ricardo Salveti de Araujo wrote: > Most Omap based boards use the heartbeat trigger as one of their main > leds (like beagleboard). The trigger architecture doesn't automatically > load the board's default trigger modules, so when we compile heartbeat > as module it'll only be used when the user manually loads it. > As it'd be good to have it properly loaded since the boot start, > changing it to built-in will make the led to work right after loading > the kernel. > > Having a hartbeat LED is very useful during development, as we can > easily notice if the board is still working after a temporary hang, so > using it as default sounds a good idea. > > Patch for current Maverick master tree. > > Ignore: yes > > Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> > --- > debian.master/config/amd64/config.common.amd64 | 2 ++ > debian.master/config/armel/config.flavour.omap | 2 ++ > .../config/armel/config.flavour.versatile | 2 ++ > debian.master/config/config.common.ubuntu | 2 -- > debian.master/config/i386/config.common.i386 | 2 ++ > 5 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 > index 3997244..374f404 100644 > --- a/debian.master/config/amd64/config.common.amd64 > +++ b/debian.master/config/amd64/config.common.amd64 > @@ -86,6 +86,8 @@ CONFIG_KSM=y > # CONFIG_KTIME_SCALAR is not set > CONFIG_LAPB=m > CONFIG_LAPBETHER=m > +CONFIG_LEDS_CLASS=m > +CONFIG_LEDS_TRIGGER_HEARTBEAT=m > CONFIG_LIBERTAS_MESH=y > CONFIG_LLC=y > CONFIG_LLC2=m > diff --git a/debian.master/config/armel/config.flavour.omap b/debian.master/config/armel/config.flavour.omap > index 6585996..2405a19 100644 > --- a/debian.master/config/armel/config.flavour.omap > +++ b/debian.master/config/armel/config.flavour.omap > @@ -52,6 +52,8 @@ CONFIG_KEYBOARD_SUNKBD=m > CONFIG_KEYBOARD_XTKBD=m > # CONFIG_KSM is not set > CONFIG_LAPB=m > +CONFIG_LEDS_CLASS=y > +CONFIG_LEDS_TRIGGER_HEARTBEAT=y > # CONFIG_LIBERTAS_MESH is not set > CONFIG_LLC=m > CONFIG_LLC2=m > diff --git a/debian.master/config/armel/config.flavour.versatile b/debian.master/config/armel/config.flavour.versatile > index 33da43e..fe78875 100644 > --- a/debian.master/config/armel/config.flavour.versatile > +++ b/debian.master/config/armel/config.flavour.versatile > @@ -52,6 +52,8 @@ CONFIG_IWMC3200TOP_DEBUGFS=y > # CONFIG_KEYBOARD_XTKBD is not set > CONFIG_KSM=y > # CONFIG_LAPB is not set > +CONFIG_LEDS_CLASS=m > +CONFIG_LEDS_TRIGGER_HEARTBEAT=m > CONFIG_LIBERTAS_MESH=y > CONFIG_LLC=y > # CONFIG_LLC2 is not set > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu > index 86962b4..06d9711 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -2328,7 +2328,6 @@ CONFIG_LEDS_88PM860X=m > CONFIG_LEDS_ADP5520=m > CONFIG_LEDS_ALIX2=m > CONFIG_LEDS_BD2802=m > -CONFIG_LEDS_CLASS=m > # CONFIG_LEDS_CLEVO_MAIL is not set > CONFIG_LEDS_CPU=y > CONFIG_LEDS_DA903X=m > @@ -2349,7 +2348,6 @@ CONFIG_LEDS_TRIGGERS=y > CONFIG_LEDS_TRIGGER_BACKLIGHT=m > CONFIG_LEDS_TRIGGER_DEFAULT_ON=m > CONFIG_LEDS_TRIGGER_GPIO=m > -CONFIG_LEDS_TRIGGER_HEARTBEAT=m > CONFIG_LEDS_TRIGGER_TIMER=m > CONFIG_LEDS_WM831X_STATUS=m > CONFIG_LEDS_WM8350=m > diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 > index 5b512b3..ab5ef95 100644 > --- a/debian.master/config/i386/config.common.i386 > +++ b/debian.master/config/i386/config.common.i386 > @@ -88,6 +88,8 @@ CONFIG_KSM=y > CONFIG_KTIME_SCALAR=y > CONFIG_LAPB=m > CONFIG_LAPBETHER=m > +CONFIG_LEDS_CLASS=m > +CONFIG_LEDS_TRIGGER_HEARTBEAT=m > CONFIG_LIBERTAS_MESH=y > CONFIG_LLC=y > CONFIG_LLC2=m > -- > 1.7.1 > >
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 3997244..374f404 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -86,6 +86,8 @@ CONFIG_KSM=y # CONFIG_KTIME_SCALAR is not set CONFIG_LAPB=m CONFIG_LAPBETHER=m +CONFIG_LEDS_CLASS=m +CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LIBERTAS_MESH=y CONFIG_LLC=y CONFIG_LLC2=m diff --git a/debian.master/config/armel/config.flavour.omap b/debian.master/config/armel/config.flavour.omap index 6585996..2405a19 100644 --- a/debian.master/config/armel/config.flavour.omap +++ b/debian.master/config/armel/config.flavour.omap @@ -52,6 +52,8 @@ CONFIG_KEYBOARD_SUNKBD=m CONFIG_KEYBOARD_XTKBD=m # CONFIG_KSM is not set CONFIG_LAPB=m +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y # CONFIG_LIBERTAS_MESH is not set CONFIG_LLC=m CONFIG_LLC2=m diff --git a/debian.master/config/armel/config.flavour.versatile b/debian.master/config/armel/config.flavour.versatile index 33da43e..fe78875 100644 --- a/debian.master/config/armel/config.flavour.versatile +++ b/debian.master/config/armel/config.flavour.versatile @@ -52,6 +52,8 @@ CONFIG_IWMC3200TOP_DEBUGFS=y # CONFIG_KEYBOARD_XTKBD is not set CONFIG_KSM=y # CONFIG_LAPB is not set +CONFIG_LEDS_CLASS=m +CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LIBERTAS_MESH=y CONFIG_LLC=y # CONFIG_LLC2 is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 86962b4..06d9711 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2328,7 +2328,6 @@ CONFIG_LEDS_88PM860X=m CONFIG_LEDS_ADP5520=m CONFIG_LEDS_ALIX2=m CONFIG_LEDS_BD2802=m -CONFIG_LEDS_CLASS=m # CONFIG_LEDS_CLEVO_MAIL is not set CONFIG_LEDS_CPU=y CONFIG_LEDS_DA903X=m @@ -2349,7 +2348,6 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_LEDS_TRIGGER_GPIO=m -CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_WM831X_STATUS=m CONFIG_LEDS_WM8350=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 5b512b3..ab5ef95 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -88,6 +88,8 @@ CONFIG_KSM=y CONFIG_KTIME_SCALAR=y CONFIG_LAPB=m CONFIG_LAPBETHER=m +CONFIG_LEDS_CLASS=m +CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LIBERTAS_MESH=y CONFIG_LLC=y CONFIG_LLC2=m
Most Omap based boards use the heartbeat trigger as one of their main leds (like beagleboard). The trigger architecture doesn't automatically load the board's default trigger modules, so when we compile heartbeat as module it'll only be used when the user manually loads it. As it'd be good to have it properly loaded since the boot start, changing it to built-in will make the led to work right after loading the kernel. Having a hartbeat LED is very useful during development, as we can easily notice if the board is still working after a temporary hang, so using it as default sounds a good idea. Patch for current Maverick master tree. Ignore: yes Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 2 ++ debian.master/config/armel/config.flavour.omap | 2 ++ .../config/armel/config.flavour.versatile | 2 ++ debian.master/config/config.common.ubuntu | 2 -- debian.master/config/i386/config.common.i386 | 2 ++ 5 files changed, 8 insertions(+), 2 deletions(-)