diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-02-12 00:56:25 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-02-12 00:56:25 +0100 |
| commit | 10bbb38a402a2faf18858c451bcdc63d45888e6e (patch) | |
| tree | 62d7fe35b4406f236678b62f0e09771af2fb5edf /include | |
| parent | ac2731f185ee4b7f56998c8f26d181f66fad84f8 (diff) | |
| parent | 4c309625e796f953f1af54d3b09f8b9d6d9fdc00 (diff) | |
| download | u-boot-imx-10bbb38a402a2faf18858c451bcdc63d45888e6e.zip u-boot-imx-10bbb38a402a2faf18858c451bcdc63d45888e6e.tar.gz u-boot-imx-10bbb38a402a2faf18858c451bcdc63d45888e6e.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/MPC8349EMDS.h | 1 | ||||
| -rw-r--r-- | include/configs/TQM834x.h | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 9964a07..331f4c9 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -354,6 +354,7 @@ #define CFG_I2C2_OFFSET 0x3100 /* SPI */ +#define CONFIG_MPC8XXX_SPI #define CONFIG_HARD_SPI /* SPI with hardware support */ #undef CONFIG_SOFT_SPI /* SPI bit-banged */ diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index 8ef3f09..7373d7b 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -181,7 +181,7 @@ extern int tqm834x_num_flash_banks; #define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET #define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */ -#define CFG_MALLOC_LEN (128 * 1024) /* Reserved for malloc */ +#define CFG_MALLOC_LEN (256 * 1024) /* Reserve 256 kB for malloc */ /* * Serial Port @@ -302,7 +302,7 @@ extern int tqm834x_num_flash_banks; #ifndef CFG_RAMBOOT #define CFG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) - #define CFG_ENV_SECT_SIZE 0x20000 /* 256K(one sector) for env */ + #define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CFG_ENV_SIZE 0x2000 #else #define CFG_NO_FLASH 1 /* Flash is not usable now */ @@ -335,6 +335,7 @@ extern int tqm834x_num_flash_banks; #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MII #define CONFIG_CMD_PING +#define CONFIG_CMD_DHCP #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI @@ -557,7 +558,7 @@ extern int tqm834x_num_flash_banks; #define MTDIDS_DEFAULT "nor0=TQM834x-0" /* default mtd partition table */ -#define MTDPARTS_DEFAULT "mtdparts=TQM834x-0:256k(u-boot),128k(env),"\ +#define MTDPARTS_DEFAULT "mtdparts=TQM834x-0:256k(u-boot),256k(env),"\ "1m(kernel),2m(initrd),"\ "-(user);"\ |