aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ppc44x/patches
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-02-03 14:54:01 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-02-03 14:54:01 +0000
commit98236f47c8bf854c4350765de24df6392bf25cfb (patch)
tree5e092cc71b419ef4f41dc4222046d1478eed6ba1 /target/linux/ppc44x/patches
parent4f71fabba4e42becf7f5a072cce3df3190961600 (diff)
downloadupstream-98236f47c8bf854c4350765de24df6392bf25cfb.tar.gz
upstream-98236f47c8bf854c4350765de24df6392bf25cfb.tar.bz2
upstream-98236f47c8bf854c4350765de24df6392bf25cfb.zip
convert ppc44x to arch/powerpc, use squashfs images by default
SVN-Revision: 10372
Diffstat (limited to 'target/linux/ppc44x/patches')
-rw-r--r--target/linux/ppc44x/patches/001-taishan_openwrt_flashmap.patch38
-rw-r--r--target/linux/ppc44x/patches/100-taishan_emac.patch71
-rw-r--r--target/linux/ppc44x/patches/110-openwrt_mtd_mapping.patch29
-rw-r--r--target/linux/ppc44x/patches/120-uncompressed_uImage.patch17
4 files changed, 38 insertions, 117 deletions
diff --git a/target/linux/ppc44x/patches/001-taishan_openwrt_flashmap.patch b/target/linux/ppc44x/patches/001-taishan_openwrt_flashmap.patch
new file mode 100644
index 0000000000..931b61a91d
--- /dev/null
+++ b/target/linux/ppc44x/patches/001-taishan_openwrt_flashmap.patch
@@ -0,0 +1,38 @@
+diff -Nur linux-2.6.24/arch/powerpc/boot/dts/taishan.dts linux-2.6.24-owrt/arch/powerpc/boot/dts/taishan.dts
+--- linux-2.6.24/arch/powerpc/boot/dts/taishan.dts 2008-01-31 18:55:57.000000000 +0100
++++ linux-2.6.24-owrt/arch/powerpc/boot/dts/taishan.dts 2008-02-02 23:04:12.000000000 +0100
+@@ -175,6 +175,34 @@
+ interrupt-parent = <&UIC1>;
+
+ /* TODO: Add other EBC devices */
++ nor_flash@0,0 {
++ compatible = "cfi-flash";
++ bank-width = <4>;
++ device-width = <2>;
++ reg = <0 000000 4000000>;
++ #address-cells = <1>;
++ #size-cells = <1>;
++ partition@0 {
++ label = "kernel";
++ reg = <0 200000>;
++ };
++ partition@200000 {
++ label = "rootfs";
++ reg = <200000 3c00000>;
++ };
++ partition@3e00000 {
++ label = "diagnostics";
++ reg = <3e00000 140000>;
++ };
++ partition@3f40000 {
++ label = "env";
++ reg = <3f40000 80000>;
++ };
++ partition@3fc0000 {
++ label = "u-boot";
++ reg = <3fc0000 40000>;
++ };
++ };
+ };
+
+
diff --git a/target/linux/ppc44x/patches/100-taishan_emac.patch b/target/linux/ppc44x/patches/100-taishan_emac.patch
deleted file mode 100644
index fde73b77b6..0000000000
--- a/target/linux/ppc44x/patches/100-taishan_emac.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -Nur linux-2.6.21/drivers/net/ibm_emac/ibm_emac_phy.c linux-2.6.21-owrt/drivers/net/ibm_emac/ibm_emac_phy.c
---- linux-2.6.21/drivers/net/ibm_emac/ibm_emac_phy.c 2007-04-27 23:49:26.000000000 +0200
-+++ linux-2.6.21-owrt/drivers/net/ibm_emac/ibm_emac_phy.c 2007-05-28 16:27:15.000000000 +0200
-@@ -299,11 +299,50 @@
- .ops = &cis8201_phy_ops
- };
-
-+#if defined(CONFIG_TAISHAN)
-+static int et1011c_init(struct mii_phy *phy)
-+{
-+ u16 reg_short;
-+
-+ reg_short = (u16)(phy_read(phy,0x16));
-+ reg_short &= ~(0x7);
-+ reg_short |= 0x6; /* RGMII Trace Delay*/
-+ phy_write(phy, 0x16, reg_short);
-+
-+ reg_short = (u16)(phy_read(phy, 0x17));
-+ reg_short &= ~(0x40);
-+ phy_write(phy, 0x17, reg_short);
-+
-+ phy_write(phy,0x1c,0x74f0);
-+ return 0;
-+}
-+
-+static struct mii_phy_ops et1011c_phy_ops = {
-+ .init = et1011c_init,
-+ .setup_aneg = genmii_setup_aneg,
-+ .setup_forced = genmii_setup_forced,
-+ .poll_link = genmii_poll_link,
-+ .read_link = genmii_read_link
-+};
-+
-+static struct mii_phy_def et1011c_phy_def = {
-+ .phy_id = 0x0282f000,
-+ .phy_id_mask = 0x0fffff00,
-+ .name = "ET1011C Gigabit Ethernet",
-+ .ops = &et1011c_phy_ops
-+};
-+
-+static struct mii_phy_def *mii_phy_table[] = {
-+ &et1011c_phy_def,
-+ NULL
-+};
-+#else
- static struct mii_phy_def *mii_phy_table[] = {
- &cis8201_phy_def,
- &genmii_phy_def,
- NULL
- };
-+#endif
-
- int mii_phy_probe(struct mii_phy *phy, int address)
- {
-diff -Nur linux-2.6.21/drivers/net/ibm_emac/ibm_emac_zmii.c linux-2.6.21-owrt/drivers/net/ibm_emac/ibm_emac_zmii.c
---- linux-2.6.21/drivers/net/ibm_emac/ibm_emac_zmii.c 2007-04-27 23:49:26.000000000 +0200
-+++ linux-2.6.21-owrt/drivers/net/ibm_emac/ibm_emac_zmii.c 2007-05-28 16:26:48.000000000 +0200
-@@ -170,6 +170,13 @@
- struct ocp_func_emac_data *emacdata = dev->def->additions;
-
- if (emacdata->zmii_idx >= 0) {
-+#if defined(CONFIG_TAISHAN)
-+ /* don't attach emac0 and emac1 */
-+ if( dev->def->index < 2 )
-+ {
-+ return -ENODEV;
-+ }
-+#endif
- dev->zmii_input = emacdata->zmii_mux;
- dev->zmii_dev =
- ocp_find_device(OCP_VENDOR_IBM, OCP_FUNC_ZMII,
diff --git a/target/linux/ppc44x/patches/110-openwrt_mtd_mapping.patch b/target/linux/ppc44x/patches/110-openwrt_mtd_mapping.patch
deleted file mode 100644
index 7d07fa9256..0000000000
--- a/target/linux/ppc44x/patches/110-openwrt_mtd_mapping.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Nur linux-2.6.21/arch/ppc/platforms/4xx/taishan.c linux-2.6.21-owrt/arch/ppc/platforms/4xx/taishan.c
---- linux-2.6.21/arch/ppc/platforms/4xx/taishan.c 2007-04-27 23:49:26.000000000 +0200
-+++ linux-2.6.21-owrt/arch/ppc/platforms/4xx/taishan.c 2007-05-28 17:21:46.000000000 +0200
-@@ -60,8 +60,8 @@
- };
-
- #define RW_PART0_OF 0
--#define RW_PART0_SZ 0x180000
--#define RW_PART1_SZ 0x200000
-+#define RW_PART0_SZ 0x400000
-+#define RW_PART1_SZ 0x3a00000
- /* Partition 2 will be autosized dynamically... */
- #define RW_PART3_SZ 0x80000
- #define RW_PART4_SZ 0x40000
-@@ -73,12 +73,12 @@
- .size = RW_PART0_SZ
- },
- {
-- .name = "root",
-+ .name = "rootfs",
- .offset = MTDPART_OFS_APPEND,
- .size = RW_PART1_SZ,
- },
- {
-- .name = "user",
-+ .name = "diagnostics",
- .offset = MTDPART_OFS_APPEND,
- /* .size = RW_PART2_SZ */ /* will be adjusted dynamically */
- },
diff --git a/target/linux/ppc44x/patches/120-uncompressed_uImage.patch b/target/linux/ppc44x/patches/120-uncompressed_uImage.patch
deleted file mode 100644
index b1f2707834..0000000000
--- a/target/linux/ppc44x/patches/120-uncompressed_uImage.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Nur linux-2.6.21/arch/ppc/boot/images/Makefile linux-2.6.21-owrt/arch/ppc/boot/images/Makefile
---- linux-2.6.21/arch/ppc/boot/images/Makefile 2007-04-27 23:49:26.000000000 +0200
-+++ linux-2.6.21-owrt/arch/ppc/boot/images/Makefile 2007-05-28 17:44:11.000000000 +0200
-@@ -20,11 +20,11 @@
-
- quiet_cmd_uimage = UIMAGE $@
- cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A ppc -O linux -T kernel \
-- -C gzip -a 00000000 -e 00000000 -n 'Linux-$(KERNELRELEASE)' \
-+ -C none -a 00000000 -e 00000000 -n 'Linux-$(KERNELRELEASE)' \
- -d $< $@
-
- targets += uImage
--$(obj)/uImage: $(obj)/vmlinux.gz
-+$(obj)/uImage: $(obj)/vmlinux.bin
- $(Q)rm -f $@
- $(call cmd,uimage)
- @echo -n ' Image: $@ '