From 4e7d8aa302f0df963f210eddcba22e837b53f680 Mon Sep 17 00:00:00 2001 From: cshore Date: Mon, 17 Sep 2012 14:17:12 +0000 Subject: [ar71xx] dir-825-b1: Fix wholeflash images: Attempting to flash a wholeflash (-openwrt) image from the normal image would brick (but recoverable via emergency flash) the router if the wholeflash image was larger than the maximum size for a normal image. First we rename the -openwrt images to -wholeflash since -openwrt is really too generic. We also revert the changes to the regular dir-825-b1 image, which now is the same as before, but add a -towholeflash image which is almost the same as the regular dir-825-b1 image, but copies caldata to new location and allows flashing of images that use the full flash (except u-boot, u-boot-env, and caldata paritition space) (these are the -wholeflash images). git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33447 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...-MIPS-ath79-dir-825-b1-for-owrt-board-def.patch | 30 ++++++++++++---------- 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'target/linux/ar71xx/patches-3.3') diff --git a/target/linux/ar71xx/patches-3.3/640-MIPS-ath79-dir-825-b1-for-owrt-board-def.patch b/target/linux/ar71xx/patches-3.3/640-MIPS-ath79-dir-825-b1-for-owrt-board-def.patch index c3c383b0a..4afd72aa3 100644 --- a/target/linux/ar71xx/patches-3.3/640-MIPS-ath79-dir-825-b1-for-owrt-board-def.patch +++ b/target/linux/ar71xx/patches-3.3/640-MIPS-ath79-dir-825-b1-for-owrt-board-def.patch @@ -4,11 +4,11 @@ #define DIR825B1_MAC_LOCATION_0 0x1f66ffa0 #define DIR825B1_MAC_LOCATION_1 0x1f66ffb4 -+#define DIR825B1_OPENWRT_CAL_LOCATION_0 0x1f7f1000 -+#define DIR825B1_OPENWRT_CAL_LOCATION_1 0x1f7f5000 ++#define DIR825B1_WHOLEFLASH_CAL_LOCATION_0 0x1f7f1000 ++#define DIR825B1_WHOLEFLASH_CAL_LOCATION_1 0x1f7f5000 + -+#define DIR825B1_OPENWRT_MAC_LOCATION_0 0x1f7fffa0 -+#define DIR825B1_OPENWRT_MAC_LOCATION_1 0x1f7fffb4 ++#define DIR825B1_WHOLEFLASH_MAC_LOCATION_0 0x1f7fffa0 ++#define DIR825B1_WHOLEFLASH_MAC_LOCATION_1 0x1f7fffb4 + static struct gpio_led dir825b1_leds_gpio[] __initdata = { { @@ -30,7 +30,7 @@ ath79_register_mdio(0, 0x0); -@@ -165,9 +171,27 @@ static void __init dir825b1_setup(void) +@@ -165,9 +171,30 @@ static void __init dir825b1_setup(void) ap9x_pci_setup_wmac_led_pin(0, 5); ap9x_pci_setup_wmac_led_pin(1, 5); @@ -46,27 +46,31 @@ + DIR825B1_CAL_LOCATION_0, DIR825B1_CAL_LOCATION_1); +} + -+static void __init dir825b1_openwrt_setup(void) ++static void __init dir825b1_wholeflash_setup(void) +{ -+ dir825b1_common_setup(DIR825B1_OPENWRT_MAC_LOCATION_0, DIR825B1_OPENWRT_MAC_LOCATION_1, -+ DIR825B1_OPENWRT_CAL_LOCATION_0, DIR825B1_OPENWRT_CAL_LOCATION_1); ++ dir825b1_common_setup(DIR825B1_WHOLEFLASH_MAC_LOCATION_0, DIR825B1_WHOLEFLASH_MAC_LOCATION_1, ++ DIR825B1_WHOLEFLASH_CAL_LOCATION_0, DIR825B1_WHOLEFLASH_CAL_LOCATION_1); } MIPS_MACHINE(ATH79_MACH_DIR_825_B1, "DIR-825-B1", "D-Link DIR-825 rev. B1", dir825b1_setup); + -+MIPS_MACHINE(ATH79_MACH_DIR_825_B1_OPENWRT, "DIR-825-B1_OPENWRT", "D-Link DIR-825 rev. B1 OpenWrt", -+ dir825b1_openwrt_setup); ++MIPS_MACHINE(ATH79_MACH_DIR_825_B1_TOWHOLEFLASH, "DIR-825-B1_TOWHOLEFLASH", "D-Link DIR-825 rev. B1 TOWHOLEFLASH", ++ dir825b1_setup); + -+MIPS_MACHINE(ATH79_MACH_DIR_825_B1_TOSTOCK, "DIR-825-B1_TOSTOCK", "D-Link DIR-825 rev. B1 TOSTOCK", dir825b1_openwrt_setup); ++MIPS_MACHINE(ATH79_MACH_DIR_825_B1_WHOLEFLASH, "DIR-825-B1_WHOLEFLASH", "D-Link DIR-825 rev. B1 WHOLEFLASH", ++ dir825b1_wholeflash_setup); ++ ++MIPS_MACHINE(ATH79_MACH_DIR_825_B1_TOSTOCK, "DIR-825-B1_TOSTOCK", "D-Link DIR-825 rev. B1 TOSTOCK", dir825b1_wholeflash_setup); + --- a/arch/mips/ath79/machtypes.h +++ b/arch/mips/ath79/machtypes.h -@@ -35,6 +35,8 @@ enum ath79_mach_type { +@@ -35,6 +35,9 @@ enum ath79_mach_type { ATH79_MACH_DIR_615_C1, /* D-Link DIR-615 rev. C1 */ ATH79_MACH_DIR_615_E4, /* D-Link DIR-615 rev. E4 */ ATH79_MACH_DIR_825_B1, /* D-Link DIR-825 rev. B1 */ -+ ATH79_MACH_DIR_825_B1_OPENWRT, /* D-Link DIR-825 rev. B1 OpenWrt */ ++ ATH79_MACH_DIR_825_B1_TOWHOLEFLASH, /* D-Link DIR-825 rev. B1 TOWHOLEFLASH */ ++ ATH79_MACH_DIR_825_B1_WHOLEFLASH, /* D-Link DIR-825 rev. B1 WHOLEFLASH */ + ATH79_MACH_DIR_825_B1_TOSTOCK, /* D-Link DIR-825 rev. B1 TOSTOCK */ ATH79_MACH_EW_DORIN, /* embedded wireless Dorin Platform */ ATH79_MACH_EW_DORIN_ROUTER, /* embedded wireless Dorin Router Platform */ -- cgit v1.2.3