summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-05-11 15:22:36 -0400
committerTom Rini <trini@konsulko.com>2018-05-11 15:22:36 -0400
commit9a66328a37e3b31dbe646ef3668b60466e8abd9a (patch)
tree0ece22b0187232017e0930aa88fa4664772edba9 /configs
parent57a72d0560eb7693a35a891f43587bcd6786dc04 (diff)
parent71cb3d7c7897cd02ca731f4c510fff49705b84b7 (diff)
downloadu-boot-9a66328a37e3b31dbe646ef3668b60466e8abd9a.tar.gz
Merge git://git.denx.de/u-boot-tegra
Diffstat (limited to 'configs')
-rw-r--r--configs/colibri_t20_defconfig1
-rw-r--r--configs/harmony_defconfig6
2 files changed, 7 insertions, 0 deletions
diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
index 90777e0201..e5d33ecfef 100644
--- a/configs/colibri_t20_defconfig
+++ b/configs/colibri_t20_defconfig
@@ -35,6 +35,7 @@ CONFIG_ENV_IS_IN_NAND=y
CONFIG_SPL_DM=y
CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y
+CONFIG_MTD=y
CONFIG_MTD_UBI_FASTMAP=y
CONFIG_DM_PMIC=y
CONFIG_DM_REGULATOR=y
diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig
index d716fc3546..9d4235b3a7 100644
--- a/configs/harmony_defconfig
+++ b/configs/harmony_defconfig
@@ -18,13 +18,19 @@ CONFIG_CMD_USB=y
CONFIG_CMD_PMIC=y
CONFIG_CMD_REGULATOR=y
CONFIG_CMD_EXT4_WRITE=y
+CONFIG_MTDIDS_DEFAULT="nand0=tegra_nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=tegra_nand:2m(u-boot)ro,1m(u-boot-env),1m(cfgblock)ro,-(ubi)"
+CONFIG_CMD_UBI=y
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_OF_LIVE=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_SPL_DM=y
CONFIG_PCI=y
CONFIG_DM_PCI=y
CONFIG_DM_PCI_COMPAT=y
+CONFIG_MTD=y
+CONFIG_MTD_UBI_FASTMAP=y
CONFIG_DM_PMIC=y
CONFIG_DM_REGULATOR=y
CONFIG_DM_REGULATOR_FIXED=y