[U-Boot] [PATCH v3 1/2] fdt: Deprecate "usbethaddr" usage in fdt_fixup_ethernet()

Joe Hershberger joe.hershberger at gmail.com
Wed Dec 9 00:10:17 CET 2015


Hi Bin,

On Sun, Dec 6, 2015 at 7:53 PM, Bin Meng <bmeng.cn at gmail.com> wrote:
> Hi Joe,
>
> On Tue, Nov 3, 2015 at 8:24 PM, Bin Meng <bmeng.cn at gmail.com> wrote:
>> In fdt_fixup_ethernet() only "usbethaddr" is handled to fix up the
>> first usb ethernet port MAC address. Other additional usb ethernet
>> ports are ignored as there is no logic to handle "usbeth%daddr".
>>
>> It is suggested we should use "ethaddr" for all ethernet devices.
>> Hence deprecate "usbethaddr" usage in fdt_fixup_ethernet().
>>
>> This actually reverts commit b1f49ab8c7bad60426b30c134ae065ef77d2dfc1
>> "ARM: fdt support: Add usbethaddr as an acceptable MAC".
>>
>> Signed-off-by: Bin Meng <bmeng.cn at gmail.com>
>> Acked-by: Joe Hershberger <joe.hershberger at ni.com>
>> Reviewed-by: Tom Rini <trini at konsulko.com>
>> On OMAP4 Panda (+ v4.3 kernel)
>> Tested-by: Tom Rini <trini at konsulko.com>
>>
>> ---
>>
>> Changes in v3:
>> - Update commit message to include full commit id and subject.
>>
>> Changes in v2:
>> - New patch to deprecate "usbethaddr" usage in fdt_fixup_ethernet()
>>
>>  common/fdt_support.c | 12 +-----------
>>  1 file changed, 1 insertion(+), 11 deletions(-)
>>
>> diff --git a/common/fdt_support.c b/common/fdt_support.c
>> index a7ff2df..ec72b86 100644
>> --- a/common/fdt_support.c
>> +++ b/common/fdt_support.c
>> @@ -490,18 +490,8 @@ void fdt_fixup_ethernet(void *fdt)
>>         if (node < 0)
>>                 return;
>>
>> -       if (!getenv("ethaddr")) {
>> -               if (getenv("usbethaddr")) {
>> -                       strcpy(mac, "usbethaddr");
>> -               } else {
>> -                       debug("No ethernet MAC Address defined\n");
>> -                       return;
>> -               }
>> -       } else {
>> -               strcpy(mac, "ethaddr");
>> -       }
>> -
>>         i = 0;
>> +       strcpy(mac, "ethaddr");
>>         while ((tmp = getenv(mac)) != NULL) {
>>                 sprintf(enet, "ethernet%d", i);
>>                 path = fdt_getprop(fdt, node, enet, NULL);
>> --
>
> I see these two patches are assigned to you on patchwork. When will
> these get merged?

I plan to do another round of patch application next week sometime.

Cheers,
-Joe


More information about the U-Boot mailing list