svn commit: r210249 - in head/sys: arm/mv arm/mv/discovery arm/mv/kirkwood arm/mv/orion conf

[Rafal Jaworowski]

Author: raj
Date: Mon Jul 19 19:19:33 2010
New Revision: 210249
URL: http://svn.freebsd.org/changeset/base/210249

Log:
  Now that we are fully FDT-driven on MRVL platforms, remove PHYSMEM_SIZE option.

Modified:
  head/sys/arm/mv/discovery/std.db78xxx
  head/sys/arm/mv/kirkwood/std.db88f6xxx
  head/sys/arm/mv/kirkwood/std.sheevaplug
  head/sys/arm/mv/mv_machdep.c
  head/sys/arm/mv/orion/std.db88f5xxx
  head/sys/conf/options.arm

Modified: head/sys/arm/mv/discovery/std.db78xxx
==============================================================================
--- head/sys/arm/mv/discovery/std.db78xxx	Mon Jul 19 18:56:18 2010	(r210248)
+++ head/sys/arm/mv/discovery/std.db78xxx	Mon Jul 19 19:19:33 2010	(r210249)
@@ -9,5 +9,4 @@ makeoptions	KERNVIRTADDR=0xc0900000
 options		KERNPHYSADDR=0x00900000
 options		KERNVIRTADDR=0xc0900000
 options		PHYSADDR=0x00000000
-options		PHYSMEM_SIZE=0x20000000
 options		STARTUP_PAGETABLE_ADDR=0x00100000

Modified: head/sys/arm/mv/kirkwood/std.db88f6xxx
==============================================================================
--- head/sys/arm/mv/kirkwood/std.db88f6xxx	Mon Jul 19 18:56:18 2010	(r210248)
+++ head/sys/arm/mv/kirkwood/std.db88f6xxx	Mon Jul 19 19:19:33 2010	(r210249)
@@ -3,5 +3,3 @@
 include	"../mv/std.mv"
 include "../mv/kirkwood/std.kirkwood"
 files	"../mv/kirkwood/files.kirkwood"
-
-options		PHYSMEM_SIZE=0x20000000

Modified: head/sys/arm/mv/kirkwood/std.sheevaplug
==============================================================================
--- head/sys/arm/mv/kirkwood/std.sheevaplug	Mon Jul 19 18:56:18 2010	(r210248)
+++ head/sys/arm/mv/kirkwood/std.sheevaplug	Mon Jul 19 19:19:33 2010	(r210249)
@@ -3,5 +3,3 @@
 include	"../mv/std.mv"
 include "../mv/kirkwood/std.kirkwood"
 files	"../mv/kirkwood/files.sheevaplug"
-
-options		PHYSMEM_SIZE=0x20000000

Modified: head/sys/arm/mv/mv_machdep.c
==============================================================================
--- head/sys/arm/mv/mv_machdep.c	Mon Jul 19 18:56:18 2010	(r210248)
+++ head/sys/arm/mv/mv_machdep.c	Mon Jul 19 19:19:33 2010	(r210249)
@@ -153,7 +153,7 @@ static int availmem_regions_sz;
 static void print_kenv(void);
 static void print_kernel_section_addr(void);
 
-static void physmap_init(int);
+static void physmap_init(void);
 static int platform_devmap_init(void);
 static int platform_mpp_init(void);
 
@@ -202,7 +202,7 @@ print_kernel_section_addr(void)
 }
 
 static void
-physmap_init(int hardcoded)
+physmap_init(void)
 {
 	int i, j, cnt;
 	vm_offset_t phys_kernelend, kernload;
@@ -213,22 +213,6 @@ physmap_init(int hardcoded)
 	kernload = KERNPHYSADDR;
 
 	/*
-	 * Use hardcoded physical addresses if we don't use memory regions
-	 * from metadata.
-	 */
-	if (hardcoded) {
-		phys_avail[0] = 0;
-		phys_avail[1] = kernload;
-
-		phys_avail[2] = phys_kernelend;
-		phys_avail[3] = PHYSMEM_SIZE;
-
-		phys_avail[4] = 0;
-		phys_avail[5] = 0;
-		return;
-	}
-
-	/*
 	 * Remove kernel physical address range from avail
 	 * regions list. Page align all regions.
 	 * Non-page aligned memory isn't very interesting to us.
@@ -352,12 +336,6 @@ initarm(void *mdp, void *unused __unused
 	} else {
 		/* Fall back to hardcoded metadata. */
 		lastaddr = fake_preload_metadata();
-
-		/*
-		 * Assume a single memory region of size specified in board
-		 * configuration file.
-		 */
-		memsize = PHYSMEM_SIZE;
 	}
 
 #if defined(FDT_DTB_STATIC)
@@ -602,10 +580,8 @@ initarm(void *mdp, void *unused __unused
 
 	/*
 	 * Prepare map of physical memory regions available to vm subsystem.
-	 * If metadata pointer doesn't point to a valid address, use hardcoded
-	 * values.
 	 */
-	physmap_init((mdp != NULL) ? 0 : 1);
+	physmap_init();
 
 	/* Do basic tuning, hz etc */
 	init_param1();

Modified: head/sys/arm/mv/orion/std.db88f5xxx
==============================================================================
--- head/sys/arm/mv/orion/std.db88f5xxx	Mon Jul 19 18:56:18 2010	(r210248)
+++ head/sys/arm/mv/orion/std.db88f5xxx	Mon Jul 19 19:19:33 2010	(r210249)
@@ -9,5 +9,4 @@ makeoptions	KERNVIRTADDR=0xc0900000
 options		KERNPHYSADDR=0x00900000
 options		KERNVIRTADDR=0xc0900000
 options		PHYSADDR=0x00000000
-options		PHYSMEM_SIZE=0x08000000
 options		STARTUP_PAGETABLE_ADDR=0x00100000

Modified: head/sys/conf/options.arm
==============================================================================
--- head/sys/conf/options.arm	Mon Jul 19 18:56:18 2010	(r210248)
+++ head/sys/conf/options.arm	Mon Jul 19 19:19:33 2010	(r210249)
@@ -23,7 +23,6 @@ KERNPHYSADDR		opt_global.h
 KERNVIRTADDR		opt_global.h
 LOADERRAMADDR		opt_global.h
 PHYSADDR		opt_global.h
-PHYSMEM_SIZE		opt_global.h
 SKYEYE_WORKAROUNDS	opt_global.h
 SOC_MV_DISCOVERY	opt_global.h
 SOC_MV_KIRKWOOD		opt_global.h