From 96044745cb8c086d47215f4aa7b4defb1d1fec57 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Fri, 17 Jun 2016 14:24:07 +0900 Subject: [PATCH] env: avoid build error for boards without CONFIG_SYS_{CPU, BOARD} If CONFIG_ENV_VARS_UBOOT_CONFIG is enabled (it is by distro), this code causes build error for boards without CONFIG_SYS_{CPU,_BOARD}. Signed-off-by: Masahiro Yamada --- include/env_default.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/env_default.h b/include/env_default.h index 3096576836..ea6704a972 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -90,9 +90,13 @@ const uchar default_environment[] = { #endif #ifdef CONFIG_ENV_VARS_UBOOT_CONFIG "arch=" CONFIG_SYS_ARCH "\0" +#ifdef CONFIG_SYS_CPU "cpu=" CONFIG_SYS_CPU "\0" +#endif +#ifdef CONFIG_SYS_BOARD "board=" CONFIG_SYS_BOARD "\0" "board_name=" CONFIG_SYS_BOARD "\0" +#endif #ifdef CONFIG_SYS_VENDOR "vendor=" CONFIG_SYS_VENDOR "\0" #endif -- 2.25.1