Skip to contentSkip to conversation

board: ls2080ardb: qds: Fix compiling issue when FSL_MC_ENET not defined

PATCH New York Sun 1 participant 2 messages May 26, 2016 – Jun 4, 2016

lore
Share & tools
lore

York Sun

author
#0 lore raw

PATCH 1/1 board: ls2080ardb: qds: Fix compiling issue when FSL_MC_ENET not defined

U-Boot should continue to work without management complex (MC). Fix compiling errors and warnings.

Signed-off-by York Sun <[email protected]>

---

 board/freescale/ls2080aqds/ls2080aqds.c |    2 ++
 board/freescale/ls2080ardb/ls2080ardb.c |    6 ++++++
 2 files changed, 8 insertions(+)
board/freescale/ls2080aqds/ls2080aqds.c +2 -0
index b3bd40a..897793d 100644
@@ -282,7 +282,9 @@ void fdt_fixup_board_enet(void *fdt)
 #ifdef CONFIG_OF_BOARD_SETUP
 int ft_board_setup(void *blob, bd_t *bd)
 {
+#ifdef CONFIG_FSL_MC_ENET
 	int err;
+#endif
 	u64 base[CONFIG_NR_DRAM_BANKS];
 	u64 size[CONFIG_NR_DRAM_BANKS];
board/freescale/ls2080ardb/ls2080ardb.c +6 -0
index fb39af6..52e5e3f 100644
@@ -156,7 +156,9 @@ int board_init(void)
 {
 	char *env_hwconfig;
 	u32 __iomem *dcfg_ccsr = (u32 __iomem *)DCFG_BASE;
+#ifdef CONFIG_FSL_MC_ENET
 	u32 __iomem *irq_ccsr = (u32 __iomem *)ISC_BASE;
+#endif
 	u32 val;
 
 	init_final_memctl_regs();

@@ -178,8 +180,10 @@ int board_init(void)
 
 	QIXIS_WRITE(rst_ctl, QIXIS_RST_CTL_RESET_EN);
 
+#ifdef CONFIG_FSL_MC_ENET
 	/* invert AQR405 IRQ pins polarity */
 	out_le32(irq_ccsr + IRQCR_OFFSET / 4, AQR405_IRQ_MASK);
+#endif
 
 	return 0;
 }

@@ -261,7 +265,9 @@ void fdt_fixup_board_enet(void *fdt)
 #ifdef CONFIG_OF_BOARD_SETUP
 int ft_board_setup(void *blob, bd_t *bd)
 {
+#ifdef CONFIG_FSL_MC_ENET
 	int err;
+#endif
 	u64 base[CONFIG_NR_DRAM_BANKS];
 	u64 size[CONFIG_NR_DRAM_BANKS];
Signature · 1 line
1.7.9.5
author Applied
#1 lore raw

PATCH 1/1 board: ls2080ardb: qds: Fix compiling issue when FSL_MC_ENET not defined

Quoted 11 lines · york sun

U-Boot should continue to work without management complex (MC). Fix compiling errors and warnings.

Signed-off-by York Sun <[email protected]>

---

 board/freescale/ls2080aqds/ls2080aqds.c |    2 ++
 board/freescale/ls2080ardb/ls2080ardb.c |    6 ++++++
 2 files changed, 8 insertions(+)

Applied to fsl-qoriq master branch. Awaiting upstream.

York