Skip to content

Commit e02e567

Browse files
committed
Fix CI failure with "error: 'LINUX_BOOTARGS' undeclared"
1 parent 46f34f6 commit e02e567

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

hal/zynq.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,13 @@
5959

6060
/* DTB fixup for kernel command line. Override LINUX_BOOTARGS or
6161
* LINUX_BOOTARGS_ROOT in your config to customize. */
62-
#ifdef __WOLFBOOT
6362
#ifndef LINUX_BOOTARGS
6463
#ifndef LINUX_BOOTARGS_ROOT
6564
#define LINUX_BOOTARGS_ROOT "/dev/mmcblk0p4"
6665
#endif
6766
#define LINUX_BOOTARGS \
6867
"earlycon console=ttyPS0,115200 root=" LINUX_BOOTARGS_ROOT " rootwait"
6968
#endif
70-
#endif /* __WOLFBOOT */
7169

7270
/* QSPI Slave Device Information */
7371
typedef struct QspiDev {
@@ -1807,7 +1805,7 @@ void RAMFUNCTION ext_flash_unlock(void)
18071805

18081806
}
18091807

1810-
#ifdef MMU
1808+
#if defined(MMU) && defined(__WOLFBOOT)
18111809
/* Get current time in microseconds using ARMv8 generic timer */
18121810
uint64_t hal_get_timer_us(void)
18131811
{

0 commit comments

Comments
 (0)