Kconfig: Migrate all of cmd/fastboot/Kconfig to defconfigs
- Move ANDROID_IMAGE_SUPPORT to top level Kconfig under images as it's not strictly part of fastboot. - Add some defaults for the fastboot buffer location and size - Migrate all options listed in cmd/fastboot/Kconfig - Cleanup the README Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
@@ -263,13 +263,6 @@
|
||||
#define CONFIG_AM335X_USB1
|
||||
#define CONFIG_AM335X_USB1_MODE MUSB_HOST
|
||||
|
||||
#ifndef CONFIG_SPL_USBETH_SUPPORT
|
||||
/* Fastboot */
|
||||
#define CONFIG_ANDROID_BOOT_IMAGE
|
||||
|
||||
#define CONFIG_FASTBOOT_FLASH_MMC_DEV 1
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_USB_MUSB_GADGET
|
||||
#define CONFIG_USB_ETHER
|
||||
#define CONFIG_USB_ETH_RNDIS
|
||||
|
||||
@@ -246,10 +246,6 @@
|
||||
|
||||
/* SPL */
|
||||
|
||||
#ifndef CONFIG_SPL_USBETH_SUPPORT
|
||||
#define CONFIG_FASTBOOT_FLASH_MMC_DEV 1
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Disable MMC DM for SPL build and can be re-enabled after adding
|
||||
* DM support in SPL
|
||||
|
||||
@@ -78,10 +78,6 @@
|
||||
#define CONFIG_BOOTCOUNT_AM33XX
|
||||
#define CONFIG_SYS_BOOTCOUNT_BE
|
||||
|
||||
#ifndef CONFIG_SPL_USBETH_SUPPORT
|
||||
#define CONFIG_FASTBOOT_FLASH_MMC_DEV 1
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
|
||||
/* Remove other SPL modes. */
|
||||
/* disable host part of MUSB in SPL */
|
||||
|
||||
@@ -420,17 +420,6 @@ DEFAULT_LINUX_BOOT_ENV \
|
||||
#define CONFIG_AM335X_USB1
|
||||
#define CONFIG_AM335X_USB1_MODE MUSB_HOST
|
||||
|
||||
#ifndef CONFIG_SPL_USBETH_SUPPORT
|
||||
/* 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 0x07000000
|
||||
|
||||
#define CONFIG_FASTBOOT_FLASH_MMC_DEV 1
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_USB_MUSB_GADGET
|
||||
#define CONFIG_USB_FUNCTION_MASS_STORAGE
|
||||
#endif /* CONFIG_USB_MUSB_GADGET */
|
||||
|
||||
@@ -72,12 +72,6 @@
|
||||
|
||||
#define CONFIG_USB_FUNCTION_MASS_STORAGE
|
||||
|
||||
#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 0x07000000
|
||||
|
||||
/* Framebuffer */
|
||||
#define CONFIG_VIDEO_IPUV3
|
||||
#define CONFIG_VIDEO_BMP_RLE8
|
||||
|
||||
@@ -76,15 +76,6 @@
|
||||
DFU_ALT_INFO_EMMC \
|
||||
DFU_ALT_INFO_RAM \
|
||||
DFU_ALT_INFO_QSPI
|
||||
#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
|
||||
|
||||
#ifdef CONFIG_SPL_BUILD
|
||||
|
||||
@@ -40,7 +40,6 @@
|
||||
|
||||
#define CONFIG_PREBOOT
|
||||
|
||||
#define CONFIG_ANDROID_BOOT_IMAGE
|
||||
#define CONFIG_SYS_BOOT_RAMDISK_HIGH
|
||||
|
||||
#undef CONFIG_BOOTCOMMAND
|
||||
|
||||
@@ -121,20 +121,6 @@
|
||||
#define CONFIG_USB_MUSB_PIO_ONLY
|
||||
#define CONFIG_USB_MUSB_OMAP2PLUS
|
||||
|
||||
/*
|
||||
* Fastboot
|
||||
*/
|
||||
|
||||
#define CONFIG_USB_FUNCTION_FASTBOOT
|
||||
|
||||
#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
|
||||
#define CONFIG_FASTBOOT_BUF_SIZE 0x2000000
|
||||
|
||||
#define CONFIG_FASTBOOT_FLASH
|
||||
#define CONFIG_FASTBOOT_FLASH_MMC_DEV 0
|
||||
|
||||
#define CONFIG_CMD_FASTBOOT
|
||||
|
||||
/*
|
||||
* Environment
|
||||
*/
|
||||
@@ -175,8 +161,6 @@
|
||||
|
||||
#define CONFIG_SYS_LOAD_ADDR 0x82000000
|
||||
|
||||
#define CONFIG_ANDROID_BOOT_IMAGE
|
||||
|
||||
#define CONFIG_BOOTCOMMAND \
|
||||
"setenv boot_mmc_part ${kernel_mmc_part}; " \
|
||||
"if test reboot-${reboot-mode} = reboot-r; then " \
|
||||
|
||||
@@ -217,12 +217,6 @@
|
||||
#define CONFIG_USBD_HS
|
||||
|
||||
#define CONFIG_USB_FUNCTION_MASS_STORAGE
|
||||
|
||||
#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 0x07000000
|
||||
#endif
|
||||
|
||||
#endif /* __MX6QSABRE_COMMON_CONFIG_H */
|
||||
|
||||
@@ -290,10 +290,4 @@
|
||||
|
||||
#define CONFIG_USB_FUNCTION_MASS_STORAGE
|
||||
|
||||
#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 0x07000000
|
||||
|
||||
#endif /* __CONFIG_H */
|
||||
|
||||
@@ -48,11 +48,6 @@
|
||||
#define CONFIG_TWL4030_USB 1
|
||||
#define CONFIG_USB_ETHER
|
||||
#define CONFIG_USB_ETHER_RNDIS
|
||||
#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 0x07000000
|
||||
|
||||
/* USB EHCI */
|
||||
|
||||
|
||||
@@ -59,11 +59,6 @@
|
||||
#define CONFIG_USB_MUSB_PIO_ONLY
|
||||
#define CONFIG_USB_ETHER
|
||||
#define CONFIG_USB_ETHER_RNDIS
|
||||
#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 0x07000000
|
||||
|
||||
/* TWL4030 */
|
||||
#define CONFIG_TWL4030_USB
|
||||
|
||||
@@ -48,14 +48,6 @@
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
/* usb otg */
|
||||
|
||||
/* fastboot */
|
||||
#define CONFIG_CMD_FASTBOOT
|
||||
#define CONFIG_USB_FUNCTION_FASTBOOT
|
||||
#define CONFIG_FASTBOOT_FLASH
|
||||
#define CONFIG_FASTBOOT_FLASH_MMC_DEV 0
|
||||
#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
|
||||
#define CONFIG_FASTBOOT_BUF_SIZE 0x08000000
|
||||
|
||||
/* usb mass storage */
|
||||
#define CONFIG_USB_FUNCTION_MASS_STORAGE
|
||||
#define CONFIG_CMD_USB_MASS_STORAGE
|
||||
|
||||
@@ -42,14 +42,6 @@
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
/* usb otg */
|
||||
|
||||
/* fastboot */
|
||||
#define CONFIG_CMD_FASTBOOT
|
||||
#define CONFIG_USB_FUNCTION_FASTBOOT
|
||||
#define CONFIG_FASTBOOT_FLASH
|
||||
#define CONFIG_FASTBOOT_FLASH_MMC_DEV 0
|
||||
#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
|
||||
#define CONFIG_FASTBOOT_BUF_SIZE 0x08000000
|
||||
|
||||
/* usb mass storage */
|
||||
#define CONFIG_USB_FUNCTION_MASS_STORAGE
|
||||
#define CONFIG_CMD_USB_MASS_STORAGE
|
||||
|
||||
@@ -58,14 +58,6 @@
|
||||
/* usb otg */
|
||||
#define CONFIG_ROCKCHIP_USB2_PHY
|
||||
|
||||
/* fastboot */
|
||||
#define CONFIG_CMD_FASTBOOT
|
||||
#define CONFIG_USB_FUNCTION_FASTBOOT
|
||||
#define CONFIG_FASTBOOT_FLASH
|
||||
#define CONFIG_FASTBOOT_FLASH_MMC_DEV 1 /* eMMC */
|
||||
#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
|
||||
#define CONFIG_FASTBOOT_BUF_SIZE 0x08000000
|
||||
|
||||
/* usb mass storage */
|
||||
#define CONFIG_USB_FUNCTION_MASS_STORAGE
|
||||
#define CONFIG_CMD_USB_MASS_STORAGE
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
#endif
|
||||
|
||||
#define CONFIG_LMB
|
||||
#define CONFIG_ANDROID_BOOT_IMAGE
|
||||
|
||||
#define CONFIG_FS_EXT4
|
||||
#define CONFIG_EXT4_WRITE
|
||||
|
||||
@@ -121,20 +121,6 @@
|
||||
#define CONFIG_USB_MUSB_OMAP2PLUS
|
||||
#define CONFIG_TWL4030_USB
|
||||
|
||||
/*
|
||||
* Fastboot
|
||||
*/
|
||||
|
||||
#define CONFIG_USB_FUNCTION_FASTBOOT
|
||||
|
||||
#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
|
||||
#define CONFIG_FASTBOOT_BUF_SIZE 0x2000000
|
||||
|
||||
#define CONFIG_FASTBOOT_FLASH
|
||||
#define CONFIG_FASTBOOT_FLASH_MMC_DEV 0
|
||||
|
||||
#define CONFIG_CMD_FASTBOOT
|
||||
|
||||
/*
|
||||
* Environment
|
||||
*/
|
||||
@@ -175,8 +161,6 @@
|
||||
|
||||
#define CONFIG_SYS_LOAD_ADDR 0x82000000
|
||||
|
||||
#define CONFIG_ANDROID_BOOT_IMAGE
|
||||
|
||||
#define CONFIG_BOOTCOMMAND \
|
||||
"setenv boot_mmc_part ${kernel_mmc_part}; " \
|
||||
"if test reboot-${reboot-mode} = reboot-r; then " \
|
||||
|
||||
@@ -311,23 +311,9 @@ extern int soft_i2c_gpio_scl;
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_USB_MUSB_GADGET
|
||||
#define CONFIG_USB_FUNCTION_FASTBOOT
|
||||
#define CONFIG_USB_FUNCTION_MASS_STORAGE
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_USB_FUNCTION_FASTBOOT
|
||||
#define CONFIG_CMD_FASTBOOT
|
||||
#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
|
||||
#define CONFIG_FASTBOOT_BUF_SIZE 0x2000000
|
||||
#define CONFIG_ANDROID_BOOT_IMAGE
|
||||
|
||||
#define CONFIG_FASTBOOT_FLASH
|
||||
|
||||
#ifdef CONFIG_MMC
|
||||
#define CONFIG_FASTBOOT_FLASH_MMC_DEV 0
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_USB_FUNCTION_MASS_STORAGE
|
||||
#endif
|
||||
|
||||
|
||||
@@ -103,16 +103,6 @@
|
||||
DFU_ALT_INFO_RAM
|
||||
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
# define CONFIG_USB_FUNCTION_FASTBOOT
|
||||
# define CONFIG_CMD_FASTBOOT
|
||||
# define CONFIG_ANDROID_BOOT_IMAGE
|
||||
# define CONFIG_FASTBOOT_BUF_ADDR 0x100000
|
||||
# define CONFIG_FASTBOOT_BUF_SIZE 0x6000000
|
||||
# define CONFIG_FASTBOOT_FLASH
|
||||
# ifdef CONFIG_MMC_SDHCI_ZYNQ
|
||||
# define CONFIG_FASTBOOT_FLASH_MMC_DEV 0
|
||||
# endif
|
||||
|
||||
# define CONFIG_RANDOM_UUID
|
||||
# define PARTS_DEFAULT \
|
||||
"partitions=uuid_disk=${uuid_gpt_disk};" \
|
||||
|
||||
Reference in New Issue
Block a user