2009-12-30 19:30:40

by Hartley Sweeten

Subject: [PATCH] arch/powerpc/boot/devtree.c: use %pM to show MAC address

Use the %pM kernel extension to display the MAC address.

Signed-off-by: H Hartley Sweeten <[email protected]>

---

diff --git a/arch/powerpc/boot/devtree.c b/arch/powerpc/boot/devtree.c
index a7e21a3..a2f07a5 100644
--- a/arch/powerpc/boot/devtree.c
+++ b/arch/powerpc/boot/devtree.c
@@ -93,10 +93,7 @@ void dt_fixup_mac_address_by_alias(const char *alias, const u8 *addr)
void *devp = find_node_by_alias(alias);

if (devp) {
- printf("%s: local-mac-address <-"
- " %02x:%02x:%02x:%02x:%02x:%02x\n\r", alias,
- addr[0], addr[1], addr[2],
- addr[3], addr[4], addr[5]);
+ printf("%s: local-mac-address <- %pM\n\r", alias, addr);

setprop(devp, "local-mac-address", addr, 6);
}
@@ -108,10 +105,7 @@ void dt_fixup_mac_address(u32 index, const u8 *addr)
(void*)&index, sizeof(index));

if (devp) {
- printf("ENET%d: local-mac-address <-"
- " %02x:%02x:%02x:%02x:%02x:%02x\n\r", index,
- addr[0], addr[1], addr[2],
- addr[3], addr[4], addr[5]);
+ printf("ENET%d: local-mac-address <- %pM\n\r", index, addr);

setprop(devp, "local-mac-address", addr, 6);
}

2009-12-31 05:22:35

by Paul Mackerras

Subject: Re: [PATCH] arch/powerpc/boot/devtree.c: use %pM to show MAC address

On Wed, Dec 30, 2009 at 02:30:39PM -0500, H Hartley Sweeten wrote:

> Use the %pM kernel extension to display the MAC address.
>
> Signed-off-by: H Hartley Sweeten <[email protected]>
>
> ---
>
> diff --git a/arch/powerpc/boot/devtree.c b/arch/powerpc/boot/devtree.c
> index a7e21a3..a2f07a5 100644
> --- a/arch/powerpc/boot/devtree.c
> +++ b/arch/powerpc/boot/devtree.c
> @@ -93,10 +93,7 @@ void dt_fixup_mac_address_by_alias(const char *alias, const u8 *addr)
> void *devp = find_node_by_alias(alias);
>
> if (devp) {
> - printf("%s: local-mac-address <-"
> - " %02x:%02x:%02x:%02x:%02x:%02x\n\r", alias,
> - addr[0], addr[1], addr[2],
> - addr[3], addr[4], addr[5]);
> + printf("%s: local-mac-address <- %pM\n\r", alias, addr);

Nak - this isn't the kernel, this is a separate program, namely the
bootwrapper that decompresses the kernel image, and it has its own
printf (not printk) implementation in arch/powerpc/boot/stdio.c, which
doesn't understand the %pX extensions (and I don't see any good reason
to make it do so).

Paul.

2009-12-31 14:33:59

by Hartley Sweeten

Subject: RE: [PATCH] arch/powerpc/boot/devtree.c: use %pM to show MAC address

On Wednesday, December 30, 2009 9:49 PM, Paul Mackerras wrote:
> On Wed, Dec 30, 2009 at 02:30:39PM -0500, H Hartley Sweeten wrote:
>
>> Use the %pM kernel extension to display the MAC address.
>>
>> Signed-off-by: H Hartley Sweeten <[email protected]>
>>
>> ---
>
> Nak - this isn't the kernel, this is a separate program, namely the
> bootwrapper that decompresses the kernel image, and it has its own
> printf (not printk) implementation in arch/powerpc/boot/stdio.c, which
> doesn't understand the %pX extensions (and I don't see any good reason
> to make it do so).

OK. Sorry for the noise.

Regards,
Hartley