Skip to content

Commit 85b5963

Browse files
dgarskedanielinux
authored andcommitted
Peer review feedback.
1 parent 87d60dd commit 85b5963

3 files changed

Lines changed: 12 additions & 13 deletions

File tree

docs/Targets.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1907,7 +1907,7 @@ make
19071907
# The next script needs to be run from wolboot root folder and assumes your
19081908
# kernel is in th root folder, named bzImage
19091909
# If this is not the case, change the path in the script accordingly
1910-
tools/x86_64/qemu/make_hd.sh
1910+
tools/x86_fsp/qemu/make_hd.sh
19111911
19121912
# Run wolfBoot + Linux in qemu
19131913
tools/scripts/qemu64/qemu64.sh

hal/nxp_t1024.c

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2331,10 +2331,11 @@ static const char* hal_phy_interface_str(enum phy_interface interface)
23312331
return "Unknown";
23322332
}
23332333

2334+
#define PHY_TIDP83867_PHYIDR 0x2000A231
23342335
static const char* hal_phy_vendor_str(uint32_t id)
23352336
{
23362337
switch (id) {
2337-
case 0x2000a231:
2338+
case PHY_TIDP83867_PHYIDR:
23382339
return "TI DP83867";
23392340
default:
23402341
break;
@@ -2506,8 +2507,6 @@ static int hal_phy_init(struct phy_device *phydev)
25062507
#if DP83867_IO_MUX_CFG_IO_IMPEDANCE_MIN >= 0
25072508
#ifdef DEBUG_PHY
25082509
wolfBoot_printf("Impedance Match 0x%x\n", DP83867_IO_MUX_CFG_IO_IMPEDANCE_MIN);
2509-
#endif
2510-
#ifdef DEBUG_PHY
25112510
val = hal_phy_read_indirect(phydev, DP83867_IO_MUX_CFG, MDIO_DEVAD_NONE);
25122511
wolfBoot_printf("IOMUX (before)=0x%x\n", val);
25132512
#endif
@@ -2538,6 +2537,7 @@ static int hal_phy_init(struct phy_device *phydev)
25382537
#define FM1_DTSEC4 3
25392538
#define FM1_10GEC1 4
25402539

2540+
25412541
static int hal_ethernet_init(void)
25422542
{
25432543
int ret, i;
@@ -2551,15 +2551,19 @@ static int hal_ethernet_init(void)
25512551
phydevs[FM1_DTSEC3].interface = PHY_INTERFACE_MODE_RGMII;
25522552
phydevs[FM1_DTSEC3].phyaddr = RGMII_PHY2_ADDR;
25532553

2554+
/* SRDS_PRTCL_S1 Bits 128-183 - SerDes protocol select - SerDes 1 */
2555+
/* See T1024RM - 30.1.1.1.2 SerDes Protocols
2556+
* Figure 30-1 Supported SerDes Options */
25542557
reg = get32(DCFG_RCWSR(4));
25552558
reg = (reg & RCWSR4_SRDS1_PRTCL) >> RCWSR4_SRDS1_PRTCL_SHIFT;
25562559
if (reg == 0x95) {
2557-
/* Use 10G XFI with Aquantia AQR105 PHY */
2560+
/* 0x095: A=XFI1 10G Aquantia AQR105 PHY, B=PCIe3, C=PCIe2, D=PCIe1 */
25582561
phydevs[FM1_10GEC1].interface = PHY_INTERFACE_MODE_XGMII;
25592562
phydevs[FM1_10GEC1].phyaddr = FM1_10GEC1_PHY_ADDR;
25602563
}
2561-
else { /* 0x5b or 0x119 */
2562-
/* Use SGMII */
2564+
else {
2565+
/* 0x05B: A=PCIe1, B=PCIe3, C=SGMII2, D=SGMII1 */
2566+
/* 0x119: A=Aurora, B=PCIe3, C=SGMII2, D=PCIe1 */
25632567
phydevs[FM1_DTSEC1].interface = PHY_INTERFACE_MODE_SGMII;
25642568
phydevs[FM1_DTSEC1].phyaddr = SGMII_PHY1_ADDR;
25652569
phydevs[FM1_DTSEC2].interface = PHY_INTERFACE_MODE_SGMII;

src/pci.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -541,12 +541,7 @@ static void pci_dump_id(uint8_t bus, uint8_t dev, uint8_t fun)
541541
bus, dev, fun, (int)vid, (int)did);
542542
}
543543
#else
544-
static inline void pci_dump_id(uint8_t bus, uint8_t dev, uint8_t fun)
545-
{
546-
(void)bus;
547-
(void)dev;
548-
(void)fun;
549-
};
544+
#define pci_dump_id(bus, dev, fun) do{}while(0)
550545
#endif
551546

552547
static int pci_program_bars(uint8_t bus, uint8_t dev, uint8_t fun,

0 commit comments

Comments
 (0)