[Armadeus-commitlog] SF.net SVN: armadeus:[1009] trunk/buildroot/target
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus:[1009] trunk/buildroot/target
|
From: <jo...@us...> - 2009-01-12 13:08:47
|
Revision: 1009
http://armadeus.svn.sourceforge.net/armadeus/?rev=1009&view=rev
Author: jorasse
Date: 2009-01-12 13:08:36 +0000 (Mon, 12 Jan 2009)
Log Message:
-----------
[UBOOT] Fixed relocation status & some compilation warnings
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/apf9328/apf9328.h
trunk/buildroot/target/u-boot/u-boot-1.3.4-110-apf9328.patch
trunk/buildroot/target/u-boot/u-boot-1.3.4-111-apf9328-DM9000.patch
Modified: trunk/buildroot/target/device/armadeus/apf9328/apf9328.h
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/apf9328.h 2009-01-10 15:20:57 UTC (rev 1008)
+++ trunk/buildroot/target/device/armadeus/apf9328/apf9328.h 2009-01-12 13:08:36 UTC (rev 1009)
@@ -33,7 +33,7 @@
#define __CONFIG_H
#define CONFIG_ENV_VERSION "3.5"
-#define CONFIG_IDENT_STRING " apf9328 patch 3.7"
+#define CONFIG_IDENT_STRING " apf9328 patch 3.8"
#define CONFIG_ARM920T 1 /* this is an ARM920T CPU */
#define CONFIG_IMX 1 /* in a Motorola MC9328MXL Chip */
Modified: trunk/buildroot/target/u-boot/u-boot-1.3.4-110-apf9328.patch
===================================================================
--- trunk/buildroot/target/u-boot/u-boot-1.3.4-110-apf9328.patch 2009-01-10 15:20:57 UTC (rev 1008)
+++ trunk/buildroot/target/u-boot/u-boot-1.3.4-110-apf9328.patch 2009-01-12 13:08:36 UTC (rev 1009)
@@ -1,6 +1,6 @@
--- ref/u-boot-1.3.4/board/armadeus/apf9328/apf9328.c 1970-01-01 01:00:00.000000000 +0100
+++ u-boot-1.3.4/board/armadeus/apf9328/apf9328.c 2008-11-14 00:48:19.000000000 +0100
-@@ -0,0 +1,98 @@
+@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2004 Sascha Hauer, Synertronixx GmbH
+ *
@@ -37,6 +37,9 @@
+ gd->bd->bi_arch_number = CONFIG_MACH_TYPE;
+ gd->bd->bi_boot_params = CONFIG_BOOT_PARAMS_ADDR;
+
++ /* On apf9328 U-Boot is always in the relocatated stated */
++ gd->flags |= GD_FLG_RELOC;
++
+ return 0;
+}
+
Modified: trunk/buildroot/target/u-boot/u-boot-1.3.4-111-apf9328-DM9000.patch
===================================================================
--- trunk/buildroot/target/u-boot/u-boot-1.3.4-111-apf9328-DM9000.patch 2009-01-10 15:20:57 UTC (rev 1008)
+++ trunk/buildroot/target/u-boot/u-boot-1.3.4-111-apf9328-DM9000.patch 2009-01-12 13:08:36 UTC (rev 1009)
@@ -1,11 +1,11 @@
--- ref/u-boot-1.3.4/drivers/net/dm9000x.c 2008-08-12 16:08:38.000000000 +0200
-+++ u-boot-1.3.4/drivers/net/dm9000x.c 2009-01-09 13:55:49.000000000 +0100
++++ u-boot-1.3.4/drivers/net/dm9000x.c 2009-01-12 13:53:57.000000000 +0100
@@ -130,6 +130,8 @@ static int dm9000_probe(void);
static u16 phy_read(int);
static void phy_write(int, u16);
u16 read_srom_word(int);
+void write_srom_word(int offset, u16 val);
-+static void program_eeprom(char* mac_addr);
++static void program_eeprom(unsigned char* mac_addr);
static u8 DM9000_ior(int);
static void DM9000_iow(int reg, u8 value);
@@ -18,17 +18,16 @@
id_val);
return 0;
} else {
-@@ -408,6 +410,9 @@ eth_init(bd_t * bd)
+@@ -408,6 +410,8 @@ eth_init(bd_t * bd)
u8 io_mode;
struct board_info *db = &dm9000_info;
+ unsigned char hw_enetaddr[6] = {0,0,0,0,0,0};
-+ char *end;
+
DM9000_DBG("eth_init()\n");
/* RESET device */
-@@ -419,19 +424,19 @@ eth_init(bd_t * bd)
+@@ -419,19 +423,19 @@ eth_init(bd_t * bd)
switch (io_mode) {
case 0x0: /* 16-bit mode */
@@ -51,7 +50,7 @@
db->outblk = dm9000_outblk_8bit;
db->inblk = dm9000_inblk_8bit;
db->rx_status = dm9000_rx_status_8bit;
-@@ -473,8 +478,8 @@ eth_init(bd_t * bd)
+@@ -473,8 +477,8 @@ eth_init(bd_t * bd)
/* Set Node address */
#ifndef CONFIG_AT91SAM9261EK
@@ -62,7 +61,7 @@
#endif
if (is_zero_ether_addr(bd->bi_enetaddr) ||
-@@ -491,6 +496,38 @@ eth_init(bd_t * bd)
+@@ -491,6 +495,38 @@ eth_init(bd_t * bd)
}
}
@@ -101,7 +100,7 @@
printf("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", bd->bi_enetaddr[0],
bd->bi_enetaddr[1], bd->bi_enetaddr[2], bd->bi_enetaddr[3],
bd->bi_enetaddr[4], bd->bi_enetaddr[5]);
-@@ -699,6 +736,28 @@ write_srom_word(int offset, u16 val)
+@@ -699,6 +735,28 @@ write_srom_word(int offset, u16 val)
DM9000_iow(DM9000_EPCR, 0);
}
@@ -111,7 +110,7 @@
+ * we don't have valid content on a new board
+ */
+static void
-+program_eeprom(char* mac_addr)
++program_eeprom(unsigned char* mac_addr)
+{
+ u16 eeprom[] = { 0x8180, 0x8382, 0x8584, /* MAC Address */
+ 0x0000 /*0x1455*/, /* Autoload: accept nothing */
@@ -120,7 +119,7 @@
+ 0x0180, /* 0x0180 Wake-up mode control, PHY DIS*/
+ 0, 0, 0, 0
+ };
-+ u16* tmp = mac_addr;
++ u16* tmp = (u16*)mac_addr;
+ int i;
+ for (i = 0; i < 3; i++)
+ eeprom[i] = *tmp++;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
