diff options
| author | Tom Rini | 2021-09-07 22:29:57 -0400 |
|---|---|---|
| committer | Tom Rini | 2021-09-07 22:29:57 -0400 |
| commit | 07298e4828b7d0904fbfd77d386f01b4a37a5609 (patch) | |
| tree | ba4e04647da735f6ac5ddc547a26578d8e99855c /board/warp7/warp7.c | |
| parent | ec929484ecd95279abd5a95516ec8307571a26a4 (diff) | |
| parent | 5f588f831b7459ea910aaf75f4ddd2522987b0e6 (diff) | |
Merge branch '2021-09-07-ATAGs-and-related-migration' into next
- Merge ATAGs and MACH_ID options to Kconfig, and then disable them for
nearly all platforms. A small number of platforms actively require
this support still, and have it still enabled. Otherwise, it's migrated
and disabled.
Diffstat (limited to 'board/warp7/warp7.c')
| -rw-r--r-- | board/warp7/warp7.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c index 0f202241dd7..c5c5433048d 100644 --- a/board/warp7/warp7.c +++ b/board/warp7/warp7.c @@ -134,7 +134,7 @@ int checkboard(void) int board_late_init(void) { struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR; -#ifdef CONFIG_SERIAL_TAG +#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG struct tag_serialnr serialnr; char serial_string[0x20]; #endif @@ -156,7 +156,7 @@ int board_late_init(void) env_set_ulong(HAB_ENABLED_ENVNAME, 0); #endif -#ifdef CONFIG_SERIAL_TAG +#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG /* Set serial# standard environment variable based on OTP settings */ get_board_serial(&serialnr); snprintf(serial_string, sizeof(serial_string), "WaRP7-0x%08x%08x", |