Commit ac9ae1333ec09b279617395b7f6ac0c02001b464
Committed by
Albert ARIBAUD
Albert ARIBAUD
1 parent
c9aab0f9dd
Exists in
v2017.01-smarct4x
and in
40 other branches
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>
Showing 1 changed file with 2 additions and 23 deletions Side-by-side Diff
include/configs/highbank.h
| ... | ... | @@ -7,15 +7,15 @@ |
| 7 | 7 | #ifndef __CONFIG_H |
| 8 | 8 | #define __CONFIG_H |
| 9 | 9 | |
| 10 | +#include <config_distro_defaults.h> | |
| 11 | + | |
| 10 | 12 | #define CONFIG_SYS_DCACHE_OFF |
| 11 | 13 | #define CONFIG_SYS_THUMB_BUILD |
| 12 | 14 | |
| 13 | 15 | #define CONFIG_SYS_NO_FLASH |
| 14 | 16 | |
| 15 | -#define CONFIG_OF_LIBFDT | |
| 16 | 17 | #define CONFIG_OF_BOARD_SETUP |
| 17 | 18 | #define CONFIG_FIT |
| 18 | -#define CONFIG_SUPPORT_RAW_INITRD | |
| 19 | 19 | #define CONFIG_SYS_BOOTMAPSZ (16 << 20) |
| 20 | 20 | |
| 21 | 21 | #define CONFIG_SYS_TIMER_RATE (150000000/256) |
| 22 | 22 | |
| 23 | 23 | |
| 24 | 24 | |
| 25 | 25 | |
| ... | ... | @@ -48,35 +48,18 @@ |
| 48 | 48 | #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ |
| 49 | 49 | CONFIG_SYS_SCSI_MAX_LUN) |
| 50 | 50 | |
| 51 | -#define CONFIG_DOS_PARTITION | |
| 52 | -#define CONFIG_EFI_PARTITION | |
| 53 | - | |
| 54 | 51 | #define CONFIG_CALXEDA_XGMAC |
| 55 | 52 | |
| 56 | -/* PXE support */ | |
| 57 | -#define CONFIG_BOOTP_PXE | |
| 58 | -#define CONFIG_BOOTP_PXE_CLIENTARCH 0x100 | |
| 59 | -#define CONFIG_BOOTP_VCI_STRING "U-boot.armv7.highbank" | |
| 60 | - | |
| 61 | 53 | /* |
| 62 | 54 | * Command line configuration. |
| 63 | 55 | */ |
| 64 | 56 | #include <config_cmd_default.h> |
| 65 | 57 | |
| 66 | 58 | #define CONFIG_CMD_BDI |
| 67 | -#define CONFIG_CMD_BOOTZ | |
| 68 | -#define CONFIG_CMD_DHCP | |
| 69 | -#define CONFIG_CMD_ELF | |
| 70 | 59 | #define CONFIG_CMD_MEMORY |
| 71 | 60 | #define CONFIG_CMD_LOADS |
| 72 | 61 | #define CONFIG_CMD_SCSI |
| 73 | -#define CONFIG_CMD_EXT2 | |
| 74 | -#define CONFIG_CMD_EXT4 | |
| 75 | -#define CONFIG_CMD_FAT | |
| 76 | -#define CONFIG_CMD_PXE | |
| 77 | -#define CONFIG_MENU | |
| 78 | 62 | |
| 79 | -#define CONFIG_BOOTDELAY 2 | |
| 80 | 63 | #define CONFIG_BOOT_RETRY_TIME -1 |
| 81 | 64 | #define CONFIG_RESET_TO_RETRY |
| 82 | 65 | #define CONFIG_AUTOBOOT_KEYED |
| 83 | 66 | |
| ... | ... | @@ -85,14 +68,10 @@ |
| 85 | 68 | /* |
| 86 | 69 | * Miscellaneous configurable options |
| 87 | 70 | */ |
| 88 | -#define CONFIG_CMDLINE_EDITING | |
| 89 | -#define CONFIG_AUTO_COMPLETE | |
| 90 | -#define CONFIG_SYS_LONGHELP /* undef to save memory */ | |
| 91 | 71 | #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ |
| 92 | 72 | #define CONFIG_SYS_MAXARGS 16 /* max number of cmd args */ |
| 93 | 73 | #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE |
| 94 | 74 | #define CONFIG_SYS_PROMPT "Highbank #" |
| 95 | -#define CONFIG_SYS_HUSH_PARSER | |
| 96 | 75 | /* Print Buffer Size */ |
| 97 | 76 | #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ |
| 98 | 77 | sizeof(CONFIG_SYS_PROMPT)+16) |