Skip to contentSkip to conversation

at91sam9260ek: fix names

PATCH New Robert Schwebel 2 participants 3 messages Jul 29, 2008 – Jul 30, 2008 Arm/Microchip (AT91) SoC support

lore
Share & tools
lore

Robert Schwebel

author
#0 lore raw

PATCH 1/1 at91sam9260ek: fix names

Fix some left-overs from copy and paste.

Signed-off-by Robert Schwebel <[email protected]>
---
 board/at91sam9260ek/init.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
board/at91sam9260ek/init.c +7 -7
Index: u-boot-v2/board/at91sam9260ek/init.c
===================================================================
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Sascha Hauer, Pengutronix 
+ * Copyright (C) 2007 Sascha Hauer, Pengutronix
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

@@ -98,7 +98,7 @@ static struct device_d macb_dev = {
 	.type     = DEVICE_TYPE_ETHER,
 };
 
-static int pcm038_devices_init(void)
+static int at91sam9260ek_devices_init(void)
 {
 	register_device(&sdram_dev);
 	register_device(&nand_dev);

@@ -110,9 +110,9 @@ static int pcm038_devices_init(void)
 	return 0;
 }
 
-device_initcall(pcm038_devices_init);
+device_initcall(at91sam9260ek_devices_init);
 
-static struct device_d pcm038_serial_device = {
+static struct device_d at91sam9260ek_serial_device = {
 	.name     = "atmel_serial",
 	.id       = "cs0",
 	.map_base = USART3_BASE,

@@ -120,10 +120,10 @@ static struct device_d pcm038_serial_dev
 	.type     = DEVICE_TYPE_CONSOLE,
 };
 
-static int pcm038_console_init(void)
+static int at91sam9260ek_console_init(void)
 {
-	register_device(&pcm038_serial_device);
+	register_device(&at91sam9260ek_serial_device);
 	return 0;
 }
 
-console_initcall(pcm038_console_init);
+console_initcall(at91sam9260ek_console_init);
Signature · 5 lines
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hannoversche Str. 2, 31134 Hildesheim, Germany
   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9
author
#1 lore raw

PATCH 1/1 at91sam9260ek: fix names

Quoted 1 line · Robert Schwebel

Fix some left-overs from copy and paste.

However, the board still fails to build, looks like you've forgotten to change in some of the Pengutronix TechWeek stuff:

rsc at thebe:u-boot-v2$ make ARCH=arm CROSS_COMPILE=/opt/OSELAS.Toolchain-1.1.1/arm-v4t-linux-gnueabi/gcc-4.1.2-glibc-2.5-kernel-2.6.18/bin/arm-v4t-linux-gnueabi-

  CHK     include/linux/version.h
  CHK     include/linux/utsrelease.h
  CC      drivers/net/macb.o

In file included from drivers/net/macb.c:48:
include/asm/arch/clk.h: In function 'get_macb_pclk_rate':
include/asm/arch/clk.h:31: error: 'AT91_MASTER_CLOCK' undeclared (first use in this function) include/asm/arch/clk.h:31: error: (Each undeclared identifier is reported only once include/asm/arch/clk.h:31: error: for each function it appears in.) include/asm/arch/clk.h: In function 'get_usart_clk_rate':
include/asm/arch/clk.h:36: error: 'AT91_MASTER_CLOCK' undeclared (first use in this function) make[2]: *** [drivers/net/macb.o] Error 1
make[1]: *** [drivers/net] Error 2
make: *** [drivers] Error 2
rsc at thebe:u-boot-v2$

rsc

Signature · 5 lines
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hannoversche Str. 2, 31134 Hildesheim, Germany
   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9
#2 lore raw

PATCH 1/1 at91sam9260ek: fix names

Quoted 5 lines · Robert Schwebel
Quoted 1 line · Robert Schwebel

Fix some left-overs from copy and paste.

However, the board still fails to build, looks like you've forgotten to change in some of the Pengutronix TechWeek stuff:

Maybe, I'll have a look.

Sascha

Quoted 26 lines

rsc at thebe:u-boot-v2$ make ARCH=arm CROSS_COMPILE=/opt/OSELAS.Toolchain-1.1.1/arm-v4t-linux-gnueabi/gcc-4.1.2-glibc-2.5-kernel-2.6.18/bin/arm-v4t-linux-gnueabi-

  CHK     include/linux/version.h
  CHK     include/linux/utsrelease.h
  CC      drivers/net/macb.o

In file included from drivers/net/macb.c:48:
include/asm/arch/clk.h: In function 'get_macb_pclk_rate':
include/asm/arch/clk.h:31: error: 'AT91_MASTER_CLOCK' undeclared (first use in this function) include/asm/arch/clk.h:31: error: (Each undeclared identifier is reported only once include/asm/arch/clk.h:31: error: for each function it appears in.) include/asm/arch/clk.h: In function 'get_usart_clk_rate':
include/asm/arch/clk.h:36: error: 'AT91_MASTER_CLOCK' undeclared (first use in this function) make[2]: *** [drivers/net/macb.o] Error 1
make[1]: *** [drivers/net] Error 2
make: *** [drivers] Error 2
rsc at thebe:u-boot-v2$

rsc

Signature · 5 lines
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hannoversche Str. 2, 31134 Hildesheim, Germany
   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9
Signature · 4 lines
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hannoversche Str. 2, 31134 Hildesheim, Germany
   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9