diff options
| author | Tom Rini <trini@ti.com> | 2013-11-06 16:18:25 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-11-06 16:18:25 -0500 |
| commit | 2cee0408e5c6f5dbdfa89fb40168ba2ead3f61a6 (patch) | |
| tree | fa227cc1d8f7956a6800ae8ca856f6df116f2707 | |
| parent | 76a224104bc9c0147385da92fd78116ba4913b90 (diff) | |
| parent | 6af3a0eaaecdaad971985c901cb675c9f8f3caac (diff) | |
| download | olio-uboot-2014.01-2cee0408e5c6f5dbdfa89fb40168ba2ead3f61a6.tar.xz olio-uboot-2014.01-2cee0408e5c6f5dbdfa89fb40168ba2ead3f61a6.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-coldfire
| -rw-r--r-- | include/configs/M5253DEMO.h | 2 | ||||
| -rw-r--r-- | include/configs/M54455EVB.h | 2 | ||||
| -rw-r--r-- | include/configs/eb_cpu5282.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 76d02bda1..3a1cbcae9 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -1,4 +1,4 @@ -TABILITY or FITNESS FO04-2007 Freescale Semiconductor, Inc. +/* Copyright (C) 2004-2007 Freescale Semiconductor, Inc. * Hayden Fraser (Hayden.Fraser@freescale.com) * * SPDX-License-Identifier: GPL-2.0+ diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index f0dc2aa53..7a55d3c61 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -177,7 +177,7 @@ #define CONFIG_SYS_I2C_FSL #define CONFIG_SYS_FSL_I2C_SPEED 80000 #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F -#define CONFIG_SYS_FSLI2C_OFFSET 0x58000 +#define CONFIG_SYS_FSL_I2C_OFFSET 0x58000 #define CONFIG_SYS_IMMR CONFIG_SYS_MBAR /* DSPI and Serial Flash */ diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index d1650eea3..bdca70587 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -152,7 +152,7 @@ #define CONFIG_SYS_SDRAM_SIZE CONFIG_SYS_SDRAM_SIZE0 #define CONFIG_SYS_MONITOR_LEN 0x20000 -#define CONFIG_SYS_MALLOC_LEN (256 << 10) +#define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) #define CONFIG_SYS_BOOTPARAMS_LEN 64*1024 /* |