| Message ID | 1440726497-5153-1-git-send-email-thomas@wytron.com.tw |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Thomas Chou |
| Headers | show |
On 08/28/2015 09:48 AM, Thomas Chou wrote: > This patch moves command line configuration from board header > file to board defconfig in the way of Kconfig. The change passed > savedefconfig. > > This fixes warnings such as : "CONFIG_SYS_HUSH_PARSER" redefined, > when "Use hush shell" is selected with menuconfig, etc. > > Signed-off-by: Thomas Chou <thomas@wytron.com.tw> > --- > configs/nios2-generic_defconfig | 3 +++ > include/configs/nios2-generic.h | 9 +-------- > 2 files changed, 4 insertions(+), 8 deletions(-) Applied to u-boot-nios.
diff --git a/configs/nios2-generic_defconfig b/configs/nios2-generic_defconfig index 573a084..5f93394 100644 --- a/configs/nios2-generic_defconfig +++ b/configs/nios2-generic_defconfig @@ -1,9 +1,12 @@ CONFIG_NIOS2=y CONFIG_TARGET_NIOS2_GENERIC=y +CONFIG_HUSH_PARSER=y # CONFIG_CMD_BOOTD is not set # CONFIG_CMD_IMLS is not set # CONFIG_CMD_XIMG is not set # CONFIG_CMD_FPGA is not set # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_DHCP=y # CONFIG_CMD_NFS is not set +CONFIG_CMD_PING=y diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h index 945cbd4..5bb7768 100644 --- a/include/configs/nios2-generic.h +++ b/include/configs/nios2-generic.h @@ -73,13 +73,8 @@ #define CONFIG_BOOTP_HOSTNAME /* - * Command line configuration. + * FDT options */ -#ifdef CONFIG_CMD_NET -# define CONFIG_CMD_DHCP -# define CONFIG_CMD_PING -#endif - #define CONFIG_OF_LIBFDT #define CONFIG_OF_BOARD_SETUP #define CONFIG_LMB @@ -130,6 +125,4 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_INIT_SP - 0x20000) #define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_HUSH_PARSER - #endif /* __CONFIG_H */
This patch moves command line configuration from board header file to board defconfig in the way of Kconfig. The change passed savedefconfig. This fixes warnings such as : "CONFIG_SYS_HUSH_PARSER" redefined, when "Use hush shell" is selected with menuconfig, etc. Signed-off-by: Thomas Chou <thomas@wytron.com.tw> --- configs/nios2-generic_defconfig | 3 +++ include/configs/nios2-generic.h | 9 +-------- 2 files changed, 4 insertions(+), 8 deletions(-)