| Message ID | 12f7e8d7571dcaf616ab35c6baa2cd818347fc8e.1456218147.git.michal.simek@xilinx.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Tue, Feb 23, 2016 at 10:02:29AM +0100, Michal Simek wrote: > Compile DCC serial driver by default. > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> Applied to u-boot/master, thanks!
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 28622dec1882..8a9ad03cb102 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -53,12 +53,9 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 0x2000000) /* Serial setup */ -#if defined(CONFIG_ZYNQMP_DCC) -# define CONFIG_ARM_DCC -# define CONFIG_CPU_ARMV8 -#else -# define CONFIG_ZYNQ_SERIAL -#endif +#define CONFIG_ARM_DCC +#define CONFIG_CPU_ARMV8 +#define CONFIG_ZYNQ_SERIAL #define CONFIG_CONS_INDEX 0 #define CONFIG_BAUDRATE 115200 diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index e8c3ef0c3872..ec4884878165 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -36,12 +36,8 @@ #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400} -/* DCC driver */ -#if defined(CONFIG_ZYNQ_DCC) -# define CONFIG_ARM_DCC -#else -# define CONFIG_ZYNQ_SERIAL -#endif +#define CONFIG_ARM_DCC +#define CONFIG_ZYNQ_SERIAL #define CONFIG_ZYNQ_GPIO
Compile DCC serial driver by default. Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- Changes in v2: None include/configs/xilinx_zynqmp.h | 9 +++------ include/configs/zynq-common.h | 8 ++------ 2 files changed, 5 insertions(+), 12 deletions(-)