diff options
author | Tom Rini <trini@ti.com> | 2014-10-07 07:38:39 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-10-07 07:38:39 -0400 |
commit | dd0204e48d05f41480743a798b94d5484b664639 (patch) | |
tree | 0dada741b0dc5b60dcc63ae0dfe783b6935e7eba /doc | |
parent | 742de9076e8a8f44b77794b43e6175d86b897996 (diff) | |
parent | c19a8bc5711ec63e905ef91f045a1489f0aa3cb0 (diff) | |
download | u-boot-imx-dd0204e48d05f41480743a798b94d5484b664639.zip u-boot-imx-dd0204e48d05f41480743a798b94d5484b664639.tar.gz u-boot-imx-dd0204e48d05f41480743a798b94d5484b664639.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'doc')
-rw-r--r-- | doc/README.nand | 6 | ||||
-rw-r--r-- | doc/git-mailrc | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/doc/README.nand b/doc/README.nand index 320d752..e29188f 100644 --- a/doc/README.nand +++ b/doc/README.nand @@ -215,12 +215,6 @@ Configuration Options: Platform specific options ========================= - CONFIG_NAND_DENALI - Enables the denali.c driver. - - CONFIG_SYS_NAND_DENALI_64BIT - Indicates that the Denali NAND controller is the 64-bit variant. - CONFIG_NAND_OMAP_GPMC Enables omap_gpmc.c driver for OMAPx and AMxxxx platforms. GPMC controller is used for parallel NAND flash devices, and can diff --git a/doc/git-mailrc b/doc/git-mailrc index 0fba100..35f2eb2 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -63,6 +63,7 @@ alias sunxi uboot, ijc, jwrdegoede alias tegra uboot, sjg, Tom Warren <twarren@nvidia.com>, Stephen Warren <swarren@nvidia.com> alias tegra2 tegra alias ti uboot, trini +alias uniphier uboot, masahiro alias zynq uboot, monstr alias avr32 uboot, abiessmann |