| Message ID | 20200526190619.29583-2-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | a4c67b0eb352748293b3580f8fc148b715190447 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [1/8] pfla02: Rework excluding NAND from SPL | expand |
Reviewed by: Eric Nelson <eric@nelint.com> On 5/26/20 12:06 PM, Tom Rini wrote: > The config header for this platform uses '#undef' in a number of cases. > All of the MMC related ones were already handled correctly in the > defconfig file. In the case of CONFIG_CMD_FUSE, the command was being > built and enabled via defconfig. Disable it in the defconfig, cleanup > the header. > > Cc: Eric Nelson <eric@nelint.com> > Signed-off-by: Tom Rini <trini@konsulko.com> > --- > configs/mx6memcal_defconfig | 1 + > include/configs/mx6memcal.h | 5 ----- > 2 files changed, 1 insertion(+), 5 deletions(-) > > diff --git a/configs/mx6memcal_defconfig b/configs/mx6memcal_defconfig > index 8b5e0ff9b134..ed24b7996b6b 100644 > --- a/configs/mx6memcal_defconfig > +++ b/configs/mx6memcal_defconfig > @@ -33,6 +33,7 @@ CONFIG_CMD_MEMINFO=y > CONFIG_CMD_MEMTEST=y > CONFIG_SYS_MEMTEST_START=0x10000000 > CONFIG_SYS_MEMTEST_END=0x20000000 > +# CONFIG_CMD_FUSE is not set > # CONFIG_CMD_LOADB is not set > # CONFIG_CMD_LOADS is not set > CONFIG_CMD_CACHE=y > diff --git a/include/configs/mx6memcal.h b/include/configs/mx6memcal.h > index 3d79a7e43765..b774b167f648 100644 > --- a/include/configs/mx6memcal.h > +++ b/include/configs/mx6memcal.h > @@ -13,11 +13,6 @@ > #include "mx6_common.h" > #include "imx6_spl.h" > > -#undef CONFIG_MMC > -#undef CONFIG_SPL_MMC_SUPPORT > -#undef CONFIG_GENERIC_MMC > -#undef CONFIG_CMD_FUSE > - > #define CONFIG_SYS_MALLOC_LEN (64 * 1024 * 1024) > > #define CONFIG_MXC_UART >
On Tue, May 26, 2020 at 03:06:13PM -0400, Tom Rini wrote: > The config header for this platform uses '#undef' in a number of cases. > All of the MMC related ones were already handled correctly in the > defconfig file. In the case of CONFIG_CMD_FUSE, the command was being > built and enabled via defconfig. Disable it in the defconfig, cleanup > the header. > > Reviewed-by: Eric Nelson <eric@nelint.com> > Signed-off-by: Tom Rini <trini@konsulko.com> Applied to u-boot/master, thanks!
diff --git a/configs/mx6memcal_defconfig b/configs/mx6memcal_defconfig index 8b5e0ff9b134..ed24b7996b6b 100644 --- a/configs/mx6memcal_defconfig +++ b/configs/mx6memcal_defconfig @@ -33,6 +33,7 @@ CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x10000000 CONFIG_SYS_MEMTEST_END=0x20000000 +# CONFIG_CMD_FUSE is not set # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set CONFIG_CMD_CACHE=y diff --git a/include/configs/mx6memcal.h b/include/configs/mx6memcal.h index 3d79a7e43765..b774b167f648 100644 --- a/include/configs/mx6memcal.h +++ b/include/configs/mx6memcal.h @@ -13,11 +13,6 @@ #include "mx6_common.h" #include "imx6_spl.h" -#undef CONFIG_MMC -#undef CONFIG_SPL_MMC_SUPPORT -#undef CONFIG_GENERIC_MMC -#undef CONFIG_CMD_FUSE - #define CONFIG_SYS_MALLOC_LEN (64 * 1024 * 1024) #define CONFIG_MXC_UART
The config header for this platform uses '#undef' in a number of cases. All of the MMC related ones were already handled correctly in the defconfig file. In the case of CONFIG_CMD_FUSE, the command was being built and enabled via defconfig. Disable it in the defconfig, cleanup the header. Cc: Eric Nelson <eric@nelint.com> Signed-off-by: Tom Rini <trini@konsulko.com> --- configs/mx6memcal_defconfig | 1 + include/configs/mx6memcal.h | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-)