summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configs/platform-v7a/barebox-mx6.config40
-rw-r--r--configs/platform-v7a/barebox-mx6.config.diff27
2 files changed, 27 insertions, 40 deletions
diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config
index 79818a1..67f9dfc 100644
--- a/configs/platform-v7a/barebox-mx6.config
+++ b/configs/platform-v7a/barebox-mx6.config
@@ -241,7 +241,9 @@ CONFIG_PARTITION_DISK_EFI_GPT_COMPARE=y
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
@@ -250,15 +252,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 is not set
# CONFIG_DEBUG_LL is not set
CONFIG_DEBUG_IMX_UART_PORT=1
@@ -294,7 +298,7 @@ CONFIG_CMD_MMC_EXTCSD=y
CONFIG_CMD_BOOT=y
CONFIG_CMD_BOOTM=y
# CONFIG_CMD_BOOTU is not set
-# CONFIG_CMD_BOOTZ is not set
+CONFIG_CMD_BOOTZ=y
CONFIG_CMD_GO=y
# CONFIG_CMD_LOADB is not set
# CONFIG_CMD_LOADS is not set
@@ -317,7 +321,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
@@ -344,7 +348,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
@@ -383,7 +387,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_SPLASH=y
# CONFIG_CMD_FBTEST is not set
@@ -437,11 +441,12 @@ 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=y
-# CONFIG_NET_NFS is not set
+CONFIG_NET_NFS=y
# CONFIG_NET_NETCONSOLE is not set
CONFIG_NET_RESOLV=y
CONFIG_NET_IFUP=y
@@ -516,15 +521,16 @@ 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_IMX=y
CONFIG_DRIVER_SPI_IMX_2_3=y
CONFIG_I2C=y
+CONFIG_I2C_ALGOBIT=y
#
# I2C Hardware Bus support
#
-# CONFIG_I2C_GPIO is not set
+CONFIG_I2C_GPIO=y
CONFIG_I2C_IMX=y
# CONFIG_I2C_DESIGNWARE is not set
# CONFIG_I2C_MV64XXX is not set
@@ -684,6 +690,7 @@ CONFIG_CLOCKSOURCE_IMX_GPT=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
@@ -828,10 +835,16 @@ CONFIG_FS_UBIFS_COMPRESSION_LZO=y
CONFIG_PARAMETER=y
CONFIG_UNCOMPRESS=y
CONFIG_ZLIB=y
-# CONFIG_BZLIB is not set
+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_BCH=y
@@ -864,10 +877,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
diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff
index fe0ead5..0d6787d 100644
--- a/configs/platform-v7a/barebox-mx6.config.diff
+++ b/configs/platform-v7a/barebox-mx6.config.diff
@@ -19,38 +19,27 @@ CONFIG_BCH=y
# CONFIG_BMP is not set
CONFIG_BOOTM_INITRD=y
CONFIG_BOOTM_OFTREE_UIMAGE=y
-# CONFIG_BZLIB is not set
# CONFIG_CACHE_L2X0 is not set
# CONFIG_CLOCKSOURCE_BCM283X is undefined
CONFIG_CLOCKSOURCE_IMX_GPT=y
-# CONFIG_CMD_BOOTZ is not set
-# CONFIG_CMD_DEFAULTENV is not set
# CONFIG_CMD_FBTEST is not set
# CONFIG_CMD_KEYSTORE is not set
-CONFIG_CMD_MENU_MANAGEMENT=y
CONFIG_CMD_MIITOOL=y
CONFIG_CMD_MMC_EXTCSD=y
CONFIG_CMD_NAND=y
CONFIG_CMD_NANDTEST=y
# CONFIG_CMD_NAND_BITFLIP is not set
-# CONFIG_CMD_SHA1SUM is not set
CONFIG_CMD_SPLASH=y
-# CONFIG_CMD_STATE is undefined
CONFIG_CMD_UBI=y
CONFIG_CMD_UBIFORMAT=y
CONFIG_COMMON_CLK_OF_PROVIDER=y
-CONFIG_COMPILE_LOGLEVEL=6
# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
CONFIG_CONSOLE_ACTIVATE_NONE=y
CONFIG_CRYPTO_KEYSTORE=y
CONFIG_DEBUG_IMX_UART_PORT=1
-# CONFIG_DEFAULT_COMPRESSION_BZIP2 is undefined
-# CONFIG_DEFAULT_COMPRESSION_XZ is undefined
CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_DFU=y
-CONFIG_DEFAULT_LOGLEVEL=7
CONFIG_DIGEST_HMAC=y
CONFIG_DIGEST_HMAC_GENERIC=y
-# CONFIG_DIGEST_SHA1_GENERIC is not set
CONFIG_DISK_AHCI=y
CONFIG_DISK_AHCI_IMX=y
CONFIG_DISK_ATA=y
@@ -59,7 +48,6 @@ CONFIG_DISK_INTF_PLATFORM_IDE=y
CONFIG_DISK_PATA_IMX=y
CONFIG_DRIVER_NET_FEC_IMX=y
CONFIG_DRIVER_SERIAL_IMX=y
-# CONFIG_DRIVER_SPI_GPIO is not set
CONFIG_DRIVER_SPI_IMX=y
CONFIG_DRIVER_SPI_IMX_2_3=y
# CONFIG_DRIVER_VIDEO_BACKLIGHT is not set
@@ -83,8 +71,6 @@ CONFIG_GPIO_IMX=y
# CONFIG_HABV4 is not set
# CONFIG_HWRNG is not set
CONFIG_HW_HAS_PCI=y
-# CONFIG_I2C_ALGOBIT is undefined
-# CONFIG_I2C_GPIO is not set
CONFIG_I2C_IMX=y
CONFIG_IMAGE_RENDERER=y
CONFIG_IMAGE_SPARSE=y
@@ -190,7 +176,6 @@ CONFIG_NAND_IMX_BBM=y
CONFIG_NAND_INFO=y
CONFIG_NAND_MXS=y
CONFIG_NAND_READ_OOB=y
-# CONFIG_NET_NFS is not set
CONFIG_PARTITION_DISK_EFI=y
CONFIG_PARTITION_DISK_EFI_GPT_COMPARE=y
CONFIG_PARTITION_DISK_EFI_GPT_NO_FORCE=y
@@ -208,12 +193,7 @@ CONFIG_REGULATOR_FIXED=y
# CONFIG_REGULATOR_PFUZE is not set
CONFIG_RESET_IMX_SRC=y
# 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_STMP_DEVICE=y
CONFIG_THUMB2_BAREBOX=y
CONFIG_UBIFORMAT=y
@@ -232,10 +212,3 @@ CONFIG_VIDEO_VPL=y
# CONFIG_WATCHDOG_BCM2835 is undefined
CONFIG_WATCHDOG_IMX=y
CONFIG_WATCHDOG_IMX_RESET_SOURCE=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