diff mbox series

[LEDE-DEV] leds-apu2: add newer board names

Message ID 1522074043-25483-1-git-send-email-pubalias@posteo.net
State Accepted
Delegated to: Hauke Mehrtens
Headers show
Series [LEDE-DEV] leds-apu2: add newer board names | expand

Commit Message

Sebastian Fleer March 26, 2018, 2:20 p.m. UTC
In recent firmware releases the board names changed from "apuX" to "PC Engines apuX"

Signed-off-by: Sebastian Fleer <pubalias@posteo.net>
---
 package/kernel/leds-apu2/src/leds-apu2.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Philip Prindeville March 28, 2018, 2:40 a.m. UTC | #1
“recent”?  I thought APU2’s had been discontinued a while ago.



> On Mar 26, 2018, at 8:20 AM, Sebastian Fleer <pubalias@posteo.net> wrote:
> 
> In recent firmware releases the board names changed from "apuX" to "PC Engines apuX"
> 
> Signed-off-by: Sebastian Fleer <pubalias@posteo.net>
> ---
> package/kernel/leds-apu2/src/leds-apu2.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/package/kernel/leds-apu2/src/leds-apu2.c b/package/kernel/leds-apu2/src/leds-apu2.c
> index 4ea552c..2fefa85 100644
> --- a/package/kernel/leds-apu2/src/leds-apu2.c
> +++ b/package/kernel/leds-apu2/src/leds-apu2.c
> @@ -335,7 +335,10 @@ static int __init gpio_apu2_init (void)
> 	if (!board_name \
> 			|| !board_vendor \
> 			|| strcasecmp(board_vendor, "PC Engines") \
> -			|| (strcasecmp(board_name, "apu2") && strcasecmp(board_name, "apu3"))) {
> +			|| (strcasecmp(board_name, "apu2") \
> +				&& strcasecmp(board_name, "apu3") \
> +				&& strcasecmp(board_name, "PC Engines apu2") \
> +				&& strcasecmp(board_name, "PC Engines apu3"))) {
> 		err = -ENODEV;
> 		goto exit;
> 	}
Sebastian Fleer March 28, 2018, 5:24 a.m. UTC | #2
Am 28.03.2018 um 04:40 schrieb Philip Prindeville:
> “recent”?  I thought APU2’s had been discontinued a while ago.
> 
> 
The APU2 boards are listed as "in stock" in the PCEngines shop 
http://www.pcengines.ch/newshop.php?c=2
Their coreboot firmware sees frequent development, see 
https://github.com/pcengines/release_manifests/blob/coreboot-4.6.x/CHANGELOG.md

The board name strings got changed in the 4.6.x branch.
Matthias May March 28, 2018, 7:02 a.m. UTC | #3
On 28/03/18 04:40, Philip Prindeville wrote:
> “recent”?  I thought APU2’s had been discontinued a while ago.
> 
> 
> 

You're probably thinking of the APU.
It hasn't been discontinued yet, but isn't recommended for new installations.
The APU2 is the successor of the APU, and the recommended longterm device.
There is also the APU3 which is basically an APU2, but optimised for
LTE (second SIM slot, different GPIO layout, option to PCIe slot, etc.)

BR
Matthias
Sebastian Fleer March 29, 2018, 7:55 p.m. UTC | #4
After building coreboot myself, I discovered that the board names 
changed again - they now seem to be the same as before.
https://github.com/pcengines/coreboot/commit/3578e9fb6dac753ec9365c88a8556ca1b90a8deb

I guess the "PC Engines apuX" strings can be considered to be a bug on 
the PCEngines side then. Just ignore my patch.
Once there is a binary release of a fixed version (probably 4.6.8), I 
can put a note on the apu2 wiki page.

Sebastian
Hauke Mehrtens March 30, 2018, 2:02 p.m. UTC | #5
On 03/29/2018 09:55 PM, Sebastian Fleer wrote:
> After building coreboot myself, I discovered that the board names
> changed again - they now seem to be the same as before.
> https://github.com/pcengines/coreboot/commit/3578e9fb6dac753ec9365c88a8556ca1b90a8deb
> 
> 
> I guess the "PC Engines apuX" strings can be considered to be a bug on
> the PCEngines side then. Just ignore my patch.
> Once there is a binary release of a fixed version (probably 4.6.8), I
> can put a note on the apu2 wiki page.
> 
> Sebastian

Is the coreboot version with the new board names used widely or can we
ignore that and drop your patch?

Hauke
Sebastian Fleer March 31, 2018, 10:37 a.m. UTC | #6
On 30.03.2018 16:02, Hauke Mehrtens wrote:
> Is the coreboot version with the new board names used widely or can we
> ignore that and drop your patch?
> 
> Hauke

I had a conversation with R1D2 in the forum. We both can't state any 
numbers, but it seems that some users needed to upgrade to the coreboot 
versions with incompatible board names because of features not 
implemented in the legacy branch.
So it's possible that there are quite a few machines with these versions 
installed. Therefore I guess it won't hurt to apply the patch.

Sebastian
diff mbox series

Patch

diff --git a/package/kernel/leds-apu2/src/leds-apu2.c b/package/kernel/leds-apu2/src/leds-apu2.c
index 4ea552c..2fefa85 100644
--- a/package/kernel/leds-apu2/src/leds-apu2.c
+++ b/package/kernel/leds-apu2/src/leds-apu2.c
@@ -335,7 +335,10 @@  static int __init gpio_apu2_init (void)
 	if (!board_name \
 			|| !board_vendor \
 			|| strcasecmp(board_vendor, "PC Engines") \
-			|| (strcasecmp(board_name, "apu2") && strcasecmp(board_name, "apu3"))) {
+			|| (strcasecmp(board_name, "apu2") \
+				&& strcasecmp(board_name, "apu3") \
+				&& strcasecmp(board_name, "PC Engines apu2") \
+				&& strcasecmp(board_name, "PC Engines apu3"))) {
 		err = -ENODEV;
 		goto exit;
 	}