| Message ID | 3ab6805366fe38cdf2c528a623930ab5e198ffc3.1515427179.git.michal.simek@xilinx.com |
|---|---|
| State | Accepted |
| Delegated to: | Michal Simek |
| Headers | show |
| Series | [U-Boot] arm: zynq: Remove ZC770_ config option | expand |
2018-01-09 0:59 GMT+09:00 Michal Simek <michal.simek@xilinx.com>: > This option is obsolete and it is no longer valid. > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > --- I agree, although an equivalent patch has been delegated to you for some months. http://patchwork.ozlabs.org/patch/841993/ The only difference is I did not touch config_whitelist. It was intentional since I know Tom periodically syncs it anyway.
Hi Masahiro, On 8.1.2018 17:33, Masahiro Yamada wrote: > 2018-01-09 0:59 GMT+09:00 Michal Simek <michal.simek@xilinx.com>: >> This option is obsolete and it is no longer valid. >> >> Signed-off-by: Michal Simek <michal.simek@xilinx.com> >> --- > > I agree, although > an equivalent patch has been delegated to you for some months. > http://patchwork.ozlabs.org/patch/841993/ > > > The only difference is I did not touch config_whitelist. > It was intentional since I know Tom periodically syncs it anyway. I missed your patch but I will take it now. Thanks, Michal
diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig index 897ca91e5606..2b8fb3c9214a 100644 --- a/configs/zynq_zc770_xm010_defconfig +++ b/configs/zynq_zc770_xm010_defconfig @@ -7,7 +7,6 @@ CONFIG_DEBUG_UART=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL=y CONFIG_SPL_STACK_R=y diff --git a/configs/zynq_zc770_xm011_defconfig b/configs/zynq_zc770_xm011_defconfig index 2b8a12ee6906..52ad66a38f61 100644 --- a/configs/zynq_zc770_xm011_defconfig +++ b/configs/zynq_zc770_xm011_defconfig @@ -7,7 +7,6 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm011" CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM011" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL=y CONFIG_SPL_STACK_R=y diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig index d53fe94db36b..a8338f5c2d82 100644 --- a/configs/zynq_zc770_xm012_defconfig +++ b/configs/zynq_zc770_xm012_defconfig @@ -7,7 +7,6 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012" CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL=y CONFIG_SPL_STACK_R=y diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig index e6445f735c57..01e2cfe04fb2 100644 --- a/configs/zynq_zc770_xm013_defconfig +++ b/configs/zynq_zc770_xm013_defconfig @@ -7,7 +7,6 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013" CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL=y CONFIG_SPL_STACK_R=y diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 43a4ff08928d..c1f1a0085768 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -5058,10 +5058,6 @@ CONFIG_YAFFS_UNICODE CONFIG_YAFFS_UTIL CONFIG_YAFFS_WINCE CONFIG_YELLOW_LED -CONFIG_ZC770_XM010 -CONFIG_ZC770_XM011 -CONFIG_ZC770_XM012 -CONFIG_ZC770_XM013 CONFIG_ZLIB CONFIG_ZLT CONFIG_ZM7300
This option is obsolete and it is no longer valid. Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- configs/zynq_zc770_xm010_defconfig | 1 - configs/zynq_zc770_xm011_defconfig | 1 - configs/zynq_zc770_xm012_defconfig | 1 - configs/zynq_zc770_xm013_defconfig | 1 - scripts/config_whitelist.txt | 4 ---- 5 files changed, 8 deletions(-)