[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-269-g351c389
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-269-g351c389
|
From: Julien B a. A. <ar...@us...> - 2011-06-30 15:51:33
|
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 351c389e327368c66c2ab99816ac315a16968261 (commit)
via aa77a41ffcf086475430e59d17fa5dd1ada6290d (commit)
via e1f0c929bd7e7199e68434472e685258ec3c25c3 (commit)
via 593577572f33a25a88e87dfb37b4f3381d0e700b (commit)
via 7cbd84f9ee6e34d064ea9e4337f7fcfc830b289e (commit)
from 24e922c55afa9cc019b2b18f4680ac0e98912827 (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 351c389e327368c66c2ab99816ac315a16968261
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 30 17:46:35 2011 +0200
[LINUX] Correctly register 16750 UARTs in wishbone_twin_uart platform data (try 2)
commit aa77a41ffcf086475430e59d17fa5dd1ada6290d
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 30 17:44:28 2011 +0200
[BUILDROOT] Add FPGA firmware automatic installation to APF51 default config
commit e1f0c929bd7e7199e68434472e685258ec3c25c3
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 30 17:40:16 2011 +0200
[BUILD] Updates cleanup_buildroot.sh
commit 593577572f33a25a88e87dfb37b4f3381d0e700b
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 30 17:37:21 2011 +0200
Indentation
commit 7cbd84f9ee6e34d064ea9e4337f7fcfc830b289e
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 30 17:36:38 2011 +0200
[FIRMWARE] Updates apf51_gsm_gps_firmware.bin
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf51_defconfig | 7 +++-
firmware/pod_scripts/apf51_gsm_gps_firmware.bin | Bin 340604 -> 340604 bytes
patches/buildroot/2010.11/cleanup_buildroot.sh | 1 +
.../fpga/wishbone_example/wb_irq_mngr/main.c | 4 +-
.../linux/modules/fpga/wishbone_twin_uart/16750.c | 45 +++++++++++--------
5 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 100f47c..fa36d23 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -255,7 +255,12 @@ BR2_PACKAGE_BUSYBOX_CONFIG="target/device/armadeus/busybox-$(BR2_BUSYBOX_VERSION
# BR2_PACKAGE_AS_DEVICES is not set
# BR2_PACKAGE_ARMADEUS_DEMOS is not set
BR2_PACKAGE_FPGAREGS=y
-# BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE is not set
+BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
+
+#
+# Choose the firmware to install
+#
+BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART=y
BR2_PACKAGE_IMXREGS=y
# BR2_PACKAGE_IMXSSI is not set
# BR2_PACKAGE_MAX5821CTRL is not set
diff --git a/firmware/pod_scripts/apf51_gsm_gps_firmware.bin b/firmware/pod_scripts/apf51_gsm_gps_firmware.bin
index 1bbb3ff..8cdc115 100644
Binary files a/firmware/pod_scripts/apf51_gsm_gps_firmware.bin and b/firmware/pod_scripts/apf51_gsm_gps_firmware.bin differ
diff --git a/patches/buildroot/2010.11/cleanup_buildroot.sh b/patches/buildroot/2010.11/cleanup_buildroot.sh
index 0f6c8c7..6cd7c25 100755
--- a/patches/buildroot/2010.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.11/cleanup_buildroot.sh
@@ -54,3 +54,4 @@ rm -rf buildroot/package/bluez3/
rm -rf buildroot/package/ngircd/
rm -rf buildroot/package/can-utils/
rm -f buildroot/toolchain/uClibc/*.patch
+rm -f buildroot/package/ntp/ntp-nano.patch
diff --git a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/main.c b/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/main.c
index 6ea5244..9b2f430 100644
--- a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/main.c
+++ b/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/main.c
@@ -49,8 +49,8 @@
#define ID_OFFSET (0x02 *(16/8))
#define NB_IT 16
-#define FPGA_IMR 0x00 /* Interrupt Mask Register relative @*/
-#define FPGA_ISR 0x02 /* Interrupt Status Register relative @*/
+#define FPGA_IMR 0x00 /* Interrupt Mask Register relative @ */
+#define FPGA_ISR 0x02 /* Interrupt Status Register relative @ */
#define DRIVER_NAME "ocore_irq_mng"
diff --git a/target/linux/modules/fpga/wishbone_twin_uart/16750.c b/target/linux/modules/fpga/wishbone_twin_uart/16750.c
index caf1c1b..8a736ca 100644
--- a/target/linux/modules/fpga/wishbone_twin_uart/16750.c
+++ b/target/linux/modules/fpga/wishbone_twin_uart/16750.c
@@ -48,7 +48,8 @@ static struct plat_serial8250_port ocore_16750_uart0_data[] = {
.regshift = 1,
.iotype = UPIO_MEM,
.flags = UPF_BOOT_AUTOCONF
- }
+ },
+ { }
};
static struct plat_serial8250_port ocore_16750_uart1_data[] = {
@@ -59,28 +60,33 @@ static struct plat_serial8250_port ocore_16750_uart1_data[] = {
.regshift = 1,
.iotype = UPIO_MEM,
.flags = UPF_BOOT_AUTOCONF
- }
+ },
+ { }
};
-static struct platform_device ocore_16750_uart_devices[] = {
- {
- .name = "serial8250",
- .id = 0,
- .dev = {
- .release = plat_uart_release,
- .platform_data = ocore_16750_uart0_data,
- },
+static struct platform_device ocore_16750_uart0_device = {
+ .name = "serial8250",
+ .id = 0,
+ .dev = {
+ .release = plat_uart_release,
+ .platform_data = ocore_16750_uart0_data,
},
- {
- .name = "serial8250",
- .id = 1,
- .dev = {
- .release = plat_uart_release,
- .platform_data = ocore_16750_uart1_data,
- },
+};
+
+static struct platform_device ocore_16750_uart1_device = {
+ .name = "serial8250",
+ .id = 1,
+ .dev = {
+ .release = plat_uart_release,
+ .platform_data = ocore_16750_uart1_data,
},
};
+static struct platform_device *ocore_16750_uart_devices[] = {
+ &ocore_16750_uart0_device,
+ &ocore_16750_uart1_device,
+};
+
static int __init ocore_16750_init(void)
{
int ret = -ENODEV;
@@ -114,14 +120,15 @@ static int __init ocore_16750_init(void)
return -ENODEV;
}
- ret = platform_device_register(ocore_16750_uart_devices);
+ ret = platform_add_devices(ocore_16750_uart_devices, ARRAY_SIZE(ocore_16750_uart_devices));
return ret;
}
static void __exit ocore_16750_exit(void)
{
- platform_device_unregister(ocore_16750_uart_devices);
+ platform_device_unregister(&ocore_16750_uart0_device);
+ platform_device_unregister(&ocore_16750_uart1_device);
}
module_init(ocore_16750_init);
hooks/post-receive
--
armadeus
|
