projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ramips: remove 2.6.3[24] support
[openwrt.git] / target / linux / ppc40x / patches / 005-openrb.patch
diff --git a/target/linux/ppc40x/patches/005-openrb.patch b/target/linux/ppc40x/patches/005-openrb.patch
index 43407c2..638c81d 100644 (file)
--- a/target/linux/ppc40x/patches/005-openrb.patch
+++ b/target/linux/ppc40x/patches/005-openrb.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/arch/powerpc/boot/cuboot-openrb.c
 --- /dev/null
 +++ b/arch/powerpc/boot/cuboot-openrb.c
-@@ -0,0 +1,71 @@
+@@ -0,0 +1,94 @@
 +/*
 + * Old U-boot compatibility for OpenRB boards
 + *
 +/*
 + * Old U-boot compatibility for OpenRB boards
 + *
@@ -26,39 +26,62 @@
 +
 +static bd_t bd;
 +
 +
 +static bd_t bd;
 +
-+static void fixup_cf_card(void)
++static void fixup_perwe(void)
 +{
 +#define DCRN_CPC0_PCI_BASE    0xf9
 +{
 +#define DCRN_CPC0_PCI_BASE    0xf9
-+#define CF_CS0_BASE           0xff100000
-+#define CF_CS1_BASE           0xff200000
 +
 +
-+      /* Turn on PerWE instead of PCIsomething */
++      /* Turn on PerWE instead of PCIINT */
 +      mtdcr(DCRN_CPC0_PCI_BASE,
 +            mfdcr(DCRN_CPC0_PCI_BASE) | (0x80000000L >> 27));
 +
 +      mtdcr(DCRN_CPC0_PCI_BASE,
 +            mfdcr(DCRN_CPC0_PCI_BASE) | (0x80000000L >> 27));
 +
++#undef DCRN_CPC0_PCI_BASE
++}
++
++static void fixup_cf_card(void)
++{
++#define CF_CS0_BASE           0xff100000
++#define CF_CS1_BASE           0xff200000
++
 +      /* PerCS1 (CF's CS0): base 0xff100000, 16-bit, rw */
 +      mtdcr(DCRN_EBC0_CFGADDR, EBC_B1CR);
 +      /* PerCS1 (CF's CS0): base 0xff100000, 16-bit, rw */
 +      mtdcr(DCRN_EBC0_CFGADDR, EBC_B1CR);
-+      mtdcr(DCRN_EBC0_CFGDATA, CF_CS0_BASE | EBC_BXCR_BU_RW | EBC_BXCR_BW_16);
++      mtdcr(DCRN_EBC0_CFGDATA, CF_CS0_BASE | EBC_BXCR_BS_1M |
++                               EBC_BXCR_BU_RW | EBC_BXCR_BW_16);
 +      mtdcr(DCRN_EBC0_CFGADDR, EBC_B1AP);
 +      mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800);
 +
 +      /* PerCS2 (CF's CS1): base 0xff200000, 16-bit, rw */
 +      mtdcr(DCRN_EBC0_CFGADDR, EBC_B2CR);
 +      mtdcr(DCRN_EBC0_CFGADDR, EBC_B1AP);
 +      mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800);
 +
 +      /* PerCS2 (CF's CS1): base 0xff200000, 16-bit, rw */
 +      mtdcr(DCRN_EBC0_CFGADDR, EBC_B2CR);
-+      mtdcr(DCRN_EBC0_CFGDATA, CF_CS1_BASE | EBC_BXCR_BU_RW | EBC_BXCR_BW_16);
++      mtdcr(DCRN_EBC0_CFGDATA, CF_CS1_BASE | EBC_BXCR_BS_1M |
++                               EBC_BXCR_BU_RW | EBC_BXCR_BW_16);
 +      mtdcr(DCRN_EBC0_CFGADDR, EBC_B2AP);
 +      mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800);
 +
 +      mtdcr(DCRN_EBC0_CFGADDR, EBC_B2AP);
 +      mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800);
 +
-+#undef DCRN_CPC0_PCI_BASE
 +#undef CF_CS0_BASE
 +#undef CF_CS1_BASE
 +}
 +
 +#undef CF_CS0_BASE
 +#undef CF_CS1_BASE
 +}
 +
++static void fixup_isp116x(void)
++{
++#define ISP116X_CS_BASE               0xf0000000
++
++      /* PerCS3 (ISP1160's CS): base 0xf0000000, size 32MB, 16-bit, rw */
++      mtdcr(DCRN_EBC0_CFGADDR, EBC_B3CR);
++      mtdcr(DCRN_EBC0_CFGDATA, ISP116X_CS_BASE | EBC_BXCR_BS_32M |
++                               EBC_BXCR_BU_RW | EBC_BXCR_BW_16);
++      mtdcr(DCRN_EBC0_CFGADDR, EBC_B3AP);
++      mtdcr(DCRN_EBC0_CFGDATA, 0x03016600);
++
++#undef ISP116X_CS_BASE
++}
++
 +static void openrb_fixups(void)
 +{
 +      ibm405ep_fixup_clocks(bd.bi_procfreq / 8);
 +      ibm4xx_sdram_fixup_memsize();
 +
 +static void openrb_fixups(void)
 +{
 +      ibm405ep_fixup_clocks(bd.bi_procfreq / 8);
 +      ibm4xx_sdram_fixup_memsize();
 +
++      fixup_perwe();
 +      fixup_cf_card();
 +      fixup_cf_card();
++      fixup_isp116x();
 +
 +      dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);
 +}
 +
 +      dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);
 +}
@@ -74,7 +97,7 @@
 +}
 --- /dev/null
 +++ b/arch/powerpc/boot/dts/openrb.dts
 +}
 --- /dev/null
 +++ b/arch/powerpc/boot/dts/openrb.dts
-@@ -0,0 +1,276 @@
+@@ -0,0 +1,291 @@
 +/*
 + * Device Tree Source for OpenRB boards
 + *
 +/*
 + * Device Tree Source for OpenRB boards
 + *
@@ -278,6 +301,17 @@
 +                       */
 +                      clock-frequency = <0>; /* Filled in by zImage */
 +
 +                       */
 +                      clock-frequency = <0>; /* Filled in by zImage */
 +
++                      isp116x@f0000000 {
++                              compatible = "isp116x-hcd";
++                              oc_enable;
++                              int_act_high;
++                              int_edge_triggered;
++                              reg = <0x00000000 0xf0000000 0x00000002 /* data */
++                                     0x00000000 0xf1000000 0x00000002 /* addr */ >;
++                              interrupt-parent = <&UIC0>;
++                              interrupts = <0x1b 0x1 /* IRQ_TYPE_EDGE_RISING */ >;
++                      };
++
 +                      cf_card@ff100000 {
 +                              compatible = "magicbox-cf", "pata-magicbox-cf";
 +                              reg = <0x00000000 0xff100000 0x00001000
 +                      cf_card@ff100000 {
 +                              compatible = "magicbox-cf", "pata-magicbox-cf";
 +                              reg = <0x00000000 0xff100000 0x00001000
@@ -292,19 +326,23 @@
 +                              reg = <0x00000000 0xff800000 0x00800000>;
 +                              #address-cells = <1>;
 +                              #size-cells = <1>;
 +                              reg = <0x00000000 0xff800000 0x00800000>;
 +                              #address-cells = <1>;
 +                              #size-cells = <1>;
-+                              partition@0 {
++                              partition0@0 {
 +                                      label = "linux";
 +                                      label = "linux";
-+                                      reg = <0x0 0x120000>;
++                                      reg = <0x0 0x140000>;
 +                              };
 +                              };
-+                              partition@120000 {
++                              partition1@120000 {
 +                                      label = "rootfs";
 +                                      label = "rootfs";
-+                                      reg = <0x120000 0x6a0000>;
++                                      reg = <0x140000 0x680000>;
 +                              };
 +                              };
-+                              partition@7c0000 {
++                              partition2@7c0000 {
 +                                      label = "u-boot";
 +                                      reg = <0x7c0000 0x30000>;
 +                                      read-only;
 +                              };
 +                                      label = "u-boot";
 +                                      reg = <0x7c0000 0x30000>;
 +                                      read-only;
 +                              };
++                              partition3@0 {
++                                      label = "firmware";
++                                      reg = <0x0 0x7c0000>;
++                              };
 +                      };
 +              };
 +
 +                      };
 +              };
 +
@@ -353,7 +391,7 @@
 +};
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
 +};
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
-@@ -43,6 +43,7 @@ $(obj)/cuboot-taishan.o: BOOTCFLAGS += -
+@@ -44,6 +44,7 @@ $(obj)/cuboot-taishan.o: BOOTCFLAGS += -
  $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
  $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
  $(obj)/cuboot-magicbox.o: BOOTCFLAGS += -mcpu=405
  $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
  $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
  $(obj)/cuboot-magicbox.o: BOOTCFLAGS += -mcpu=405
@@ -361,17 +399,16 @@
  $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
  $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405
  
  $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
  $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405
  
-@@ -76,7 +77,8 @@ src-plat := of.c cuboot-52xx.c cuboot-82
-               cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \
+@@ -78,7 +79,7 @@ src-plat := of.c cuboot-52xx.c cuboot-82
                cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
                virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \
                cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
                virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \
--              cuboot-acadia.c cuboot-amigaone.c cuboot-magicbox.c
-+              cuboot-acadia.c cuboot-amigaone.c cuboot-magicbox.c \
-+              cuboot-openrb.c
+               cuboot-acadia.c cuboot-amigaone.c cuboot-kilauea.c \
+-              cuboot-magicbox.c
++              cuboot-magicbox.c cuboot-openrb.c
  src-boot := $(src-wlib) $(src-plat) empty.c
  
  src-boot := $(addprefix $(obj)/, $(src-boot))
  src-boot := $(src-wlib) $(src-plat) empty.c
  
  src-boot := $(addprefix $(obj)/, $(src-boot))
-@@ -194,6 +196,7 @@ image-$(CONFIG_EP405)                      += dtbImage.ep40
+@@ -197,6 +198,7 @@ image-$(CONFIG_HOTFOOT)                    += cuImage.hot
  image-$(CONFIG_WALNUT)                        += treeImage.walnut
  image-$(CONFIG_ACADIA)                        += cuImage.acadia
  image-$(CONFIG_MAGICBOX)              += cuImage.magicbox
  image-$(CONFIG_WALNUT)                        += treeImage.walnut
  image-$(CONFIG_ACADIA)                        += cuImage.acadia
  image-$(CONFIG_MAGICBOX)              += cuImage.magicbox
@@ -381,7 +418,7 @@
  image-$(CONFIG_EBONY)                 += treeImage.ebony cuImage.ebony
 --- a/arch/powerpc/platforms/40x/Kconfig
 +++ b/arch/powerpc/platforms/40x/Kconfig
  image-$(CONFIG_EBONY)                 += treeImage.ebony cuImage.ebony
 --- a/arch/powerpc/platforms/40x/Kconfig
 +++ b/arch/powerpc/platforms/40x/Kconfig
-@@ -60,6 +60,16 @@ config MAGICBOX
+@@ -70,6 +70,16 @@ config MAGICBOX
        help
          This option enables support for the Magicbox boards.
  
        help
          This option enables support for the Magicbox boards.
  
@@ -400,10 +437,10 @@
        depends on 40x
 --- a/arch/powerpc/platforms/40x/ppc40x_simple.c
 +++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
        depends on 40x
 --- a/arch/powerpc/platforms/40x/ppc40x_simple.c
 +++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
-@@ -55,7 +55,8 @@ static char *board[] __initdata = {
-       "amcc,haleakala",
+@@ -56,7 +56,8 @@ static char *board[] __initdata = {
        "amcc,kilauea",
        "amcc,makalu",
        "amcc,kilauea",
        "amcc,makalu",
+       "est,hotfoot",
 -      "magicbox"
 +      "magicbox",
 +      "openrb"
 -      "magicbox"
 +      "magicbox",
 +      "openrb"
Personal OpenWRT clone
This page took 0.036021 seconds and 4 git commands to generate.