subject:"\[PATCH 3\/5\] Warp Base Platform"

Re: [PATCH 3/5] Warp Base Platform

2008-01-11 Thread Josh Boyer

On Fri, 11 Jan 2008 01:17:51 -0500
Sean MacLennan [EMAIL PROTECTED] wrote:

 Update based on fixes to warp.dts.
 
 Signed-off-by: Sean MacLennan [EMAIL PROTECTED]

Looks good.

josh
___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev

Re: [PATCH 3/5] Warp Base Platform

2008-01-10 Thread Sean MacLennan

David Gibson wrote:

 Fold all this into cuboot-warp.c, unless you actually anticipate
 adding another wrapper for another firmware which will also use the
 functions in warp.c.

   
Done.

Signed-off-by: Sean MacLennan [EMAIL PROTECTED]
---
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 66a3d8c..b3e4c35 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -469,7 +469,7 @@ config MCA
 config PCI
bool PCI support if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \
|| PPC_MPC52xx || (EMBEDDED  (PPC_PSERIES || PPC_ISERIES)) \
-   || PPC_PS3
+   || PPC_PS3 || 44x
default y if !40x  !CPM2  !8xx  !PPC_83xx \
 !PPC_85xx  !PPC_86xx
default PCI_PERMEDIA if !4xx  !CPM2  !8xx
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index d1e625c..cd83c4f 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -62,7 +62,7 @@ src-plat := of.c cuboot-52xx.c cuboot-83xx.c cuboot-85xx.c 
holly.c \
ps3-head.S ps3-hvcall.S ps3.c treeboot-bamboo.c cuboot-8xx.c \
cuboot-pq2.c cuboot-sequoia.c treeboot-walnut.c cuboot-bamboo.c 
\
fixed-head.S ep88xc.c cuboot-hpc2.c ep405.c cuboot-taishan.c \
-   cuboot-katmai.c cuboot-rainier.c
+   cuboot-katmai.c cuboot-rainier.c cuboot-warp.c
 src-boot := $(src-wlib) $(src-plat) empty.c
 
 src-boot := $(addprefix $(obj)/, $(src-boot))
@@ -206,6 +206,7 @@ image-$(CONFIG_RAINIER) += 
cuImage.rainier
 image-$(CONFIG_WALNUT) += treeImage.walnut
 image-$(CONFIG_TAISHAN)+= cuImage.taishan
 image-$(CONFIG_KATMAI) += cuImage.katmai
+image-$(CONFIG_WARP)   += cuImage.warp
 endif
 
 # For 32-bit powermacs, build the COFF and miboot images
--- /dev/null   2005-11-20 22:22:37.0 -0500
+++ arch/powerpc/boot/cuboot-warp.c 2008-01-10 15:28:30.0 -0500
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2008 PIKA Technologies
+ *   Sean MacLennan [EMAIL PROTECTED]
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include ops.h
+#include 4xx.h
+#include cuboot.h
+
+#define TARGET_44x
+#include ppcboot.h
+
+static bd_t bd;
+
+static void warp_fixups(void)
+{
+   unsigned long sysclk = 6600;
+
+   ibm440ep_fixup_clocks(sysclk, 11059200, 5000);
+   ibm4xx_sdram_fixup_memsize();
+   dt_fixup_mac_addresses(bd.bi_enetaddr);
+}
+
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+  unsigned long r6, unsigned long r7)
+{
+   CUBOOT_INIT();
+
+   platform_ops.fixups = warp_fixups;
+   platform_ops.exit = ibm44x_dbcr_reset;
+   fdt_init(_dtb_start);
+   serial_console_init();
+}


___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev

Re: [PATCH 3/5] Warp Base Platform

2008-01-10 Thread Sean MacLennan

Update based on fixes to warp.dts.

Signed-off-by: Sean MacLennan [EMAIL PROTECTED]
---
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index d1e625c..cd83c4f 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -62,7 +62,7 @@ src-plat := of.c cuboot-52xx.c cuboot-83xx.c cuboot-85xx.c 
holly.c \
ps3-head.S ps3-hvcall.S ps3.c treeboot-bamboo.c cuboot-8xx.c \
cuboot-pq2.c cuboot-sequoia.c treeboot-walnut.c cuboot-bamboo.c 
\
fixed-head.S ep88xc.c cuboot-hpc2.c ep405.c cuboot-taishan.c \
-   cuboot-katmai.c cuboot-rainier.c
+   cuboot-katmai.c cuboot-rainier.c cuboot-warp.c
 src-boot := $(src-wlib) $(src-plat) empty.c
 
 src-boot := $(addprefix $(obj)/, $(src-boot))
@@ -206,6 +206,7 @@ image-$(CONFIG_RAINIER) += 
cuImage.rainier
 image-$(CONFIG_WALNUT) += treeImage.walnut
 image-$(CONFIG_TAISHAN)+= cuImage.taishan
 image-$(CONFIG_KATMAI) += cuImage.katmai
+image-$(CONFIG_WARP)   += cuImage.warp
 endif
 
 # For 32-bit powermacs, build the COFF and miboot images
--- /dev/null   2005-11-20 22:22:37.0 -0500
+++ arch/powerpc/boot/cuboot-warp.c 2008-01-11 01:08:54.0 -0500
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2008 PIKA Technologies
+ *   Sean MacLennan [EMAIL PROTECTED]
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include ops.h
+#include 4xx.h
+#include cuboot.h
+
+#define TARGET_44x
+#include ppcboot.h
+
+static bd_t bd;
+
+static void warp_fixups(void)
+{
+   unsigned long sysclk = 6600;
+
+   ibm440ep_fixup_clocks(sysclk, 11059200, 5000);
+   ibm4xx_sdram_fixup_memsize();
+   ibm4xx_fixup_ebc_ranges(/plb/opb/ebc);
+   dt_fixup_mac_addresses(bd.bi_enetaddr);
+}
+
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+  unsigned long r6, unsigned long r7)
+{
+   CUBOOT_INIT();
+
+   platform_ops.fixups = warp_fixups;
+   platform_ops.exit = ibm44x_dbcr_reset;
+   fdt_init(_dtb_start);
+   serial_console_init();
+}


___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev

[PATCH 3/5] Warp Base Platform

2008-01-09 Thread Sean MacLennan

Basically the powerpc/boot directory files.

Signed-off-by: Sean MacLennan [EMAIL PROTECTED]
---
diff --git a/arch/powerpc/boot/44x.h b/arch/powerpc/boot/44x.h
index 0256344..9db0213 100644
--- a/arch/powerpc/boot/44x.h
+++ b/arch/powerpc/boot/44x.h
@@ -12,5 +12,6 @@
 
 void ebony_init(void *mac0, void *mac1);
 void bamboo_init(void *mac0, void *mac1);
+void warp_init(void *mac0, void *mac1);
 
 #endif /* _PPC_BOOT_44X_H_ */
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index d1e625c..df0ef6f 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -56,13 +56,13 @@ src-wlib := string.S crt0.S stdio.c main.c \
gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \
4xx.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c bamboo.c \
cpm-serial.c stdlib.c mpc52xx-psc.c planetcore.c uartlite.c \
-   fsl-soc.c mpc8xx.c pq2.c
+   fsl-soc.c mpc8xx.c pq2.c warp.c
 src-plat := of.c cuboot-52xx.c cuboot-83xx.c cuboot-85xx.c holly.c \
cuboot-ebony.c treeboot-ebony.c prpmc2800.c \
ps3-head.S ps3-hvcall.S ps3.c treeboot-bamboo.c cuboot-8xx.c \
cuboot-pq2.c cuboot-sequoia.c treeboot-walnut.c cuboot-bamboo.c 
\
fixed-head.S ep88xc.c cuboot-hpc2.c ep405.c cuboot-taishan.c \
-   cuboot-katmai.c cuboot-rainier.c
+   cuboot-katmai.c cuboot-rainier.c cuboot-warp.c
 src-boot := $(src-wlib) $(src-plat) empty.c
 
 src-boot := $(addprefix $(obj)/, $(src-boot))
@@ -206,6 +206,7 @@ image-$(CONFIG_RAINIER) += 
cuImage.rainier
 image-$(CONFIG_WALNUT) += treeImage.walnut
 image-$(CONFIG_TAISHAN)+= cuImage.taishan
 image-$(CONFIG_KATMAI) += cuImage.katmai
+image-$(CONFIG_WARP)   += cuImage.warp
 endif
 
 # For 32-bit powermacs, build the COFF and miboot images
--- /dev/null   2005-11-20 22:22:37.0 -0500
+++ arch/powerpc/boot/cuboot-warp.c 2008-01-08 12:09:39.0 -0500
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2008 PIKA Technologies
+ *   Sean MacLennan [EMAIL PROTECTED]
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include ops.h
+#include 44x.h
+#include cuboot.h
+
+#define TARGET_44x
+#include ppcboot.h
+
+static bd_t bd;
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+  unsigned long r6, unsigned long r7)
+{
+   CUBOOT_INIT();
+
+   warp_init(bd.bi_enetaddr, bd.bi_enet1addr);
+}
--- /dev/null   2005-11-20 22:22:37.0 -0500
+++ arch/powerpc/boot/warp.c2008-01-08 12:09:54.0 -0500
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2008 PIKA Technologies
+ *   Sean MacLennan [EMAIL PROTECTED]
+ *
+ * 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; version 2 of the License
+ */
+#include ops.h
+#include 4xx.h
+#include 44x.h
+
+static u8 *warp_mac0, *warp_mac1;
+
+static void warp_fixups(void)
+{
+   unsigned long sysclk = 6600;
+
+   ibm440ep_fixup_clocks(sysclk, 11059200, 5000);
+   ibm4xx_sdram_fixup_memsize();
+   ibm4xx_quiesce_eth((u32 *)0xef600e00, (u32 *)0xef600f00);
+   dt_fixup_mac_addresses(warp_mac0, warp_mac1);
+}
+
+void warp_init(void *mac0, void *mac1)
+{
+   platform_ops.fixups = warp_fixups;
+   platform_ops.exit = ibm44x_dbcr_reset;
+   warp_mac0 = mac0;
+   warp_mac1 = mac1;
+   fdt_init(_dtb_start);
+   serial_console_init();
+}


___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev

Re: [PATCH 3/5] Warp Base Platform

2008-01-09 Thread David Gibson

On Wed, Jan 09, 2008 at 03:22:46PM -0500, Sean MacLennan wrote:
 Basically the powerpc/boot directory files.

[snip]
 --- /dev/null 2005-11-20 22:22:37.0 -0500
 +++ arch/powerpc/boot/cuboot-warp.c   2008-01-08 12:09:39.0 -0500
 @@ -0,0 +1,25 @@
 +/*
 + * Copyright (c) 2008 PIKA Technologies
 + *   Sean MacLennan [EMAIL PROTECTED]
 + *
 + * This program is free software; you can redistribute it and/or modify it
 + * under the terms of the GNU General Public License version 2 as published
 + * by the Free Software Foundation.
 + */
 +
 +#include ops.h
 +#include 44x.h
 +#include cuboot.h
 +
 +#define TARGET_44x
 +#include ppcboot.h
 +
 +static bd_t bd;
 +
 +void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
 +unsigned long r6, unsigned long r7)
 +{
 + CUBOOT_INIT();
 +
 + warp_init(bd.bi_enetaddr, bd.bi_enet1addr);
 +}
 --- /dev/null 2005-11-20 22:22:37.0 -0500
 +++ arch/powerpc/boot/warp.c  2008-01-08 12:09:54.0 -0500

Fold all this into cuboot-warp.c, unless you actually anticipate
adding another wrapper for another firmware which will also use the
functions in warp.c.

-- 
David Gibson| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au  | minimalist, thank you.  NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev

Re: [PATCH 3/5] Warp Base Platform

2008-01-09 Thread Sean MacLennan

David Gibson wrote:
 On Wed, Jan 09, 2008 at 03:22:46PM -0500, Sean MacLennan wrote:
   
 Basically the powerpc/boot directory files.
 

 [snip]
   
 --- /dev/null2005-11-20 22:22:37.0 -0500
 +++ arch/powerpc/boot/cuboot-warp.c  2008-01-08 12:09:39.0 -0500
 @@ -0,0 +1,25 @@
 +/*
 + * Copyright (c) 2008 PIKA Technologies
 + *   Sean MacLennan [EMAIL PROTECTED]
 + *
 + * This program is free software; you can redistribute it and/or modify it
 + * under the terms of the GNU General Public License version 2 as published
 + * by the Free Software Foundation.
 + */
 +
 +#include ops.h
 +#include 44x.h
 +#include cuboot.h
 +
 +#define TARGET_44x
 +#include ppcboot.h
 +
 +static bd_t bd;
 +
 +void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
 +   unsigned long r6, unsigned long r7)
 +{
 +CUBOOT_INIT();
 +
 +warp_init(bd.bi_enetaddr, bd.bi_enet1addr);
 +}
 --- /dev/null2005-11-20 22:22:37.0 -0500
 +++ arch/powerpc/boot/warp.c 2008-01-08 12:09:54.0 -0500
 

 Fold all this into cuboot-warp.c, unless you actually anticipate
 adding another wrapper for another firmware which will also use the
 functions in warp.c.

   
Yes, there is still a plan to use the u-boot device tree. Although not 
in the near feature. I could roll them togeather for now and split them 
out later.

Cheers,
Sean
___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev

Re: [PATCH 3/5] Warp Base Platform

2008-01-09 Thread David Gibson

On Wed, Jan 09, 2008 at 10:17:26PM -0500, Sean MacLennan wrote:
 David Gibson wrote:
  On Wed, Jan 09, 2008 at 03:22:46PM -0500, Sean MacLennan wrote:

  Basically the powerpc/boot directory files.
  
 
  [snip]

  --- /dev/null  2005-11-20 22:22:37.0 -0500
  +++ arch/powerpc/boot/cuboot-warp.c2008-01-08 12:09:39.0 
  -0500
  @@ -0,0 +1,25 @@
  +/*
  + * Copyright (c) 2008 PIKA Technologies
  + *   Sean MacLennan [EMAIL PROTECTED]
  + *
  + * This program is free software; you can redistribute it and/or modify it
  + * under the terms of the GNU General Public License version 2 as 
  published
  + * by the Free Software Foundation.
  + */
  +
  +#include ops.h
  +#include 44x.h
  +#include cuboot.h
  +
  +#define TARGET_44x
  +#include ppcboot.h
  +
  +static bd_t bd;
  +
  +void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
  + unsigned long r6, unsigned long r7)
  +{
  +  CUBOOT_INIT();
  +
  +  warp_init(bd.bi_enetaddr, bd.bi_enet1addr);
  +}
  --- /dev/null  2005-11-20 22:22:37.0 -0500
  +++ arch/powerpc/boot/warp.c   2008-01-08 12:09:54.0 -0500
  
 
  Fold all this into cuboot-warp.c, unless you actually anticipate
  adding another wrapper for another firmware which will also use the
  functions in warp.c.
 

 Yes, there is still a plan to use the u-boot device tree. Although not 
 in the near feature. I could roll them togeather for now and split them 
 out later.

Yes, but device-tree aware u-boot doesn't need anything platform
specific in the bootwrapper, so won't be a second user of warp.c.

-- 
David Gibson| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au  | minimalist, thank you.  NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev

Re: [PATCH 3/5] Warp Base Platform

Re: [PATCH 3/5] Warp Base Platform

Re: [PATCH 3/5] Warp Base Platform

[PATCH 3/5] Warp Base Platform

Re: [PATCH 3/5] Warp Base Platform

Re: [PATCH 3/5] Warp Base Platform

Re: [PATCH 3/5] Warp Base Platform

7 matches

Site Navigation

Mail list logo

Footer information