| Message ID | 20160922185207.4261-1-semen.protsenko@linaro.org |
|---|---|
| State | Accepted |
| Commit | 234600c1ca9fca800c8b41710cfc4fb7a30d887c |
| Headers | show |
Bump. On Thu, Sep 22, 2016 at 9:52 PM, Sam Protsenko <semen.protsenko@linaro.org> wrote: > Now that fastboot options are available in Kconfig, we can migrate them > from DRA7 header to corresponding DRA7 defconfigs. > > Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> > --- > configs/dra7xx_evm_defconfig | 8 ++++++++ > configs/dra7xx_hs_evm_defconfig | 8 ++++++++ > include/configs/dra7xx_evm.h | 18 +++++++++--------- > 3 files changed, 25 insertions(+), 9 deletions(-) > > diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig > index 64df490..321ac45 100644 > --- a/configs/dra7xx_evm_defconfig > +++ b/configs/dra7xx_evm_defconfig > @@ -14,6 +14,14 @@ CONFIG_SPL=y > CONFIG_SPL_STACK_R=y > CONFIG_SPL_DMA_SUPPORT=y > CONFIG_HUSH_PARSER=y > +CONFIG_FASTBOOT=y > +CONFIG_USB_FUNCTION_FASTBOOT=y > +CONFIG_CMD_FASTBOOT=y > +CONFIG_ANDROID_BOOT_IMAGE=y > +CONFIG_FASTBOOT_BUF_ADDR=0x82000000 > +CONFIG_FASTBOOT_BUF_SIZE=0x2f000000 > +CONFIG_FASTBOOT_FLASH=y > +CONFIG_FASTBOOT_FLASH_MMC_DEV=1 > CONFIG_CMD_BOOTZ=y > # CONFIG_CMD_IMLS is not set > CONFIG_CMD_ASKENV=y > diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig > index 5fdc2b7..c0485e0 100644 > --- a/configs/dra7xx_hs_evm_defconfig > +++ b/configs/dra7xx_hs_evm_defconfig > @@ -18,6 +18,14 @@ CONFIG_SPL=y > CONFIG_SPL_STACK_R=y > CONFIG_SPL_DMA_SUPPORT=y > CONFIG_HUSH_PARSER=y > +CONFIG_FASTBOOT=y > +CONFIG_USB_FUNCTION_FASTBOOT=y > +CONFIG_CMD_FASTBOOT=y > +CONFIG_ANDROID_BOOT_IMAGE=y > +CONFIG_FASTBOOT_BUF_ADDR=0x82000000 > +CONFIG_FASTBOOT_BUF_SIZE=0x2f000000 > +CONFIG_FASTBOOT_FLASH=y > +CONFIG_FASTBOOT_FLASH_MMC_DEV=1 > CONFIG_CMD_BOOTZ=y > # CONFIG_CMD_IMLS is not set > CONFIG_CMD_ASKENV=y > diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h > index 194804c..273374a 100644 > --- a/include/configs/dra7xx_evm.h > +++ b/include/configs/dra7xx_evm.h > @@ -121,15 +121,15 @@ > DFU_ALT_INFO_EMMC \ > DFU_ALT_INFO_RAM \ > DFU_ALT_INFO_QSPI > - > -/* Fastboot */ > -#define CONFIG_USB_FUNCTION_FASTBOOT > -#define CONFIG_CMD_FASTBOOT > -#define CONFIG_ANDROID_BOOT_IMAGE > -#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR > -#define CONFIG_FASTBOOT_BUF_SIZE 0x2F000000 > -#define CONFIG_FASTBOOT_FLASH > -#define CONFIG_FASTBOOT_FLASH_MMC_DEV 1 > +#else > +/* Discard fastboot in SPL build, to spare some space */ > +#undef CONFIG_FASTBOOT > +#undef CONFIG_USB_FUNCTION_FASTBOOT > +#undef CONFIG_CMD_FASTBOOT > +#undef CONFIG_ANDROID_BOOT_IMAGE > +#undef CONFIG_FASTBOOT_BUF_ADDR > +#undef CONFIG_FASTBOOT_BUF_SIZE > +#undef CONFIG_FASTBOOT_FLASH > #endif > > #include <configs/ti_omap5_common.h> > -- > 2.9.3 > _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 64df490..321ac45 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -14,6 +14,14 @@ CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_SPL_DMA_SUPPORT=y CONFIG_HUSH_PARSER=y +CONFIG_FASTBOOT=y +CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_CMD_FASTBOOT=y +CONFIG_ANDROID_BOOT_IMAGE=y +CONFIG_FASTBOOT_BUF_ADDR=0x82000000 +CONFIG_FASTBOOT_BUF_SIZE=0x2f000000 +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig index 5fdc2b7..c0485e0 100644 --- a/configs/dra7xx_hs_evm_defconfig +++ b/configs/dra7xx_hs_evm_defconfig @@ -18,6 +18,14 @@ CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_SPL_DMA_SUPPORT=y CONFIG_HUSH_PARSER=y +CONFIG_FASTBOOT=y +CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_CMD_FASTBOOT=y +CONFIG_ANDROID_BOOT_IMAGE=y +CONFIG_FASTBOOT_BUF_ADDR=0x82000000 +CONFIG_FASTBOOT_BUF_SIZE=0x2f000000 +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 194804c..273374a 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -121,15 +121,15 @@ DFU_ALT_INFO_EMMC \ DFU_ALT_INFO_RAM \ DFU_ALT_INFO_QSPI - -/* Fastboot */ -#define CONFIG_USB_FUNCTION_FASTBOOT -#define CONFIG_CMD_FASTBOOT -#define CONFIG_ANDROID_BOOT_IMAGE -#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR -#define CONFIG_FASTBOOT_BUF_SIZE 0x2F000000 -#define CONFIG_FASTBOOT_FLASH -#define CONFIG_FASTBOOT_FLASH_MMC_DEV 1 +#else +/* Discard fastboot in SPL build, to spare some space */ +#undef CONFIG_FASTBOOT +#undef CONFIG_USB_FUNCTION_FASTBOOT +#undef CONFIG_CMD_FASTBOOT +#undef CONFIG_ANDROID_BOOT_IMAGE +#undef CONFIG_FASTBOOT_BUF_ADDR +#undef CONFIG_FASTBOOT_BUF_SIZE +#undef CONFIG_FASTBOOT_FLASH #endif #include <configs/ti_omap5_common.h>
Now that fastboot options are available in Kconfig, we can migrate them from DRA7 header to corresponding DRA7 defconfigs. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> --- configs/dra7xx_evm_defconfig | 8 ++++++++ configs/dra7xx_hs_evm_defconfig | 8 ++++++++ include/configs/dra7xx_evm.h | 18 +++++++++--------- 3 files changed, 25 insertions(+), 9 deletions(-) -- 2.9.3 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot