<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems (2010-12-30)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>sh</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-12-30 Sebastian Huber <sebastian.huber@embedded-brains.de>
* Makefile.am, preinstall.am, mpc83xx/include/mpc83xx.h,
mpc83xx/network/tsec.c, mpc83xx/network/tsec.h: Make it possible to
use the TSEC driver for other systems.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libcpu/powerpc/ChangeLog.diff?r1=text&tr1=1.365&r2=text&tr2=1.366&diff_format=h">M</a></td><td width='1%'>1.366</td><td width='100%'>c/src/lib/libcpu/powerpc/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libcpu/powerpc/Makefile.am.diff?r1=text&tr1=1.61&r2=text&tr2=1.62&diff_format=h">M</a></td><td width='1%'>1.62</td><td width='100%'>c/src/lib/libcpu/powerpc/Makefile.am</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libcpu/powerpc/preinstall.am.diff?r1=text&tr1=1.26&r2=text&tr2=1.27&diff_format=h">M</a></td><td width='1%'>1.27</td><td width='100%'>c/src/lib/libcpu/powerpc/preinstall.am</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/lib/libcpu/powerpc/ChangeLog:1.365 rtems/c/src/lib/libcpu/powerpc/ChangeLog:1.366
--- rtems/c/src/lib/libcpu/powerpc/ChangeLog:1.365 Thu Dec 30 07:09:47 2010
+++ rtems/c/src/lib/libcpu/powerpc/ChangeLog Thu Dec 30 07:12:03 2010
</font><font color='#997700'>@@ -1,8 +1,8 @@
</font> 2010-12-30 Sebastian Huber <sebastian.huber@embedded-brains.de>
<font color='#880000'>- * mpc83xx/include/mpc83xx.h, mpc83xx/network/tsec.c,
- mpc83xx/network/tsec.h: Make it possible to use the TSEC driver for
- other systems.
</font><font color='#000088'>+ * Makefile.am, preinstall.am, mpc83xx/include/mpc83xx.h,
+ mpc83xx/network/tsec.c, mpc83xx/network/tsec.h: Make it possible to
+ use the TSEC driver for other systems.
</font>
2010-12-29 Sebastian Huber <sebastian.huber@embedded-brains.de>
<font color='#006600'>diff -u rtems/c/src/lib/libcpu/powerpc/Makefile.am:1.61 rtems/c/src/lib/libcpu/powerpc/Makefile.am:1.62
--- rtems/c/src/lib/libcpu/powerpc/Makefile.am:1.61 Mon Jun 14 11:02:31 2010
+++ rtems/c/src/lib/libcpu/powerpc/Makefile.am Thu Dec 30 07:12:03 2010
</font><font color='#997700'>@@ -368,7 +368,7 @@
</font> include_mpc83xx_HEADERS = mpc83xx/include/mpc83xx.h
# Network
<font color='#880000'>-include_mpc83xx_HEADERS += mpc83xx/network/tsec.h
</font><font color='#000088'>+include_bsp_HEADERS += mpc83xx/network/tsec.h
</font> if HAS_NETWORKING
noinst_PROGRAMS += mpc83xx/tsec.rel
mpc83xx_tsec_rel_SOURCES = mpc83xx/network/tsec.c
<font color='#006600'>diff -u rtems/c/src/lib/libcpu/powerpc/preinstall.am:1.26 rtems/c/src/lib/libcpu/powerpc/preinstall.am:1.27
--- rtems/c/src/lib/libcpu/powerpc/preinstall.am:1.26 Thu Mar 25 15:26:51 2010
+++ rtems/c/src/lib/libcpu/powerpc/preinstall.am Thu Dec 30 07:12:03 2010
</font><font color='#997700'>@@ -224,9 +224,9 @@
</font> $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/mpc83xx.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc83xx/mpc83xx.h
<font color='#880000'>-$(PROJECT_INCLUDE)/mpc83xx/tsec.h: mpc83xx/network/tsec.h $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/tsec.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc83xx/tsec.h
</font><font color='#000088'>+$(PROJECT_INCLUDE)/bsp/tsec.h: mpc83xx/network/tsec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tsec.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tsec.h
</font>
$(PROJECT_INCLUDE)/mpc83xx/mpc83xx_i2cdrv.h: mpc83xx/i2c/mpc83xx_i2cdrv.h $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_i2cdrv.h
</pre>
<p> </p>
<a name='cs2'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>sh</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-12-30 Sebastian Huber <sebastian.huber@embedded-brains.de>
* include/u-boot.h: Removed file.
* include/u-boot-config.h, include/tsec-config.h: New files.
* include/bsp.h, start/start.S, startup/bspstart.c: Use new U-Boot
support.
* network/network.c: Update for API changes.
* Makefile.am, preinstall.am: Reflect changes above.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog.diff?r1=text&tr1=1.96&r2=text&tr2=1.97&diff_format=h">M</a></td><td width='1%'>1.97</td><td width='100%'>c/src/lib/libbsp/powerpc/gen83xx/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am.diff?r1=text&tr1=1.31&r2=text&tr2=1.32&diff_format=h">M</a></td><td width='1%'>1.32</td><td width='100%'>c/src/lib/libbsp/powerpc/gen83xx/Makefile.am</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h.diff?r1=text&tr1=1.20&r2=text&tr2=1.21&diff_format=h">M</a></td><td width='1%'>1.21</td><td width='100%'>c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/gen83xx/include/tsec-config.h?rev=1.1&content-type=text/vnd.viewcvs-markup">A</a></td><td width='1%'><font color="#000088">1.1</font></td><td width='100%'><font color="#000088">c/src/lib/libbsp/powerpc/gen83xx/include/tsec-config.h</font></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/gen83xx/include/u-boot-config.h?rev=1.1&content-type=text/vnd.viewcvs-markup">A</a></td><td width='1%'><font color="#000088">1.1</font></td><td width='100%'><font color="#000088">c/src/lib/libbsp/powerpc/gen83xx/include/u-boot-config.h</font></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/gen83xx/network/network.c.diff?r1=text&tr1=1.13&r2=text&tr2=1.14&diff_format=h">M</a></td><td width='1%'>1.14</td><td width='100%'>c/src/lib/libbsp/powerpc/gen83xx/network/network.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/gen83xx/preinstall.am.diff?r1=text&tr1=1.11&r2=text&tr2=1.12&diff_format=h">M</a></td><td width='1%'>1.12</td><td width='100%'>c/src/lib/libbsp/powerpc/gen83xx/preinstall.am</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/gen83xx/start/start.S.diff?r1=text&tr1=1.10&r2=text&tr2=1.11&diff_format=h">M</a></td><td width='1%'>1.11</td><td width='100%'>c/src/lib/libbsp/powerpc/gen83xx/start/start.S</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c.diff?r1=text&tr1=1.29&r2=text&tr2=1.30&diff_format=h">M</a></td><td width='1%'>1.30</td><td width='100%'>c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/gen83xx/startup/cpuinit.c.diff?r1=text&tr1=1.11&r2=text&tr2=1.12&diff_format=h">M</a></td><td width='1%'>1.12</td><td width='100%'>c/src/lib/libbsp/powerpc/gen83xx/startup/cpuinit.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog:1.96 rtems/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog:1.97
--- rtems/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog:1.96 Fri Nov 12 08:16:57 2010
+++ rtems/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog Thu Dec 30 07:16:41 2010
</font><font color='#997700'>@@ -1,3 +1,12 @@
</font><font color='#000088'>+2010-12-30 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ * include/u-boot.h: Removed file.
+ * include/u-boot-config.h, include/tsec-config.h: New files.
+ * include/bsp.h, start/start.S, startup/bspstart.c: Use new U-Boot
+ support.
+ * network/network.c: Update for API changes.
+ * Makefile.am, preinstall.am: Reflect changes above.
+
</font> 2010-11-12 Sebastian Huber <sebastian.huber@embedded-brains.de>
* console/console.h, console/console.c, console/config.c,
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am:1.31 rtems/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am:1.32
--- rtems/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am:1.31 Fri Nov 12 08:16:57 2010
+++ rtems/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am Thu Dec 30 07:16:41 2010
</font><font color='#997700'>@@ -57,7 +57,7 @@
</font> ../../shared/bspclean.c \
startup/bspreset.c \
../../shared/bspgetworkarea.c \
<font color='#880000'>- startup/uboot_support.c \
</font><font color='#000088'>+ ../../shared/src/bsp-uboot-board-info.c \
</font> ../shared/uboot_getenv.c
# clock
<font color='#997700'>@@ -66,9 +66,12 @@
</font> include_bsp_HEADERS = include/irq.h \
../../shared/include/irq-generic.h \
../../shared/include/irq-info.h \
<font color='#000088'>+ ../../shared/include/u-boot.h \
+ ../shared/include/u-boot-board-info.h \
+ ../shared/include/tictac.h \
</font> include/hwreg_vals.h \
<font color='#880000'>- ../shared/include/u-boot.h \
- ../shared/include/tictac.h
</font><font color='#000088'>+ include/tsec-config.h \
+ include/u-boot-config.h
</font>
# irq
libbsp_a_SOURCES += irq/irq.c \
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h:1.20 rtems/c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h:1.21
--- rtems/c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h:1.20 Fri Nov 12 08:16:57 2010
+++ rtems/c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h Thu Dec 30 07:16:41 2010
</font><font color='#997700'>@@ -72,18 +72,6 @@
</font> #include <bsp/vectors.h>
#include <bsp/irq.h>
<font color='#880000'>-#ifdef HAS_UBOOT
- #ifdef MPC8313ERDB
- #define CONFIG_MPC83XX
- #define CONFIG_HAS_ETH1
- #endif
-
- #include <bsp/u-boot.h>
-
- extern bd_t bsp_uboot_board_info;
- extern const size_t bsp_uboot_board_info_size;
-#endif
-
</font> /*
* indicate, that BSP has no IDE driver
*/
<font color='#006600'>diff -u /dev/null rtems/c/src/lib/libbsp/powerpc/gen83xx/include/tsec-config.h:1.1
--- /dev/null Thu Dec 30 08:10:59 2010
+++ rtems/c/src/lib/libbsp/powerpc/gen83xx/include/tsec-config.h Thu Dec 30 07:16:41 2010
</font><font color='#997700'>@@ -0,0 +1,28 @@
</font><font color='#000088'>+/*
+ * Copyright (c) 2010 embedded brains GmbH. All rights reserved.
+ *
+ * embedded brains GmbH
+ * Obere Lagerstr. 30
+ * 82178 Puchheim
+ * Germany
+ * <rtems@embedded-brains.de>
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ */
+
+#ifndef LIBBSP_POWERPC_GEN83XX_TSEC_CONFIG_H
+#define LIBBSP_POWERPC_GEN83XX_TSEC_CONFIG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#define TSEC_COUNT 2
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* LIBBSP_POWERPC_GEN83XX_TSEC_CONFIG_H */
</font>
<font color='#006600'>diff -u /dev/null rtems/c/src/lib/libbsp/powerpc/gen83xx/include/u-boot-config.h:1.1
--- /dev/null Thu Dec 30 08:10:59 2010
+++ rtems/c/src/lib/libbsp/powerpc/gen83xx/include/u-boot-config.h Thu Dec 30 07:16:41 2010
</font><font color='#997700'>@@ -0,0 +1,23 @@
</font><font color='#000088'>+/*
+ * Copyright (c) 2010 embedded brains GmbH. All rights reserved.
+ *
+ * embedded brains GmbH
+ * Obere Lagerstr. 30
+ * 82178 Puchheim
+ * Germany
+ * <rtems@embedded-brains.de>
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+#ifndef LIBBSP_POWERPC_GEN83XX_U_BOOT_CONFIG_H
+#define LIBBSP_POWERPC_GEN83XX_U_BOOT_CONFIG_H
+
+#define CONFIG_MPC83xx
+#define CONFIG_HAS_ETH1
+
+#endif /* LIBBSP_POWERPC_GEN83XX_U_BOOT_CONFIG_H */
</font>
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/gen83xx/network/network.c:1.13 rtems/c/src/lib/libbsp/powerpc/gen83xx/network/network.c:1.14
--- rtems/c/src/lib/libbsp/powerpc/gen83xx/network/network.c:1.13 Fri Nov 12 08:16:57 2010
+++ rtems/c/src/lib/libbsp/powerpc/gen83xx/network/network.c Thu Dec 30 07:16:41 2010
</font><font color='#997700'>@@ -22,7 +22,8 @@
</font> #include <rtems/rtems_bsdnet.h>
#include <rtems/rtems_bsdnet_internal.h>
#include <bsp.h>
<font color='#880000'>-#include <mpc83xx/tsec.h>
</font><font color='#000088'>+#include <bsp/tsec.h>
+#include <bsp/u-boot.h>
</font> #include <mpc83xx/mpc83xx.h>
#include <stdio.h>
<font color='#997700'>@@ -67,11 +68,12 @@
</font> \*=========================================================================*/
{
int unitNumber;
<font color='#000088'>+ char *unitName;
</font>
/*
* Parse driver name
*/
<font color='#880000'>- if((unitNumber = rtems_bsdnet_parse_driver_name(config, NULL)) < 0) {
</font><font color='#000088'>+ if((unitNumber = rtems_bsdnet_parse_driver_name(config, &unitName)) < 0) {
</font> return 0;
}
if (attaching) {
<font color='#997700'>@@ -181,8 +183,12 @@
</font> /*
* call attach function of board independent driver
*/
<font color='#880000'>- if (0 == rtems_mpc83xx_tsec_driver_attach_detach(config,attaching)) {
- return 0;
- }
- return 1;
</font><font color='#000088'>+ return tsec_driver_attach_detach(
+ config,
+ unitNumber,
+ unitName,
+ &mpc83xx.tsec [unitNumber - 1],
+ &mpc83xx.tsec [0],
+ attaching
+ );
</font> }
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/gen83xx/preinstall.am:1.11 rtems/c/src/lib/libbsp/powerpc/gen83xx/preinstall.am:1.12
--- rtems/c/src/lib/libbsp/powerpc/gen83xx/preinstall.am:1.11 Fri Apr 30 07:48:52 2010
+++ rtems/c/src/lib/libbsp/powerpc/gen83xx/preinstall.am Thu Dec 30 07:16:41 2010
</font><font color='#997700'>@@ -101,15 +101,27 @@
</font> $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
<font color='#880000'>-$(PROJECT_INCLUDE)/bsp/hwreg_vals.h: include/hwreg_vals.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/hwreg_vals.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/hwreg_vals.h
-
-$(PROJECT_INCLUDE)/bsp/u-boot.h: ../shared/include/u-boot.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
</font><font color='#000088'>+$(PROJECT_INCLUDE)/bsp/u-boot.h: ../../shared/include/u-boot.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
</font> $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot.h
<font color='#000088'>+$(PROJECT_INCLUDE)/bsp/u-boot-board-info.h: ../shared/include/u-boot-board-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot-board-info.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot-board-info.h
+
</font> $(PROJECT_INCLUDE)/bsp/tictac.h: ../shared/include/tictac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tictac.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tictac.h
<font color='#000088'>+$(PROJECT_INCLUDE)/bsp/hwreg_vals.h: include/hwreg_vals.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/hwreg_vals.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/hwreg_vals.h
+
+$(PROJECT_INCLUDE)/bsp/tsec-config.h: include/tsec-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tsec-config.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tsec-config.h
+
+$(PROJECT_INCLUDE)/bsp/u-boot-config.h: include/u-boot-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot-config.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot-config.h
+
</font>
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/gen83xx/start/start.S:1.10 rtems/c/src/lib/libbsp/powerpc/gen83xx/start/start.S:1.11
--- rtems/c/src/lib/libbsp/powerpc/gen83xx/start/start.S:1.10 Sun Nov 29 22:26:10 2009
+++ rtems/c/src/lib/libbsp/powerpc/gen83xx/start/start.S Thu Dec 30 07:16:41 2010
</font><font color='#997700'>@@ -58,29 +58,13 @@
</font> PUBLIC_VAR (start)
start:
<font color='#880000'>-#ifdef HAS_UBOOT
-
-.extern bsp_uboot_board_info
-.extern bsp_uboot_board_info_size
-
</font> /* Reset time base */
li r0, 0
mtspr TBWU, r0
mtspr TBWL, r0
<font color='#880000'>- /* Copy board info */
- LA r6, bsp_uboot_board_info
- LW r5, bsp_uboot_board_info_size
- mtctr r5
-
-copy_uboot_board_info:
-
- lwz r5, 0(r3)
- addi r3, r3, 4
- stw r5, 0(r6)
- addi r6, r6, 4
- bdnz copy_uboot_board_info
-
</font><font color='#000088'>+#ifdef HAS_UBOOT
+ mr r14, r3
</font> #endif /* HAS_UBOOT */
/*
<font color='#997700'>@@ -422,6 +406,11 @@
</font> LA r3, bsp_section_bss_start /* get start address of bss section */
LWI r4, bsp_section_bss_size /* get size of bss section */
bl mpc83xx_zero_4 /* Clear the bss section */
<font color='#000088'>+
+#ifdef HAS_UBOOT
+ mr r3, r14
+ bl bsp_uboot_copy_board_info
+#endif /* HAS_UBOOT */
</font> /*
* call boot_card
*/
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c:1.29 rtems/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c:1.30
--- rtems/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c:1.29 Fri Nov 12 08:16:57 2010
+++ rtems/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c Thu Dec 30 07:16:41 2010
</font><font color='#997700'>@@ -28,19 +28,7 @@
</font> #include <bsp/vectors.h>
#include <bsp/bootcard.h>
#include <bsp/irq-generic.h>
<font color='#880000'>-
-#ifdef HAS_UBOOT
-
-/*
- * We want this in the data section, because the startup code clears the BSS
- * section after the initialization of the board info.
- */
-bd_t bsp_uboot_board_info = { .bi_baudrate = 123 };
-
-/* Size in words */
-const size_t bsp_uboot_board_info_size = (sizeof( bd_t) + 3) / 4;
-
-#endif /* HAS_UBOOT */
</font><font color='#000088'>+#include <bsp/u-boot.h>
</font>
/* Configuration parameters for console driver, ... */
unsigned int BSP_bus_frequency;
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/gen83xx/startup/cpuinit.c:1.11 rtems/c/src/lib/libbsp/powerpc/gen83xx/startup/cpuinit.c:1.12
--- rtems/c/src/lib/libbsp/powerpc/gen83xx/startup/cpuinit.c:1.11 Sun Nov 29 22:26:10 2009
+++ rtems/c/src/lib/libbsp/powerpc/gen83xx/startup/cpuinit.c Thu Dec 30 07:16:41 2010
</font><font color='#997700'>@@ -79,6 +79,7 @@
</font> #include <mpc83xx/mpc83xx.h>
#include <bsp.h>
<font color='#000088'>+#include <bsp/u-boot.h>
</font>
#define SET_DBAT( n, uv, lv) \
do { \
</pre>
<p> </p>
<a name='cs3'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>sh</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-12-30 Sebastian Huber <sebastian.huber@embedded-brains.de>
* network/network.c: Update for API changes.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/gen83xx/network/network.c.diff?r1=text&tr1=1.14&r2=text&tr2=1.15&diff_format=h">M</a></td><td width='1%'>1.15</td><td width='100%'>c/src/lib/libbsp/powerpc/gen83xx/network/network.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/gen83xx/network/network.c:1.14 rtems/c/src/lib/libbsp/powerpc/gen83xx/network/network.c:1.15
--- rtems/c/src/lib/libbsp/powerpc/gen83xx/network/network.c:1.14 Thu Dec 30 07:16:41 2010
+++ rtems/c/src/lib/libbsp/powerpc/gen83xx/network/network.c Thu Dec 30 08:05:34 2010
</font><font color='#997700'>@@ -125,8 +125,8 @@
</font> */
if (config->hardware_address == NULL) {
#if !defined(HAS_UBOOT)
<font color='#880000'>- static char hw_addr [M83xx_TSEC_NIFACES][6];
- m83xxTSEC_Registers_t *reg_ptr;
</font><font color='#000088'>+ static char hw_addr [TSEC_COUNT][6];
+ volatile tsec_registers *reg_ptr;
</font>
/* read MAC address from hardware register */
/* we expect it htere from the boot loader */
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>