Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 5e69947f51d72a2f75f2132c2cc8bae3f0ebcdef

Authored by Quentin Armitage
Committed by Luka Perkov
1 parent 82a19de3d2
Exists in v2017.01-smarct4x and in 30 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

arm: kirkwood: Move configuration of some commands to _defconfig files 

For Marvell plugs, move the configuration of DHCP, NAND/SF, PING
and USB commands, and HUSH_PARSER into the _defconfig file, rather
than the include/configs/*plug.h files.

This avoids compiler warnings of duplicate definitions if the
option is selected in the .config, but also defined in the
include/configs/*plug.h file.

Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>

Showing 6 changed files with 15 additions and 22 deletions Side-by-side Diff

configs/dreamplug_defconfig
Diff comments   View file @ 5e69947
... ... @@ -5,4 +5,9 @@
5 5 # CONFIG_CMD_FLASH is not set
6 6 # CONFIG_CMD_SETEXPR is not set
7 7 CONFIG_SPI_FLASH=y
  8 +CONFIG_HUSH_PARSER=y
  9 +CONFIG_CMD_DHCP=y
  10 +CONFIG_CMD_SF=y
  11 +CONFIG_CMD_PING=y
  12 +CONFIG_CMD_USB=y
configs/guruplug_defconfig
Diff comments   View file @ 5e69947
... ... @@ -4,4 +4,9 @@
4 4 # CONFIG_CMD_IMLS is not set
5 5 # CONFIG_CMD_FLASH is not set
6 6 # CONFIG_CMD_SETEXPR is not set
  7 +CONFIG_HUSH_PARSER=y
  8 +CONFIG_CMD_DHCP=y
  9 +CONFIG_CMD_NAND=y
  10 +CONFIG_CMD_PING=y
  11 +CONFIG_CMD_USB=y
configs/sheevaplug_defconfig
Diff comments   View file @ 5e69947
... ... @@ -4,4 +4,9 @@
4 4 # CONFIG_CMD_IMLS is not set
5 5 # CONFIG_CMD_FLASH is not set
6 6 # CONFIG_CMD_SETEXPR is not set
  7 +CONFIG_HUSH_PARSER=y
  8 +CONFIG_CMD_DHCP=y
  9 +CONFIG_CMD_NAND=y
  10 +CONFIG_CMD_PING=y
  11 +CONFIG_CMD_USB=y
include/configs/dreamplug.h
Diff comments   View file @ 5e69947
... ... @@ -46,16 +46,12 @@
46 46 */
47 47 #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
48 48 #define CONFIG_CMD_DATE
49   -#define CONFIG_CMD_DHCP
50 49 #define CONFIG_CMD_ENV
51 50 #define CONFIG_CMD_EXT2
52 51 #define CONFIG_CMD_EXT4
53 52 #define CONFIG_CMD_FAT
54 53 #define CONFIG_CMD_IDE
55 54 #define CONFIG_CMD_MII
56   -#define CONFIG_CMD_SF
57   -#define CONFIG_CMD_PING
58   -#define CONFIG_CMD_USB
59 55  
60 56 /*
61 57 * mv-common.h should be defined after CMD configs since it used them
include/configs/guruplug.h
Diff comments   View file @ 5e69947
... ... @@ -40,23 +40,14 @@
40 40 #define CONFIG_OF_LIBFDT
41 41  
42 42 /*
43   - * Miscellaneous configurable options
44   - */
45   -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
46   -
47   -/*
48 43 * Commands configuration
49 44 */
50 45 #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
51 46 #define CONFIG_CMD_BOOTZ
52 47 #define CONFIG_CMD_DATE
53   -#define CONFIG_CMD_DHCP
54 48 #define CONFIG_CMD_ENV
55 49 #define CONFIG_CMD_IDE
56 50 #define CONFIG_CMD_MII
57   -#define CONFIG_CMD_NAND
58   -#define CONFIG_CMD_PING
59   -#define CONFIG_CMD_USB
60 51  
61 52 /*
62 53 * mv-common.h should be defined after CMD configs since it used them
include/configs/sheevaplug.h
Diff comments   View file @ 5e69947
... ... @@ -40,24 +40,15 @@
40 40 #define CONFIG_OF_LIBFDT
41 41  
42 42 /*
43   - * Miscellaneous configurable options
44   - */
45   -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
46   -
47   -/*
48 43 * Commands configuration
49 44 */
50 45 #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
51 46 #define CONFIG_CMD_BOOTZ
52 47 #define CONFIG_CMD_DATE
53   -#define CONFIG_CMD_DHCP
54 48 #define CONFIG_CMD_ENV
55 49 #define CONFIG_CMD_IDE
56 50 #define CONFIG_CMD_MII
57 51 #define CONFIG_CMD_MMC
58   -#define CONFIG_CMD_NAND
59   -#define CONFIG_CMD_PING
60   -#define CONFIG_CMD_USB
61 52  
62 53 /*
63 54 * mv-common.h should be defined after CMD configs since it used them