[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-418-g70f2d20
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-418-g70f2d20
|
From: jorasse <jo...@us...> - 2012-06-25 14:39:17
|
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 70f2d2053678126596e6f72890fc12edde06b824 (commit)
from b7bd19e786a2b24a3c1e10f22201bd670f346c2a (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 70f2d2053678126596e6f72890fc12edde06b824
Author: Eric Jarrige <eri...@ar...>
Date: Mon Jun 25 16:41:07 2012 +0200
[UBOOT] apf9328: fix typo / checkpatch
-----------------------------------------------------------------------
Summary of changes:
patches/u-boot/2012.04/102-mx1-i2c.patch | 26 +++++++++++++-------------
patches/u-boot/2012.04/103-apf9328.patch | 17 ++++++++---------
patches/u-boot/2012.04/108-DM9000.patch | 2 +-
3 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/patches/u-boot/2012.04/102-mx1-i2c.patch b/patches/u-boot/2012.04/102-mx1-i2c.patch
index 6919c81..13720d6 100644
--- a/patches/u-boot/2012.04/102-mx1-i2c.patch
+++ b/patches/u-boot/2012.04/102-mx1-i2c.patch
@@ -26,19 +26,19 @@ index 0c26a36..a7b3404 100644
+#define I2SR __REG(IMX_I2C_BASE + 0x00C) /* I2C Status Register */
+#define I2DR __REG(IMX_I2C_BASE + 0x010) /* I2C Data I/O Register */
+/* I2C Control Register Bit Fields */
-+#define I2CR_IEN (1<<7) /* I2C Enable */
-+#define I2CR_IIEN (1<<6) /* I2C Interrupt Enable */
-+#define I2CR_MSTA (1<<5) /* I2C Master/Slave Mode Select */
-+#define I2CR_MTX (1<<4) /* I2C Transmit/Receive Mode Select */
-+#define I2CR_TXAK (1<<3) /* I2C Transmit Acknowledge Enable */
-+#define I2CR_RSTA (1<<2) /* I2C Repeated START */
-+#define I2SR_ICF (1<<7) /* I2C Data Transfer */
-+#define I2SR_IAAS (1<<6) /* I2C Addressed As a Slave */
-+#define I2SR_IBB (1<<5) /* I2C Bus Busy */
-+#define I2SR_IAL (1<<4) /* I2C Arbitration Lost */
-+#define I2SR_SRW (1<<2) /* I2C Slave Read/Write */
-+#define I2SR_IIF (1<<1) /* I2C interrupt */
-+#define I2SR_RXAK (1<<0) /* I2C Received Acknowledge */
++#define I2CR_IEN (1<<7) /* I2C Enable */
++#define I2CR_IIEN (1<<6) /* I2C Interrupt Enable */
++#define I2CR_MSTA (1<<5) /* I2C Master/Slave Mode Select */
++#define I2CR_MTX (1<<4) /* I2C Transmit/Receive Mode Select */
++#define I2CR_TXAK (1<<3) /* I2C Transmit Acknowledge Enable */
++#define I2CR_RSTA (1<<2) /* I2C Repeated START */
++#define I2SR_ICF (1<<7) /* I2C Data Transfer */
++#define I2SR_IAAS (1<<6) /* I2C Addressed As a Slave */
++#define I2SR_IBB (1<<5) /* I2C Bus Busy */
++#define I2SR_IAL (1<<4) /* I2C Arbitration Lost */
++#define I2SR_SRW (1<<2) /* I2C Slave Read/Write */
++#define I2SR_IIF (1<<1) /* I2C interrupt */
++#define I2SR_RXAK (1<<0) /* I2C Received Acknowledge */
+
#endif /* _IMX_REGS_H */
--
diff --git a/patches/u-boot/2012.04/103-apf9328.patch b/patches/u-boot/2012.04/103-apf9328.patch
index edd07ea..5be9d3d 100644
--- a/patches/u-boot/2012.04/103-apf9328.patch
+++ b/patches/u-boot/2012.04/103-apf9328.patch
@@ -201,7 +201,7 @@ new file mode 100644
index 0000000..4c63c4e
--- /dev/null
+++ b/board/armadeus/apf9328/apf9328fpga.c
-@@ -0,0 +1,101 @@
+@@ -0,0 +1,100 @@
+/*
+ * (C) Copyright 2005-2011
+ * Nicolas Colombin <th...@us...>
@@ -285,9 +285,8 @@ index 0000000..4c63c4e
+ }
+
+ if ((autoload) && (0 == strcmp(autoload, "1"))) {
-+ if (mtdparts_init() == 0)
-+ if (find_dev_and_part("firmware", &dev, &pnum, &part) == 0)
-+ {
++ if ((mtdparts_init() == 0) &&
++ (find_dev_and_part("firmware", &dev, &pnum, &part) == 0)) {
+ if (ctrlc()) {
+ printf("Firmware download stopped!\n");
+ lout = 0;
@@ -429,11 +428,11 @@ index 0000000..8f2ad9a
+}
+
+U_BOOT_CMD(dm9000ee, 4, 1, do_dm9000_eeprom,
-+ "Read/Write eeprom connected to Ethernet Controller",
-+ "\ndm9000ee write <word offset> <value> \n"
-+ "\tdm9000ee read \n"
-+ "\tword:\t\t00-02 : MAC Address\n"
-+ "\t\t\t03-07 : DM9000 Configuration\n" "\t\t\t08-63 : User data");
++ "Read/Write eeprom connected to Ethernet Controller",
++ "\ndm9000ee write <word offset> <value>\n"
++ "\tdm9000ee read\n"
++ "\tword:\t\t00-02 : MAC Address\n"
++ "\t\t\t03-07 : DM9000 Configuration\n" "\t\t\t08-63 : User data");
diff --git a/board/armadeus/apf9328/fpga.c b/board/armadeus/apf9328/fpga.c
new file mode 100644
index 0000000..f3d4f03
diff --git a/patches/u-boot/2012.04/108-DM9000.patch b/patches/u-boot/2012.04/108-DM9000.patch
index e6a18d7..e3f9c1c 100644
--- a/patches/u-boot/2012.04/108-DM9000.patch
+++ b/patches/u-boot/2012.04/108-DM9000.patch
@@ -16,7 +16,7 @@ index 0424110..3e56db5 100644
id_val |= DM9000_ior(DM9000_PIDH) << 24;
if (id_val == DM9000_ID) {
- printf("dm9000 i/o: 0x%x, id: 0x%x \n", CONFIG_DM9000_BASE,
-+ DM9000_DBG("dm9000 i/o: 0x%x, id: 0x%x \n", CONFIG_DM9000_BASE,
++ DM9000_DBG("dm9000 i/o: 0x%x, id: 0x%x\n", CONFIG_DM9000_BASE,
id_val);
return 0;
} else {
hooks/post-receive
--
armadeus
|
