From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 05 Sep 2022 15:57:40 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oVCba-007YrW-CW for lore@lore.pengutronix.de; Mon, 05 Sep 2022 15:57:40 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1oVCbb-0005nG-BZ; Mon, 05 Sep 2022 15:57:39 +0200 Received: from pty.hi.pengutronix.de ([2001:67c:670:100:1d::c5]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oVCba-0005n2-5i; Mon, 05 Sep 2022 15:57:38 +0200 Received: from rsc by pty.hi.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oVCbZ-00DHly-L9; Mon, 05 Sep 2022 15:57:37 +0200 Date: Mon, 5 Sep 2022 15:57:37 +0200 From: Robert Schwebel To: Jan Luebbe Message-ID: References: <20220803130400.1895583-1-jlu@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220803130400.1895583-1-jlu@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain Subject: Re: [DistroKit] [PATCH] v7a/barebox: enable fastboot and mass storage gadget support X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: distrokit@pengutronix.de Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Hi Jan, this patch doesn't apply any more, could you respin against next? rsc On Wed, Aug 03, 2022 at 03:04:00PM +0200, Jan Luebbe wrote: > Signed-off-by: Jan Luebbe > --- > 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 +- > configs/platform-v7a/barebox.config | 15 ++++++++++++--- > 13 files changed, 49 insertions(+), 29 deletions(-) > > diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config > index 3554401a0fb0..d5158225a3b1 100644 > --- a/configs/platform-v7a/barebox-am335x.config > +++ b/configs/platform-v7a/barebox-am335x.config > @@ -181,7 +181,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 > @@ -633,7 +633,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 d13e6f828218..b104b9de3213 100644 > --- a/configs/platform-v7a/barebox-am335x.config.diff > +++ b/configs/platform-v7a/barebox-am335x.config.diff > @@ -1,4 +1,4 @@ > -e763acc45047a436f8f51a20f6c5e230 > +bccbfd59ca1a1f55312818ed9031a323 > # CONFIG_AM33XX_NET_BOOT is not set > CONFIG_ARCH_AM33XX=y > # CONFIG_ARCH_BCM283X is not set > @@ -42,9 +42,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 > @@ -54,7 +51,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 a0382de22f76..dde0ec8b8e39 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 8f173ecd1982..e7e3a813f21c 100644 > --- a/configs/platform-v7a/barebox-at91.config.diff > +++ b/configs/platform-v7a/barebox-at91.config.diff > @@ -1,4 +1,4 @@ > -e763acc45047a436f8f51a20f6c5e230 > +bccbfd59ca1a1f55312818ed9031a323 > 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 23d2fb6ab41e..a63564c7bdb8 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 > @@ -731,7 +731,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 36ba2904fd8f..93a31eeb7940 100644 > --- a/configs/platform-v7a/barebox-mx6.config.diff > +++ b/configs/platform-v7a/barebox-mx6.config.diff > @@ -1,4 +1,4 @@ > -e763acc45047a436f8f51a20f6c5e230 > +bccbfd59ca1a1f55312818ed9031a323 > # CONFIG_ARCH_BCM283X is not set > CONFIG_ARCH_HAS_FEC_IMX=y > CONFIG_ARCH_HAS_IMX_GPT=y > @@ -65,9 +65,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 > @@ -82,7 +79,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 > @@ -231,7 +227,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 67e19233b1b2..cf10534d4579 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 42233c546822..01d75e5ceda9 100644 > --- a/configs/platform-v7a/barebox-rpi2.config.diff > +++ b/configs/platform-v7a/barebox-rpi2.config.diff > @@ -1,4 +1,4 @@ > -e763acc45047a436f8f51a20f6c5e230 > +bccbfd59ca1a1f55312818ed9031a323 > CONFIG_ARM_ASM_UNIFIED=y > CONFIG_BOOTM_INITRD=y > # CONFIG_CMD_I2C is undefined > @@ -8,6 +8,9 @@ CONFIG_CMD_MIITOOL=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 > @@ -20,6 +23,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 23751d5362dd..31a5ddf0b99d 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 9d8dd43ab352..39d7c5333749 100644 > --- a/configs/platform-v7a/barebox-stm32mp.config.diff > +++ b/configs/platform-v7a/barebox-stm32mp.config.diff > @@ -1,4 +1,4 @@ > -e763acc45047a436f8f51a20f6c5e230 > +bccbfd59ca1a1f55312818ed9031a323 > # CONFIG_ARCH_BCM283X is not set > CONFIG_ARCH_HAS_RESET_CONTROLLER=y > CONFIG_ARCH_NR_GPIO=416 > @@ -53,6 +53,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 > @@ -61,6 +64,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 33d166ce2a98..f646dfa6dadf 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 > > # > @@ -585,8 +593,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 > @@ -823,6 +831,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 3548882baf41..01d5633ac198 100644 > --- a/configs/platform-v7a/barebox-vexpress.config.diff > +++ b/configs/platform-v7a/barebox-vexpress.config.diff > @@ -1,4 +1,4 @@ > -e763acc45047a436f8f51a20f6c5e230 > +bccbfd59ca1a1f55312818ed9031a323 > CONFIG_AMBA_SP804=y > # CONFIG_ARCH_BCM283X is not set > CONFIG_ARCH_VEXPRESS=y > diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config > index 62db9479f339..da56af9ace67 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 > > # > @@ -597,8 +605,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 > @@ -870,6 +878,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 |