Merge branch 'master' of git://git.denx.de/u-boot-socfpga

arch/arm/dts/socfpga_arria5_socdk.dts

@@ -21,7 +21,7 @@
 	};
 
 	aliases {
-		/* this allow the ethaddr uboot environmnet variable contents
+		/* this allow the ethaddr uboot environment variable contents
 		 * to be added to the gmac1 device tree blob.
 		 */
 		ethernet0 = &gmac1;

arch/arm/dts/socfpga_cyclone5_socdk.dts

@@ -21,7 +21,7 @@
 	};
 
 	aliases {
-		/* this allow the ethaddr uboot environmnet variable contents
+		/* this allow the ethaddr uboot environment variable contents
 		 * to be added to the gmac1 device tree blob.
 		 */
 		ethernet0 = &gmac1;

arch/arm/dts/socfpga_cyclone5_socrates.dts

@@ -15,6 +15,11 @@
 	};
 
 	aliases {
+		/*
+		 * This allows the ethaddr uboot environment variable
+		 * contents to be added to the gmac1 device tree blob.
+		 */
+		ethernet0 = &gmac1;
 		udc0 = &usb1;
 	};
 

arch/arm/dts/socfpga_cyclone5_sr1500.dts

@@ -16,7 +16,7 @@
 
 	aliases {
 		/*
-		 * This allows the ethaddr uboot environmnet variable
+		 * This allows the ethaddr uboot environment variable
 		 * contents to be added to the gmac1 device tree blob.
 		 */
 		ethernet0 = &gmac1;

drivers/ddr/altera/sdram.c

@@ -118,7 +118,7 @@ static void sdram_set_rule(struct sdram_prot_rule *prule)
 
 	/* Obtain the address bits */
 	lo_addr_bits = prule->sdram_start >> 20ULL;
-	hi_addr_bits = prule->sdram_end >> 20ULL;
+	hi_addr_bits = (prule->sdram_end - 1) >> 20ULL;
 
 	debug("sdram set rule start %x, %d\n", lo_addr_bits,
 	      prule->sdram_start);