[U-Boot] [PATCH] ARM: rmobile: Add missing config bits after resync
The commit "fb82fe385173 configs: Resync defconfigs" broke all Gen3 boards by removing config options from the config which are needed for correct build. Reinstate those.
Signed-off-by: Marek Vasut marek.vasut+renesas@gmail.com Cc: Nobuhiro Iwamatsu iwamatsu@nigauri.org --- configs/r8a7795_salvator-x_defconfig | 2 ++ configs/r8a7796_salvator-x_defconfig | 1 + 2 files changed, 3 insertions(+)
diff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig index e4f80c427d..0cab920d96 100644 --- a/configs/r8a7795_salvator-x_defconfig +++ b/configs/r8a7795_salvator-x_defconfig @@ -1,7 +1,9 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_DEFAULT_FDT_FILE="r8a7795-salvator-x.dtb" CONFIG_RCAR_GEN3=y +CONFIG_R8A7795=y CONFIG_TARGET_SALVATOR_X=y CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig index e859311030..dfd91d2755 100644 --- a/configs/r8a7796_salvator-x_defconfig +++ b/configs/r8a7796_salvator-x_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_DEFAULT_FDT_FILE="r8a7796-salvator-x.dtb" CONFIG_RCAR_GEN3=y CONFIG_R8A7796=y CONFIG_TARGET_SALVATOR_X=y
From: Marek Vasut marek.vasut@gmail.com
The commit "fb82fe385173 configs: Resync defconfigs" broke all Gen3 boards by removing config options from the config which are needed for correct build. Reinstate those.
Signed-off-by: Marek Vasut marek.vasut+renesas@gmail.com Cc: Nobuhiro Iwamatsu iwamatsu@nigauri.org --- configs/r8a7795_salvator-x_defconfig | 1 + configs/r8a7796_salvator-x_defconfig | 1 + 2 files changed, 2 insertions(+)
diff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig index 0d0f07752bb8..a4e67a8b3340 100644 --- a/configs/r8a7795_salvator-x_defconfig +++ b/configs/r8a7795_salvator-x_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_RCAR_GEN3=y CONFIG_TARGET_SALVATOR_X=y +CONFIG_DEFAULT_FDT_FILE="r8a7795-salvator-x.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig index 9914417be4b6..13ca10c8bd35 100644 --- a/configs/r8a7796_salvator-x_defconfig +++ b/configs/r8a7796_salvator-x_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_RCAR_GEN3=y CONFIG_R8A7796=y CONFIG_TARGET_SALVATOR_X=y +CONFIG_DEFAULT_FDT_FILE="r8a7796-salvator-x.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set
On 06/20/2017 08:06 PM, Tom Rini wrote:
From: Marek Vasut marek.vasut@gmail.com
The commit "fb82fe385173 configs: Resync defconfigs" broke all Gen3 boards by removing config options from the config which are needed for correct build. Reinstate those.
Signed-off-by: Marek Vasut marek.vasut+renesas@gmail.com Cc: Nobuhiro Iwamatsu iwamatsu@nigauri.org
Please keep the CONFIG_R8A7795=y for consistency's sake.
configs/r8a7795_salvator-x_defconfig | 1 + configs/r8a7796_salvator-x_defconfig | 1 + 2 files changed, 2 insertions(+)
diff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig index 0d0f07752bb8..a4e67a8b3340 100644 --- a/configs/r8a7795_salvator-x_defconfig +++ b/configs/r8a7795_salvator-x_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_RCAR_GEN3=y CONFIG_TARGET_SALVATOR_X=y +CONFIG_DEFAULT_FDT_FILE="r8a7795-salvator-x.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig index 9914417be4b6..13ca10c8bd35 100644 --- a/configs/r8a7796_salvator-x_defconfig +++ b/configs/r8a7796_salvator-x_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_RCAR_GEN3=y CONFIG_R8A7796=y CONFIG_TARGET_SALVATOR_X=y +CONFIG_DEFAULT_FDT_FILE="r8a7796-salvator-x.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set
On Tue, Jun 20, 2017 at 08:22:15PM +0200, Marek Vasut wrote:
On 06/20/2017 08:06 PM, Tom Rini wrote:
From: Marek Vasut marek.vasut@gmail.com
The commit "fb82fe385173 configs: Resync defconfigs" broke all Gen3 boards by removing config options from the config which are needed for correct build. Reinstate those.
Signed-off-by: Marek Vasut marek.vasut+renesas@gmail.com Cc: Nobuhiro Iwamatsu iwamatsu@nigauri.org
Please keep the CONFIG_R8A7795=y for consistency's sake.
Nope, please correct your Kconfig entry for consistency's sake (in this case, default R8A7795 rather than it just being the first entry). You cannot rely on X being set in the defconfig file to enforce Y happening, you use the Kconfig files for that. configs/ content is regnerated.
From: Marek Vasut marek.vasut@gmail.com
The commit "fb82fe385173 configs: Resync defconfigs" resynced all config files. This exposed two latent issues with the Gen3 boards in that we had not been setting CONFIG_DEFAULT_FDT_FILE correctly and had not been setting CONFIG_CMD_MMC. Fix both of these.
Fixes: fb82fe385173 ("configs: Resync defconfigs") Signed-off-by: Marek Vasut marek.vasut+renesas@gmail.com Cc: Nobuhiro Iwamatsu iwamatsu@nigauri.org Signed-off-by: Tom Rini trini@konsulko.com --- configs/r8a7795_salvator-x_defconfig | 2 ++ configs/r8a7796_salvator-x_defconfig | 2 ++ 2 files changed, 4 insertions(+)
diff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig index 0d0f07752bb8..c0e3999f9675 100644 --- a/configs/r8a7795_salvator-x_defconfig +++ b/configs/r8a7795_salvator-x_defconfig @@ -3,9 +3,11 @@ CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_RCAR_GEN3=y CONFIG_TARGET_SALVATOR_X=y +CONFIG_DEFAULT_FDT_FILE="r8a7795-salvator-x.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig index 9914417be4b6..d57305112b52 100644 --- a/configs/r8a7796_salvator-x_defconfig +++ b/configs/r8a7796_salvator-x_defconfig @@ -4,9 +4,11 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_RCAR_GEN3=y CONFIG_R8A7796=y CONFIG_TARGET_SALVATOR_X=y +CONFIG_DEFAULT_FDT_FILE="r8a7796-salvator-x.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y
On 06/20/2017 08:32 PM, Tom Rini wrote:
From: Marek Vasut marek.vasut@gmail.com
The commit "fb82fe385173 configs: Resync defconfigs" resynced all config files. This exposed two latent issues with the Gen3 boards in that we had not been setting CONFIG_DEFAULT_FDT_FILE correctly and had not been setting CONFIG_CMD_MMC. Fix both of these.
This patch now conflicts with https://patchwork.ozlabs.org/patch/777294/
Fixes: fb82fe385173 ("configs: Resync defconfigs") Signed-off-by: Marek Vasut marek.vasut+renesas@gmail.com Cc: Nobuhiro Iwamatsu iwamatsu@nigauri.org Signed-off-by: Tom Rini trini@konsulko.com
configs/r8a7795_salvator-x_defconfig | 2 ++ configs/r8a7796_salvator-x_defconfig | 2 ++ 2 files changed, 4 insertions(+)
diff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig index 0d0f07752bb8..c0e3999f9675 100644 --- a/configs/r8a7795_salvator-x_defconfig +++ b/configs/r8a7795_salvator-x_defconfig @@ -3,9 +3,11 @@ CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_RCAR_GEN3=y CONFIG_TARGET_SALVATOR_X=y +CONFIG_DEFAULT_FDT_FILE="r8a7795-salvator-x.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig index 9914417be4b6..d57305112b52 100644 --- a/configs/r8a7796_salvator-x_defconfig +++ b/configs/r8a7796_salvator-x_defconfig @@ -4,9 +4,11 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_RCAR_GEN3=y CONFIG_R8A7796=y CONFIG_TARGET_SALVATOR_X=y +CONFIG_DEFAULT_FDT_FILE="r8a7796-salvator-x.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y
On Tue, Jun 20, 2017 at 08:35:15PM +0200, Marek Vasut wrote:
On 06/20/2017 08:32 PM, Tom Rini wrote:
From: Marek Vasut marek.vasut@gmail.com
The commit "fb82fe385173 configs: Resync defconfigs" resynced all config files. This exposed two latent issues with the Gen3 boards in that we had not been setting CONFIG_DEFAULT_FDT_FILE correctly and had not been setting CONFIG_CMD_MMC. Fix both of these.
This patch now conflicts with https://patchwork.ozlabs.org/patch/777294/
Yes, your second patch does not apply and is superseded by this single patch that corrects both problems that were exposed by the resync.
participants (2)
-
Marek Vasut -
Tom Rini