X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/933921a3b139c77f9c8e85b2cccc383ce00e0b19..ca93116b8d8097330d718e820c26ade1343622dd:/target/linux/ppc40x/patches/004-magicbox.patch?ds=inline

diff --git a/target/linux/ppc40x/patches/004-magicbox.patch b/target/linux/ppc40x/patches/004-magicbox.patch
index 0f9e192fc..78653afff 100644
--- a/target/linux/ppc40x/patches/004-magicbox.patch
+++ b/target/linux/ppc40x/patches/004-magicbox.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/arch/powerpc/boot/cuboot-magicbox.c
-@@ -0,0 +1,90 @@
+@@ -0,0 +1,98 @@
 +/*
 + * Old U-boot compatibility for Magicbox boards
 + *
@@ -26,29 +26,36 @@
 +
 +static bd_t bd;
 +
-+static void fixup_cf_card(void)
++static void fixup_perwe(void)
 +{
 +#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));
 +
++#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);
-+	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_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);
 +
-+#undef DCRN_CPC0_PCI_BASE
 +#undef CF_CS0_BASE
 +#undef CF_CS1_BASE
 +}
@@ -76,6 +83,7 @@
 +		devp = finddevice("/plb/ebc/cf_card@ff100000");
 +		del_node(devp);
 +	} else {
++		fixup_perwe();
 +		fixup_cf_card();
 +	}
 +
@@ -322,16 +330,16 @@
 +				};
 +				partition1@120000 {
 +					label = "rootfs";
-+					reg = <0x140000 0x680000>;
++					reg = <0x140000 0x280000>;
 +				};
-+				partition2@7c0000 {
++				partition2@3c0000 {
 +					label = "u-boot";
-+					reg = <0x7c0000 0x30000>;
++					reg = <0x3c0000 0x30000>;
 +					read-only;
 +				};
 +				partition3@0 {
 +					label = "firmware";
-+					reg = <0x0 0x7c0000>;
++					reg = <0x0 0x3c0000>;
 +				};
 +			};
 +		};