On Fri, Jun 08, 2018 at 05:34:23PM +0200, Marcin Wojtas wrote: > Finally, after switching to new MV_BOARD_DESC solution > in all drivers, stop using MvHwDescLib.h by its last user > and safely remove this header. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Marcin Wojtas <m...@semihalf.com> > Reviewed-by: Hua Jing <jing...@marvell.com> > --- > Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.c | 3 +- > Silicon/Marvell/Include/Library/MvHwDescLib.h | 70 -------------------- > 2 files changed, 1 insertion(+), 72 deletions(-) > > diff --git a/Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.c > b/Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.c > index dd2edae..3deb286 100644 > --- a/Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.c > +++ b/Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.c > @@ -41,7 +41,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > #include <Library/DebugLib.h> > #include <Library/IoLib.h> > #include <Library/MemoryAllocationLib.h> > -#include <Library/MvHwDescLib.h> > #include <Library/PcdLib.h> > #include <Library/UefiBootServicesTableLib.h> > #include <Library/UefiLib.h> > @@ -380,7 +379,7 @@ MvPhyInit ( > MdioIndex = Phy2MdioController[PhyIndex]; > > /* Verify correctness of PHY <-> MDIO assignment */ > - if (!MVHW_DEV_ENABLED (Mdio, MdioIndex) || MdioIndex >= > Mdio->ControllerCount) { > + if (MdioDeviceTable[MdioIndex] == 0 || MdioIndex >= Mdio->ControllerCount) > { > DEBUG ((DEBUG_ERROR, "MvPhyDxe: Incorrect Mdio controller assignment for > PHY#%d", PhyIndex));
I think I already commented on lack of parentheses - just keep those added ones. / Leif > return EFI_INVALID_PARAMETER; > } > diff --git a/Silicon/Marvell/Include/Library/MvHwDescLib.h > b/Silicon/Marvell/Include/Library/MvHwDescLib.h > deleted file mode 100644 > index 0de435d..0000000 > --- a/Silicon/Marvell/Include/Library/MvHwDescLib.h > +++ /dev/null > @@ -1,70 +0,0 @@ > -/******************************************************************************** > -Copyright (C) 2017 Marvell International Ltd. > - > -Marvell BSD License Option > - > -If you received this File from Marvell, you may opt to use, redistribute > and/or > -modify this File under the following licensing terms. > -Redistribution and use in source and binary forms, with or without > modification, > -are permitted provided that the following conditions are met: > - > -* Redistributions of source code must retain the above copyright notice, > - this list of conditions and the following disclaimer. > - > -* Redistributions in binary form must reproduce the above copyright > - notice, this list of conditions and the following disclaimer in the > - documentation and/or other materials provided with the distribution. > - > -* Neither the name of Marvell nor the names of its contributors may be > - used to endorse or promote products derived from this software without > - specific prior written permission. > - > -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" > AND > -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED > -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE > -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE > FOR > -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > DAMAGES > -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; > -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND > ON > -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > - > -*******************************************************************************/ > - > -#ifndef __MVHWDESCLIB_H__ > -#define __MVHWDESCLIB_H__ > - > -// > -// Helper macros > -// > - > -// Check if device is enabled - it expects PCD to be read to > '<type>DeviceTable' array > -#define MVHW_DEV_ENABLED(type, index) (type ## DeviceTable[index]) > - > -// > -// I2C devices description template definition > -// > -#define MVHW_MAX_I2C_DEVS 4 > - > -typedef struct { > - UINT8 I2cDevCount; > - UINTN I2cBaseAddresses[MVHW_MAX_I2C_DEVS]; > -} MVHW_I2C_DESC; > - > -// > -// Platform description of I2C devices > -// > -#define MVHW_CP0_I2C0_BASE 0xF2701000 > -#define MVHW_CP0_I2C1_BASE 0xF2701100 > -#define MVHW_CP1_I2C0_BASE 0xF4701000 > -#define MVHW_CP1_I2C1_BASE 0xF4701100 > - > -#define DECLARE_A7K8K_I2C_TEMPLATE \ > -STATIC \ > -MVHW_I2C_DESC mA7k8kI2cDescTemplate = {\ > - 4,\ > - { MVHW_CP0_I2C0_BASE, MVHW_CP0_I2C1_BASE, MVHW_CP1_I2C0_BASE, > MVHW_CP1_I2C1_BASE }\ > -} > - > -#endif /* __MVHWDESCLIB_H__ */ > -- > 2.7.4 > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel