Skip to content

Commit edc1888

Browse files
committed
fix(intel): fix UART baud rate and clock
Move EMULATOR flag build from all platform common Makefile to its own platform for the UART baud rate and clock. Signed-off-by: Sieu Mun Tang <[email protected]> Change-Id: I6b26ad863e67d7070ab47dd2809c007fe339d38e
1 parent b179839 commit edc1888

File tree

3 files changed

+2
-11
lines changed

3 files changed

+2
-11
lines changed

Makefile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -321,12 +321,6 @@ else
321321
LOG_LEVEL := 20
322322
endif
323323

324-
# Process Emulator flag
325-
$(eval $(call add_define,EMULATOR))
326-
ifneq (${EMULATOR}, 0)
327-
EMULATOR := 1
328-
endif
329-
330324
# Default build string (git branch and commit)
331325
ifeq (${BUILD_STRING},)
332326
BUILD_STRING := $(shell git describe --always --dirty --tags 2> /dev/null)

make_helpers/defaults.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,6 @@ DISABLE_MTPMU := 0
9393
# development platforms.
9494
DYN_DISABLE_AUTH := 0
9595

96-
# Build option to enable EMULATOR code
97-
EMULATOR := 0
98-
9996
# Build option to enable MPAM for lower ELs
10097
ENABLE_MPAM_FOR_LOWER_ELS := 0
10198

plat/intel/soc/common/include/platform_def.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#define PLAT_SOCFPGA_STRATIX10 1
1818
#define PLAT_SOCFPGA_AGILEX 2
1919
#define PLAT_SOCFPGA_N5X 3
20-
#define PLAT_SOCFPGA_EMU EMULATOR
20+
#define PLAT_SOCFPGA_EMULATOR 0
2121

2222
/* sysmgr.boot_scratch_cold4 & 5 used for CPU release address for SPL */
2323
#define PLAT_CPU_RELEASE_ADDR 0xffd12210
@@ -171,7 +171,7 @@
171171
#define CRASH_CONSOLE_BASE PLAT_UART0_BASE
172172
#define PLAT_INTEL_UART_BASE PLAT_UART0_BASE
173173

174-
#if PLAT_SOCFPGA_EMU
174+
#if PLAT_SOCFPGA_EMULATOR
175175
#define PLAT_BAUDRATE (4800)
176176
#define PLAT_UART_CLOCK (76800)
177177
#else

0 commit comments

Comments
 (0)