[DistroKit] [PATCH v2 5/9] v7a: bareboxes: use config diffs with the common reference config

[Roland Hieber <rhi@pengutronix.de>]

Make it easier to maintain a common set of features and also review the
device-specific changes between all the barebox variants by using the
config diff mechanism which has been available since PTXdist 2019.01.0.

No barebox config was harmed in the making of this patch, only their
difference to the common reference config was computed.

Also add a helper script to regenerate the config diffs after the common
config was changed.

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

Notes:
    Changes in v1 -> v2:
    - config diffs were calculated based on the wrong commit. redo all of
      them. this also includes changes due to removal of
      barebox-am335x.config and disabling CMD_CMP in the previous patch.

 .../platform-v7a/barebox-am335x.config.diff   | 156 ++++++++++++
 configs/platform-v7a/barebox-mx6.config.diff  | 241 ++++++++++++++++++
 configs/platform-v7a/barebox-rpi2.config.diff | 152 +++++++++++
 .../platform-v7a/barebox-vexpress.config.diff | 162 ++++++++++++
 .../platform-v7a/rules/barebox-am335x.make    |   1 +
 configs/platform-v7a/rules/barebox-mx6.make   |   1 +
 configs/platform-v7a/rules/barebox-rpi2.make  |   1 +
 .../platform-v7a/rules/barebox-vexpress.make  |   1 +
 scripts/update-diffs-v7a.sh                   |   6 +
 9 files changed, 721 insertions(+)
 create mode 100644 configs/platform-v7a/barebox-am335x.config.diff
 create mode 100644 configs/platform-v7a/barebox-mx6.config.diff
 create mode 100644 configs/platform-v7a/barebox-rpi2.config.diff
 create mode 100644 configs/platform-v7a/barebox-vexpress.config.diff
 create mode 100755 scripts/update-diffs-v7a.sh

diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff
new file mode 100644
index 000000000000..142570557ba3
--- /dev/null
+++ b/configs/platform-v7a/barebox-am335x.config.diff
@@ -0,0 +1,156 @@
+c20722800c30a40b29690bb8e12f2781
+# CONFIG_AM33XX_NET_BOOT is not set
+CONFIG_ARCH_AM33XX=y
+# CONFIG_ARCH_BCM283X is not set
+CONFIG_ARCH_OMAP=y
+# CONFIG_ARCH_TEXT_BASE is undefined
+# CONFIG_ARM_AMBA is undefined
+CONFIG_ARM_ASM_UNIFIED=y
+CONFIG_ARM_BOARD_APPEND_ATAG=y
+# CONFIG_ARM_BOARD_PREPEND_ATAG is not set
+# CONFIG_ARM_SECURE_MONITOR is undefined
+# CONFIG_ARM_SMCCC is undefined
+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
+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
+# CONFIG_MACH_PHYTEC_SOM_AM335X is not set
+# CONFIG_MACH_RPI2 is undefined
+# CONFIG_MACH_RPI3 is undefined
+# CONFIG_MACH_RPI is undefined
+# CONFIG_MACH_RPI_COMMON is undefined
+# CONFIG_MACH_VSCOM_BALTOS is not set
+# CONFIG_MACH_WAGO_PFC_AM35XX is not set
+# CONFIG_MCI_BCM283X is undefined
+# CONFIG_MCI_MMCI is undefined
+CONFIG_MCI_OMAP_HSMMC=y
+CONFIG_MTD_M25P80=y
+# CONFIG_MTD_NAND_DENALI is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+CONFIG_MTD_NAND_IDS=y
+CONFIG_MTD_SPI_NOR=y
+# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
+# CONFIG_MTD_SST25L is not set
+CONFIG_NAND=y
+# CONFIG_NAND_ALLOW_ERASE_BAD is not set
+CONFIG_NAND_BBT=y
+# CONFIG_NAND_ECC_BCH is not set
+CONFIG_NAND_ECC_HW=y
+CONFIG_NAND_ECC_HW_NONE=y
+# CONFIG_NAND_ECC_HW_OOB_FIRST is not set
+CONFIG_NAND_ECC_HW_SYNDROME=y
+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_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
diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff
new file mode 100644
index 000000000000..fe0ead522546
--- /dev/null
+++ b/configs/platform-v7a/barebox-mx6.config.diff
@@ -0,0 +1,241 @@
+c20722800c30a40b29690bb8e12f2781
+# CONFIG_ARCH_BCM283X is not set
+CONFIG_ARCH_HAS_FEC_IMX=y
+CONFIG_ARCH_HAS_IMX_GPT=y
+CONFIG_ARCH_HAS_L2X0=y
+CONFIG_ARCH_IMX6=y
+CONFIG_ARCH_IMX6SX=y
+CONFIG_ARCH_IMX=y
+CONFIG_ARCH_IMX_IMXIMAGE=y
+# CONFIG_ARCH_IMX_USBLOADER is not set
+CONFIG_ARCH_TEXT_BASE=0x4fc00000
+# CONFIG_ARM_AMBA is undefined
+CONFIG_ARM_ASM_UNIFIED=y
+# CONFIG_ARM_SECURE_MONITOR is undefined
+# CONFIG_ARM_SMCCC is undefined
+CONFIG_AT803X_PHY=y
+CONFIG_BAREBOX_UPDATE_IMX_NAND_FCB=y
+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
+CONFIG_DISK_IDE_SFF=y
+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
+# CONFIG_DRIVER_VIDEO_EDID is not set
+# CONFIG_DRIVER_VIDEO_FB_SSD1307 is not set
+CONFIG_DRIVER_VIDEO_IMX_IPUV3=y
+CONFIG_DRIVER_VIDEO_IMX_IPUV3_LVDS=y
+# CONFIG_DRIVER_VIDEO_IMX_IPUV3_PARALLEL is not set
+# CONFIG_DRIVER_VIDEO_MTL017 is not set
+CONFIG_DRIVER_VIDEO_SIMPLEFB=y
+# CONFIG_DRIVER_VIDEO_SIMPLE_PANEL is not set
+CONFIG_EEPROM_AT25=y
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
+CONFIG_FS_UBIFS=y
+CONFIG_FS_UBIFS_COMPRESSION_LZO=y
+# CONFIG_FS_UBIFS_COMPRESSION_ZLIB is not set
+CONFIG_GENERIC_PHY=y
+# CONFIG_GPIO_BCM283X is undefined
+CONFIG_GPIO_IMX=y
+# CONFIG_GPIO_PL061 is undefined
+# 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
+CONFIG_IMX_IIM=y
+CONFIG_IMX_IIM_FUSE_BLOW=y
+CONFIG_IMX_MULTI_BOARDS=y
+# CONFIG_IMX_WEIM is not set
+CONFIG_INPUT=y
+CONFIG_KEYBOARD_GPIO=y
+# CONFIG_KEYBOARD_IMX_KEYPAD is not set
+# CONFIG_LED_PWM is not set
+CONFIG_LIBSCAN=y
+CONFIG_LIBUBIGEN=y
+CONFIG_LODEPNG=y
+# CONFIG_MACH_ADVANTECH_ROM_742X is not set
+# CONFIG_MACH_CCMX51 is not set
+# CONFIG_MACH_CCMX53 is not set
+# CONFIG_MACH_CM_FX6 is not set
+# CONFIG_MACH_DFI_FS700_M60 is not set
+# CONFIG_MACH_EFIKA_MX_SMARTBOOK is not set
+# CONFIG_MACH_ELTEC_HIPERCAM is not set
+# CONFIG_MACH_EMBEDSKY_E9 is not set
+CONFIG_MACH_EMBEST_RIOTBOARD=y
+# CONFIG_MACH_FREESCALE_IMX6SX_SABRESDB is not set
+# CONFIG_MACH_FREESCALE_MX51_PDK is not set
+# CONFIG_MACH_FREESCALE_MX53_LOCO is not set
+# CONFIG_MACH_FREESCALE_MX53_VMX53 is not set
+# CONFIG_MACH_FREESCALE_MX7_SABRESD is not set
+# CONFIG_MACH_GK802 is not set
+# CONFIG_MACH_GRINN_LITEBOARD is not set
+# CONFIG_MACH_GUF_SANTARO is not set
+# CONFIG_MACH_GUF_VINCELL is not set
+# CONFIG_MACH_GW_VENTANA is not set
+# CONFIG_MACH_KINDLE_MX50 is not set
+# CONFIG_MACH_KONTRON_SAMX6I is not set
+CONFIG_MACH_NITROGEN6=y
+# CONFIG_MACH_NXP_IMX6ULL_EVK is not set
+# CONFIG_MACH_NXP_IMX8MQ_EVK is not set
+# CONFIG_MACH_PCA100 is not set
+# CONFIG_MACH_PCM038 is not set
+# CONFIG_MACH_PHYTEC_PHYCORE_IMX7 is not set
+# CONFIG_MACH_PHYTEC_SOM_IMX6 is not set
+# CONFIG_MACH_REALQ7 is not set
+# CONFIG_MACH_RPI2 is undefined
+# CONFIG_MACH_RPI3 is undefined
+# CONFIG_MACH_RPI is undefined
+# CONFIG_MACH_RPI_COMMON is undefined
+CONFIG_MACH_SABRELITE=y
+# CONFIG_MACH_SABRESD is not set
+# CONFIG_MACH_SOLIDRUN_MICROSOM is not set
+# CONFIG_MACH_TECHNEXION_PICO_HOBBIT is not set
+# CONFIG_MACH_TECHNEXION_WANDBOARD is not set
+# CONFIG_MACH_TQMA53 is not set
+# CONFIG_MACH_TQMA6X is not set
+# CONFIG_MACH_TX25 is not set
+# CONFIG_MACH_TX53 is not set
+# CONFIG_MACH_TX6X is not set
+# CONFIG_MACH_UDOO is not set
+CONFIG_MACH_UDOO_NEO=y
+# CONFIG_MACH_VARISCITE_MX6 is not set
+# CONFIG_MACH_VF610_TWR is not set
+# CONFIG_MACH_WARP7 is not set
+# CONFIG_MACH_ZII_IMX7D_RPU2 is not set
+# CONFIG_MACH_ZII_IMX8MQ_DEV is not set
+# CONFIG_MACH_ZII_RDU1 is not set
+# CONFIG_MACH_ZII_RDU2 is not set
+# CONFIG_MACH_ZII_VF610_DEV is not set
+# CONFIG_MCI_BCM283X is undefined
+CONFIG_MCI_IMX_ESDHC=y
+# CONFIG_MCI_IMX_ESDHC_PIO is not set
+# CONFIG_MCI_MMCI is undefined
+CONFIG_MCI_MMC_BOOT_PARTITIONS=y
+# CONFIG_MCI_STARTUP is not set
+CONFIG_MICREL_PHY=y
+CONFIG_MTD_DATAFLASH=y
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+CONFIG_MTD_M25P80=y
+# CONFIG_MTD_NAND_DENALI is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+CONFIG_MTD_NAND_IDS=y
+CONFIG_MTD_RAW_DEVICE=y
+CONFIG_MTD_SPI_NOR=y
+# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
+CONFIG_MTD_SST25L=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_CHECK_IO is not set
+CONFIG_MTD_UBI_FASTMAP=y
+# CONFIG_MTD_UBI_GENERAL_EXTRA_CHECKS is not set
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MXS_APBH_DMA=y
+CONFIG_NAND=y
+CONFIG_NAND_ALLOW_ERASE_BAD=y
+CONFIG_NAND_BBT=y
+# CONFIG_NAND_ECC_BCH is not set
+CONFIG_NAND_ECC_HW=y
+CONFIG_NAND_ECC_HW_NONE=y
+# CONFIG_NAND_ECC_HW_OOB_FIRST is not set
+CONFIG_NAND_ECC_HW_SYNDROME=y
+CONFIG_NAND_ECC_SOFT=y
+CONFIG_NAND_IMX=y
+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
+# CONFIG_PCI is not set
+# CONFIG_PCI_IMX6 is not set
+# CONFIG_PICOPNG is not set
+CONFIG_PINCTRL_IMX_IOMUX_V3=y
+CONFIG_PNG=y
+CONFIG_PRINTF_UUID=y
+CONFIG_PROMPT="barebox:"
+CONFIG_PWM=y
+CONFIG_PWM_IMX=y
+# CONFIG_REGULATOR_BCM283X is undefined
+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
+CONFIG_USB_GADGET_DFU=y
+CONFIG_USB_GADGET_DRIVER_ARC=y
+CONFIG_USB_GADGET_DUALSPEED=y
+CONFIG_USB_GADGET_FASTBOOT=y
+# CONFIG_USB_GADGET_FASTBOOT_BUF is not set
+CONFIG_USB_GADGET_FASTBOOT_SPARSE=y
+CONFIG_USB_IMX_CHIPIDEA=y
+CONFIG_USB_IMX_PHY=y
+CONFIG_USB_NOP_XCEIV=y
+CONFIG_USB_ULPI=y
+CONFIG_VIDEO=y
+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
diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff
new file mode 100644
index 000000000000..e3c9bbdf1873
--- /dev/null
+++ b/configs/platform-v7a/barebox-rpi2.config.diff
@@ -0,0 +1,152 @@
+c20722800c30a40b29690bb8e12f2781
+# CONFIG_AR8327N_PHY is undefined
+# CONFIG_AT803X_PHY is undefined
+CONFIG_BAREBOXENV_TARGET=y
+# CONFIG_BOOTM_OFTREE is not set
+# CONFIG_BOOTM_OFTREE_UIMAGE is undefined
+# CONFIG_BOOTM_SHOW_TYPE is not set
+# CONFIG_BOOTM_VERBOSE is not set
+# CONFIG_BZLIB is not set
+# CONFIG_CMD_DHCP is undefined
+# CONFIG_CMD_HOST is undefined
+# CONFIG_CMD_I2C is undefined
+# CONFIG_CMD_IMD is not set
+# CONFIG_CMD_IP_ROUTE_GET is undefined
+# 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_MIITOOL is undefined
+# CONFIG_CMD_PING is undefined
+# CONFIG_CMD_REGULATOR is not set
+# CONFIG_CMD_SHA1SUM is not set
+# CONFIG_CMD_SPI is not set
+# CONFIG_CMD_STATE is undefined
+# CONFIG_CMD_TFTP is undefined
+# CONFIG_CMD_USB is undefined
+CONFIG_COMPILE_LOGLEVEL=6
+# CONFIG_DAVICOM_PHY is undefined
+# CONFIG_DEFAULT_COMPRESSION_BZIP2 is undefined
+# CONFIG_DEFAULT_COMPRESSION_GZIP is undefined
+# CONFIG_DEFAULT_COMPRESSION_LZO is undefined
+# CONFIG_DEFAULT_COMPRESSION_XZ is undefined
+CONFIG_DEFAULT_LOGLEVEL=7
+# CONFIG_DIGEST_SHA1_GENERIC is not set
+# CONFIG_DP83867_PHY is undefined
+# CONFIG_DRIVER_CFI is undefined
+# CONFIG_DRIVER_NET_ARC_EMAC is undefined
+# CONFIG_DRIVER_NET_CALXEDA_XGMAC is undefined
+# CONFIG_DRIVER_NET_DESIGNWARE is undefined
+# CONFIG_DRIVER_NET_ENC28J60 is undefined
+# CONFIG_DRIVER_NET_KS8851_MLL is undefined
+# CONFIG_DRIVER_NET_MICREL is undefined
+# CONFIG_DRIVER_NET_SMC91111 is undefined
+# CONFIG_DRIVER_NET_SMC911X is undefined
+CONFIG_DRIVER_SERIAL_NS16550=y
+# CONFIG_DRIVER_SPI_GPIO is not set
+# CONFIG_EEPROM_93XX46 is not set
+# CONFIG_EEPROM_AT24 is undefined
+# CONFIG_FS_NFS is undefined
+# CONFIG_FS_TFTP is undefined
+CONFIG_GPIO_BCM283X=y
+# CONFIG_GPIO_PCA953X is undefined
+# CONFIG_GPIO_SX150X is undefined
+# CONFIG_HWRNG is not set
+# CONFIG_I2C is not set
+# CONFIG_I2C_ALGOBIT is undefined
+# CONFIG_I2C_DESIGNWARE is undefined
+# CONFIG_I2C_GPIO is undefined
+# CONFIG_I2C_MUX is undefined
+# CONFIG_I2C_MV64XXX is undefined
+# CONFIG_IMD is not set
+# CONFIG_IMD_TARGET is undefined
+# CONFIG_KEYBOARD_QT1070 is undefined
+# CONFIG_KEYBOARD_USB is undefined
+# CONFIG_LED_GPIO_OF is not set
+# CONFIG_LED_PCA955X is undefined
+# CONFIG_LXT_PHY is undefined
+# CONFIG_LZO_DECOMPRESS is not set
+CONFIG_MACH_RPI2=y
+CONFIG_MALLOC_SIZE=0x400000
+# CONFIG_MARVELL_PHY is undefined
+CONFIG_MCI_BCM283X=y
+# CONFIG_MCI_MMCI is not set
+CONFIG_MCI_MMC_BOOT_PARTITIONS=y
+# CONFIG_MDIO_BITBANG is undefined
+# CONFIG_MDIO_BUS_MUX_GPIO is undefined
+# CONFIG_MFD_ACT8846 is undefined
+# CONFIG_MFD_DA9053 is undefined
+# CONFIG_MFD_DA9063 is undefined
+# CONFIG_MFD_LP3972 is undefined
+# CONFIG_MFD_MC34704 is undefined
+# CONFIG_MFD_MC9SDZ60 is undefined
+# CONFIG_MFD_STMPE is undefined
+# CONFIG_MFD_TWL4030 is undefined
+# CONFIG_MFD_TWL6030 is undefined
+# CONFIG_MICREL_PHY is undefined
+# CONFIG_MTD is not set
+# CONFIG_MTD_CONCAT is undefined
+# CONFIG_MTD_DATAFLASH is undefined
+# CONFIG_MTD_DOCG3 is undefined
+# CONFIG_MTD_M25P80 is undefined
+# CONFIG_MTD_MTDRAM is undefined
+# CONFIG_MTD_OOB_DEVICE is undefined
+# CONFIG_MTD_PEB_DEBUG is undefined
+# CONFIG_MTD_RAW_DEVICE is undefined
+# CONFIG_MTD_SPI_NOR is undefined
+# CONFIG_MTD_UBI is undefined
+# CONFIG_MTD_WRITE is undefined
+# CONFIG_NAND is undefined
+# CONFIG_NATIONAL_PHY is undefined
+# CONFIG_NET is not set
+# CONFIG_NET_CMD_IFUP is undefined
+# CONFIG_NET_DHCP is undefined
+# CONFIG_NET_DSA_MV88E6XXX is undefined
+# CONFIG_NET_IFUP is undefined
+# CONFIG_NET_NETCONSOLE is undefined
+# CONFIG_NET_NFS is undefined
+# CONFIG_NET_RESOLV is undefined
+# CONFIG_NET_SNTP is undefined
+# CONFIG_NET_USB is undefined
+# CONFIG_NET_USB_ASIX is undefined
+# CONFIG_NET_USB_SMSC95XX is undefined
+CONFIG_NVMEM=y
+# CONFIG_NVMEM_SNVS_LPGPR is not set
+# CONFIG_OF_BAREBOX_DRIVERS is not set
+# CONFIG_OF_BAREBOX_ENV_IN_FS is undefined
+# CONFIG_OF_NET is undefined
+# 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_PHYLIB is undefined
+# CONFIG_PINCTRL is not set
+# CONFIG_PINCTRL_SINGLE is undefined
+CONFIG_PROMPT="R-Pi> "
+# CONFIG_RESET_SOURCE is not set
+CONFIG_SERIAL_AMBA_PL011=y
+# CONFIG_SHA1 is undefined
+# CONFIG_SMSC_PHY is undefined
+# CONFIG_STATE is not set
+# CONFIG_STATE_BACKWARD_COMPATIBLE is undefined
+# CONFIG_STATE_CRYPTO is undefined
+# CONFIG_STATE_DRV is undefined
+# CONFIG_USB_EHCI is undefined
+# CONFIG_USB_GADGET_SERIAL is not set
+# CONFIG_USB_HOST is not set
+# CONFIG_USB_STORAGE is undefined
+# CONFIG_USB_ULPI is undefined
+# CONFIG_USB_XHCI is undefined
+CONFIG_WATCHDOG_BCM2835=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
diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff
new file mode 100644
index 000000000000..578d108adfab
--- /dev/null
+++ b/configs/platform-v7a/barebox-vexpress.config.diff
@@ -0,0 +1,162 @@
+c20722800c30a40b29690bb8e12f2781
+CONFIG_AMBA_SP804=y
+# CONFIG_ARCH_BCM283X is not set
+CONFIG_ARCH_VEXPRESS=y
+# CONFIG_ARM_SECURE_MONITOR is undefined
+# CONFIG_ARM_SMCCC is undefined
+CONFIG_BOOTM_INITRD=y
+# CONFIG_BZLIB is not set
+# CONFIG_CFI_BUFFER_WRITE is not set
+# CONFIG_CLOCKSOURCE_BCM283X is undefined
+# CONFIG_CMD_ARM_MMUINFO is not set
+# CONFIG_CMD_BOOTZ is not set
+# CONFIG_CMD_CLK is not set
+# CONFIG_CMD_GPIO is undefined
+# CONFIG_CMD_I2C is undefined
+# CONFIG_CMD_IMD is not set
+# CONFIG_CMD_LED is undefined
+# CONFIG_CMD_LED_TRIGGER is undefined
+# CONFIG_CMD_LET is not set
+# CONFIG_CMD_LN is not set
+CONFIG_CMD_LOADB=y
+# CONFIG_CMD_MEMTEST is not set
+# CONFIG_CMD_MENU is undefined
+# CONFIG_CMD_MENUTREE is undefined
+# CONFIG_CMD_MENU_MANAGEMENT is undefined
+# CONFIG_CMD_MM is not set
+# CONFIG_CMD_MSLEEP is not set
+# CONFIG_CMD_OF_NODE is not set
+# CONFIG_CMD_OF_PROPERTY is not set
+# CONFIG_CMD_READF is not set
+# CONFIG_CMD_REGULATOR is undefined
+# CONFIG_CMD_SHA1SUM is not set
+# CONFIG_CMD_SPI is undefined
+# CONFIG_CMD_STATE is undefined
+# CONFIG_CMD_TIME is not set
+# CONFIG_CMD_USB is undefined
+# CONFIG_CMD_USBGADGET is undefined
+# CONFIG_CMD_WD is undefined
+# CONFIG_CMD_WD_DEFAULT_TIMOUT is undefined
+CONFIG_COMMON_CLK_OF_PROVIDER=y
+CONFIG_COMPILE_LOGLEVEL=6
+CONFIG_CONSOLE_ACTIVATE_ALL=y
+# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
+# CONFIG_DEFAULT_COMPRESSION_BZIP2 is undefined
+# CONFIG_DEFAULT_COMPRESSION_GZIP is undefined
+# CONFIG_DEFAULT_COMPRESSION_LZO is undefined
+# CONFIG_DEFAULT_COMPRESSION_XZ is undefined
+# CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU is undefined
+# CONFIG_DIGEST_SHA1_GENERIC is not set
+CONFIG_DRIVER_CFI=y
+CONFIG_DRIVER_CFI_AMD=y
+CONFIG_DRIVER_CFI_BANK_WIDTH_1=y
+CONFIG_DRIVER_CFI_BANK_WIDTH_2=y
+CONFIG_DRIVER_CFI_BANK_WIDTH_4=y
+# CONFIG_DRIVER_CFI_BANK_WIDTH_8 is not set
+CONFIG_DRIVER_CFI_INTEL=y
+# CONFIG_DRIVER_NET_ENC28J60 is undefined
+# CONFIG_DRIVER_NET_MICREL is undefined
+CONFIG_DRIVER_NET_SMC911X=y
+# CONFIG_DRIVER_SPI_GPIO is undefined
+# CONFIG_EEPROM_AT24 is undefined
+# CONFIG_EEPROM_AT25 is undefined
+# CONFIG_FILE_LIST is undefined
+# CONFIG_FIRMWARE_ALTERA_SERIAL is undefined
+# CONFIG_FS_FAT_LFN is not set
+# CONFIG_FS_FAT_WRITE is not set
+# CONFIG_FS_NFS is not set
+# CONFIG_GENERIC_GPIO is undefined
+# CONFIG_GPIOLIB is undefined
+# CONFIG_GPIO_74164 is undefined
+# CONFIG_GPIO_BCM283X is undefined
+# CONFIG_GPIO_DESIGNWARE is undefined
+# CONFIG_GPIO_GENERIC_PLATFORM is undefined
+# CONFIG_GPIO_PCA953X is undefined
+# CONFIG_GPIO_PL061 is undefined
+# CONFIG_GPIO_SX150X is undefined
+# CONFIG_HWRNG is not set
+# CONFIG_I2C is not set
+# CONFIG_I2C_ALGOBIT is undefined
+# CONFIG_I2C_DESIGNWARE is undefined
+# CONFIG_I2C_GPIO is undefined
+# CONFIG_I2C_MUX is undefined
+# CONFIG_I2C_MV64XXX is undefined
+# CONFIG_JTAG is undefined
+# CONFIG_KEYBOARD_GPIO is undefined
+# CONFIG_KEYBOARD_QT1070 is undefined
+# CONFIG_KEYBOARD_USB is undefined
+# CONFIG_LED is not set
+# CONFIG_LED_GPIO is undefined
+# CONFIG_LED_GPIO_BICOLOR is undefined
+# CONFIG_LED_GPIO_OF is undefined
+# CONFIG_LED_GPIO_RGB is undefined
+# CONFIG_LED_PCA955X is undefined
+# CONFIG_LED_TRIGGERS is undefined
+# CONFIG_LZO_DECOMPRESS is not set
+# CONFIG_MACH_RPI2 is undefined
+# CONFIG_MACH_RPI3 is undefined
+# CONFIG_MACH_RPI is undefined
+# CONFIG_MACH_RPI_COMMON is undefined
+CONFIG_MACH_VEXPRESS=y
+# CONFIG_MCI_BCM283X is undefined
+# CONFIG_MCI_SPI is undefined
+# CONFIG_MDIO_BUS_MUX_GPIO is undefined
+# CONFIG_MENU is not set
+# CONFIG_MENUTREE is undefined
+# CONFIG_MFD_ACT8846 is undefined
+# CONFIG_MFD_DA9053 is undefined
+# CONFIG_MFD_DA9063 is undefined
+# CONFIG_MFD_LP3972 is undefined
+# CONFIG_MFD_MC13XXX is undefined
+# CONFIG_MFD_MC34704 is undefined
+# CONFIG_MFD_MC9SDZ60 is undefined
+# CONFIG_MFD_STMPE is undefined
+# CONFIG_MFD_TWL4030 is undefined
+# CONFIG_MFD_TWL6030 is undefined
+CONFIG_MTD_CONCAT=y
+# CONFIG_MTD_DATAFLASH is undefined
+# CONFIG_MTD_M25P80 is undefined
+# CONFIG_NET_USB is undefined
+# CONFIG_NET_USB_ASIX is undefined
+# CONFIG_NET_USB_SMSC95XX is undefined
+# CONFIG_OF_GPIO is undefined
+CONFIG_PBL_CONSOLE=y
+# CONFIG_PINCTRL is not set
+# CONFIG_PINCTRL_SINGLE is undefined
+CONFIG_PROMPT="vexpress: "
+# CONFIG_REGULATOR is not set
+# CONFIG_REGULATOR_BCM283X is undefined
+# CONFIG_REGULATOR_FIXED is undefined
+CONFIG_SERIAL_AMBA_PL011=y
+# CONFIG_SHA1 is undefined
+# CONFIG_SPI is not set
+CONFIG_SRAM=y
+# CONFIG_STATE is not set
+# CONFIG_STATE_BACKWARD_COMPATIBLE is undefined
+# CONFIG_STATE_CRYPTO is undefined
+# CONFIG_STATE_DRV is undefined
+# CONFIG_USB is undefined
+# CONFIG_USBGADGET_START is undefined
+# CONFIG_USB_EHCI is undefined
+# CONFIG_USB_GADGET is not set
+# CONFIG_USB_GADGET_AUTOSTART is undefined
+# CONFIG_USB_GADGET_DFU is undefined
+# CONFIG_USB_GADGET_FASTBOOT is undefined
+# CONFIG_USB_GADGET_FASTBOOT_SPARSE is undefined
+# CONFIG_USB_GADGET_SERIAL is undefined
+# CONFIG_USB_HOST is not set
+# CONFIG_USB_STORAGE is undefined
+# CONFIG_USB_ULPI is undefined
+# CONFIG_USB_XHCI is undefined
+# CONFIG_WATCHDOG is not set
+# CONFIG_WATCHDOG_BCM2835 is undefined
+# CONFIG_WATCHDOG_DW is undefined
+# CONFIG_WATCHDOG_POLLER is undefined
+# 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
diff --git a/configs/platform-v7a/rules/barebox-am335x.make b/configs/platform-v7a/rules/barebox-am335x.make
index fb86c3b4a42a..0b9d4589f6f6 100644
--- a/configs/platform-v7a/rules/barebox-am335x.make
+++ b/configs/platform-v7a/rules/barebox-am335x.make
@@ -22,6 +22,7 @@ BAREBOX_AM335X		:= barebox-$(BAREBOX_AM335X_VERSION)
 BAREBOX_AM335X_SUFFIX	:= tar.bz2
 BAREBOX_AM335X_DIR	:= $(BUILDDIR)/barebox-am335x-$(BAREBOX_AM335X_VERSION)
 BAREBOX_AM335X_CONFIG	:= $(call ptx/in-platformconfigdir, barebox-am335x.config)
+BAREBOX_AM335X_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
 BAREBOX_AM335X_LICENSE	:= GPL-2.0
 BAREBOX_AM335X_URL	:= $(call barebox-url, BAREBOX_AM335X)
 BAREBOX_AM335X_SOURCE	:= $(SRCDIR)/$(BAREBOX_AM335X).$(BAREBOX_AM335X_SUFFIX)
diff --git a/configs/platform-v7a/rules/barebox-mx6.make b/configs/platform-v7a/rules/barebox-mx6.make
index 04c771fada60..69d823678c83 100644
--- a/configs/platform-v7a/rules/barebox-mx6.make
+++ b/configs/platform-v7a/rules/barebox-mx6.make
@@ -22,6 +22,7 @@ BAREBOX_MX6		:= barebox-$(BAREBOX_MX6_VERSION)
 BAREBOX_MX6_SUFFIX	:= tar.bz2
 BAREBOX_MX6_DIR		:= $(BUILDDIR)/barebox-mx6-$(BAREBOX_MX6_VERSION)
 BAREBOX_MX6_CONFIG	:= $(call ptx/in-platformconfigdir, barebox-mx6.config)
+BAREBOX_MX6_REF_CONFIG	:= $(call ptx/in-platformconfigdir, barebox.config)
 BAREBOX_MX6_LICENSE	:= GPL-2.0
 BAREBOX_MX6_URL		:= $(call barebox-url, BAREBOX_MX6)
 BAREBOX_MX6_SOURCE	:= $(SRCDIR)/$(BAREBOX_MX6).$(BAREBOX_MX6_SUFFIX)
diff --git a/configs/platform-v7a/rules/barebox-rpi2.make b/configs/platform-v7a/rules/barebox-rpi2.make
index fb05123500f7..97b66878a358 100644
--- a/configs/platform-v7a/rules/barebox-rpi2.make
+++ b/configs/platform-v7a/rules/barebox-rpi2.make
@@ -22,6 +22,7 @@ BAREBOX_RPI2		:= barebox-$(BAREBOX_RPI2_VERSION)
 BAREBOX_RPI2_SUFFIX	:= tar.bz2
 BAREBOX_RPI2_DIR	:= $(BUILDDIR)/barebox-rpi2-$(BAREBOX_RPI2_VERSION)
 BAREBOX_RPI2_CONFIG	:= $(call ptx/in-platformconfigdir, barebox-rpi2.config)
+BAREBOX_RPI2_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
 BAREBOX_RPI2_LICENSE	:= GPL-2.0
 BAREBOX_RPI2_URL	:= $(call barebox-url, BAREBOX_RPI2)
 BAREBOX_RPI2_SOURCE	:= $(SRCDIR)/$(BAREBOX_RPI2).$(BAREBOX_RPI2_SUFFIX)
diff --git a/configs/platform-v7a/rules/barebox-vexpress.make b/configs/platform-v7a/rules/barebox-vexpress.make
index 76063982c628..cdf8cc178691 100644
--- a/configs/platform-v7a/rules/barebox-vexpress.make
+++ b/configs/platform-v7a/rules/barebox-vexpress.make
@@ -22,6 +22,7 @@ BAREBOX_VEXPRESS		:= barebox-$(BAREBOX_VEXPRESS_VERSION)
 BAREBOX_VEXPRESS_SUFFIX		:= tar.bz2
 BAREBOX_VEXPRESS_DIR		:= $(BUILDDIR)/barebox-vexpress-$(BAREBOX_VEXPRESS_VERSION)
 BAREBOX_VEXPRESS_CONFIG		:= $(call ptx/in-platformconfigdir, barebox-vexpress.config)
+BAREBOX_VEXPRESS_REF_CONFIG	:= $(call ptx/in-platformconfigdir, barebox.config)
 BAREBOX_VEXPRESS_LICENSE	:= GPL-2.0
 BAREBOX_VEXPRESS_URL		:= $(call barebox-url, BAREBOX_VEXPRESS)
 BAREBOX_VEXPRESS_SOURCE		:= $(SRCDIR)/$(BAREBOX_VEXPRESS).$(BAREBOX_VEXPRESS_SUFFIX)
diff --git a/scripts/update-diffs-v7a.sh b/scripts/update-diffs-v7a.sh
new file mode 100755
index 000000000000..72490d756c5f
--- /dev/null
+++ b/scripts/update-diffs-v7a.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+BAREBOXES="barebox-common barebox-am335x barebox-mx6 barebox-rpi2 barebox-vexpress"
+for pkg in $BAREBOXES; do
+	ptxdist oldconfig $pkg
+done
-- 
2.20.1


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de