svn commit: r281904 - head/sys/arm/amlogic/aml8726

[Andrew Turner]

Author: andrew
Date: Thu Apr 23 20:43:24 2015
New Revision: 281904
URL: https://svnweb.freebsd.org/changeset/base/281904

Log:
  Move KERNVIRTADDR to the common std.aml8726.

Modified:
  head/sys/arm/amlogic/aml8726/std.aml8726
  head/sys/arm/amlogic/aml8726/std.odroidc1
  head/sys/arm/amlogic/aml8726/std.vsatv102-m6

Modified: head/sys/arm/amlogic/aml8726/std.aml8726
==============================================================================
--- head/sys/arm/amlogic/aml8726/std.aml8726	Thu Apr 23 20:39:40 2015	(r281903)
+++ head/sys/arm/amlogic/aml8726/std.aml8726	Thu Apr 23 20:43:24 2015	(r281904)
@@ -4,6 +4,15 @@ cpu		CPU_CORTEXA
 machine		arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
+# Physical memory starts at 0x80000000.  We assume the kernel is loaded
+# at 0x80100000 by u-boot (which doesn't support ubldr since it's missing
+# CONFIG_API).  The kernel must be supplied as a binary since u-boot is
+# also missing CONFIG_CMD_ELF.
+#
+#
+options 	KERNVIRTADDR=0xc0100000		# Used in ldscript.arm
+makeoptions	KERNVIRTADDR=0xc0100000
+
 device		fdt_pinctrl
 
 files		"../amlogic/aml8726/files.aml8726"

Modified: head/sys/arm/amlogic/aml8726/std.odroidc1
==============================================================================
--- head/sys/arm/amlogic/aml8726/std.odroidc1	Thu Apr 23 20:39:40 2015	(r281903)
+++ head/sys/arm/amlogic/aml8726/std.odroidc1	Thu Apr 23 20:43:24 2015	(r281904)
@@ -5,12 +5,3 @@ include		"../amlogic/aml8726/std.aml8726
 makeoptions	FDT_DTS_FILE=odroidc1.dts
 
 options		SMP				# Enable multiple cores
-
-# Physical memory starts at 0x00000000.  We assume the kernel is loaded
-# at 0x00100000 by u-boot (which doesn't support ubldr since it's missing
-# CONFIG_API).  The kernel must be supplied as a binary since u-boot is
-# also missing CONFIG_CMD_ELF.
-#
-#
-options		KERNVIRTADDR=0xc0100000		# Used in ldscript.arm
-makeoptions	KERNVIRTADDR=0xc0100000

Modified: head/sys/arm/amlogic/aml8726/std.vsatv102-m6
==============================================================================
--- head/sys/arm/amlogic/aml8726/std.vsatv102-m6	Thu Apr 23 20:39:40 2015	(r281903)
+++ head/sys/arm/amlogic/aml8726/std.vsatv102-m6	Thu Apr 23 20:43:24 2015	(r281904)
@@ -5,12 +5,3 @@ include		"../amlogic/aml8726/std.aml8726
 makeoptions	FDT_DTS_FILE=vsatv102-m6.dts
 
 options		SMP				# Enable multiple cores
-
-# Physical memory starts at 0x80000000.  We assume the kernel is loaded
-# at 0x80100000 by u-boot (which doesn't support ubldr since it's missing
-# CONFIG_API).  The kernel must be supplied as a binary since u-boot is
-# also missing CONFIG_CMD_ELF.
-#
-#
-options		KERNVIRTADDR=0xc0100000		# Used in ldscript.arm
-makeoptions	KERNVIRTADDR=0xc0100000