Message ID | 20170912170822.29810-1-marek.vasut+renesas@gmail.com |
---|---|
State | Accepted |
Delegated to: | Nobuhiro Iwamatsu |
Headers | show |
Series | [U-Boot] ARM: rmobile: Move CONFIG_CMD_ from rcar-gen3-common to configs | expand |
Hi, 2017-09-13 2:08 GMT+09:00 Marek Vasut <marek.vasut@gmail.com>: > Just move those config options from macros to configs. > > Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> > Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Applied to rmobile branch. Thanks, Nobuhiro > --- > configs/r8a7795_salvator-x_defconfig | 4 ++++ > configs/r8a7795_ulcb_defconfig | 5 +++++ > configs/r8a7796_salvator-x_defconfig | 4 ++++ > configs/r8a7796_ulcb_defconfig | 5 +++++ > include/configs/rcar-gen3-common.h | 4 ---- > 5 files changed, 18 insertions(+), 4 deletions(-) > > diff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig > index 585eb64973..c5f86464d6 100644 > --- a/configs/r8a7795_salvator-x_defconfig > +++ b/configs/r8a7795_salvator-x_defconfig > @@ -19,7 +19,11 @@ CONFIG_CMD_USB=y > CONFIG_CMD_DHCP=y > CONFIG_CMD_MII=y > CONFIG_CMD_PING=y > +CONFIG_CMD_EXT2=y > +CONFIG_CMD_EXT4=y > +CONFIG_CMD_EXT4_WRITE=y > CONFIG_CMD_FAT=y > +CONFIG_CMD_FS_GENERIC=y > CONFIG_OF_CONTROL=y > CONFIG_ENV_IS_IN_MMC=y > CONFIG_CLK=y > diff --git a/configs/r8a7795_ulcb_defconfig b/configs/r8a7795_ulcb_defconfig > index 6f30c8d870..63fdb8d697 100644 > --- a/configs/r8a7795_ulcb_defconfig > +++ b/configs/r8a7795_ulcb_defconfig > @@ -18,6 +18,11 @@ CONFIG_CMD_USB=y > CONFIG_CMD_DHCP=y > CONFIG_CMD_MII=y > CONFIG_CMD_PING=y > +CONFIG_CMD_EXT2=y > +CONFIG_CMD_EXT4=y > +CONFIG_CMD_EXT4_WRITE=y > +CONFIG_CMD_FAT=y > +CONFIG_CMD_FS_GENERIC=y > CONFIG_OF_CONTROL=y > CONFIG_ENV_IS_IN_MMC=y > CONFIG_CLK=y > diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig > index 302e8999a6..4273f4186f 100644 > --- a/configs/r8a7796_salvator-x_defconfig > +++ b/configs/r8a7796_salvator-x_defconfig > @@ -20,7 +20,11 @@ CONFIG_CMD_USB=y > CONFIG_CMD_DHCP=y > CONFIG_CMD_MII=y > CONFIG_CMD_PING=y > +CONFIG_CMD_EXT2=y > +CONFIG_CMD_EXT4=y > +CONFIG_CMD_EXT4_WRITE=y > CONFIG_CMD_FAT=y > +CONFIG_CMD_FS_GENERIC=y > CONFIG_OF_CONTROL=y > CONFIG_ENV_IS_IN_MMC=y > CONFIG_CLK=y > diff --git a/configs/r8a7796_ulcb_defconfig b/configs/r8a7796_ulcb_defconfig > index 2ff91dfbf3..77a5018dc7 100644 > --- a/configs/r8a7796_ulcb_defconfig > +++ b/configs/r8a7796_ulcb_defconfig > @@ -19,6 +19,11 @@ CONFIG_CMD_USB=y > CONFIG_CMD_DHCP=y > CONFIG_CMD_MII=y > CONFIG_CMD_PING=y > +CONFIG_CMD_EXT2=y > +CONFIG_CMD_EXT4=y > +CONFIG_CMD_EXT4_WRITE=y > +CONFIG_CMD_FAT=y > +CONFIG_CMD_FS_GENERIC=y > CONFIG_OF_CONTROL=y > CONFIG_ENV_IS_IN_MMC=y > CONFIG_CLK=y > diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h > index 49b1b5ade4..745291a971 100644 > --- a/include/configs/rcar-gen3-common.h > +++ b/include/configs/rcar-gen3-common.h > @@ -12,10 +12,6 @@ > > #include <asm/arch/rmobile.h> > > -#define CONFIG_CMD_EXT2 > -#define CONFIG_CMD_EXT4 > -#define CONFIG_CMD_EXT4_WRITE > - > #define CONFIG_REMAKE_ELF > > /* boot option */ > -- > 2.11.0 >
diff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig index 585eb64973..c5f86464d6 100644 --- a/configs/r8a7795_salvator-x_defconfig +++ b/configs/r8a7795_salvator-x_defconfig @@ -19,7 +19,11 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_MMC=y CONFIG_CLK=y diff --git a/configs/r8a7795_ulcb_defconfig b/configs/r8a7795_ulcb_defconfig index 6f30c8d870..63fdb8d697 100644 --- a/configs/r8a7795_ulcb_defconfig +++ b/configs/r8a7795_ulcb_defconfig @@ -18,6 +18,11 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_MMC=y CONFIG_CLK=y diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig index 302e8999a6..4273f4186f 100644 --- a/configs/r8a7796_salvator-x_defconfig +++ b/configs/r8a7796_salvator-x_defconfig @@ -20,7 +20,11 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_MMC=y CONFIG_CLK=y diff --git a/configs/r8a7796_ulcb_defconfig b/configs/r8a7796_ulcb_defconfig index 2ff91dfbf3..77a5018dc7 100644 --- a/configs/r8a7796_ulcb_defconfig +++ b/configs/r8a7796_ulcb_defconfig @@ -19,6 +19,11 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_MMC=y CONFIG_CLK=y diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index 49b1b5ade4..745291a971 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -12,10 +12,6 @@ #include <asm/arch/rmobile.h> -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_EXT4_WRITE - #define CONFIG_REMAKE_ELF /* boot option */
Just move those config options from macros to configs. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> --- configs/r8a7795_salvator-x_defconfig | 4 ++++ configs/r8a7795_ulcb_defconfig | 5 +++++ configs/r8a7796_salvator-x_defconfig | 4 ++++ configs/r8a7796_ulcb_defconfig | 5 +++++ include/configs/rcar-gen3-common.h | 4 ---- 5 files changed, 18 insertions(+), 4 deletions(-)