diff options
author | raj <raj@FreeBSD.org> | 2010-07-19 19:19:33 +0000 |
---|---|---|
committer | raj <raj@FreeBSD.org> | 2010-07-19 19:19:33 +0000 |
commit | 38ed317cdb7029de69bac81c9a5f8ea9bc43e4b3 (patch) | |
tree | bc608413bce80560ae29cdac2557c52ff6648027 /sys/arm | |
parent | 08397bfd61943e5715d578fd3dda33c12d6c3ba7 (diff) | |
download | FreeBSD-src-38ed317cdb7029de69bac81c9a5f8ea9bc43e4b3.zip FreeBSD-src-38ed317cdb7029de69bac81c9a5f8ea9bc43e4b3.tar.gz |
Now that we are fully FDT-driven on MRVL platforms, remove PHYSMEM_SIZE option.
Diffstat (limited to 'sys/arm')
-rw-r--r-- | sys/arm/mv/discovery/std.db78xxx | 1 | ||||
-rw-r--r-- | sys/arm/mv/kirkwood/std.db88f6xxx | 2 | ||||
-rw-r--r-- | sys/arm/mv/kirkwood/std.sheevaplug | 2 | ||||
-rw-r--r-- | sys/arm/mv/mv_machdep.c | 30 | ||||
-rw-r--r-- | sys/arm/mv/orion/std.db88f5xxx | 1 |
5 files changed, 3 insertions, 33 deletions
diff --git a/sys/arm/mv/discovery/std.db78xxx b/sys/arm/mv/discovery/std.db78xxx index b2f6049..7a7d927 100644 --- a/sys/arm/mv/discovery/std.db78xxx +++ b/sys/arm/mv/discovery/std.db78xxx @@ -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 diff --git a/sys/arm/mv/kirkwood/std.db88f6xxx b/sys/arm/mv/kirkwood/std.db88f6xxx index 6414e74..012a882 100644 --- a/sys/arm/mv/kirkwood/std.db88f6xxx +++ b/sys/arm/mv/kirkwood/std.db88f6xxx @@ -3,5 +3,3 @@ include "../mv/std.mv" include "../mv/kirkwood/std.kirkwood" files "../mv/kirkwood/files.kirkwood" - -options PHYSMEM_SIZE=0x20000000 diff --git a/sys/arm/mv/kirkwood/std.sheevaplug b/sys/arm/mv/kirkwood/std.sheevaplug index 0a0b6ed..44c977e 100644 --- a/sys/arm/mv/kirkwood/std.sheevaplug +++ b/sys/arm/mv/kirkwood/std.sheevaplug @@ -3,5 +3,3 @@ include "../mv/std.mv" include "../mv/kirkwood/std.kirkwood" files "../mv/kirkwood/files.sheevaplug" - -options PHYSMEM_SIZE=0x20000000 diff --git a/sys/arm/mv/mv_machdep.c b/sys/arm/mv/mv_machdep.c index 72cc62b..b2ec33b 100644 --- a/sys/arm/mv/mv_machdep.c +++ b/sys/arm/mv/mv_machdep.c @@ -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(); diff --git a/sys/arm/mv/orion/std.db88f5xxx b/sys/arm/mv/orion/std.db88f5xxx index de93847..49c6ae4 100644 --- a/sys/arm/mv/orion/std.db88f5xxx +++ b/sys/arm/mv/orion/std.db88f5xxx @@ -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 |