change log for rtems (2010-12-30)
rtems-vc at rtems.org
rtems-vc at rtems.org
Thu Dec 30 14:11:00 UTC 2010
*sh*:
2010-12-30 Sebastian Huber <sebastian.huber at 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.
M 1.366 c/src/lib/libcpu/powerpc/ChangeLog
M 1.62 c/src/lib/libcpu/powerpc/Makefile.am
M 1.27 c/src/lib/libcpu/powerpc/preinstall.am
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
@@ -1,8 +1,8 @@
2010-12-30 Sebastian Huber <sebastian.huber at embedded-brains.de>
- * mpc83xx/include/mpc83xx.h, mpc83xx/network/tsec.c,
- mpc83xx/network/tsec.h: Make it possible to use the TSEC driver for
- other systems.
+ * 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.
2010-12-29 Sebastian Huber <sebastian.huber at embedded-brains.de>
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
@@ -368,7 +368,7 @@
include_mpc83xx_HEADERS = mpc83xx/include/mpc83xx.h
# Network
-include_mpc83xx_HEADERS += mpc83xx/network/tsec.h
+include_bsp_HEADERS += mpc83xx/network/tsec.h
if HAS_NETWORKING
noinst_PROGRAMS += mpc83xx/tsec.rel
mpc83xx_tsec_rel_SOURCES = mpc83xx/network/tsec.c
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
@@ -224,9 +224,9 @@
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/mpc83xx.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc83xx/mpc83xx.h
-$(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
+$(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
$(PROJECT_INCLUDE)/mpc83xx/mpc83xx_i2cdrv.h: mpc83xx/i2c/mpc83xx_i2cdrv.h $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_i2cdrv.h
*sh*:
2010-12-30 Sebastian Huber <sebastian.huber at 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.
M 1.97 c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
M 1.32 c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
M 1.21 c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h
A 1.1 c/src/lib/libbsp/powerpc/gen83xx/include/tsec-config.h
A 1.1 c/src/lib/libbsp/powerpc/gen83xx/include/u-boot-config.h
M 1.14 c/src/lib/libbsp/powerpc/gen83xx/network/network.c
M 1.12 c/src/lib/libbsp/powerpc/gen83xx/preinstall.am
M 1.11 c/src/lib/libbsp/powerpc/gen83xx/start/start.S
M 1.30 c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c
M 1.12 c/src/lib/libbsp/powerpc/gen83xx/startup/cpuinit.c
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
@@ -1,3 +1,12 @@
+2010-12-30 Sebastian Huber <sebastian.huber at 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.
+
2010-11-12 Sebastian Huber <sebastian.huber at embedded-brains.de>
* console/console.h, console/console.c, console/config.c,
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
@@ -57,7 +57,7 @@
../../shared/bspclean.c \
startup/bspreset.c \
../../shared/bspgetworkarea.c \
- startup/uboot_support.c \
+ ../../shared/src/bsp-uboot-board-info.c \
../shared/uboot_getenv.c
# clock
@@ -66,9 +66,12 @@
include_bsp_HEADERS = include/irq.h \
../../shared/include/irq-generic.h \
../../shared/include/irq-info.h \
+ ../../shared/include/u-boot.h \
+ ../shared/include/u-boot-board-info.h \
+ ../shared/include/tictac.h \
include/hwreg_vals.h \
- ../shared/include/u-boot.h \
- ../shared/include/tictac.h
+ include/tsec-config.h \
+ include/u-boot-config.h
# irq
libbsp_a_SOURCES += irq/irq.c \
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
@@ -72,18 +72,6 @@
#include <bsp/vectors.h>
#include <bsp/irq.h>
-#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
-
/*
* indicate, that BSP has no IDE driver
*/
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
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2010 embedded brains GmbH. All rights reserved.
+ *
+ * embedded brains GmbH
+ * Obere Lagerstr. 30
+ * 82178 Puchheim
+ * Germany
+ * <rtems at 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 */
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
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2010 embedded brains GmbH. All rights reserved.
+ *
+ * embedded brains GmbH
+ * Obere Lagerstr. 30
+ * 82178 Puchheim
+ * Germany
+ * <rtems at 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 */
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
@@ -22,7 +22,8 @@
#include <rtems/rtems_bsdnet.h>
#include <rtems/rtems_bsdnet_internal.h>
#include <bsp.h>
-#include <mpc83xx/tsec.h>
+#include <bsp/tsec.h>
+#include <bsp/u-boot.h>
#include <mpc83xx/mpc83xx.h>
#include <stdio.h>
@@ -67,11 +68,12 @@
\*=========================================================================*/
{
int unitNumber;
+ char *unitName;
/*
* Parse driver name
*/
- if((unitNumber = rtems_bsdnet_parse_driver_name(config, NULL)) < 0) {
+ if((unitNumber = rtems_bsdnet_parse_driver_name(config, &unitName)) < 0) {
return 0;
}
if (attaching) {
@@ -181,8 +183,12 @@
/*
* call attach function of board independent driver
*/
- if (0 == rtems_mpc83xx_tsec_driver_attach_detach(config,attaching)) {
- return 0;
- }
- return 1;
+ return tsec_driver_attach_detach(
+ config,
+ unitNumber,
+ unitName,
+ &mpc83xx.tsec [unitNumber - 1],
+ &mpc83xx.tsec [0],
+ attaching
+ );
}
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
@@ -101,15 +101,27 @@
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-$(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)
+$(PROJECT_INCLUDE)/bsp/u-boot.h: ../../shared/include/u-boot.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot.h
+$(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
+
$(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
+$(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
+
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
@@ -58,29 +58,13 @@
PUBLIC_VAR (start)
start:
-#ifdef HAS_UBOOT
-
-.extern bsp_uboot_board_info
-.extern bsp_uboot_board_info_size
-
/* Reset time base */
li r0, 0
mtspr TBWU, r0
mtspr TBWL, r0
- /* 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
-
+#ifdef HAS_UBOOT
+ mr r14, r3
#endif /* HAS_UBOOT */
/*
@@ -422,6 +406,11 @@
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 */
+
+#ifdef HAS_UBOOT
+ mr r3, r14
+ bl bsp_uboot_copy_board_info
+#endif /* HAS_UBOOT */
/*
* call boot_card
*/
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
@@ -28,19 +28,7 @@
#include <bsp/vectors.h>
#include <bsp/bootcard.h>
#include <bsp/irq-generic.h>
-
-#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 */
+#include <bsp/u-boot.h>
/* Configuration parameters for console driver, ... */
unsigned int BSP_bus_frequency;
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
@@ -79,6 +79,7 @@
#include <mpc83xx/mpc83xx.h>
#include <bsp.h>
+#include <bsp/u-boot.h>
#define SET_DBAT( n, uv, lv) \
do { \
*sh*:
2010-12-30 Sebastian Huber <sebastian.huber at embedded-brains.de>
* network/network.c: Update for API changes.
M 1.15 c/src/lib/libbsp/powerpc/gen83xx/network/network.c
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
@@ -125,8 +125,8 @@
*/
if (config->hardware_address == NULL) {
#if !defined(HAS_UBOOT)
- static char hw_addr [M83xx_TSEC_NIFACES][6];
- m83xxTSEC_Registers_t *reg_ptr;
+ static char hw_addr [TSEC_COUNT][6];
+ volatile tsec_registers *reg_ptr;
/* read MAC address from hardware register */
/* we expect it htere from the boot loader */
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20101230/f54b4831/attachment-0001.html>
More information about the vc
mailing list