[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-53-g2889b52
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-53-g2889b52
|
From: jorasse <jo...@us...> - 2012-02-13 22:03:55
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 2889b522aae55c6794e0a4fb3f26c42e394f203a (commit)
from d4e694321fd9f87e9d11a8ec6c2085fbb31f6ad3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2889b522aae55c6794e0a4fb3f26c42e394f203a
Author: Eric Jarrige <eri...@ar...>
Date: Mon Feb 13 23:03:26 2012 +0100
[UBOOT] apf27: Remove unexpected apf27.h patches
-----------------------------------------------------------------------
Summary of changes:
.../2011.12/305-Define-uart1-for-the-console.patch | 24 -------
...6-Debug-nand-this-patch-should-be-removed.patch | 73 +-------------------
2 files changed, 1 insertions(+), 96 deletions(-)
delete mode 100644 patches/u-boot/2011.12/305-Define-uart1-for-the-console.patch
diff --git a/patches/u-boot/2011.12/305-Define-uart1-for-the-console.patch b/patches/u-boot/2011.12/305-Define-uart1-for-the-console.patch
deleted file mode 100644
index 7f00497..0000000
--- a/patches/u-boot/2011.12/305-Define-uart1-for-the-console.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 434d5acde85c1277d3ff32597a56e50304fd4081 Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@ya...>
-Date: Wed, 28 Dec 2011 14:27:48 +0100
-Subject: [PATCH 5/6] Define uart1 for the console
-
----
- include/configs/apf27.h | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/include/configs/apf27.h b/include/configs/apf27.h
-index f1602a0..48c73bb 100644
---- a/include/configs/apf27.h
-+++ b/include/configs/apf27.h
-@@ -66,6 +66,7 @@
- #define CONFIG_CONS_INDEX 1 /* use UART0 for console */
- #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
- #define CONFIG_BAUDRATE 115200
-+#define CONFIG_MXC_UART_BASE UART1_BASE
-
- /*
- * Definition of u-boot build in commands. Check out CONFIG_CMD_DFL if
---
-1.7.4.4
-
diff --git a/patches/u-boot/2011.12/306-Debug-nand-this-patch-should-be-removed.patch b/patches/u-boot/2011.12/306-Debug-nand-this-patch-should-be-removed.patch
index 5746cda..2ba4946 100644
--- a/patches/u-boot/2011.12/306-Debug-nand-this-patch-should-be-removed.patch
+++ b/patches/u-boot/2011.12/306-Debug-nand-this-patch-should-be-removed.patch
@@ -6,8 +6,7 @@ Subject: [PATCH 6/6] Debug nand, this patch should be removed
---
drivers/mtd/nand/mxc_nand.c | 22 +++++++++++++++++++++-
drivers/mtd/nand/nand_base.c | 2 ++
- include/configs/apf27.h | 16 ++++++++--------
- 3 files changed, 31 insertions(+), 9 deletions(-)
+ 2 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 35e89a0..929e228 100644
@@ -76,75 +75,5 @@ index 27f6c77..6107b8b 100644
if (tmp_manf != *maf_id || tmp_id != *dev_id) {
printk(KERN_INFO "%s: second ID read did not match "
"%02x,%02x against %02x,%02x\n", __func__,
-diff --git a/include/configs/apf27.h b/include/configs/apf27.h
-index 48c73bb..162bced 100644
---- a/include/configs/apf27.h
-+++ b/include/configs/apf27.h
-@@ -80,7 +80,7 @@
- #define CONFIG_CMD_BSP /* Board Specific functions */
- #define CONFIG_CMD_CACHE /* icache, dcache */
- #define CONFIG_CMD_CDP /* Cisco Discovery Protocol */
--//#define CONFIG_CMD_DATE /* support for RTC, date/time...*/
-+// #define CONFIG_CMD_DATE /* support for RTC, date/time...*/
- #define CONFIG_CMD_DHCP /* DHCP Support */
- #define CONFIG_CMD_DIAG /* Diagnostics */
- //#define CONFIG_CMD_EEPROM /* EEPROM read/write support */
-@@ -358,7 +358,7 @@
- /*
- * SDRAM definition parameter
- */
--#define CONFIG_NR_DRAM_BANKS 1
-+#define CONFIG_NR_DRAM_BANKS 2
-
- #define CONFIG_SYS_SDRAM_MBYTE_SYZE 64
-
-@@ -552,8 +552,8 @@
- //#define CONFIG_MTD_NAND_VERIFY_WRITE 1
- //#define CONFIG_SYS_NAND_SELECT_DEVICE 0 /* nand driver supports mutipl. chips */
- //#define CONFIG_SYS_NFC_DEBUG
--//#define CONFIG_MTD_DEBUG
--//#define CONFIG_MTD_DEBUG_VERBOSE 3
-+#define CONFIG_MTD_DEBUG
-+#define CONFIG_MTD_DEBUG_VERBOSE 3
-
- /*=====================*/
-
-@@ -787,7 +787,7 @@
- #define CONFIG_SYS_OCR2_B_VAL 0x00000000
- #define CONFIG_SYS_ICFA1_B_VAL 0xFFFFFFFF
- #define CONFIG_SYS_ICFA2_B_VAL 0xFFFFFFFF
--#define CONFIG_SYS_ICFB1_B_VAL 0xFFFFFFFF
-+#define CONFIG_SYS_ICFB1_B_VAL 0xFFFFFFFF
- #define CONFIG_SYS_ICFB2_B_VAL 0xFFFFFFFF
- #define CONFIG_SYS_DR_B_VAL 0x00000000
- #define CONFIG_SYS_GIUS_B_VAL 0xFF3FFFF0
-@@ -805,7 +805,7 @@
- #define CONFIG_SYS_ICFB1_C_VAL 0xFFFFFFFF
- #define CONFIG_SYS_ICFB2_C_VAL 0xFFFFFFFF
- #define CONFIG_SYS_DR_C_VAL 0x00000000
--#define CONFIG_SYS_GIUS_C_VAL 0xFFFFFFFF
-+#define CONFIG_SYS_GIUS_C_VAL 0xFFFFC07F
- #define CONFIG_SYS_ICR1_C_VAL 0x00000000
- #define CONFIG_SYS_ICR2_C_VAL 0x00000000
- #define CONFIG_SYS_IMR_C_VAL 0x00000000
-@@ -835,7 +835,7 @@
- #define CONFIG_SYS_ICFB1_E_VAL 0xFFFFFFFF
- #define CONFIG_SYS_ICFB2_E_VAL 0xFFFFFFFF
- #define CONFIG_SYS_DR_E_VAL 0x00000000
--#define CONFIG_SYS_GIUS_E_VAL 0xFFFFCCF8
-+#define CONFIG_SYS_GIUS_E_VAL 0xFCFFCCF8
- #define CONFIG_SYS_ICR1_E_VAL 0x00000000
- #define CONFIG_SYS_ICR2_E_VAL 0x00000000
- #define CONFIG_SYS_IMR_E_VAL 0x00000000
-@@ -880,7 +880,7 @@
- #define CONFIG_SYS_AIPI2_PSR1_VAL 0xFFFFFFFF
-
- /* PCCR enable DMA FEC I2C1 IIM SDHC1 */
--#define CONFIG_SYS_PCCR0_VAL 0x05070410
-+#define CONFIG_SYS_PCCR0_VAL 0x05070400
- #define CONFIG_SYS_PCCR1_VAL 0xA14A0408
-
- /* CONFIG_SKIP_LOWLEVEL_INIT bypass lowlevel init in bootstrap mode */
---
1.7.4.4
hooks/post-receive
--
armadeus
|
