v7a: barebox-am335x: slim down config diff

* don't disable common features unnecessarily: enable the features
  BZLIB, DRIVER_SPI_GPIO, HWRNG, I2C_GPIO, IMD, NET_USB*,
  REGULATOR, STATE, USB_EHCI, USB_HOST, XZ_DECOMPRESS, ZLIB, and the
  commands cmp, defaultenv, imd, memtest, regulator, sha1sum, state, and
  usb. All of those are enabled in the barebox-common config too, and
  make sense to have on a generic barebox.
* repair compile log level < default log level by using the defaults
* now that USB_HOST is enabled, MUSB_HOST makes sense too
* disable unneeded features:
  - CMD_LOADB: no one uses kermit these days
  - FIT image support: not used
  - initrd support: not used

Signed-off-by: Roland Hieber <rhi@pengutronix.de>

2 files changed, 49 insertions, 79 deletions

diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config
index 9bc9c42..51f434b 100644
--- a/configs/platform-v7a/barebox-am335x.config
+++ b/configs/platform-v7a/barebox-am335x.config
@@ -92,8 +92,6 @@ CONFIG_BLOCK_WRITE=y
 CONFIG_FILETYPE=y
 CONFIG_BINFMT=y
 CONFIG_UIMAGE=y
-CONFIG_FITIMAGE=y
-CONFIG_FITIMAGE_SIGNATURE=y
 CONFIG_LOGBUF=y
 CONFIG_STDDEV=y
 CONFIG_BAREBOX_UPDATE=y
@@ -161,17 +159,15 @@ CONFIG_ERRNO_MESSAGES=y
 CONFIG_BOOTM=y
 CONFIG_BOOTM_SHOW_TYPE=y
 CONFIG_BOOTM_VERBOSE=y
-CONFIG_BOOTM_INITRD=y
+# CONFIG_BOOTM_INITRD is not set
 CONFIG_BOOTM_OFTREE=y
 CONFIG_BOOTM_OFTREE_UIMAGE=y
 # CONFIG_BOOTM_AIMAGE is not set
-CONFIG_BOOTM_FITIMAGE=y
-CONFIG_BOOTM_FITIMAGE_SIGNATURE=y
-CONFIG_BOOTM_FITIMAGE_PUBKEY="../fit/pubkey.dtsi"
-# CONFIG_BOOTM_FORCE_SIGNED_IMAGES is not set
+# CONFIG_BOOTM_FITIMAGE is not set
 CONFIG_BLSPEC=y
 CONFIG_FLEXIBLE_BOOTARGS=y
-# CONFIG_IMD is not set
+CONFIG_IMD=y
+# CONFIG_IMD_TARGET is not set
 # CONFIG_KERNEL_INSTALL_TARGET is not set
 CONFIG_CONSOLE_FULL=y
 # CONFIG_CONSOLE_SIMPLE is not set
@@ -188,7 +184,10 @@ CONFIG_PARTITION_DISK_DOS=y
 # CONFIG_PARTITION_DISK_EFI is not set
 CONFIG_ENV_HANDLING=y
 CONFIG_DEFAULT_ENVIRONMENT=y
+# CONFIG_DEFAULT_COMPRESSION_GZIP is not set
+# CONFIG_DEFAULT_COMPRESSION_BZIP2 is not set
 # CONFIG_DEFAULT_COMPRESSION_LZO is not set
+# CONFIG_DEFAULT_COMPRESSION_XZ is not set
 CONFIG_DEFAULT_COMPRESSION_NONE=y
 CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
 CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y
@@ -196,15 +195,17 @@ CONFIG_DEFAULT_ENVIRONMENT_PATH=".ptxdist-defaultenv"
 # CONFIG_BAREBOXENV_TARGET is not set
 # CONFIG_BAREBOXCRC32_TARGET is not set
 CONFIG_POLLER=y
-# CONFIG_STATE is not set
+CONFIG_STATE=y
+# CONFIG_STATE_CRYPTO is not set
+# CONFIG_STATE_BACKWARD_COMPATIBLE is not set
 # CONFIG_BOOTCHOOSER is not set
 CONFIG_RESET_SOURCE=y
 
 #
 # Debugging
 #
-CONFIG_COMPILE_LOGLEVEL=6
-CONFIG_DEFAULT_LOGLEVEL=7
+CONFIG_COMPILE_LOGLEVEL=7
+CONFIG_DEFAULT_LOGLEVEL=6
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_LL is not set
 CONFIG_DEBUG_OMAP_UART_PORT=1
@@ -227,9 +228,10 @@ CONFIG_CMD_DRVINFO=y
 CONFIG_CMD_HELP=y
 CONFIG_LONGHELP=y
 CONFIG_CMD_IOMEM=y
-# CONFIG_CMD_IMD is not set
+CONFIG_CMD_IMD=y
 CONFIG_CMD_MEMINFO=y
 CONFIG_CMD_ARM_MMUINFO=y
+CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_VERSION=y
 # CONFIG_CMD_MMC_EXTCSD is not set
 
@@ -241,7 +243,7 @@ CONFIG_CMD_BOOTM=y
 # CONFIG_CMD_BOOTU is not set
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GO=y
-CONFIG_CMD_LOADB=y
+# CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_LOADY is not set
 CONFIG_CMD_RESET=y
@@ -260,7 +262,7 @@ CONFIG_CMD_UMOUNT=y
 #
 CONFIG_CMD_NV=y
 CONFIG_CMD_EXPORT=y
-# CONFIG_CMD_DEFAULTENV is not set
+CONFIG_CMD_DEFAULTENV=y
 CONFIG_CMD_GLOBAL=y
 CONFIG_CMD_LOADENV=y
 CONFIG_CMD_PRINTENV=y
@@ -287,7 +289,7 @@ CONFIG_CMD_PWD=y
 CONFIG_CMD_READLINK=y
 CONFIG_CMD_RM=y
 CONFIG_CMD_RMDIR=y
-# CONFIG_CMD_SHA1SUM is not set
+CONFIG_CMD_SHA1SUM=y
 # CONFIG_CMD_SHA224SUM is not set
 # CONFIG_CMD_SHA256SUM is not set
 # CONFIG_CMD_SHA384SUM is not set
@@ -340,7 +342,7 @@ CONFIG_CMD_MD=y
 CONFIG_CMD_MEMCMP=y
 CONFIG_CMD_MEMCPY=y
 CONFIG_CMD_MEMSET=y
-# CONFIG_CMD_MEMTEST is not set
+CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MM=y
 CONFIG_CMD_MW=y
 
@@ -358,6 +360,7 @@ CONFIG_CMD_NAND=y
 # CONFIG_CMD_POWEROFF is not set
 CONFIG_CMD_SPI=y
 CONFIG_CMD_LED_TRIGGER=y
+CONFIG_CMD_USB=y
 CONFIG_CMD_USBGADGET=y
 CONFIG_CMD_WD=y
 CONFIG_CMD_WD_DEFAULT_TIMOUT=0
@@ -376,6 +379,7 @@ CONFIG_CMD_OF_PROPERTY=y
 # CONFIG_CMD_OF_FIXUP_STATUS is not set
 CONFIG_CMD_OFTREE=y
 CONFIG_CMD_TIME=y
+CONFIG_CMD_STATE=y
 # CONFIG_CMD_DHRYSTONE is not set
 # CONFIG_CMD_SPD_DECODE is not set
 # CONFIG_CMD_SEED is not set
@@ -446,19 +450,23 @@ CONFIG_DRIVER_NET_CPSW=y
 #
 # CONFIG_MDIO_BITBANG is not set
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
+CONFIG_NET_USB=y
+CONFIG_NET_USB_ASIX=y
+CONFIG_NET_USB_SMSC95XX=y
 
 #
 # SPI drivers
 #
 CONFIG_SPI=y
-# CONFIG_DRIVER_SPI_GPIO is not set
+CONFIG_DRIVER_SPI_GPIO=y
 CONFIG_DRIVER_SPI_OMAP3=y
 CONFIG_I2C=y
+CONFIG_I2C_ALGOBIT=y
 
 #
 # I2C Hardware Bus support
 #
-# CONFIG_I2C_GPIO is not set
+CONFIG_I2C_GPIO=y
 # CONFIG_I2C_DESIGNWARE is not set
 CONFIG_I2C_OMAP=y
 # CONFIG_I2C_MUX is not set
@@ -515,7 +523,11 @@ CONFIG_DISK_WRITE=y
 #
 # CONFIG_DISK_INTF_PLATFORM_IDE is not set
 CONFIG_USB=y
-# CONFIG_USB_HOST is not set
+CONFIG_USB_HOST=y
+CONFIG_USB_EHCI=y
+# CONFIG_USB_XHCI is not set
+# CONFIG_USB_ULPI is not set
+CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_AUTOSTART=y
 
@@ -530,6 +542,7 @@ CONFIG_USB_GADGET_FASTBOOT_SPARSE=y
 CONFIG_USB_MUSB=y
 CONFIG_USB_MUSB_DSPS=y
 CONFIG_USB_MUSB_AM335X=y
+CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
 # CONFIG_VIDEO is not set
 CONFIG_MCI=y
@@ -576,6 +589,7 @@ CONFIG_CLOCKSOURCE_TI_DM=y
 #
 # CONFIG_JTAG is not set
 # CONFIG_SRAM is not set
+CONFIG_STATE_DRV=y
 CONFIG_DEV_MEM=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
@@ -596,12 +610,13 @@ CONFIG_EEPROM_AT24=y
 #
 # CONFIG_KEYBOARD_GPIO is not set
 # CONFIG_KEYBOARD_QT1070 is not set
+# CONFIG_KEYBOARD_USB is not set
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_POLLER is not set
 # CONFIG_WATCHDOG_DW is not set
 CONFIG_WATCHDOG_OMAP=y
 # CONFIG_PWM is not set
-# CONFIG_HWRNG is not set
+CONFIG_HWRNG=y
 
 #
 # DMA support
@@ -628,7 +643,8 @@ CONFIG_PINCTRL_SINGLE=y
 #
 CONFIG_BUS_OMAP_GPMC=y
 CONFIG_TI_SYSC=y
-# CONFIG_REGULATOR is not set
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_FIXED is not set
 # CONFIG_RESET_CONTROLLER is not set
 # CONFIG_RTC_CLASS is not set
 
@@ -700,11 +716,17 @@ CONFIG_FS_FAT_LFN=y
 #
 CONFIG_PARAMETER=y
 CONFIG_UNCOMPRESS=y
-# CONFIG_ZLIB is not set
-# CONFIG_BZLIB is not set
+CONFIG_ZLIB=y
+CONFIG_BZLIB=y
 # CONFIG_LZ4_DECOMPRESS is not set
 # CONFIG_ZSTD_DECOMPRESS is not set
-# CONFIG_XZ_DECOMPRESS is not set
+CONFIG_XZ_DECOMPRESS=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
 CONFIG_PROCESS_ESCAPE_SEQUENCE=y
 CONFIG_LZO_DECOMPRESS=y
 CONFIG_FNMATCH=y
@@ -727,10 +749,11 @@ CONFIG_CRC32=y
 CONFIG_CRC16=y
 CONFIG_DIGEST=y
 CONFIG_MD5=y
+CONFIG_SHA1=y
 CONFIG_DIGEST_HMAC=y
 # CONFIG_DIGEST_CRC32_GENERIC is not set
 CONFIG_DIGEST_MD5_GENERIC=y
-# CONFIG_DIGEST_SHA1_GENERIC is not set
+CONFIG_DIGEST_SHA1_GENERIC=y
 # CONFIG_DIGEST_SHA224_GENERIC is not set
 # CONFIG_DIGEST_SHA256_GENERIC is not set
 # CONFIG_DIGEST_SHA384_GENERIC is not set
@@ -738,7 +761,6 @@ CONFIG_DIGEST_MD5_GENERIC=y
 CONFIG_DIGEST_HMAC_GENERIC=y
 # CONFIG_DIGEST_SHA1_ARM is not set
 # CONFIG_DIGEST_SHA256_ARM is not set
-CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_KEYSTORE=y
 
 #
diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff
index 1425705..f88290b 100644
--- a/configs/platform-v7a/barebox-am335x.config.diff
+++ b/configs/platform-v7a/barebox-am335x.config.diff
@@ -14,54 +14,30 @@ CONFIG_ARM_USE_COMPRESSED_DTB=y
 # CONFIG_BAREBOX_UPDATE_AM33XX_EMMC is not set
 # CONFIG_BAREBOX_UPDATE_AM33XX_NAND is not set
 CONFIG_BAREBOX_UPDATE_AM33XX_SPI_NOR_MLO=y
-CONFIG_BOOTM_FITIMAGE=y
-CONFIG_BOOTM_FITIMAGE_PUBKEY="../fit/pubkey.dtsi"
-CONFIG_BOOTM_FITIMAGE_SIGNATURE=y
-# CONFIG_BOOTM_FORCE_SIGNED_IMAGES is not set
-CONFIG_BOOTM_INITRD=y
 CONFIG_BOOTM_OFTREE_UIMAGE=y
 CONFIG_BUS_OMAP_GPMC=y
-# CONFIG_BZLIB is not set
 # CONFIG_CLKDEV_LOOKUP is undefined
 # CONFIG_CLOCKSOURCE_BCM283X is undefined
 CONFIG_CLOCKSOURCE_TI_DM=y
 # CONFIG_CMD_CLK is undefined
-# CONFIG_CMD_DEFAULTENV is not set
-# CONFIG_CMD_IMD is not set
 # CONFIG_CMD_KEYSTORE is not set
-CONFIG_CMD_LOADB=y
-# CONFIG_CMD_MEMTEST is not set
 CONFIG_CMD_MIITOOL=y
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_NANDTEST is not set
 # CONFIG_CMD_NAND_BITFLIP is not set
-# CONFIG_CMD_REGULATOR is undefined
-# CONFIG_CMD_SHA1SUM is not set
-# CONFIG_CMD_STATE is undefined
-# CONFIG_CMD_USB is undefined
 # CONFIG_COMMON_CLK is undefined
-CONFIG_COMPILE_LOGLEVEL=6
 # CONFIG_CONSOLE_ACTIVATE_FIRST is not set
 CONFIG_CONSOLE_ACTIVATE_NONE=y
 CONFIG_CRYPTO_KEYSTORE=y
-CONFIG_CRYPTO_RSA=y
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_OMAP_UART_PORT=1
-# CONFIG_DEFAULT_COMPRESSION_BZIP2 is undefined
-# CONFIG_DEFAULT_COMPRESSION_GZIP is undefined
-# CONFIG_DEFAULT_COMPRESSION_XZ is undefined
-CONFIG_DEFAULT_LOGLEVEL=7
 CONFIG_DIGEST_HMAC=y
 CONFIG_DIGEST_HMAC_GENERIC=y
-# CONFIG_DIGEST_SHA1_GENERIC is not set
 CONFIG_DRIVER_NET_CPSW=y
 CONFIG_DRIVER_SERIAL_NS16550=y
 CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
-# CONFIG_DRIVER_SPI_GPIO is not set
 CONFIG_DRIVER_SPI_OMAP3=y
 CONFIG_EEPROM_AT24=y
-CONFIG_FITIMAGE=y
-CONFIG_FITIMAGE_SIGNATURE=y
 # CONFIG_GPIO_BCM283X is undefined
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_GENERIC_PLATFORM=y
@@ -69,15 +45,9 @@ CONFIG_GPIO_OMAP=y
 # CONFIG_GPIO_PL061 is undefined
 # CONFIG_GREGORIAN_CALENDER is undefined
 # CONFIG_HAVE_CLK is undefined
-# CONFIG_HWRNG is not set
-# CONFIG_I2C_ALGOBIT is undefined
-# CONFIG_I2C_GPIO is not set
 # CONFIG_I2C_MV64XXX is undefined
 CONFIG_I2C_OMAP=y
 CONFIG_IMAGE_SPARSE=y
-# CONFIG_IMD is not set
-# CONFIG_IMD_TARGET is undefined
-# CONFIG_KEYBOARD_USB is undefined
 CONFIG_MACH_AFI_GF=y
 # CONFIG_MACH_BEAGLE is not set
 CONFIG_MACH_BEAGLEBONE=y
@@ -110,47 +80,25 @@ CONFIG_NAND_ECC_SOFT=y
 CONFIG_NAND_INFO=y
 CONFIG_NAND_OMAP_GPMC=y
 CONFIG_NAND_READ_OOB=y
-# CONFIG_NET_USB is undefined
-# CONFIG_NET_USB_ASIX is undefined
-# CONFIG_NET_USB_SMSC95XX is undefined
 # CONFIG_OMAP_BUILD_IFT is not set
 # CONFIG_OMAP_BUILD_SPI is not set
 CONFIG_OMAP_GPMC=y
 CONFIG_OMAP_MULTI_BOARDS=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_PROMPT="barebox> "
-# CONFIG_REGULATOR is not set
 # CONFIG_REGULATOR_BCM283X is undefined
-# CONFIG_REGULATOR_FIXED is undefined
 # CONFIG_SERIAL_AMBA_PL011 is undefined
-# CONFIG_SHA1 is undefined
 # CONFIG_SPI_CADENCE_QUADSPI is not set
-# CONFIG_STATE is not set
-# CONFIG_STATE_BACKWARD_COMPATIBLE is undefined
-# CONFIG_STATE_CRYPTO is undefined
-# CONFIG_STATE_DRV is undefined
 CONFIG_THUMB2_BAREBOX=y
 # CONFIG_TIMESTAMP is not set
 CONFIG_TI_SYSC=y
-# CONFIG_USB_EHCI is undefined
 CONFIG_USB_GADGET_FASTBOOT=y
 # CONFIG_USB_GADGET_FASTBOOT_BUF is not set
 CONFIG_USB_GADGET_FASTBOOT_SPARSE=y
-# CONFIG_USB_HOST is not set
 CONFIG_USB_MUSB=y
 CONFIG_USB_MUSB_AM335X=y
 CONFIG_USB_MUSB_DSPS=y
 CONFIG_USB_MUSB_GADGET=y
-# CONFIG_USB_STORAGE is undefined
-# CONFIG_USB_ULPI is undefined
-# CONFIG_USB_XHCI is undefined
+CONFIG_USB_MUSB_HOST=y
 # CONFIG_WATCHDOG_BCM2835 is undefined
 CONFIG_WATCHDOG_OMAP=y
-# CONFIG_XZ_DECOMPRESS is not set
-# CONFIG_XZ_DEC_ARM is undefined
-# CONFIG_XZ_DEC_ARMTHUMB is undefined
-# CONFIG_XZ_DEC_IA64 is undefined
-# CONFIG_XZ_DEC_POWERPC is undefined
-# CONFIG_XZ_DEC_SPARC is undefined
-# CONFIG_XZ_DEC_X86 is undefined
-# CONFIG_ZLIB is not set