* [DistroKit] [PATCH 2/2] v7a: barebox: update diffs with enabled fastboot and mass storage gadget
2022-09-07 13:23 [DistroKit] [PATCH 1/2] v7a/barebox: enable fastboot and mass storage gadget support Jan Luebbe
@ 2022-09-07 13:23 ` Jan Luebbe
2022-09-07 13:26 ` [DistroKit] [PATCH 1/2] v7a/barebox: enable fastboot and mass storage gadget support Robert Schwebel
1 sibling, 0 replies; 3+ messages in thread
From: Jan Luebbe @ 2022-09-07 13:23 UTC (permalink / raw)
To: distrokit; +Cc: Jan Luebbe
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
configs/platform-v7a/barebox-am335x.config | 4 ++--
configs/platform-v7a/barebox-am335x.config.diff | 7 +------
configs/platform-v7a/barebox-at91.config | 2 +-
configs/platform-v7a/barebox-at91.config.diff | 6 +++++-
configs/platform-v7a/barebox-mx6.config | 4 ++--
configs/platform-v7a/barebox-mx6.config.diff | 7 +------
configs/platform-v7a/barebox-rpi2.config | 2 +-
configs/platform-v7a/barebox-rpi2.config.diff | 6 +++++-
configs/platform-v7a/barebox-stm32mp.config | 2 +-
configs/platform-v7a/barebox-stm32mp.config.diff | 6 +++++-
configs/platform-v7a/barebox-vexpress.config | 15 ++++++++++++---
configs/platform-v7a/barebox-vexpress.config.diff | 2 +-
12 files changed, 37 insertions(+), 26 deletions(-)
diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config
index 254c3c2d711b..7113f7bb0767 100644
--- a/configs/platform-v7a/barebox-am335x.config
+++ b/configs/platform-v7a/barebox-am335x.config
@@ -182,7 +182,7 @@ CONFIG_BLSPEC=y
CONFIG_FLEXIBLE_BOOTARGS=y
# CONFIG_MMCBLKDEV_ROOTARG is not set
CONFIG_BAREBOX_UPDATE=y
-# CONFIG_SYSTEM_PARTITIONS is not set
+CONFIG_SYSTEM_PARTITIONS=y
CONFIG_IMD=y
CONFIG_CONSOLE_FULL=y
# CONFIG_CONSOLE_SIMPLE is not set
@@ -637,7 +637,7 @@ CONFIG_USB_GADGET_AUTOSTART=y
# CONFIG_USB_GADGET_DFU is not set
CONFIG_USB_GADGET_SERIAL=y
CONFIG_USB_GADGET_FASTBOOT=y
-# CONFIG_USB_GADGET_MASS_STORAGE is not set
+CONFIG_USB_GADGET_MASS_STORAGE=y
CONFIG_USB_MUSB=y
CONFIG_USB_MUSB_DSPS=y
CONFIG_USB_MUSB_AM335X=y
diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff
index f72858bc5afa..147a62b4bb5f 100644
--- a/configs/platform-v7a/barebox-am335x.config.diff
+++ b/configs/platform-v7a/barebox-am335x.config.diff
@@ -1,4 +1,4 @@
-966dda2ed3dbd86ed65356ae62444002
+fceca70b5894506c425ba4448ecfcb98
# CONFIG_AM33XX_NET_BOOT is not set
CONFIG_ARCH_AM33XX=y
# CONFIG_ARCH_BCM283X is not set
@@ -41,9 +41,6 @@ CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
CONFIG_DRIVER_SPI_OMAP3=y
# CONFIG_EEPROM_93XX46 is not set
CONFIG_EEPROM_AT24=y
-CONFIG_FASTBOOT_BASE=y
-CONFIG_FASTBOOT_CMD_OEM=y
-CONFIG_FASTBOOT_SPARSE=y
CONFIG_GPIO_GENERIC=y
CONFIG_GPIO_GENERIC_PLATFORM=y
CONFIG_GPIO_OMAP=y
@@ -53,7 +50,6 @@ CONFIG_GPIO_OMAP=y
CONFIG_HAVE_DIGEST_HMAC=y
# CONFIG_I2C_MV64XXX is undefined
CONFIG_I2C_OMAP=y
-CONFIG_IMAGE_SPARSE=y
CONFIG_MACH_AFI_GF=y
# CONFIG_MACH_BEAGLE is not set
CONFIG_MACH_BEAGLEBONE=y
@@ -102,7 +98,6 @@ CONFIG_SPI_MEM=y
CONFIG_THUMB2_BAREBOX=y
# CONFIG_TIMESTAMP is not set
CONFIG_TI_SYSC=y
-CONFIG_USB_GADGET_FASTBOOT=y
CONFIG_USB_MUSB=y
CONFIG_USB_MUSB_AM335X=y
CONFIG_USB_MUSB_DSPS=y
diff --git a/configs/platform-v7a/barebox-at91.config b/configs/platform-v7a/barebox-at91.config
index 9f2c14a8c1cd..b8b9c2c7e46b 100644
--- a/configs/platform-v7a/barebox-at91.config
+++ b/configs/platform-v7a/barebox-at91.config
@@ -186,7 +186,7 @@ CONFIG_BLSPEC=y
CONFIG_FLEXIBLE_BOOTARGS=y
# CONFIG_MMCBLKDEV_ROOTARG is not set
CONFIG_BAREBOX_UPDATE=y
-# CONFIG_SYSTEM_PARTITIONS is not set
+CONFIG_SYSTEM_PARTITIONS=y
CONFIG_IMD=y
CONFIG_CONSOLE_FULL=y
# CONFIG_CONSOLE_SIMPLE is not set
diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff
index 65100afc1de8..41ca541003aa 100644
--- a/configs/platform-v7a/barebox-at91.config.diff
+++ b/configs/platform-v7a/barebox-at91.config.diff
@@ -1,4 +1,4 @@
-966dda2ed3dbd86ed65356ae62444002
+fceca70b5894506c425ba4448ecfcb98
CONFIG_ARCH_AT91=y
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_TEXT_BASE=0x23f00000
@@ -36,6 +36,9 @@ CONFIG_DRIVER_SERIAL_ATMEL=y
# CONFIG_DRIVER_SPI_ATMEL is not set
# CONFIG_DRIVER_SPI_FSL_QUADSPI is not set
# CONFIG_DRIVER_SPI_GPIO is not set
+# CONFIG_FASTBOOT_BASE is undefined
+# CONFIG_FASTBOOT_CMD_OEM is undefined
+# CONFIG_FASTBOOT_SPARSE is undefined
# CONFIG_GPIO_PL061 is undefined
# CONFIG_GPIO_RASPBERRYPI_EXP is undefined
CONFIG_HAS_MACB=y
@@ -54,6 +57,7 @@ CONFIG_I2C_AT91=y
# CONFIG_I2C_GPIO is not set
# CONFIG_IMAGE_COMPRESSION_LZO is not set
CONFIG_IMAGE_COMPRESSION_NONE=y
+# CONFIG_IMAGE_SPARSE is undefined
CONFIG_IMD_TARGET=y
# CONFIG_KEYBOARD_USB is undefined
# CONFIG_LIBFDT is undefined
diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config
index b6cf2e696158..dff7a650e8c6 100644
--- a/configs/platform-v7a/barebox-mx6.config
+++ b/configs/platform-v7a/barebox-mx6.config
@@ -250,7 +250,7 @@ CONFIG_BLSPEC=y
CONFIG_FLEXIBLE_BOOTARGS=y
# CONFIG_MMCBLKDEV_ROOTARG is not set
CONFIG_BAREBOX_UPDATE=y
-# CONFIG_SYSTEM_PARTITIONS is not set
+CONFIG_SYSTEM_PARTITIONS=y
CONFIG_IMD=y
CONFIG_CONSOLE_FULL=y
# CONFIG_CONSOLE_SIMPLE is not set
@@ -734,7 +734,7 @@ CONFIG_USB_GADGET_AUTOSTART=y
CONFIG_USB_GADGET_DFU=y
CONFIG_USB_GADGET_SERIAL=y
CONFIG_USB_GADGET_FASTBOOT=y
-# CONFIG_USB_GADGET_MASS_STORAGE is not set
+CONFIG_USB_GADGET_MASS_STORAGE=y
# CONFIG_USB_MUSB is not set
CONFIG_VIDEO=y
# CONFIG_FRAMEBUFFER_CONSOLE is not set
diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff
index 1f5f0354c55c..60bc19dc0e85 100644
--- a/configs/platform-v7a/barebox-mx6.config.diff
+++ b/configs/platform-v7a/barebox-mx6.config.diff
@@ -1,4 +1,4 @@
-966dda2ed3dbd86ed65356ae62444002
+fceca70b5894506c425ba4448ecfcb98
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_HAS_FEC_IMX=y
CONFIG_ARCH_HAS_IMX_GPT=y
@@ -63,9 +63,6 @@ CONFIG_DRIVER_VIDEO_SIMPLEFB=y
# CONFIG_DRIVER_VIDEO_SIMPLE_PANEL is not set
# CONFIG_EEPROM_93XX46 is not set
CONFIG_EEPROM_AT25=y
-CONFIG_FASTBOOT_BASE=y
-CONFIG_FASTBOOT_CMD_OEM=y
-CONFIG_FASTBOOT_SPARSE=y
# CONFIG_FRAMEBUFFER_CONSOLE is not set
CONFIG_FS_UBIFS=y
CONFIG_FS_UBIFS_COMPRESSION_LZO=y
@@ -80,7 +77,6 @@ CONFIG_HAVE_DIGEST_HMAC=y
CONFIG_HW_HAS_PCI=y
CONFIG_I2C_IMX=y
CONFIG_IMAGE_RENDERER=y
-CONFIG_IMAGE_SPARSE=y
CONFIG_IMX_IIM=y
CONFIG_IMX_IIM_FUSE_BLOW=y
CONFIG_IMX_MULTI_BOARDS=y
@@ -229,7 +225,6 @@ CONFIG_UBIFORMAT=y
CONFIG_USB_GADGET_DFU=y
CONFIG_USB_GADGET_DRIVER_ARC=y
CONFIG_USB_GADGET_DUALSPEED=y
-CONFIG_USB_GADGET_FASTBOOT=y
CONFIG_USB_IMX_CHIPIDEA=y
CONFIG_USB_IMX_CHIPIDEA_USBMISC=y
CONFIG_USB_IMX_PHY=y
diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config
index 650aad7c4c22..607269b11be9 100644
--- a/configs/platform-v7a/barebox-rpi2.config
+++ b/configs/platform-v7a/barebox-rpi2.config
@@ -170,7 +170,7 @@ CONFIG_BLSPEC=y
CONFIG_FLEXIBLE_BOOTARGS=y
# CONFIG_MMCBLKDEV_ROOTARG is not set
CONFIG_BAREBOX_UPDATE=y
-# CONFIG_SYSTEM_PARTITIONS is not set
+CONFIG_SYSTEM_PARTITIONS=y
CONFIG_IMD=y
CONFIG_CONSOLE_FULL=y
# CONFIG_CONSOLE_SIMPLE is not set
diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff
index c49e6ff64442..0ee1b9e7d1f1 100644
--- a/configs/platform-v7a/barebox-rpi2.config.diff
+++ b/configs/platform-v7a/barebox-rpi2.config.diff
@@ -1,4 +1,4 @@
-966dda2ed3dbd86ed65356ae62444002
+fceca70b5894506c425ba4448ecfcb98
CONFIG_ARM_ASM_UNIFIED=y
# CONFIG_CMD_I2C is undefined
# CONFIG_CMD_NVMEM is not set
@@ -6,6 +6,9 @@ CONFIG_ARM_ASM_UNIFIED=y
CONFIG_DRIVER_SERIAL_NS16550=y
# CONFIG_EEPROM_93XX46 is not set
# CONFIG_EEPROM_AT24 is undefined
+# CONFIG_FASTBOOT_BASE is undefined
+# CONFIG_FASTBOOT_CMD_OEM is undefined
+# CONFIG_FASTBOOT_SPARSE is undefined
CONFIG_GENERIC_PHY=y
# CONFIG_GPIO_PCA953X is undefined
# CONFIG_GPIO_PCF857X is undefined
@@ -18,6 +21,7 @@ CONFIG_GPIO_RASPBERRYPI_EXP=y
# CONFIG_I2C_GPIO is undefined
# CONFIG_I2C_MUX is undefined
# CONFIG_I2C_MV64XXX is undefined
+# CONFIG_IMAGE_SPARSE is undefined
# CONFIG_KEYBOARD_QT1070 is undefined
# CONFIG_LED_PCA955X is undefined
CONFIG_MACH_RPI2=y
diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config
index 6053a43fd0f1..529d2fad66a7 100644
--- a/configs/platform-v7a/barebox-stm32mp.config
+++ b/configs/platform-v7a/barebox-stm32mp.config
@@ -170,7 +170,7 @@ CONFIG_BLSPEC=y
CONFIG_FLEXIBLE_BOOTARGS=y
# CONFIG_MMCBLKDEV_ROOTARG is not set
CONFIG_BAREBOX_UPDATE=y
-# CONFIG_SYSTEM_PARTITIONS is not set
+CONFIG_SYSTEM_PARTITIONS=y
CONFIG_IMD=y
CONFIG_CONSOLE_FULL=y
# CONFIG_CONSOLE_SIMPLE is not set
diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff
index 5957e8c1e04e..c684c2e984bd 100644
--- a/configs/platform-v7a/barebox-stm32mp.config.diff
+++ b/configs/platform-v7a/barebox-stm32mp.config.diff
@@ -1,4 +1,4 @@
-966dda2ed3dbd86ed65356ae62444002
+fceca70b5894506c425ba4448ecfcb98
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_HAS_RESET_CONTROLLER=y
CONFIG_ARCH_NR_GPIO=416
@@ -51,6 +51,9 @@ CONFIG_DRIVER_SERIAL_STM32=y
# CONFIG_DRIVER_SPI_LITEX_SPIFLASH is undefined
CONFIG_EEPROM_AT24=y
# CONFIG_EEPROM_AT25 is undefined
+# CONFIG_FASTBOOT_BASE is undefined
+# CONFIG_FASTBOOT_CMD_OEM is undefined
+# CONFIG_FASTBOOT_SPARSE is undefined
# CONFIG_FIRMWARE_ALTERA_SERIAL is undefined
# CONFIG_FS_JFFS2 is undefined
# CONFIG_GPIO_74164 is undefined
@@ -59,6 +62,7 @@ CONFIG_EEPROM_AT24=y
# CONFIG_I2C_ALGOBIT is undefined
# CONFIG_I2C_GPIO is not set
CONFIG_I2C_STM32=y
+# CONFIG_IMAGE_SPARSE is undefined
# CONFIG_KEYBOARD_USB is undefined
CONFIG_LED_PWM=y
# CONFIG_LED_TRIGGERS is not set
diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config
index 4478d1b4e57d..80c75c355aac 100644
--- a/configs/platform-v7a/barebox-vexpress.config
+++ b/configs/platform-v7a/barebox-vexpress.config
@@ -84,6 +84,7 @@ CONFIG_STDDEV=y
CONFIG_MENUTREE=y
CONFIG_USBGADGET_START=y
CONFIG_BOOT=y
+CONFIG_FASTBOOT_BASE=y
#
# General Settings
@@ -158,7 +159,7 @@ CONFIG_BLSPEC=y
CONFIG_FLEXIBLE_BOOTARGS=y
# CONFIG_MMCBLKDEV_ROOTARG is not set
CONFIG_BAREBOX_UPDATE=y
-# CONFIG_SYSTEM_PARTITIONS is not set
+CONFIG_SYSTEM_PARTITIONS=y
CONFIG_IMD=y
CONFIG_CONSOLE_FULL=y
# CONFIG_CONSOLE_SIMPLE is not set
@@ -203,6 +204,13 @@ CONFIG_EXTERNAL_DTS_FRAGMENTS=""
# CONFIG_BOOTM_OPTEE is not set
# CONFIG_PBL_OPTEE is not set
# end of OP-TEE loading
+
+#
+# Android Fastboot
+#
+CONFIG_FASTBOOT_SPARSE=y
+CONFIG_FASTBOOT_CMD_OEM=y
+# end of Android Fastboot
# end of General Settings
#
@@ -588,8 +596,8 @@ CONFIG_USB_GADGET_AUTOSTART=y
#
# CONFIG_USB_GADGET_DFU is not set
CONFIG_USB_GADGET_SERIAL=y
-# CONFIG_USB_GADGET_FASTBOOT is not set
-# CONFIG_USB_GADGET_MASS_STORAGE is not set
+CONFIG_USB_GADGET_FASTBOOT=y
+CONFIG_USB_GADGET_MASS_STORAGE=y
# CONFIG_USB_MUSB is not set
# CONFIG_VIDEO is not set
# CONFIG_SOUND is not set
@@ -827,6 +835,7 @@ CONFIG_PROCESS_ESCAPE_SEQUENCE=y
CONFIG_LZO_DECOMPRESS=y
CONFIG_FNMATCH=y
CONFIG_QSORT=y
+CONFIG_IMAGE_SPARSE=y
CONFIG_LIBFDT=y
# CONFIG_RATP is not set
# CONFIG_ALLOW_PRNG_FALLBACK is not set
diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff
index 977f0f9fbc85..1c27b8d203fd 100644
--- a/configs/platform-v7a/barebox-vexpress.config.diff
+++ b/configs/platform-v7a/barebox-vexpress.config.diff
@@ -1,4 +1,4 @@
-966dda2ed3dbd86ed65356ae62444002
+fceca70b5894506c425ba4448ecfcb98
CONFIG_AMBA_SP804=y
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_VEXPRESS=y
--
2.30.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [DistroKit] [PATCH 1/2] v7a/barebox: enable fastboot and mass storage gadget support
2022-09-07 13:23 [DistroKit] [PATCH 1/2] v7a/barebox: enable fastboot and mass storage gadget support Jan Luebbe
2022-09-07 13:23 ` [DistroKit] [PATCH 2/2] v7a: barebox: update diffs with enabled fastboot and mass storage gadget Jan Luebbe
@ 2022-09-07 13:26 ` Robert Schwebel
1 sibling, 0 replies; 3+ messages in thread
From: Robert Schwebel @ 2022-09-07 13:26 UTC (permalink / raw)
To: Jan Luebbe; +Cc: distrokit
Series applied to next
On Wed, Sep 07, 2022 at 03:23:42PM +0200, Jan Luebbe wrote:
> Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
> ---
> configs/platform-v7a/barebox.config | 15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config
> index b7d48a39ac5f..688c914edaf2 100644
> --- a/configs/platform-v7a/barebox.config
> +++ b/configs/platform-v7a/barebox.config
> @@ -96,6 +96,7 @@ CONFIG_STDDEV=y
> CONFIG_MENUTREE=y
> CONFIG_USBGADGET_START=y
> CONFIG_BOOT=y
> +CONFIG_FASTBOOT_BASE=y
>
> #
> # General Settings
> @@ -170,7 +171,7 @@ CONFIG_BLSPEC=y
> CONFIG_FLEXIBLE_BOOTARGS=y
> # CONFIG_MMCBLKDEV_ROOTARG is not set
> CONFIG_BAREBOX_UPDATE=y
> -# CONFIG_SYSTEM_PARTITIONS is not set
> +CONFIG_SYSTEM_PARTITIONS=y
> CONFIG_IMD=y
> CONFIG_CONSOLE_FULL=y
> # CONFIG_CONSOLE_SIMPLE is not set
> @@ -215,6 +216,13 @@ CONFIG_EXTERNAL_DTS_FRAGMENTS=""
> # CONFIG_BOOTM_OPTEE is not set
> # CONFIG_PBL_OPTEE is not set
> # end of OP-TEE loading
> +
> +#
> +# Android Fastboot
> +#
> +CONFIG_FASTBOOT_SPARSE=y
> +CONFIG_FASTBOOT_CMD_OEM=y
> +# end of Android Fastboot
> # end of General Settings
>
> #
> @@ -600,8 +608,8 @@ CONFIG_USB_GADGET_AUTOSTART=y
> #
> # CONFIG_USB_GADGET_DFU is not set
> CONFIG_USB_GADGET_SERIAL=y
> -# CONFIG_USB_GADGET_FASTBOOT is not set
> -# CONFIG_USB_GADGET_MASS_STORAGE is not set
> +CONFIG_USB_GADGET_FASTBOOT=y
> +CONFIG_USB_GADGET_MASS_STORAGE=y
> # CONFIG_USB_MUSB is not set
> # CONFIG_VIDEO is not set
> # CONFIG_SOUND is not set
> @@ -874,6 +882,7 @@ CONFIG_PROCESS_ESCAPE_SEQUENCE=y
> CONFIG_LZO_DECOMPRESS=y
> CONFIG_FNMATCH=y
> CONFIG_QSORT=y
> +CONFIG_IMAGE_SPARSE=y
> CONFIG_LIBFDT=y
> # CONFIG_RATP is not set
> # CONFIG_ALLOW_PRNG_FALLBACK is not set
> --
> 2.30.2
>
>
>
--
Pengutronix e.K. | Dipl.-Ing. Robert Schwebel |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |
^ permalink raw reply [flat|nested] 3+ messages in thread