[DistroKit] [PATCH 8/9] v7a: barebox-rpi2: slim down config diff

[Roland Hieber <rhi@pengutronix.de>]

* don't disable common features unnecessarily
* repair compile log level < default log level by using the defaults
* disable unneeded features:
  - CMD_LOADB: no one uses kermit these days
  - BAREBOXENV_TARGET: should come from a common barebox-tools package
  - CMD_MENU_MANAGEMENT: not used
  - PASSWORD: not used

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 configs/platform-v7a/barebox-rpi2.config      | 208 ++++++++++++++----
 configs/platform-v7a/barebox-rpi2.config.diff |  42 ----
 2 files changed, 166 insertions(+), 84 deletions(-)

diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config
index d2e2757323fd..948a1da1e1b9 100644
--- a/configs/platform-v7a/barebox-rpi2.config
+++ b/configs/platform-v7a/barebox-rpi2.config
@@ -142,26 +142,22 @@ CONFIG_HUSH_FANCY_PROMPT=y
 CONFIG_CMDLINE_EDITING=y
 CONFIG_AUTO_COMPLETE=y
 CONFIG_MENU=y
-CONFIG_PASSWORD=y
-CONFIG_PASSWORD_DEFAULT=""
-CONFIG_PASSWD_SUM_MD5=y
-# CONFIG_PASSWD_SUM_SHA1 is not set
-# CONFIG_PASSWD_SUM_SHA256 is not set
-# CONFIG_PASSWD_SUM_SHA512 is not set
-# CONFIG_PASSWD_CRYPTO_PBKDF2 is not set
+# CONFIG_PASSWORD is not set
 CONFIG_DYNAMIC_CRC_TABLE=y
 CONFIG_ERRNO_MESSAGES=y
 CONFIG_TIMESTAMP=y
 CONFIG_BOOTM=y
-# CONFIG_BOOTM_SHOW_TYPE is not set
-# CONFIG_BOOTM_VERBOSE is not set
+CONFIG_BOOTM_SHOW_TYPE=y
+CONFIG_BOOTM_VERBOSE=y
 # CONFIG_BOOTM_INITRD is not set
-# CONFIG_BOOTM_OFTREE is not set
+CONFIG_BOOTM_OFTREE=y
+# CONFIG_BOOTM_OFTREE_UIMAGE is not set
 # CONFIG_BOOTM_AIMAGE 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
@@ -178,22 +174,28 @@ 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
 CONFIG_DEFAULT_ENVIRONMENT_PATH=".ptxdist-defaultenv"
-CONFIG_BAREBOXENV_TARGET=y
+# 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 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 is not set
 # CONFIG_DEBUG_LL is not set
 # CONFIG_DEBUG_INITCALLS is not set
@@ -215,10 +217,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 is not set
+CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_VERSION=y
 # CONFIG_CMD_MMC_EXTCSD is not set
 
@@ -230,7 +232,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
@@ -264,7 +266,7 @@ CONFIG_CMD_BASENAME=y
 CONFIG_CMD_CAT=y
 CONFIG_CMD_CD=y
 CONFIG_CMD_CP=y
-# CONFIG_CMD_CMP is not set
+CONFIG_CMD_CMP=y
 CONFIG_CMD_DIGEST=y
 CONFIG_CMD_DIRNAME=y
 CONFIG_CMD_FILETYPE=y
@@ -276,7 +278,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
@@ -295,6 +297,17 @@ CONFIG_CMD_SLEEP=y
 CONFIG_CMD_TEST=y
 CONFIG_CMD_TRUE=y
 
+#
+# Network
+#
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_HOST=y
+CONFIG_NET_CMD_IFUP=y
+# CONFIG_CMD_MIITOOL is not set
+CONFIG_CMD_PING=y
+CONFIG_CMD_TFTP=y
+CONFIG_CMD_IP_ROUTE_GET=y
+
 #
 # Console and Framebuffer interaction
 #
@@ -304,7 +317,7 @@ CONFIG_CMD_ECHO_E=y
 CONFIG_CMD_EDIT=y
 # CONFIG_CMD_LOGIN is not set
 CONFIG_CMD_MENU=y
-CONFIG_CMD_MENU_MANAGEMENT=y
+# CONFIG_CMD_MENU_MANAGEMENT is not set
 CONFIG_CMD_MENUTREE=y
 CONFIG_CMD_READLINE=y
 CONFIG_CMD_TIMEOUT=y
@@ -318,7 +331,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
 
@@ -329,10 +342,12 @@ CONFIG_CMD_CLK=y
 CONFIG_CMD_DETECT=y
 CONFIG_CMD_FLASH=y
 CONFIG_CMD_GPIO=y
-# CONFIG_CMD_LED is not set
+CONFIG_CMD_I2C=y
+CONFIG_CMD_LED=y
 # CONFIG_CMD_POWEROFF is not set
-# CONFIG_CMD_SPI is not set
-# CONFIG_CMD_LED_TRIGGER 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
@@ -350,10 +365,17 @@ 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
-# CONFIG_NET is not set
+CONFIG_NET=y
+CONFIG_NET_NFS=y
+# CONFIG_NET_NETCONSOLE is not set
+CONFIG_NET_RESOLV=y
+CONFIG_NET_IFUP=y
+CONFIG_NET_DHCP=y
+# CONFIG_NET_SNTP is not set
 
 #
 # Drivers
@@ -362,8 +384,10 @@ CONFIG_OFTREE=y
 CONFIG_OFTREE_MEM_GENERIC=y
 CONFIG_DTC=y
 CONFIG_OFDEVICE=y
+CONFIG_OF_NET=y
 CONFIG_OF_GPIO=y
-# CONFIG_OF_BAREBOX_DRIVERS is not set
+CONFIG_OF_BAREBOX_DRIVERS=y
+# CONFIG_OF_BAREBOX_ENV_IN_FS is not set
 # CONFIG_AIODEV is not set
 CONFIG_ARM_AMBA=y
 
@@ -375,14 +399,84 @@ CONFIG_ARM_AMBA=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_DRIVER_SERIAL_NS16550=y
 # CONFIG_DRIVER_SERIAL_CADENCE is not set
+CONFIG_PHYLIB=y
+
+#
+# Network drivers
+#
+# CONFIG_DRIVER_NET_ARC_EMAC is not set
+# CONFIG_DRIVER_NET_CALXEDA_XGMAC is not set
+# CONFIG_DRIVER_NET_DESIGNWARE is not set
+# CONFIG_DRIVER_NET_ENC28J60 is not set
+# CONFIG_DRIVER_NET_KS8851_MLL is not set
+# CONFIG_DRIVER_NET_MICREL is not set
+# CONFIG_DRIVER_NET_SMC911X is not set
+# CONFIG_DRIVER_NET_SMC91111 is not set
+
+#
+# phylib
+#
+
+#
+# MII PHY device drivers
+#
+# CONFIG_AR8327N_PHY is not set
+# CONFIG_AT803X_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_DP83867_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_NET_DSA_MV88E6XXX is not set
+
+#
+# MII bus device drivers
+#
+# 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_I2C is not set
-# CONFIG_MTD is not set
+CONFIG_DRIVER_SPI_GPIO=y
+CONFIG_I2C=y
+CONFIG_I2C_ALGOBIT=y
+
+#
+# I2C Hardware Bus support
+#
+CONFIG_I2C_GPIO=y
+# CONFIG_I2C_DESIGNWARE is not set
+# CONFIG_I2C_MV64XXX is not set
+# CONFIG_I2C_MUX is not set
+CONFIG_MTD=y
+CONFIG_MTD_WRITE=y
+CONFIG_MTD_OOB_DEVICE=y
+# CONFIG_MTD_RAW_DEVICE is not set
+# CONFIG_MTD_CONCAT is not set
+
+#
+# MTD debug options
+#
+# CONFIG_MTD_PEB_DEBUG is not set
+
+#
+# Self contained MTD devices
+#
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_DOCG3 is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_DRIVER_CFI is not set
+# CONFIG_NAND is not set
+# CONFIG_MTD_SPI_NOR is not set
+# CONFIG_MTD_UBI is not set
 CONFIG_DISK=y
 CONFIG_DISK_WRITE=y
 
@@ -397,7 +491,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
 
@@ -405,7 +503,7 @@ CONFIG_USB_GADGET_AUTOSTART=y
 # USB Gadget drivers
 #
 # CONFIG_USB_GADGET_DFU is not set
-# CONFIG_USB_GADGET_SERIAL is not set
+CONFIG_USB_GADGET_SERIAL=y
 # CONFIG_USB_GADGET_FASTBOOT is not set
 # CONFIG_USB_GADGET_FASTBOOT_SPARSE is not set
 # CONFIG_USB_MUSB is not set
@@ -425,7 +523,7 @@ CONFIG_MCI_MMC_BOOT_PARTITIONS=y
 #
 # CONFIG_MCI_DW is not set
 CONFIG_MCI_BCM283X=y
-# CONFIG_MCI_MMCI is not set
+CONFIG_MCI_MMCI=y
 # CONFIG_MCI_SPI is not set
 CONFIG_HAVE_CLK=y
 CONFIG_CLKDEV_LOOKUP=y
@@ -441,37 +539,51 @@ CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
 #
 # MFD
 #
+# CONFIG_MFD_ACT8846 is not set
+# CONFIG_MFD_DA9053 is not set
+# CONFIG_MFD_DA9063 is not set
+# CONFIG_MFD_LP3972 is not set
 # CONFIG_MFD_MC13XXX is not set
+# CONFIG_MFD_MC34704 is not set
+# CONFIG_MFD_MC9SDZ60 is not set
+# CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_SYSCON is not set
+# CONFIG_MFD_TWL4030 is not set
+# CONFIG_MFD_TWL6030 is not set
 
 #
 # Misc devices
 #
 # 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
-# CONFIG_LED_GPIO_OF is not set
+CONFIG_LED_GPIO_OF=y
 # CONFIG_LED_GPIO_RGB is not set
 # CONFIG_LED_GPIO_BICOLOR is not set
 CONFIG_LED_TRIGGERS=y
+# CONFIG_LED_PCA955X is not set
 
 #
 # EEPROM support
 #
 # CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_AT24 is not set
 
 #
 # Input device support
 #
 # 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_BCM2835=y
 # CONFIG_PWM is not set
-# CONFIG_HWRNG is not set
+CONFIG_HWRNG=y
 
 #
 # DMA support
@@ -484,10 +596,13 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_74164 is not set
 CONFIG_GPIO_BCM283X=y
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PL061 is not set
 # CONFIG_GPIO_DESIGNWARE is not set
+# CONFIG_GPIO_SX150X is not set
 # CONFIG_W1 is not set
-# CONFIG_PINCTRL is not set
+CONFIG_PINCTRL=y
+# CONFIG_PINCTRL_SINGLE is not set
 CONFIG_NVMEM=y
 # CONFIG_NVMEM_SNVS_LPGPR is not set
 # CONFIG_EEPROM_93XX46 is not set
@@ -534,6 +649,8 @@ CONFIG_FS_AUTOMOUNT=y
 CONFIG_FS_EXT4=y
 CONFIG_FS_RAMFS=y
 CONFIG_FS_DEVFS=y
+CONFIG_FS_TFTP=y
+CONFIG_FS_NFS=y
 CONFIG_FS_FAT=y
 CONFIG_FS_FAT_WRITE=y
 CONFIG_FS_FAT_LFN=y
@@ -567,13 +684,19 @@ 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 is not set
+CONFIG_LZO_DECOMPRESS=y
 CONFIG_FNMATCH=y
 CONFIG_QSORT=y
 # CONFIG_RATP is not set
@@ -593,9 +716,10 @@ CONFIG_CRC32=y
 CONFIG_CRC16=y
 CONFIG_DIGEST=y
 CONFIG_MD5=y
+CONFIG_SHA1=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
diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff
index b49099c5f3d4..c17d6508cebe 100644
--- a/configs/platform-v7a/barebox-rpi2.config.diff
+++ b/configs/platform-v7a/barebox-rpi2.config.diff
@@ -1,55 +1,13 @@
 df476738fde44fbb427543dd2747d3ee
-CONFIG_BAREBOXENV_TARGET=y
-# CONFIG_BOOTM_OFTREE is not set
-# CONFIG_BOOTM_SHOW_TYPE is not set
-# CONFIG_BOOTM_VERBOSE is not set
-# CONFIG_BZLIB is not set
-# CONFIG_CMD_CMP is not set
-# CONFIG_CMD_IMD is not set
-# CONFIG_CMD_LED is not set
-# CONFIG_CMD_LED_TRIGGER is not set
-CONFIG_CMD_LOADB=y
-# CONFIG_CMD_MEMTEST is not set
-CONFIG_CMD_MENU_MANAGEMENT=y
-# CONFIG_CMD_REGULATOR is not set
-# CONFIG_CMD_SHA1SUM is not set
-# CONFIG_CMD_SPI is not set
-CONFIG_COMPILE_LOGLEVEL=6
-CONFIG_DEFAULT_LOGLEVEL=7
-# CONFIG_DIGEST_SHA1_GENERIC is not set
 CONFIG_DRIVER_SERIAL_NS16550=y
-# CONFIG_DRIVER_SPI_GPIO is not set
 # CONFIG_EEPROM_93XX46 is not set
 CONFIG_GPIO_BCM283X=y
-# CONFIG_HWRNG is not set
-# CONFIG_I2C is not set
-# CONFIG_IMD is not set
-# CONFIG_LED_GPIO_OF is not set
-# CONFIG_LZO_DECOMPRESS is not set
 CONFIG_MACH_RPI2=y
 CONFIG_MALLOC_SIZE=0x400000
 CONFIG_MCI_BCM283X=y
-# CONFIG_MCI_MMCI is not set
 CONFIG_MCI_MMC_BOOT_PARTITIONS=y
-# CONFIG_MTD is not set
-# CONFIG_NET is not set
 CONFIG_NVMEM=y
 # CONFIG_NVMEM_SNVS_LPGPR is not set
-# CONFIG_OF_BAREBOX_DRIVERS is not set
-# CONFIG_PASSWD_CRYPTO_PBKDF2 is not set
-CONFIG_PASSWD_SUM_MD5=y
-# CONFIG_PASSWD_SUM_SHA1 is not set
-# CONFIG_PASSWD_SUM_SHA256 is not set
-# CONFIG_PASSWD_SUM_SHA512 is not set
-CONFIG_PASSWORD=y
-CONFIG_PASSWORD_DEFAULT=""
-# CONFIG_PINCTRL is not set
 CONFIG_PROMPT="R-Pi> "
-# CONFIG_RESET_SOURCE is not set
 CONFIG_SERIAL_AMBA_PL011=y
-# CONFIG_STATE is not set
-# CONFIG_USB_GADGET_SERIAL is not set
-# CONFIG_USB_HOST is not set
 CONFIG_WATCHDOG_BCM2835=y
-# CONFIG_XZ_DECOMPRESS is not set
-# CONFIG_ZLIB is not set
-- 
2.20.1


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de