summaryrefslogtreecommitdiffstats
path: root/include/configs/tegra20-common.h
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-03-15 20:50:43 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-03-15 20:50:43 +0100
commitb27673ccbd3d5435319b5c09c3e7061f559f925d (patch)
tree24c58f5a1e950ec107f40690032ac89c62d3ad83 /include/configs/tegra20-common.h
parent6579d15c58e2b6b051f126ea8b77dd767252aa14 (diff)
parent477393e7875cf4261f107fdfb8887309ea7fc3f7 (diff)
downloadblackbird-obmc-uboot-b27673ccbd3d5435319b5c09c3e7061f559f925d.tar.gz
blackbird-obmc-uboot-b27673ccbd3d5435319b5c09c3e7061f559f925d.zip
Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/tegra20-common.h')
-rw-r--r--include/configs/tegra20-common.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/configs/tegra20-common.h b/include/configs/tegra20-common.h
index 186e023364..e464e06173 100644
--- a/include/configs/tegra20-common.h
+++ b/include/configs/tegra20-common.h
@@ -114,13 +114,7 @@
/* Total I2C ports on Tegra20 */
#define TEGRA_I2C_NUM_CONTROLLERS 4
-#define CONFIG_PARTITION_UUIDS
-#define CONFIG_CMD_PART
-
#define CONFIG_SYS_NAND_SELF_INIT
#define CONFIG_SYS_NAND_ONFI_DETECTION
-/* Misc utility code */
-#define CONFIG_BOUNCE_BUFFER
-
#endif /* _TEGRA20_COMMON_H_ */
OpenPOWER on IntegriCloud