summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2014-04-10 16:17:30 -0500
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-05-02 11:43:11 +0200
commitac9ae1333ec09b279617395b7f6ac0c02001b464 (patch)
tree6a7fc2bffdafbf0e545a31ca0bc4abf08ee06eaf /include/configs
parentc9aab0f9dd23fddcebf5984dc19e62b514e759a7 (diff)
downloadu-boot-imx-ac9ae1333ec09b279617395b7f6ac0c02001b464.zip
u-boot-imx-ac9ae1333ec09b279617395b7f6ac0c02001b464.tar.gz
u-boot-imx-ac9ae1333ec09b279617395b7f6ac0c02001b464.tar.bz2
ARM: highbank: use config_distro_defaults.h
Adapt highbank to use config_distro_defaults.h and remove the redundant defines. Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/highbank.h25
1 files changed, 2 insertions, 23 deletions
diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 7dbee3c..f8794dc 100644
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -7,15 +7,15 @@
#ifndef __CONFIG_H
#define __CONFIG_H
+#include <config_distro_defaults.h>
+
#define CONFIG_SYS_DCACHE_OFF
#define CONFIG_SYS_THUMB_BUILD
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_OF_LIBFDT
#define CONFIG_OF_BOARD_SETUP
#define CONFIG_FIT
-#define CONFIG_SUPPORT_RAW_INITRD
#define CONFIG_SYS_BOOTMAPSZ (16 << 20)
#define CONFIG_SYS_TIMER_RATE (150000000/256)
@@ -48,35 +48,18 @@
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
CONFIG_SYS_SCSI_MAX_LUN)
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-
#define CONFIG_CALXEDA_XGMAC
-/* PXE support */
-#define CONFIG_BOOTP_PXE
-#define CONFIG_BOOTP_PXE_CLIENTARCH 0x100
-#define CONFIG_BOOTP_VCI_STRING "U-boot.armv7.highbank"
-
/*
* Command line configuration.
*/
#include <config_cmd_default.h>
#define CONFIG_CMD_BDI
-#define CONFIG_CMD_BOOTZ
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
#define CONFIG_CMD_MEMORY
#define CONFIG_CMD_LOADS
#define CONFIG_CMD_SCSI
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_EXT4
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_PXE
-#define CONFIG_MENU
-#define CONFIG_BOOTDELAY 2
#define CONFIG_BOOT_RETRY_TIME -1
#define CONFIG_RESET_TO_RETRY
#define CONFIG_AUTOBOOT_KEYED
@@ -85,14 +68,10 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_MAXARGS 16 /* max number of cmd args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_PROMPT "Highbank #"
-#define CONFIG_SYS_HUSH_PARSER
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
sizeof(CONFIG_SYS_PROMPT)+16)