aboutsummaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2023-04-17 10:47:33 -0400
committerTom Rini <trini@konsulko.com>2023-04-17 10:47:33 -0400
commit5db4972a5bbdbf9e3af48ffc9bc4fec73b7b6a79 (patch)
tree59af02fa40552c4e3eb547019c4cc7d0aaaf2d35 /configs
parent10f8eec3e0f948005b208869a9ec26b1bf896f86 (diff)
parent156968211ef0e155a198a2fe9e94187a91186ab9 (diff)
downloadu-boot-5db4972a5bbdbf9e3af48ffc9bc4fec73b7b6a79.zip
u-boot-5db4972a5bbdbf9e3af48ffc9bc4fec73b7b6a79.tar.gz
u-boot-5db4972a5bbdbf9e3af48ffc9bc4fec73b7b6a79.tar.bz2
Merge tag 'u-boot-nand-20230417' of https://source.denx.de/u-boot/custodians/u-boot-nand-flash
Pull request for u-boot-nand-20230417 The first two patches are by Frieder Schrempf who joins as a reviewer for the SPI NAND framework and drivers. The following 2 patches are by Linus Walleij and are taken by the series "Add Broadcom Northstar basic support". Bin Meng makes static a list for octeontx. Francesco Dolcini specifies MTD partitions on command line for colibri-{imx6ull,imx7}.
Diffstat (limited to 'configs')
-rw-r--r--configs/colibri-imx6ull_defconfig1
-rw-r--r--configs/colibri_imx7_defconfig1
2 files changed, 0 insertions, 2 deletions
diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig
index b50577f..2f1a201 100644
--- a/configs/colibri-imx6ull_defconfig
+++ b/configs/colibri-imx6ull_defconfig
@@ -104,4 +104,3 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_OF_LIBFDT_OVERLAY=y
-CONFIG_FDT_FIXUP_PARTITIONS=y
diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig
index 3a67ea3..8439742 100644
--- a/configs/colibri_imx7_defconfig
+++ b/configs/colibri_imx7_defconfig
@@ -102,4 +102,3 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_OF_LIBFDT_OVERLAY=y
-CONFIG_FDT_FIXUP_PARTITIONS=y