From: Ibai Erkiaga Date: Thu, 5 Apr 2018 10:01:37 +0000 (-0700) Subject: arm: zynq_rsa: remove bootcommand configuration X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15537574657e734e37b1357d996899f0012d6c9d;p=thirdparty%2Fu-boot.git arm: zynq_rsa: remove bootcommand configuration BOOTCOMMAND config setting in the header file is warning generation prome, as it likely redefines the configuration file setting. Signed-off-by: Ibai Erkiaga Signed-off-by: Michal Simek --- diff --git a/configs/zynq_zc702_RSA_defconfig b/configs/zynq_zc702_RSA_defconfig index 2473f2f5d1e..497f6b59e98 100644 --- a/configs/zynq_zc702_RSA_defconfig +++ b/configs/zynq_zc702_RSA_defconfig @@ -11,6 +11,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y +CONFIG_BOOTCOMMAND="run rsa_$modeboot || run distro_bootcmd" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL=y CONFIG_SPL_STACK_R=y diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 853fbc083d8..ee2a1c83504 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -165,13 +165,6 @@ /* enable preboot to be loaded before CONFIG_BOOTDELAY */ #define CONFIG_PREBOOT -/* Boot configuration */ -/* default boot is according to the bootmode switch settings */ -#if defined(CONFIG_CMD_ZYNQ_RSA) -#define CONFIG_BOOTCOMMAND "run rsa_$modeboot || run distro_bootcmd" -#else -#define CONFIG_BOOTCOMMAND "run $modeboot || run distro_bootcmd" -#endif #define CONFIG_SYS_LOAD_ADDR 0 /* default? */ /* Distro boot enablement */