| Message ID | 1bb56057c2d02b270dfb2a7f7c7f7dc23c960fb5.1455811258.git.michal.simek@xilinx.com |
|---|---|
| State | Accepted |
| Commit | 636ac181fa66c45a0761d89f711ae52f68dce095 |
| Headers | show |
Hi Michal, On 18 February 2016 at 09:01, Michal Simek <michal.simek@xilinx.com> wrote: > Compile DCC serial driver by default. > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > --- > > include/configs/xilinx_zynqmp.h | 9 +++------ > include/configs/zynq-common.h | 8 ++------ > 2 files changed, 5 insertions(+), 12 deletions(-) > > 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 Can some of these go in either the board _defconfig files or as a 'default y' in Zynq's Kconfig? > > #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 > > -- > 1.9.1 > Regards, Simon
On 19.2.2016 21:55, Simon Glass wrote: > Hi Michal, > > On 18 February 2016 at 09:01, Michal Simek <michal.simek@xilinx.com> wrote: >> Compile DCC serial driver by default. >> >> Signed-off-by: Michal Simek <michal.simek@xilinx.com> >> --- >> >> include/configs/xilinx_zynqmp.h | 9 +++------ >> include/configs/zynq-common.h | 8 ++------ >> 2 files changed, 5 insertions(+), 12 deletions(-) >> >> 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 > > Can some of these go in either the board _defconfig files or as a > 'default y' in Zynq's Kconfig? They will go to defconfig for sure. I wanted to clear this here first. There will be patches about DT binding and Kconfig entries. I need to review all drivers which were moved to DM and config cleanups will be the part of it. Also with adding more boards for ZynqMP and cleanup existing zynq one. Thanks, Michal
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> --- include/configs/xilinx_zynqmp.h | 9 +++------ include/configs/zynq-common.h | 8 ++------ 2 files changed, 5 insertions(+), 12 deletions(-)