diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 10:42:05 -0600 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 10:42:05 -0600 |
commit | f8edca2e9a128f526b1fe6f997f7adb852cf5b3c (patch) | |
tree | 92deb9ddf1153c64ff1ced9392816e60b4ecaa03 /include/configs/sacsng.h | |
parent | 79582020313e6d992a3bac71cf3a9b337f9ac7f7 (diff) | |
parent | 7b4fd36b0322ec98836a8459d9be80e2777fdc05 (diff) | |
download | u-boot-imx-f8edca2e9a128f526b1fe6f997f7adb852cf5b3c.zip u-boot-imx-f8edca2e9a128f526b1fe6f997f7adb852cf5b3c.tar.gz u-boot-imx-f8edca2e9a128f526b1fe6f997f7adb852cf5b3c.tar.bz2 |
Merge branch 'origin'
Conflicts:
CHANGELOG
Diffstat (limited to 'include/configs/sacsng.h')
-rw-r--r-- | include/configs/sacsng.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h index 4e0cfdb..97b52fa 100644 --- a/include/configs/sacsng.h +++ b/include/configs/sacsng.h @@ -507,7 +507,6 @@ # define CONFIG_COMMANDS (((CONFIG_CMD_DFL & ~(CFG_CMD_KGDB))) | \ CFG_CMD_ELF | \ CFG_CMD_ASKENV | \ - CFG_CMD_ECHO | \ CFG_CMD_I2C | \ CFG_CMD_SPI | \ CFG_CMD_SDRAM | \ @@ -520,7 +519,6 @@ # define CONFIG_COMMANDS (((CONFIG_CMD_DFL & ~(CFG_CMD_KGDB))) | \ CFG_CMD_ELF | \ CFG_CMD_ASKENV | \ - CFG_CMD_ECHO | \ CFG_CMD_I2C | \ CFG_CMD_SPI | \ CFG_CMD_SDRAM | \ |