Skip to contentSkip to conversation

Add CONFIG_SYS_GENERIC_BOARD to all gdsys boards

PATCH New dirk.eibach at gdsys.cc 2 participants 5 messages Jun 30, 2014 – Jul 24, 2014 PowerPC

lore
Share & tools
lore
#0 lore raw

cover Add CONFIG_SYS_GENERIC_BOARD to all gdsys boards

From: Dirk Eibach <[email protected]>

Dirk Eibach (2):
ppc: Make ppc4xx ready for CONFIG_SYS_GENERIC_BOARD
board: Add CONFIG_SYS_GENERIC_BOARD to all gdsys boards

 arch/powerpc/cpu/ppc4xx/cpu_init.c | 2 ++
 include/configs/controlcenterd.h   | 2 ++
 include/configs/dlvision-10g.h     | 1 +
 include/configs/dlvision.h         | 1 +
 include/configs/gdppc440etx.h      | 1 +
 include/configs/intip.h            | 1 +
 include/configs/io.h               | 1 +
 include/configs/io64.h             | 1 +
 include/configs/iocon.h            | 1 +
 include/configs/neo.h              | 1 +
 10 files changed, 12 insertions(+)
Signature · 1 line
1.8.3
#1 lore raw

PATCH 1/2 ppc: Make ppc4xx ready for CONFIG_SYS_GENERIC_BOARD

From: Dirk Eibach <[email protected]>

The generic board infrastructure assumes that gd is set by arch code.

---

 arch/powerpc/cpu/ppc4xx/cpu_init.c | 2 ++
 1 file changed, 2 insertions(+)
arch/powerpc/cpu/ppc4xx/cpu_init.c +2 -0
index d465dcd..86891c1 100644
@@ -451,6 +451,8 @@ cpu_init_f (void)
 	mtdcr(PLB4A1_ACR, (mfdcr(PLB4A1_ACR) & ~PLB4Ax_ACR_RDP_MASK) |
 	      PLB4Ax_ACR_RDP_4DEEP);
 #endif /* CONFIG_440SP/SPE || CONFIG_460EX/GT || CONFIG_405EX */
+
+	gd = (gd_t *)(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_GBL_DATA_OFFSET);
 }
 
 /*
Signature · 1 line
1.8.3
#2 lore raw

PATCH 1/2 ppc: Make ppc4xx ready for CONFIG_SYS_GENERIC_BOARD

Quoted 16 lines · dirk.eibach at gdsys.cc

From: Dirk Eibach <[email protected]>

The generic board infrastructure assumes that gd is set by arch code.

---

  arch/powerpc/cpu/ppc4xx/cpu_init.c | 2 ++
  1 file changed, 2 insertions(+)
arch/powerpc/cpu/ppc4xx/cpu_init.c +0 -0
index d465dcd..86891c1 100644

arch/powerpc/cpu/ppc4xx/cpu_init.c cpu_init_f (void) · line 456

Quoted 6 lines
arch/powerpc/cpu/ppc4xx/cpu_init.c +2 -0
@@ -451,6 +451,8 @@ cpu_init_f (void)
  	mtdcr(PLB4A1_ACR, (mfdcr(PLB4A1_ACR) & ~PLB4Ax_ACR_RDP_MASK) |
  	      PLB4Ax_ACR_RDP_4DEEP);
  #endif /* CONFIG_440SP/SPE || CONFIG_460EX/GT || CONFIG_405EX */
+
+	gd = (gd_t *)(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_GBL_DATA_OFFSET);
  }

After applying both patches I get this:

Configuring for intip - Board: intip, Options: INTIB
arch/powerpc/cpu/ppc4xx/cpu_init.c:455:2: error: 'gd' undeclared (first use in this function)
make[1]: *** [arch/powerpc/cpu/ppc4xx/cpu_init.o] Error 1
make: *** [arch/powerpc/cpu/ppc4xx] Error 2
powerpc-linux-size: './u-boot': No such file
arch/powerpc/cpu/ppc4xx/cpu_init.c: In function 'cpu_init_f':
arch/powerpc/cpu/ppc4xx/cpu_init.c:455:2: error: 'gd' undeclared (first use in this function) arch/powerpc/cpu/ppc4xx/cpu_init.c:455:2: note: each undeclared identifier is reported only once for each function it appears in make[1]: *** [arch/powerpc/cpu/ppc4xx/cpu_init.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [arch/powerpc/cpu/ppc4xx] Error 2
make: *** Waiting for unfinished jobs....

Please fix and resubmit. And sorry for the delay.

Thanks,
Stefan

#3 lore raw

PATCH 2/2 board: Add CONFIG_SYS_GENERIC_BOARD to all gdsys boards

In reply to dirk.eibach at gdsys.cc

From: Dirk Eibach <[email protected]>

Add the generic board infrastructure to all gdsys boards.

---

 include/configs/controlcenterd.h | 2 ++
 include/configs/dlvision-10g.h   | 1 +
 include/configs/dlvision.h       | 1 +
 include/configs/gdppc440etx.h    | 1 +
 include/configs/intip.h          | 1 +
 include/configs/io.h             | 1 +
 include/configs/io64.h           | 1 +
 include/configs/iocon.h          | 1 +
 include/configs/neo.h            | 1 +
 9 files changed, 10 insertions(+)
include/configs/controlcenterd.h +2 -0
index 868813f..ed07a0f 100644
@@ -45,6 +45,8 @@
 #define CONFIG_CONTROLCENTERD
 #define CONFIG_MP			/* support multiple processors */
 
+#define CONFIG_SYS_GENERIC_BOARD
+
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_ENABLE_36BIT_PHYS
 #define CONFIG_FSL_LAW			/* Use common FSL init code */
include/configs/dlvision-10g.h +1 -0
index 7877897..ec85db2 100644
@@ -24,6 +24,7 @@
 #define CONFIG_BOARD_EARLY_INIT_R
 #define CONFIG_MISC_INIT_R
 #define CONFIG_LAST_STAGE_INIT
+#define CONFIG_SYS_GENERIC_BOARD
 
 #define CONFIG_SYS_CLK_FREQ	33333333 /* external frequency to pll   */
 
include/configs/dlvision.h +1 -0
index 1e86c55..af0d602 100644
@@ -22,6 +22,7 @@
 
 #define CONFIG_BOARD_EARLY_INIT_F	/* call board_early_init_f */
 #define CONFIG_MISC_INIT_R		/* call misc_init_r */
+#define CONFIG_SYS_GENERIC_BOARD
 
 #define CONFIG_SYS_CLK_FREQ	33333333 /* external frequency to pll   */
 
include/configs/gdppc440etx.h +1 -0
index 6810b3b..12fd75d 100644
@@ -32,6 +32,7 @@
 
 #define CONFIG_BOARD_EARLY_INIT_F	1	/* call board_early_init_f*/
 #define CONFIG_MISC_INIT_R		1	/* call misc_init_r()     */
+#define CONFIG_SYS_GENERIC_BOARD
 
 #undef CONFIG_ZERO_BOOTDELAY_CHECK     /* ignore keypress on bootdelay==0 */
 #define CONFIG_AUTOBOOT_KEYED          /* use key strings to stop autoboot */
include/configs/intip.h +1 -0
index b56b3aa..928eb5b 100644
@@ -45,6 +45,7 @@
 #define CONFIG_BOARD_EARLY_INIT_F	1	/* Call board_early_init_f */
 #define CONFIG_BOARD_EARLY_INIT_R	1	/* Call board_early_init_r */
 #define CONFIG_MISC_INIT_R		1	/* Call misc_init_r */
+#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_BOARD_TYPES		1	/* support board types */
 #define CONFIG_FIT
 #define CFG_ALT_MEMTEST
include/configs/io.h +1 -0
index 9da6cc6..8c8afef 100644
@@ -24,6 +24,7 @@
 #define CONFIG_BOARD_EARLY_INIT_R
 #define CONFIG_MISC_INIT_R
 #define CONFIG_LAST_STAGE_INIT
+#define CONFIG_SYS_GENERIC_BOARD
 
 #define CONFIG_SYS_CLK_FREQ	33333333 /* external frequency to pll   */
 
include/configs/io64.h +1 -0
index 6915b20..2a9ff37 100644
@@ -43,6 +43,7 @@
 #define CONFIG_BOARD_EARLY_INIT_R
 #define CONFIG_MISC_INIT_R
 #define CONFIG_LAST_STAGE_INIT
+#define CONFIG_SYS_GENERIC_BOARD
 
 #undef CONFIG_ZERO_BOOTDELAY_CHECK	/* ignore keypress on bootdelay==0 */
 #define CONFIG_AUTOBOOT_KEYED		/* use key strings to stop autoboot */
include/configs/iocon.h +1 -0
index 79c4736..7fd7527 100644
@@ -23,6 +23,7 @@
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_EARLY_INIT_R
 #define CONFIG_LAST_STAGE_INIT
+#define CONFIG_SYS_GENERIC_BOARD
 
 #define CONFIG_SYS_CLK_FREQ	33333333 /* external frequency to pll   */
 
include/configs/neo.h +1 -0
index d549985..5fdeff1 100644
@@ -25,6 +25,7 @@
 #define CONFIG_BOARD_EARLY_INIT_R
 #define CONFIG_MISC_INIT_R
 #define CONFIG_LAST_STAGE_INIT
+#define CONFIG_SYS_GENERIC_BOARD
 
 #define CONFIG_SYS_CLK_FREQ	33333333 /* external frequency to pll   */
 
Signature · 1 line
1.8.3
#4 lore raw

cover Add CONFIG_SYS_GENERIC_BOARD to all gdsys boards

In reply to dirk.eibach at gdsys.cc

Ping.

2014-06-30 13:05 GMT+02:00 <[email protected]>:

Quoted 24 lines

From: Dirk Eibach <[email protected]>

Dirk Eibach (2):
ppc: Make ppc4xx ready for CONFIG_SYS_GENERIC_BOARD
board: Add CONFIG_SYS_GENERIC_BOARD to all gdsys boards

 arch/powerpc/cpu/ppc4xx/cpu_init.c | 2 ++
 include/configs/controlcenterd.h   | 2 ++
 include/configs/dlvision-10g.h     | 1 +
 include/configs/dlvision.h         | 1 +
 include/configs/gdppc440etx.h      | 1 +
 include/configs/intip.h            | 1 +
 include/configs/io.h               | 1 +
 include/configs/io64.h             | 1 +
 include/configs/iocon.h            | 1 +
 include/configs/neo.h              | 1 +
 10 files changed, 12 insertions(+)

--
1.8.3