diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2010-04-16 18:39:52 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2010-04-16 18:39:52 +0000 |
| commit | 0d47d330f3f98a5bc15d4419f82d585b31616282 (patch) | |
| tree | 0bab70d89124f15520998ba6826e4e591e08da76 /target/linux/ppc40x | |
| parent | d010b1efe5c369c3ed8e65d3f116ee783a3482cd (diff) | |
| download | upstream-0d47d330f3f98a5bc15d4419f82d585b31616282.tar.gz upstream-0d47d330f3f98a5bc15d4419f82d585b31616282.tar.bz2 upstream-0d47d330f3f98a5bc15d4419f82d585b31616282.zip | |
ppc40x: move perwe fixup into a separate function
Cc: backfire@openwrt.org
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20929 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ppc40x')
| -rw-r--r-- | target/linux/ppc40x/patches/004-magicbox.patch | 18 | ||||
| -rw-r--r-- | target/linux/ppc40x/patches/005-openrb.patch | 18 |
2 files changed, 24 insertions, 12 deletions
diff --git a/target/linux/ppc40x/patches/004-magicbox.patch b/target/linux/ppc40x/patches/004-magicbox.patch index 0f9e192fcf..8de4a11b57 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,96 @@ +/* + * Old U-boot compatibility for Magicbox boards + * @@ -26,16 +26,22 @@ + +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); @@ -48,7 +54,6 @@ + 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 +81,7 @@ + devp = finddevice("/plb/ebc/cf_card@ff100000"); + del_node(devp); + } else { ++ fixup_perwe(); + fixup_cf_card(); + } + diff --git a/target/linux/ppc40x/patches/005-openrb.patch b/target/linux/ppc40x/patches/005-openrb.patch index a90fba88cc..17a6bb12ce 100644 --- 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 -@@ -0,0 +1,71 @@ +@@ -0,0 +1,77 @@ +/* + * Old U-boot compatibility for OpenRB boards + * @@ -26,16 +26,22 @@ + +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); @@ -48,7 +54,6 @@ + mtdcr(DCRN_EBC0_CFGADDR, EBC_B2AP); + mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800); + -+#undef DCRN_CPC0_PCI_BASE +#undef CF_CS0_BASE +#undef CF_CS1_BASE +} @@ -58,6 +63,7 @@ + ibm405ep_fixup_clocks(bd.bi_procfreq / 8); + ibm4xx_sdram_fixup_memsize(); + ++ fixup_perwe(); + fixup_cf_card(); + + dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr); |