372-final: Merge router code; integrated some ARM prebuilt binaries

README-merlin.txt

@@ -34,7 +34,7 @@ Features
 Here is a list of features that Asuswrt-merlin brings over the original firmware:
 
 System:
-   - Based on pre-release 3.0.0.4.372 sources from Asus
+   - Based on pre-release 3.0.0.4.372_1363 sources from Asus
    - Various bugfixes all over the place
    - Some components were updated to their latest versions, for improved stability
      and security

README.TXT

@@ -35,9 +35,19 @@ Set Up Environment (Tested in Fedora 8/9 and Ubuntu 10.04/12.04 LTS amd64)
 		libssl-dev
 		libxml2-dev
 		libelf1:i386
+		mtd-utils
 
 	b. Fedora
 		sudo yum groupinstall "Development Tools"
+ 		sudo yum install gettext-devel libxml2-devel mtd-utils-ubi ncurses-devel zlib-devel
+
+		If you are using Fedora 19, you need to install below packages.
+		sudo yum groupinstall "C Development Tools and Libraries"
+
+ 		If you are using Fedora x86_64, you may need to install 32-bit packages listed below.
+ 			glibc.i686
+ 			libstdc++.i686
+ 			zlib.i686
 
    2. prepare source to, ex, $HOME/asuswrt
 
@@ -47,8 +57,7 @@ Set Up Environment (Tested in Fedora 8/9 and Ubuntu 10.04/12.04 LTS amd64)
    3. setup development system
 
 	ln -s $HOME/asuswrt/tools/brcm /opt/brcm
-        export PATH=$PATH:/opt/brcm/hndtools-mipsel-linux/bin:/opt/brcm/hndtools-mipsel-uclibc/bin
-	ln -s ~/asuswrt /media/ASUSWRT/asuswrt
+	export PATH=$PATH:/opt/brcm/hndtools-mipsel-linux/bin:/opt/brcm/hndtools-mipsel-uclibc/bin:/opt/asuswrt/tools/brcm/hndtools-arm-linux/bin
 
 	Note: Broadcom/Ralink platform use the same toolchain for user space program, so please set PATH to the same directory as above
 
@@ -65,3 +74,12 @@ Set Up Environment (Tested in Fedora 8/9 and Ubuntu 10.04/12.04 LTS amd64)
 		cd release/src-ra-3.0
 		make rt-n65u
 
+ 	d. rt-n14u
+ 		cd release/src-ra-mt7620
+ 		make rt-n14u
+
+ 	e. rt-ac56u (/ rt-ac68u / rt-n18uhp)
+ 		cd release/src-rt-6.x.4708
+ 		make rt-ac56u
+ 		( make rt-ac68u  )
+ 		( make rt-n18uhp )

release/src-rt-6.x/et/sys/etc.c

@@ -443,8 +443,10 @@ etc_ioctl(etc_info_t *etc, int cmd, void *arg)
 			(*etc->chops->phywr)(etc->ch, etc->phyaddr, vec[0], (uint16)vec[1]);
 #ifdef ETROBO
 			/* Invalidate current robo page */
-			if (etc->robo && etc->phyaddr == EPHY_NOREG && vec[0] == 0x10)
-				((robo_info_t *)etc->robo)->page = ((uint16)vec[1] >> 8);
+			if (etc->robo && etc->phyaddr == EPHY_NOREG && vec[0] == 0x10) {
+				uint16 page = (*etc->chops->phyrd)(etc->ch, EPHY_NOREG, 0x10);
+				((robo_info_t *)etc->robo)->page = (page == 0xffff) ? -1 : (page >> 8);
+			}
 #endif
 		}
 		break;
@@ -458,8 +460,10 @@ etc_ioctl(etc_info_t *etc, int cmd, void *arg)
 				(*etc->chops->phywr)(etc->ch, phyaddr, reg, (uint16)vec[1]);
 #ifdef ETROBO
 				/* Invalidate current robo page */
-				if (etc->robo && phyaddr == EPHY_NOREG && reg == 0x10)
-					((robo_info_t *)etc->robo)->page = ((uint16)vec[1] >> 8);
+				if (etc->robo && phyaddr == EPHY_NOREG && reg == 0x10) {
+					uint16 page = (*etc->chops->phyrd)(etc->ch, EPHY_NOREG, 0x10);
+					((robo_info_t *)etc->robo)->page = (page == 0xffff) ? -1 : (page >> 8);
+				}
 #endif
 				ET_TRACE(("etc_ioctl: ETCPHYWR2 to phy 0x%x, reg 0x%x <= 0x%x\n",
 				          phyaddr, reg, vec[1]));

release/src-rt-6.x/shared/bcmrobo.c

@@ -1558,8 +1558,7 @@ bcm_robo_config_vlan(robo_info_t *robo, uint8 *mac_addr)
 
 	/* Drop reserved bit, if any */
 	robo->ops->read_reg(robo, PAGE_CTRL, 0x2f, &val8, sizeof(val8));
-	if (/*((robo->devid == DEVID53115) || (robo->devid == DEVID53125)) &&*/
-	    val8 & (1 << 1)) {
+	if (robo->devid != DEVID5325 && val8 & (1 << 1)) {
 		val8 &= ~(1 << 1);
 		robo->ops->write_reg(robo, PAGE_CTRL, 0x2f, &val8, sizeof(val8));
 	}