From a0ed083e546d89c47f4c9f057d64b42a9252a3e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Tue, 10 Feb 2009 16:55:26 +0100 Subject: u-boot-1.3.2: prune obsolete patches for boc01 --- .../u-boot/u-boot-1.3.2/boc01/001-090115-SPI.patch | 90 ---------------------- .../013-081211-FIX_OOB_8BITS_LARGEPAGE_NAND.patch | 17 ---- 2 files changed, 107 deletions(-) delete mode 100644 packages/u-boot/u-boot-1.3.2/boc01/001-090115-SPI.patch delete mode 100644 packages/u-boot/u-boot-1.3.2/boc01/013-081211-FIX_OOB_8BITS_LARGEPAGE_NAND.patch diff --git a/packages/u-boot/u-boot-1.3.2/boc01/001-090115-SPI.patch b/packages/u-boot/u-boot-1.3.2/boc01/001-090115-SPI.patch deleted file mode 100644 index 96b624b3a1..0000000000 --- a/packages/u-boot/u-boot-1.3.2/boc01/001-090115-SPI.patch +++ /dev/null @@ -1,90 +0,0 @@ -Index: u-boot-1.3.2/board/freescale/mpc8313erdb/mpc8313erdb.c -=================================================================== ---- u-boot-1.3.2.orig/board/freescale/mpc8313erdb/mpc8313erdb.c 2009-01-15 10:51:45.000000000 +0100 -+++ u-boot-1.3.2/board/freescale/mpc8313erdb/mpc8313erdb.c 2009-01-15 12:18:31.000000000 +0100 -@@ -28,6 +28,7 @@ - #endif - #include - #include -+#include - - DECLARE_GLOBAL_DATA_PTR; - -@@ -107,3 +108,29 @@ - #endif - } - #endif -+ -+ -+/* -+ * The following are used to control the SPI chip selects for the SPI command. -+ */ -+#ifdef CONFIG_HARD_SPI -+ -+void spi_rfid_chipsel(int cs) -+{ -+ if(cs) -+ gpio_clear(14); -+ else -+ gpio_set(14); -+} -+ -+/* -+ * The SPI command uses this table of functions for controlling the SPI -+ * chip selects. -+ */ -+spi_chipsel_type spi_chipsel[] = { -+ spi_rfid_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 2009-01-15 10:51:51.000000000 +0100 -+++ u-boot-1.3.2/include/configs/MPC8313ERDB.h 2009-01-15 12:16:57.000000000 +0100 -@@ -369,6 +369,7 @@ - #define CONFIG_CMD_PCI - #define CONFIG_CMD_NAND - #define CONFIG_CMD_JFFS2 -+#define CONFIG_CMD_SPI - - #if defined(CFG_RAMBOOT) - #undef CONFIG_CMD_ENV -@@ -386,6 +387,11 @@ - #define MTDPARTS_DEFAULT "mtdparts=physmap-flash.0:384k(uboot),64k(env)" - - -+/* SPI */ -+#define CONFIG_MPC8XXX_SPI -+#define CONFIG_HARD_SPI /* SPI with hardware support */ -+#undef CONFIG_SOFT_SPI /* SPI bit-banged */ -+ - /* - * Miscellaneous configurable options - */ -Index: u-boot-1.3.2/drivers/spi/mpc8xxx_spi.c -=================================================================== ---- u-boot-1.3.2.orig/drivers/spi/mpc8xxx_spi.c 2009-01-15 10:52:30.000000000 +0100 -+++ u-boot-1.3.2/drivers/spi/mpc8xxx_spi.c 2009-01-15 10:53:23.000000000 +0100 -@@ -34,6 +34,8 @@ - #define SPI_MODE_REV (0x80000000 >> 5) /* Reverse mode - MSB first */ - #define SPI_MODE_MS (0x80000000 >> 6) /* Always master */ - #define SPI_MODE_EN (0x80000000 >> 7) /* Enable interface */ -+#define SPI_MODE_DIV16 (0x80000000 >> 4) /*Divide by 16. */ -+#define SPI_MODE_LEN_8 (0x00700000) /*0111 8-bit characters*/ - - #define SPI_TIMEOUT 1000 - -@@ -45,9 +47,7 @@ - * SPI pins on the MPC83xx are not muxed, so all we do is initialize - * some registers - */ -- spi->mode = SPI_MODE_REV | SPI_MODE_MS | SPI_MODE_EN; -- spi->mode = (spi->mode & 0xfff0ffff) | (1 << 16); /* Use SYSCLK / 8 -- (16.67MHz typ.) */ -+ spi->mode = SPI_MODE_DIV16 |SPI_MODE_LEN_8| SPI_MODE_REV | SPI_MODE_MS | SPI_MODE_EN; - spi->event = 0xffffffff; /* Clear all SPI events */ - spi->mask = 0x00000000; /* Mask all SPI interrupts */ - spi->com = 0; /* LST bit doesn't do anything, so disregard */ diff --git a/packages/u-boot/u-boot-1.3.2/boc01/013-081211-FIX_OOB_8BITS_LARGEPAGE_NAND.patch b/packages/u-boot/u-boot-1.3.2/boc01/013-081211-FIX_OOB_8BITS_LARGEPAGE_NAND.patch deleted file mode 100644 index 911dd2907e..0000000000 --- a/packages/u-boot/u-boot-1.3.2/boc01/013-081211-FIX_OOB_8BITS_LARGEPAGE_NAND.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: u-boot-1.3.2/drivers/mtd/nand/nand_bbt.c -=================================================================== ---- u-boot-1.3.2.orig/drivers/mtd/nand/nand_bbt.c 2008-12-11 10:15:52.000000000 +0100 -+++ u-boot-1.3.2/drivers/mtd/nand/nand_bbt.c 2008-12-11 10:16:39.000000000 +0100 -@@ -914,10 +914,11 @@ - .pattern = scan_ff_pattern - }; - -+//Samsung makes sure that either the 1st or 2nd page of every initial invalid block has non-FFh data at the column address of 2048. - static struct nand_bbt_descr largepage_memorybased = { - .options = 0, - .offs = 0, -- .len = 2, -+ .len = 1, - .pattern = scan_ff_pattern - }; - -- cgit v1.2.3