u-boot: refresh patches for mpc8313e-rdb

5 files changed, 31 insertions, 101 deletions

diff --git a/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-eeprom.patch b/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-eeprom.patch
index bdc69d9562..51ff0f8ca0 100644
--- a/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-eeprom.patch
+++ b/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-eeprom.patch
@@ -1,7 +1,7 @@
 Index: u-boot-1.3.2/include/configs/MPC8313ERDB.h
 ===================================================================
---- u-boot-1.3.2.orig/include/configs/MPC8313ERDB.h	2008-09-12 18:52:50.000000000 +0200
-+++ u-boot-1.3.2/include/configs/MPC8313ERDB.h	2008-09-12 18:52:58.000000000 +0200
+--- u-boot-1.3.2.orig/include/configs/MPC8313ERDB.h	2008-11-21 14:55:25.000000000 +0100
++++ u-boot-1.3.2/include/configs/MPC8313ERDB.h	2008-11-21 14:55:36.000000000 +0100
 @@ -263,6 +263,16 @@
  #define CFG_I2C_OFFSET		0x3000
  #define CFG_I2C2_OFFSET		0x3100
diff --git a/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-lm75.patch b/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-lm75.patch
index d9331dde37..e76b95cf9f 100644
--- a/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-lm75.patch
+++ b/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-lm75.patch
@@ -1,23 +1,23 @@
 Index: u-boot-1.3.2/include/configs/MPC8313ERDB.h
 ===================================================================
---- u-boot-1.3.2.orig/include/configs/MPC8313ERDB.h	2008-09-12 18:52:58.000000000 +0200
-+++ u-boot-1.3.2/include/configs/MPC8313ERDB.h	2008-09-12 18:53:10.000000000 +0200
-@@ -370,6 +370,7 @@
- #define CONFIG_CMD_PCI
- #define CONFIG_CMD_NAND
- #define CONFIG_CMD_SPI
+--- u-boot-1.3.2.orig/include/configs/MPC8313ERDB.h	2008-11-21 15:00:28.000000000 +0100
++++ u-boot-1.3.2/include/configs/MPC8313ERDB.h	2008-11-21 15:01:10.000000000 +0100
+@@ -364,6 +364,7 @@
+ #define CONFIG_CMD_PING
+ #define CONFIG_CMD_DHCP
+ #define CONFIG_CMD_I2C
 +#define CONFIG_CMD_DTT
- 
- #if defined(CFG_RAMBOOT)
-     #undef CONFIG_CMD_ENV
-@@ -392,6 +393,10 @@
- #define MTDPARTS_DEFAULT	"mtdparts=physmap-flash.0:384k(uboot),64k(env)"
- 
+ #define CONFIG_CMD_MII
+ #define CONFIG_CMD_DATE
+ #define CONFIG_CMD_PCI
+@@ -390,6 +391,10 @@
+ #define CFG_BARGSIZE	CFG_CBSIZE	/* Boot Argument Buffer Size */
+ #define CFG_HZ		1000		/* decrementer freq: 1ms ticks */
  
 +/* Digital Thermometer and Thermostat */
 +#define CONFIG_DTT_LM75		1
 +#define CONFIG_DTT_SENSORS	{ 0x48 }
 +
  /*
-  * Miscellaneous configurable options
-  */
+  * For booting Linux, the board info and command line data
+  * have to be in the first 8 MB of memory, since this is
diff --git a/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-mtdparts.patch b/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-mtdparts.patch
index 9071dfa419..1c7ccbff53 100644
--- a/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-mtdparts.patch
+++ b/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-mtdparts.patch
@@ -1,7 +1,8 @@
-diff -urN u-boot-1.3.2.orig/include/configs/MPC8313ERDB.h u-boot-1.3.2/include/configs/MPC8313ERDB.h
---- u-boot-1.3.2.orig/include/configs/MPC8313ERDB.h	2008-03-09 16:20:02.000000000 +0100
-+++ u-boot-1.3.2/include/configs/MPC8313ERDB.h	2008-04-21 19:20:51.000000000 +0200
-@@ -179,7 +179,7 @@
+Index: u-boot-1.3.2/include/configs/MPC8313ERDB.h
+===================================================================
+--- u-boot-1.3.2.orig/include/configs/MPC8313ERDB.h	2008-11-21 15:01:24.000000000 +0100
++++ u-boot-1.3.2/include/configs/MPC8313ERDB.h	2008-11-21 15:01:57.000000000 +0100
+@@ -182,7 +182,7 @@
  #define CFG_INIT_SP_OFFSET	CFG_GBL_DATA_OFFSET
  
  /* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */
@@ -10,15 +11,15 @@ diff -urN u-boot-1.3.2.orig/include/configs/MPC8313ERDB.h u-boot-1.3.2/include/c
  #define CFG_MALLOC_LEN		(512 * 1024)	/* Reserved for malloc */
  
  /*
-@@ -354,6 +354,7 @@
- #define CONFIG_CMD_PING
- #define CONFIG_CMD_DHCP
- #define CONFIG_CMD_I2C
-+#define CONFIG_CMD_JFFS2
- #define CONFIG_CMD_MII
+@@ -372,6 +372,7 @@
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_PCI
-@@ -365,6 +366,14 @@
+ #define CONFIG_CMD_NAND
++#define CONFIG_CMD_JFFS2
+ 
+ #if defined(CFG_RAMBOOT)
+     #undef CONFIG_CMD_ENV
+@@ -380,6 +381,14 @@
  
  #define CONFIG_CMDLINE_EDITING 1
  
diff --git a/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-spi.patch b/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-spi.patch
deleted file mode 100644
index 039996c7f3..0000000000
--- a/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-spi.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Index: u-boot-1.3.2/board/freescale/mpc8313erdb/mpc8313erdb.c
-===================================================================
---- u-boot-1.3.2.orig/board/freescale/mpc8313erdb/mpc8313erdb.c	2008-09-12 18:48:23.000000000 +0200
-+++ u-boot-1.3.2/board/freescale/mpc8313erdb/mpc8313erdb.c	2008-09-12 18:50:10.000000000 +0200
-@@ -28,6 +28,7 @@
- #endif
- #include <pci.h>
- #include <mpc83xx.h>
-+#include <spi.h> 
- 
- DECLARE_GLOBAL_DATA_PTR;
- 
-@@ -107,3 +108,33 @@
- #endif
- }
- #endif
-+
-+
-+/*
-+ * The following are used to control the SPI chip selects for the SPI command.
-+ */
-+#ifdef CONFIG_HARD_SPI
-+
-+#define SPI_CS_MASK	0x80000000
-+
-+void spi_eeprom_chipsel(int cs)
-+{
-+	volatile gpio83xx_t *iopd = &((immap_t *)CFG_IMMR)->gpio[0];
-+
-+	if (cs)
-+		iopd->dat &= ~SPI_CS_MASK;
-+	else
-+		iopd->dat |=  SPI_CS_MASK;
-+}
-+
-+/*
-+ * The SPI command uses this table of functions for controlling the SPI
-+ * chip selects.
-+ */
-+spi_chipsel_type spi_chipsel[] = {
-+	spi_eeprom_chipsel,
-+};
-+int spi_chipsel_cnt = sizeof(spi_chipsel) / sizeof(spi_chipsel[0]);
-+
-+#endif /* CONFIG_HARD_SPI */
-+
-Index: u-boot-1.3.2/include/configs/MPC8313ERDB.h
-===================================================================
---- u-boot-1.3.2.orig/include/configs/MPC8313ERDB.h	2008-09-12 18:50:09.000000000 +0200
-+++ u-boot-1.3.2/include/configs/MPC8313ERDB.h	2008-09-12 18:50:50.000000000 +0200
-@@ -359,6 +359,7 @@
- #define CONFIG_CMD_DATE
- #define CONFIG_CMD_PCI
- #define CONFIG_CMD_NAND
-+#define CONFIG_CMD_SPI
- 
- #if defined(CFG_RAMBOOT)
-     #undef CONFIG_CMD_ENV
-@@ -367,6 +368,11 @@
- 
- #define CONFIG_CMDLINE_EDITING 1
- 
-+/* SPI */
-+#define CONFIG_MPC8XXX_SPI
-+#define CONFIG_HARD_SPI			/* SPI with hardware support */
-+#undef CONFIG_SOFT_SPI			/* SPI bit-banged */
-+
- /*
-  * JFFS2 partitions (mtdparts command line support)
-  */
diff --git a/packages/u-boot/u-boot_1.3.2.bb b/packages/u-boot/u-boot_1.3.2.bb
index d610526081..0946275f66 100644
--- a/packages/u-boot/u-boot_1.3.2.bb
+++ b/packages/u-boot/u-boot_1.3.2.bb
@@ -2,20 +2,19 @@ require u-boot.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2"
 
 SRC_URI_append_mpc8313e-rdb = "\
-           file://mpc8313e-rdb-autoboot.patch;patch=1 \
-           file://mpc8313e-rdb-mtdparts.patch;patch=1 \
            file://mpc8313e-rdb-nand.patch;patch=1 \
-           file://mpc8313e-rdb-spi.patch;patch=1 \
            file://mpc8313e-rdb-eeprom.patch;patch=1 \
            file://mpc8313e-rdb-lm75.patch;patch=1 \
            file://u-boot-fsl-1.3.0-mpc8313erdb-vsc7385-support.patch;patch=1 \
            file://u-boot-fsl-1.3.0-mpc8313erdb-fix-vitesse-7385-firmware.patch;patch=1 \
            file://u-boot-fsl-1.3.0-mpc8313erdb-performance-tuning-for-TSEC.patch;patch=1 \
+           file://mpc8313e-rdb-autoboot.patch;patch=1 \
+           file://mpc8313e-rdb-mtdparts.patch;patch=1 \
            "
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"