Commit 10bbb38a authored by Wolfgang Denk's avatar Wolfgang Denk
Browse files

Merge branch 'master' of /home/wd/git/u-boot/custodians

parents ac2731f1 4c309625
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
*/ */
#include <common.h> #include <common.h>
#if defined(CONFIG_MPC8XXX_SPI) && defined(CONFIG_HARD_SPI)
#include <spi.h> #include <spi.h>
#include <asm/mpc8xxx_spi.h> #include <asm/mpc8xxx_spi.h>
#ifdef CONFIG_HARD_SPI
#define SPI_EV_NE (0x80000000 >> 22) /* Receiver Not Empty */ #define SPI_EV_NE (0x80000000 >> 22) /* Receiver Not Empty */
#define SPI_EV_NF (0x80000000 >> 23) /* Transmitter Not Full */ #define SPI_EV_NF (0x80000000 >> 23) /* Transmitter Not Full */
......
...@@ -354,6 +354,7 @@ ...@@ -354,6 +354,7 @@
#define CFG_I2C2_OFFSET 0x3100 #define CFG_I2C2_OFFSET 0x3100
/* SPI */ /* SPI */
#define CONFIG_MPC8XXX_SPI
#define CONFIG_HARD_SPI /* SPI with hardware support */ #define CONFIG_HARD_SPI /* SPI with hardware support */
#undef CONFIG_SOFT_SPI /* SPI bit-banged */ #undef CONFIG_SOFT_SPI /* SPI bit-banged */
......
...@@ -181,7 +181,7 @@ extern int tqm834x_num_flash_banks; ...@@ -181,7 +181,7 @@ extern int tqm834x_num_flash_banks;
#define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET #define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */ #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 * Serial Port
...@@ -302,7 +302,7 @@ extern int tqm834x_num_flash_banks; ...@@ -302,7 +302,7 @@ extern int tqm834x_num_flash_banks;
#ifndef CFG_RAMBOOT #ifndef CFG_RAMBOOT
#define CFG_ENV_IS_IN_FLASH 1 #define CFG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) #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 #define CFG_ENV_SIZE 0x2000
#else #else
#define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CFG_NO_FLASH 1 /* Flash is not usable now */
...@@ -335,6 +335,7 @@ extern int tqm834x_num_flash_banks; ...@@ -335,6 +335,7 @@ extern int tqm834x_num_flash_banks;
#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_JFFS2
#define CONFIG_CMD_MII #define CONFIG_CMD_MII
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
#define CONFIG_CMD_DHCP
#if defined(CONFIG_PCI) #if defined(CONFIG_PCI)
#define CONFIG_CMD_PCI #define CONFIG_CMD_PCI
...@@ -557,7 +558,7 @@ extern int tqm834x_num_flash_banks; ...@@ -557,7 +558,7 @@ extern int tqm834x_num_flash_banks;
#define MTDIDS_DEFAULT "nor0=TQM834x-0" #define MTDIDS_DEFAULT "nor0=TQM834x-0"
/* default mtd partition table */ /* 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),"\ "1m(kernel),2m(initrd),"\
"-(user);"\ "-(user);"\
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment