From 8931ab176025b03cfc320b3fd1eca432a88ed560 Mon Sep 17 00:00:00 2001 From: Ben Warren Date: Sat, 26 Jan 2008 23:41:19 -0500 Subject: Fix conditional compilation of mpx8xxx_spi driver This driver should only compile if CONFIG_MPC8XXX_SPI is set Signed-off-by: Ben Warren Signed-off-by: Kim Phillips --- drivers/spi/mpc8xxx_spi.c | 4 ++-- include/configs/MPC8349EMDS.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c index a3d1c95515..2fe838c45d 100644 --- a/drivers/spi/mpc8xxx_spi.c +++ b/drivers/spi/mpc8xxx_spi.c @@ -22,11 +22,11 @@ */ #include +#if defined(CONFIG_MPC8XXX_SPI) && defined(CONFIG_HARD_SPI) + #include #include -#ifdef CONFIG_HARD_SPI - #define SPI_EV_NE (0x80000000 >> 22) /* Receiver Not Empty */ #define SPI_EV_NF (0x80000000 >> 23) /* Transmitter Not Full */ diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 07f2f30ef8..bb90c2d0a7 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -356,6 +356,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 */ -- cgit v1.2.1 From a877004d44ca7dbc1e618add3eeb1da7c84e4bec Mon Sep 17 00:00:00 2001 From: Jens Gehrlein Date: Tue, 29 Jan 2008 08:45:02 +0100 Subject: TQM834x: support for Spansion N-type Flashes (sector size = 256 KiB at 2x16 Bit). Signed-off-by: Jens Gehrlein Signed-off-by: Kim Phillips --- include/configs/TQM834x.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index 8ef3f09085..0f734006eb 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 */ @@ -557,7 +557,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);"\ -- cgit v1.2.1 From 7047b388876e7b905b2ec4edb8010543e3641b85 Mon Sep 17 00:00:00 2001 From: Jens Gehrlein Date: Tue, 29 Jan 2008 08:45:03 +0100 Subject: TQM834x: enable DHCP Signed-off-by: Jens Gehrlein Signed-off-by: Kim Phillips --- include/configs/TQM834x.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index 0f734006eb..7373d7b7c4 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -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 -- cgit v1.2.1