82 lines
2.3 KiB
Diff
82 lines
2.3 KiB
Diff
From d7827a3fd19d7bee575e639ed9b9cbed57eabffe Mon Sep 17 00:00:00 2001
|
|
From: Stephen Warren <swarren@nvidia.com>
|
|
Date: Thu, 23 Jan 2014 13:17:02 -0700
|
|
Subject: [PATCH 06/13] ARM: tegra: convert tegra to use distro defaults
|
|
|
|
Modify all Tegra boards to include the "distro defaults" header, so that
|
|
all the config options distros expect are enabled. Remove any #defines
|
|
that enable the same options from the Tegra files.
|
|
|
|
Signed-off-by: Stephen Warren <swarren@nvidia.com>
|
|
---
|
|
include/configs/tegra-common.h | 20 ++++----------------
|
|
1 file changed, 4 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
|
|
index 522cd41..bbe417a 100644
|
|
--- a/include/configs/tegra-common.h
|
|
+++ b/include/configs/tegra-common.h
|
|
@@ -29,7 +29,6 @@
|
|
#define CONFIG_DISPLAY_BOARDINFO
|
|
|
|
#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
|
|
-#define CONFIG_OF_LIBFDT /* enable passing of devicetree */
|
|
|
|
/* Environment */
|
|
#define CONFIG_ENV_VARS_UBOOT_CONFIG
|
|
@@ -69,33 +68,20 @@
|
|
#undef CONFIG_CMD_NET /* network support */
|
|
|
|
/* turn on command-line edit/hist/auto */
|
|
-#define CONFIG_CMDLINE_EDITING
|
|
#define CONFIG_COMMAND_HISTORY
|
|
-#define CONFIG_AUTO_COMPLETE
|
|
|
|
/* turn on commonly used storage-related commands */
|
|
-
|
|
-#define CONFIG_DOS_PARTITION
|
|
-#define CONFIG_EFI_PARTITION
|
|
#define CONFIG_PARTITION_UUIDS
|
|
-#define CONFIG_FS_EXT4
|
|
-#define CONFIG_FS_FAT
|
|
-#define CONFIG_CMD_EXT2
|
|
-#define CONFIG_CMD_FAT
|
|
-#define CONFIG_CMD_FS_GENERIC
|
|
#define CONFIG_CMD_PART
|
|
|
|
#define CONFIG_SYS_NO_FLASH
|
|
|
|
#define CONFIG_CONSOLE_MUX
|
|
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
|
|
-#define CONFIG_BOOTDELAY 2 /* -1 to disable auto boot */
|
|
|
|
/*
|
|
* Miscellaneous configurable options
|
|
*/
|
|
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
|
|
-#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
|
|
#define CONFIG_SYS_PROMPT V_PROMPT
|
|
/*
|
|
* Increasing the size of the IO buffer as default nfsargs size is more
|
|
@@ -133,8 +119,6 @@
|
|
#define CONFIG_TEGRA_GPIO
|
|
#define CONFIG_CMD_GPIO
|
|
#define CONFIG_CMD_ENTERRCM
|
|
-#define CONFIG_CMD_BOOTZ
|
|
-#define CONFIG_SUPPORT_RAW_INITRD
|
|
|
|
/* Defines for SPL */
|
|
#define CONFIG_SPL
|
|
@@ -157,4 +141,8 @@
|
|
#define CONFIG_BOUNCE_BUFFER
|
|
#define CONFIG_CRC32_VERIFY
|
|
|
|
+#ifndef CONFIG_SPL_BUILD
|
|
+#include <config_distro_defaults.h>
|
|
+#endif
|
|
+
|
|
#endif /* _TEGRA_COMMON_H_ */
|
|
--
|
|
1.8.5.3
|
|
|