Index: kernel/arch/arm32/src/mm/frame.c
===================================================================
--- kernel/arch/arm32/src/mm/frame.c	(revision 9cc0d7c4f78aa4efea62a2d761476193f7e7717d)
+++ kernel/arch/arm32/src/mm/frame.c	(revision e7045039e22decbd208b7b85570324c5de0c9301)
@@ -36,4 +36,5 @@
 #include <mm/frame.h>
 #include <arch/mm/frame.h>
+#include <arch/machine.h>
 #include <config.h>
 #include <arch/debug/print.h>
@@ -46,7 +47,7 @@
 {
 	/* all memory as one zone */
-	zone_create(0, ADDR2PFN(config.memory_size),
+	zone_create(0, ADDR2PFN(machine_get_memory_size()),
 	    BOOT_PAGE_TABLE_START_FRAME + BOOT_PAGE_TABLE_SIZE_IN_FRAMES, 0);
-	last_frame = config.memory_size;
+	last_frame = machine_get_memory_size();
 
 	/* blacklist boot page table */
Index: kernel/arch/arm32/src/mm/memory_init.c
===================================================================
--- kernel/arch/arm32/src/mm/memory_init.c	(revision 9cc0d7c4f78aa4efea62a2d761476193f7e7717d)
+++ 	(revision )
@@ -1,50 +1,0 @@
-/*
- * Copyright (c) 2007 Pavel Jancik
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup arm32mm	
- * @{
- */
-/** @file
- *  @brief Memory information functions.
- */
-
-#include <arch/mm/memory_init.h>
-#include <arch/mm/page.h>
-#include <arch/machine.h>
-
-/** Returns memory size.
- *
- * @return Memory size in bytes
- */
-size_t get_memory_size(void) 
-{
-	return  machine_get_memory_size();
-}
-
-/** @}
- */