From: Michal Simek Date: Tue, 10 May 2016 11:11:19 +0000 (+0200) Subject: microblaze: Enable option to overwrite default variables X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=516716fcd04c2ee027faab5e1d7b9d526fc8d9ca;p=thirdparty%2Fu-boot.git microblaze: Enable option to overwrite default variables Enable overwriting variables out of main config file. Signed-off-by: Michal Simek --- diff --git a/board/xilinx/zynqmp/MAINTAINERS b/board/xilinx/zynqmp/MAINTAINERS index 781922e5269..5df1c93bfdc 100644 --- a/board/xilinx/zynqmp/MAINTAINERS +++ b/board/xilinx/zynqmp/MAINTAINERS @@ -1,18 +1,6 @@ -XILINX ZYNQMP BOARDS +XILINX_ZYNQMP BOARDS M: Michal Simek S: Maintained F: board/xilinx/zynqmp/ -F: include/configs/xilinx_zynqmp.h -F: include/configs/xilinx_zynqmp_ep.h -F: include/configs/xilinx_zynqmp_mini.h -F: include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h -F: include/configs/xilinx_zynqmp_zc1751_xm016_dc2.h -F: include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h -F: include/configs/xilinx_zynqmp_zcu102.h -F: configs/xilinx_zynqmp_ep_defconfig -F: configs/xilinx_zynqmp_mini_qspi_defconfig -F: configs/xilinx_zynqmp_mini_nand_defconfig -F: configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig -F: configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig -F: configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig -F: configs/xilinx_zynqmp_zcu102_defconfig +F: include/configs/xilinx_zynqmp* +F: configs/xilinx_zynqmp* \ No newline at end of file diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index b4247826188..9edea8694f7 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -256,6 +256,7 @@ #define CONFIG_PREBOOT "echo U-BOOT for ${hostname};setenv preboot;echo" +#ifndef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS "unlock=yes\0" \ "nor0=flash-0\0"\ "mtdparts=mtdparts=flash-0:"\ @@ -265,7 +266,8 @@ "setenv stdin nc\0" \ "serial=setenv stdout serial;"\ "setenv stdin serial\0" - +#endif + #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_CONSOLE_IS_IN_ENV