svn commit: r259620 - projects/specific_leg/sys/arm/arm

[Andrew Turner]

Author: andrew
Date: Thu Dec 19 18:52:27 2013
New Revision: 259620
URL: http://svnweb.freebsd.org/changeset/base/259620

Log:
  Re-enable the FreeBSD boot ABI, it works as expected.

Modified:
  projects/specific_leg/sys/arm/arm/machdep.c

Modified: projects/specific_leg/sys/arm/arm/machdep.c
==============================================================================
--- projects/specific_leg/sys/arm/arm/machdep.c	Thu Dec 19 18:27:32 2013	(r259619)
+++ projects/specific_leg/sys/arm/arm/machdep.c	Thu Dec 19 18:52:27 2013	(r259620)
@@ -994,11 +994,11 @@ default_parse_boot_param(struct arm_boot
 	if ((lastaddr = linux_parse_boot_param(abp)) != 0)
 		return lastaddr;
 #endif
+#endif
 #if defined(FREEBSD_BOOT_LOADER)
 	if ((lastaddr = freebsd_parse_boot_param(abp)) != 0)
 		return lastaddr;
 #endif
-#endif
 	/* Fall back to hardcoded metadata. */
 	lastaddr = fake_preload_metadata(abp);