From e190d42231c277af4c8d4c079b8d5d2039de69fc Mon Sep 17 00:00:00 2001 From: andrew Date: Thu, 23 Apr 2015 20:39:40 +0000 Subject: [PATCH] - Move files selected in files.smp to files.aml8726 and remove it. - Remove a redundant file from files.aml8726 --- sys/arm/amlogic/aml8726/files.aml8726 | 3 ++- sys/arm/amlogic/aml8726/files.smp | 4 ---- sys/arm/amlogic/aml8726/std.odroidc1 | 1 - sys/arm/amlogic/aml8726/std.vsatv102-m6 | 1 - 4 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 sys/arm/amlogic/aml8726/files.smp diff --git a/sys/arm/amlogic/aml8726/files.aml8726 b/sys/arm/amlogic/aml8726/files.aml8726 index b32ebcdf449f..ca058a519ed6 100644 --- a/sys/arm/amlogic/aml8726/files.aml8726 +++ b/sys/arm/amlogic/aml8726/files.aml8726 @@ -4,12 +4,13 @@ kern/kern_clocksource.c standard arm/arm/bus_space_base.c standard arm/arm/bus_space_generic.c standard -arm/arm/bus_space_asm_generic.S standard +arm/arm/gic.c standard arm/arm/pl310.c standard arm/amlogic/aml8726/aml8726_l2cache.c standard arm/amlogic/aml8726/aml8726_machdep.c standard +arm/amlogic/aml8726/aml8726_mp.c optional smp arm/amlogic/aml8726/aml8726_identsoc.c standard arm/amlogic/aml8726/aml8726_ccm.c standard arm/amlogic/aml8726/aml8726_clkmsr.c standard diff --git a/sys/arm/amlogic/aml8726/files.smp b/sys/arm/amlogic/aml8726/files.smp deleted file mode 100644 index 9b6c6ab07427..000000000000 --- a/sys/arm/amlogic/aml8726/files.smp +++ /dev/null @@ -1,4 +0,0 @@ -#$FreeBSD$ - -arm/arm/gic.c standard -arm/amlogic/aml8726/aml8726_mp.c standard diff --git a/sys/arm/amlogic/aml8726/std.odroidc1 b/sys/arm/amlogic/aml8726/std.odroidc1 index 441c135b21c1..bf2b7a4c536d 100644 --- a/sys/arm/amlogic/aml8726/std.odroidc1 +++ b/sys/arm/amlogic/aml8726/std.odroidc1 @@ -5,7 +5,6 @@ include "../amlogic/aml8726/std.aml8726" makeoptions FDT_DTS_FILE=odroidc1.dts options SMP # Enable multiple cores -files "../amlogic/aml8726/files.smp" # 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 diff --git a/sys/arm/amlogic/aml8726/std.vsatv102-m6 b/sys/arm/amlogic/aml8726/std.vsatv102-m6 index e0014a48c459..984ccd381902 100644 --- a/sys/arm/amlogic/aml8726/std.vsatv102-m6 +++ b/sys/arm/amlogic/aml8726/std.vsatv102-m6 @@ -5,7 +5,6 @@ include "../amlogic/aml8726/std.aml8726" makeoptions FDT_DTS_FILE=vsatv102-m6.dts options SMP # Enable multiple cores -files "../amlogic/aml8726/files.smp" # 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