sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Rob Herring 2014-04-10 16:17:30 -05:00 committed by Albert ARIBAUD
parent c9aab0f9dd
commit ac9ae1333e
1 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/configs/highbank.h
View File

@ -7,15 +7,15 @@
#ifndef __CONFIG_H #ifndef __CONFIG_H
#define __CONFIG_H #define __CONFIG_H
#include <config_distro_defaults.h>
#define CONFIG_SYS_DCACHE_OFF #define CONFIG_SYS_DCACHE_OFF
#define CONFIG_SYS_THUMB_BUILD #define CONFIG_SYS_THUMB_BUILD
#define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_NO_FLASH
#define CONFIG_OF_LIBFDT
#define CONFIG_OF_BOARD_SETUP #define CONFIG_OF_BOARD_SETUP
#define CONFIG_FIT #define CONFIG_FIT
#define CONFIG_SUPPORT_RAW_INITRD
#define CONFIG_SYS_BOOTMAPSZ (16 << 20) #define CONFIG_SYS_BOOTMAPSZ (16 << 20)
#define CONFIG_SYS_TIMER_RATE (150000000/256) #define CONFIG_SYS_TIMER_RATE (150000000/256)
@ -48,35 +48,18 @@
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
CONFIG_SYS_SCSI_MAX_LUN) CONFIG_SYS_SCSI_MAX_LUN)
#define CONFIG_DOS_PARTITION
#define CONFIG_EFI_PARTITION
#define CONFIG_CALXEDA_XGMAC #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. * Command line configuration.
*/ */
#include <config_cmd_default.h> #include <config_cmd_default.h>
#define CONFIG_CMD_BDI #define CONFIG_CMD_BDI
#define CONFIG_CMD_BOOTZ
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_ELF
#define CONFIG_CMD_MEMORY #define CONFIG_CMD_MEMORY
#define CONFIG_CMD_LOADS #define CONFIG_CMD_LOADS
#define CONFIG_CMD_SCSI #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_BOOT_RETRY_TIME -1
#define CONFIG_RESET_TO_RETRY #define CONFIG_RESET_TO_RETRY
#define CONFIG_AUTOBOOT_KEYED #define CONFIG_AUTOBOOT_KEYED
@ -85,14 +68,10 @@
/* /*
* Miscellaneous configurable options * 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_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_MAXARGS 16 /* max number of cmd args */ #define CONFIG_SYS_MAXARGS 16 /* max number of cmd args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_PROMPT "Highbank #" #define CONFIG_SYS_PROMPT "Highbank #"
#define CONFIG_SYS_HUSH_PARSER
/* Print Buffer Size */ /* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
sizeof(CONFIG_SYS_PROMPT)+16) sizeof(CONFIG_SYS_PROMPT)+16)