Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-12-01 08:59:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

nios2: move command line configuration to Kconfig

Browse source 
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>
This commit is contained in:
Thomas Chou 2015-08-26 21:24:35 +08:00
parent 9f13b6d147
commit ca1d80c02f
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configs/nios2-generic_defconfig
View file

@ -1,9 +1,12 @@
CONFIG_NIOS2=y CONFIG_NIOS2=y
CONFIG_TARGET_NIOS2_GENERIC=y CONFIG_TARGET_NIOS2_GENERIC=y
CONFIG_HUSH_PARSER=y
# CONFIG_CMD_BOOTD is not set # CONFIG_CMD_BOOTD is not set
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
# CONFIG_CMD_XIMG is not set # CONFIG_CMD_XIMG is not set
# CONFIG_CMD_FPGA is not set # CONFIG_CMD_FPGA is not set
# CONFIG_CMD_ITEST is not set # CONFIG_CMD_ITEST is not set
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_DHCP=y
# CONFIG_CMD_NFS is not set # CONFIG_CMD_NFS is not set
CONFIG_CMD_PING=y

9
include/configs/nios2-generic.h
View file

@ -73,13 +73,8 @@
#define CONFIG_BOOTP_HOSTNAME #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_LIBFDT
#define CONFIG_OF_BOARD_SETUP #define CONFIG_OF_BOARD_SETUP
#define CONFIG_LMB #define CONFIG_LMB
@ -130,6 +125,4 @@
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_INIT_SP - 0x20000) #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_INIT_SP - 0x20000)
#define CONFIG_CMDLINE_EDITING #define CONFIG_CMDLINE_EDITING
#define CONFIG_SYS_HUSH_PARSER
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */