When detecting Juno rev1 hardware, we add a sky2.mac_address=xx:xx:... kernel command line parameter, in an apparent attempt to override the MAC address that the Linux driver probes from the hardware. However, the Linux driver does not in fact take a 'mac_address' parameter, so there is no point in doing this. So drop it.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel <[email protected]> --- ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c | 28 ++------------------ 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c index 756c2751e160..c82657aef718 100644 --- a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c +++ b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c @@ -31,13 +31,6 @@ #include <Library/PrintLib.h> // -// Size in number of characters of the Linux boot argument -// passing the MAC address to be used by the PCI GigaByte -// Ethernet device : " sky2.mac_address=0x11,0x22,0x33,0x44,0x55,0x66" -// -#define SKY2_MAC_ADDRESS_BOOTARG_LEN 47 - -// // Hardware platform identifiers // typedef enum { @@ -416,9 +409,6 @@ SetJunoR1DefaultBootEntries ( UINTN Size; EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL *EfiDevicePathFromTextProtocol; EFI_DEVICE_PATH* BootDevicePath; - UINT32 SysPciGbeL; - UINT32 SysPciGbeH; - CHAR16* DefaultBootArgument; CHAR16* DefaultBootArgument1; UINTN DefaultBootArgument1Size; CHAR16* DefaultBootArgument2; @@ -463,9 +453,8 @@ SetJunoR1DefaultBootEntries ( return EFI_UNSUPPORTED; } - DefaultBootArgument = (CHAR16*)PcdGetPtr (PcdDefaultBootArgument); - DefaultBootArgument1Size = StrSize (DefaultBootArgument) + - (SKY2_MAC_ADDRESS_BOOTARG_LEN * sizeof (CHAR16)); + DefaultBootArgument1 = (CHAR16*)PcdGetPtr (PcdDefaultBootArgument); + DefaultBootArgument1Size = StrSize (DefaultBootArgument1); DefaultBootArgument2Size = DefaultBootArgument1Size + StrSize (ExtraBootArgument); Status = EFI_OUT_OF_RESOURCES; @@ -478,19 +467,6 @@ SetJunoR1DefaultBootEntries ( goto Error; } - SysPciGbeL = MmioRead32 (ARM_JUNO_SYS_PCIGBE_L); - SysPciGbeH = MmioRead32 (ARM_JUNO_SYS_PCIGBE_H); - - UnicodeSPrint ( - DefaultBootArgument1, - DefaultBootArgument1Size, - L"%s sky2.mac_address=0x%02x,0x%02x,0x%02x,0x%02x,0x%02x,0x%02x", - DefaultBootArgument, - (SysPciGbeH >> 8 ) & 0xFF, (SysPciGbeH ) & 0xFF, - (SysPciGbeL >> 24) & 0xFF, (SysPciGbeL >> 16) & 0xFF, - (SysPciGbeL >> 8 ) & 0xFF, (SysPciGbeL ) & 0xFF - ); - CopyMem (DefaultBootArgument2, DefaultBootArgument1, DefaultBootArgument1Size); CopyMem ( (UINT8*)DefaultBootArgument2 + DefaultBootArgument1Size - sizeof (CHAR16), -- 1.9.1 _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
