diff options
| author | Evert Pap <evert.pap@sintecs.nl> | 2016-09-14 11:10:56 (GMT) |
|---|---|---|
| committer | Evert Pap <evert.pap@sintecs.nl> | 2016-09-14 11:10:56 (GMT) |
| commit | 67e39eed5d590a9d29e2cb747b5eaa79a0f11a69 (patch) | |
| tree | 40422948d7909f8306f4425adca0d838ba81976b /include/configs/aria.h | |
| parent | 6d249763300432a786ee03cdbb09dd3b065c5189 (diff) | |
| parent | ab01ef5fa617444fd95543ee04ea53ccda273269 (diff) | |
| download | u-boot-fsl-qoriq-67e39eed5d590a9d29e2cb747b5eaa79a0f11a69.tar.xz | |
Merge branch 'master' into scalys
Diffstat (limited to 'include/configs/aria.h')
| -rw-r--r-- | include/configs/aria.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/configs/aria.h b/include/configs/aria.h index c56a2e3..cb50658 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -326,10 +326,6 @@ #define CONSOLE_FIFO_RX_ADDR FIFOC_PSC3_RX_ADDR #define CONFIG_CMDLINE_EDITING 1 /* command line history */ -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER -#ifdef CONFIG_SYS_HUSH_PARSER -#endif /* * PCI @@ -406,15 +402,10 @@ #define CONFIG_LOADS_ECHO 1 #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 -#define CONFIG_CMD_ASKENV -#define CONFIG_CMD_DHCP #define CONFIG_CMD_EEPROM #undef CONFIG_CMD_FUSE -#define CONFIG_CMD_I2C #undef CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_MII -#define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) @@ -519,7 +510,6 @@ #define CONFIG_LOADADDR 400000 /* default load addr */ -#define CONFIG_BOOTDELAY 5 /* -1 disables auto-boot */ #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ #define CONFIG_BAUDRATE 115200 |