Skip to contentSkip to conversation

Move and rename common headers from under board/davinci

PATCH Superseded Sughosh Ganu 2 participants 8 messages Oct 21, 2010 – Oct 22, 2010

v1 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 Move and rename common headers from under board/davinci

Move and rename common header files from under board/davinci to the standard include file path.

---
This patch is needed for adding board support for the hawkboard which uses nand_spl based boot mechanism.

 board/davinci/common/misc.c               |    2 +-
 board/davinci/common/misc.h               |   54 -----------------------------
 board/davinci/da8xxevm/common.c           |    2 +-
 board/davinci/da8xxevm/common.h           |   30 ----------------
 board/davinci/da8xxevm/da830evm.c         |    4 +-
 board/davinci/da8xxevm/da850evm.c         |    4 +-
 board/davinci/dm355evm/dm355evm.c         |    2 +-
 board/davinci/dm355leopard/dm355leopard.c |    2 +-
 board/davinci/dm365evm/dm365evm.c         |    2 +-
 board/davinci/dvevm/dvevm.c               |    2 +-
 board/davinci/schmoogie/schmoogie.c       |    2 +-
 board/davinci/sffsdr/sffsdr.c             |    2 +-
 board/davinci/sonata/sonata.c             |    2 +-
 include/da8xx_common.h                    |   30 ++++++++++++++++
 include/davinci_misc.h                    |   54 +++++++++++++++++++++++++++++
 15 files changed, 97 insertions(+), 97 deletions(-)
 delete mode 100644 board/davinci/common/misc.h
 delete mode 100644 board/davinci/da8xxevm/common.h
 create mode 100644 include/da8xx_common.h
 create mode 100644 include/davinci_misc.h
board/davinci/common/misc.c +1 -1
index b60a46e..28750b1 100644
@@ -29,7 +29,7 @@
 #include <net.h>
 #include <asm/arch/hardware.h>
 #include <asm/io.h>
-#include "misc.h"
+#include <davinci_misc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
board/davinci/common/misc.h deleted +0 -54

54 lines not on this page · raw message

board/davinci/da8xxevm/common.c +1 -1
index 9cd5204..f2d0266 100644
@@ -20,7 +20,7 @@
 
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
-#include "common.h"
+#include <da8xx_common.h>
 
 #ifndef CONFIG_USE_IRQ
 void irq_init(void)
board/davinci/da8xxevm/common.h deleted +0 -30
deleted file mode 100644
index 7ae63a6..0000000
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __COMMON_H
-#define __COMMON_H
-
-struct lpsc_resource {
-	const int	lpsc_no;
-};
-
-void irq_init(void);
-int da8xx_configure_lpsc_items(const struct lpsc_resource *item,
-				    int n_items);
-
-#endif /* __COMMON_H */
board/davinci/da8xxevm/da830evm.c +2 -2
index 8a9f988..16eb8d2 100644
@@ -40,8 +40,8 @@
 #include <asm/arch/emif_defs.h>
 #include <asm/arch/emac_defs.h>
 #include <asm/io.h>
-#include "../common/misc.h"
-#include "common.h"
+#include <davinci_misc.h>
+#include <da8xx_common.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
board/davinci/da8xxevm/da850evm.c +2 -2
index c8c5e1b..efb2605 100644
@@ -29,8 +29,8 @@
 #include <asm/arch/emif_defs.h>
 #include <asm/arch/emac_defs.h>
 #include <asm/io.h>
-#include "../common/misc.h"
-#include "common.h"
+#include <davinci_misc.h>
+#include <da8xx_common.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
board/davinci/dm355evm/dm355evm.c +1 -1
index 87f284c..62b7e4f 100644
@@ -22,7 +22,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/emif_defs.h>
 #include <asm/arch/nand_defs.h>
-#include "../common/misc.h"
+#include <davinci_misc.h>
 #include <net.h>
 #include <netdev.h>
 
board/davinci/dm355leopard/dm355leopard.c +1 -1
index e89786e..f3e2b90 100644
@@ -22,7 +22,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/gpio_defs.h>
 #include <asm/arch/nand_defs.h>
-#include "../common/misc.h"
+#include <davinci_misc.h>
 #include <net.h>
 #include <netdev.h>
 
board/davinci/dm365evm/dm365evm.c +1 -1
index 85dbe2a..48ed5ba 100644
@@ -24,7 +24,7 @@
 #include <asm/arch/nand_defs.h>
 #include <asm/arch/gpio_defs.h>
 #include <netdev.h>
-#include "../common/misc.h"
+#include <davinci_misc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
board/davinci/dvevm/dvevm.c +1 -1
index 073c21a..d254f33 100644
@@ -27,7 +27,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <asm/arch/hardware.h>
-#include "../common/misc.h"
+#include <davinci_misc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
board/davinci/schmoogie/schmoogie.c +1 -1
index 80a0f9f..b09a4bd 100644
@@ -27,7 +27,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <asm/arch/hardware.h>
-#include "../common/misc.h"
+#include <davinci_misc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
board/davinci/sffsdr/sffsdr.c +1 -1
index 657cf2b..60e5456 100644
@@ -30,7 +30,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <asm/arch/hardware.h>
-#include "../common/misc.h"
+#include <davinci_misc.h>
 
 #define DAVINCI_A3CR     (0x01E00014)	/* EMIF-A CS3 config register. */
 #define DAVINCI_A3CR_VAL (0x3FFFFFFD)	/* EMIF-A CS3 value for FPGA. */
board/davinci/sonata/sonata.c +1 -1
index 1dc42c4..d85ae5a 100644
@@ -28,7 +28,7 @@
 #include <nand.h>
 #include <asm/arch/nand_defs.h>
 #include <asm/arch/hardware.h>
-#include "../common/misc.h"
+#include <davinci_misc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
include/da8xx_common.h new file +30 -0
new file mode 100644
index 0000000..7ae63a6
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef __COMMON_H
+#define __COMMON_H
+
+struct lpsc_resource {
+	const int	lpsc_no;
+};
+
+void irq_init(void);
+int da8xx_configure_lpsc_items(const struct lpsc_resource *item,
+				    int n_items);
+
+#endif /* __COMMON_H */
include/davinci_misc.h new file +54 -0

54 lines not on this page · raw message

Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 1/2 Move and rename common headers from under board/davinci

Dear Sughosh Ganu,

Quoted 7 lines · In message <[email protected]> you wrote:

Move and rename common header files from under board/davinci to the standard include file path.

---
This patch is needed for adding board support for the hawkboard which uses nand_spl based boot mechanism.

Why would that be the case?

I don't like to move davinci specific headers into the top level include/ directory. That's inherently wrong.

If these headers are indeed common to all davinci boards, they should probably be moved to arch/arm/cpu/arm926ejs/davinci/

Quoted 12 lines
 board/davinci/common/misc.c               |    2 +-
 board/davinci/common/misc.h               |   54 -----------------------------
 board/davinci/da8xxevm/common.c           |    2 +-
 board/davinci/da8xxevm/common.h           |   30 ----------------
 board/davinci/da8xxevm/da830evm.c         |    4 +-
 board/davinci/da8xxevm/da850evm.c         |    4 +-
 board/davinci/dm355evm/dm355evm.c         |    2 +-
 board/davinci/dm355leopard/dm355leopard.c |    2 +-
 board/davinci/dm365evm/dm365evm.c         |    2 +-
 board/davinci/dvevm/dvevm.c               |    2 +-
 board/davinci/schmoogie/schmoogie.c       |    2 +-
 board/davinci/sffsdr/sffsdr.c             |    2 +-
Quoted 8 lines
 board/davinci/sonata/sonata.c             |    2 +-
 include/da8xx_common.h                    |   30 ++++++++++++++++
 include/davinci_misc.h                    |   54 +++++++++++++++++++++++++++++
 15 files changed, 97 insertions(+), 97 deletions(-)
 delete mode 100644 board/davinci/common/misc.h
 delete mode 100644 board/davinci/da8xxevm/common.h
 create mode 100644 include/da8xx_common.h
 create mode 100644 include/davinci_misc.h

Please use the "-M" option with "git format-patch" to make it detect such renames.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
If programming was easy, they wouldn't need something as  complicated
as a human being to do it, now would they?
                       - L. Wall & R. L. Schwartz, _Programming Perl_
#2 lore raw

PATCH 1/2 Move and rename common headers from under board/davinci

hi Wolfgang,

Quoted 6 lines · Wolfgang Denk

Dear Sughosh Ganu,

Quoted 3 lines · In message <[email protected]> you wrote:

Move and rename common header files from under board/davinci to the standard include file path.

Quoted 6 lines
Quoted 4 lines

---
This patch is needed for adding board support for the hawkboard which uses nand_spl based boot mechanism.

Why would that be the case?

The board file is symlinked under the nand_spl/board directory and we cannot do relative path based file inclusion.

Quoted 5 lines

I don't like to move davinci specific headers into the top level include/ directory. That's inherently wrong.

If these headers are indeed common to all davinci boards, they should probably be moved to arch/arm/cpu/arm926ejs/davinci/

Ok. In that case, i guess i can keep them in the same place. Would rename them as davinci_misc.h and da8xx_common.h, and add the include path in my board's config.mk. Is this fine.

Quoted 22 lines
Quoted 13 lines
 board/davinci/common/misc.c               |    2 +-
 board/davinci/common/misc.h               |   54 -----------------------------
 board/davinci/da8xxevm/common.c           |    2 +-
 board/davinci/da8xxevm/common.h           |   30 ----------------
 board/davinci/da8xxevm/da830evm.c         |    4 +-
 board/davinci/da8xxevm/da850evm.c         |    4 +-
 board/davinci/dm355evm/dm355evm.c         |    2 +-
 board/davinci/dm355leopard/dm355leopard.c |    2 +-
 board/davinci/dm365evm/dm365evm.c         |    2 +-
 board/davinci/dvevm/dvevm.c               |    2 +-
 board/davinci/schmoogie/schmoogie.c       |    2 +-
 board/davinci/sffsdr/sffsdr.c             |    2 +-
Quoted 8 lines
 board/davinci/sonata/sonata.c             |    2 +-
 include/da8xx_common.h                    |   30 ++++++++++++++++
 include/davinci_misc.h                    |   54 +++++++++++++++++++++++++++++
 15 files changed, 97 insertions(+), 97 deletions(-)
 delete mode 100644 board/davinci/common/misc.h
 delete mode 100644 board/davinci/da8xxevm/common.h
 create mode 100644 include/da8xx_common.h
 create mode 100644 include/davinci_misc.h
Quoted 2 lines

Please use the "-M" option with "git format-patch" to make it detect such renames.

Ok. Will do. Thanks.

-sughosh

#3 lore raw

PATCH 1/2 Move and rename common headers from under board/davinci

Dear Sughosh Ganu,

Quoted 8 lines · In message <20101022072634.GA8597@Hardy> you wrote:
Quoted 5 lines
Quoted 3 lines

This patch is needed for adding board support for the hawkboard which uses nand_spl based boot mechanism.

Why would that be the case?

The board file is symlinked under the nand_spl/board directory and we cannot do relative path based file inclusion.

Which points out where the actual problem comes from: relative path based file inclusion is a Bad Thing and should be avoided.

Quoted 6 lines
Quoted 2 lines

If these headers are indeed common to all davinci boards, they should probably be moved to arch/arm/cpu/arm926ejs/davinci/

Ok. In that case, i guess i can keep them in the same place. Would rename them as davinci_misc.h and da8xx_common.h, and add the include path in my board's config.mk. Is this fine.

I don't understand what you man by "keep them in the same place". Where?

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The goal of science is to build better mousetraps. The goal of nature
is to build better mice.
#4 lore raw

PATCH 1/2 Move and rename common headers from under board/davinci

hi Wolfgang,

Quoted 7 lines · Wolfgang Denk

Dear Sughosh Ganu,

Quoted 4 lines · In message <20101022072634.GA8597@Hardy> you wrote:
Quoted 4 lines
Quoted 3 lines

This patch is needed for adding board support for the hawkboard which uses nand_spl based boot mechanism.

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

Why would that be the case?

The board file is symlinked under the nand_spl/board directory and we cannot do relative path based file inclusion.

Which points out where the actual problem comes from: relative path based file inclusion is a Bad Thing and should be avoided.

So then can we remove the relative path based inclusion used by all files under board/davinci. We would need to add corresponding path entries to the board's config.mk.

Quoted 9 lines
Quoted 6 lines
Quoted 2 lines

If these headers are indeed common to all davinci boards, they should probably be moved to arch/arm/cpu/arm926ejs/davinci/

Ok. In that case, i guess i can keep them in the same place. Would rename them as davinci_misc.h and da8xx_common.h, and add the include path in my board's config.mk. Is this fine.

I don't understand what you man by "keep them in the same place". Where?

I meant not moving the files to arch/arm/cpu/arm926ejs/davinci, and keep them in their current location under board/davinci.

-sughosh

#5 lore raw

PATCH 1/2 Move and rename common headers from under board/davinci

Dear Sughosh Ganu,

Quoted 7 lines · In message <20101022080434.GC8597@Hardy> you wrote:
Quoted 3 lines

Which points out where the actual problem comes from: relative path based file inclusion is a Bad Thing and should be avoided.

So then can we remove the relative path based inclusion used by all files under board/davinci. We would need to add corresponding path entries to the board's config.mk.

Please don't. Assume that all config.mk files are candidates for removal.

Rather put commonly used header files in places where they can be found easily.

Quoted 5 lines
Quoted 2 lines

I don't understand what you man by "keep them in the same place". Where?

I meant not moving the files to arch/arm/cpu/arm926ejs/davinci, and keep them in their current location under board/davinci.

That does not solve the problem, then, it seems.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
When some people discover the truth, they just can't  understand  why
everybody isn't eager to hear it.
#6 lore raw

PATCH 1/2 Move and rename common headers from under board/davinci

hi Wolfgang,

Quoted 11 lines · Wolfgang Denk

Dear Sughosh Ganu,

Quoted 7 lines · In message <20101022080434.GC8597@Hardy> you wrote:
Quoted 3 lines

Which points out where the actual problem comes from: relative path based file inclusion is a Bad Thing and should be avoided.

So then can we remove the relative path based inclusion used by all files under board/davinci. We would need to add corresponding path entries to the board's config.mk.

Quoted 5 lines

Please don't. Assume that all config.mk files are candidates for removal.

Rather put commonly used header files in places where they can be found easily.

Which is what i was trying in the first place :). Any place other than the include directory would need us to specifiy the path to the files. Where can we put such information then, if not config.mk. Please let me know.

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

I don't understand what you man by "keep them in the same place". Where?

I meant not moving the files to arch/arm/cpu/arm926ejs/davinci, and keep them in their current location under board/davinci.

That does not solve the problem, then, it seems.

Yes, in case we do not move it to the standard include path, i don't think we are adding any value by moving it under the arch directory. Please let me know how to proceed on this.

-sughosh

#7 lore raw

PATCH 1/2 Move and rename common headers from under board/davinci

Dear Sughosh Ganu,

Quoted 11 lines · In message <20101022084641.GD8597@Hardy> you wrote:
Quoted 6 lines

Please don't. Assume that all config.mk files are candidates for removal.

Rather put commonly used header files in places where they can be found easily.

Which is what i was trying in the first place :). Any place other than the include directory would need us to specifiy the path to the files. Where can we put such information then, if not config.mk. Please let me know.

If you have common code and local header files that are only needed by that code you should place this into the arch/arm/cpu/arm926ejs/davinci/ directory, and use the #include "..." notation.

Headers that are architecture specific, but otherwise global for all boards, should probably go to arch/arm/include/asm/arch-davinci/, in which case you can use #include <asm/arch/...>

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
On a clear disk you can seek forever.