[src/trunk]: src/sys/arch Adapt ti fdt glue to support GENERIC kernel.

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c1d1910b5cad
branches:  trunk
changeset: 460512:c1d1910b5cad
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Oct 26 14:57:27 2019 +0000

description:
Adapt ti fdt glue to support GENERIC kernel.

diffstat:

 sys/arch/arm/ti/files.ti           |  25 ++++++++----------
 sys/arch/evbarm/conf/TI            |  50 --------------------------------------
 sys/arch/evbarm/conf/files.generic |   3 +-
 sys/arch/evbarm/conf/files.ti      |   9 ------
 sys/arch/evbarm/conf/std.ti        |  30 ----------------------
 5 files changed, 13 insertions(+), 104 deletions(-)

diffs (163 lines):

diff -r bc9260dadc58 -r c1d1910b5cad sys/arch/arm/ti/files.ti
--- a/sys/arch/arm/ti/files.ti  Sat Oct 26 11:34:48 2019 +0000
+++ b/sys/arch/arm/ti/files.ti  Sat Oct 26 14:57:27 2019 +0000
@@ -1,16 +1,7 @@
-#      $NetBSD: files.ti,v 1.4 2018/11/21 08:55:05 skrll Exp $
+#      $NetBSD: files.ti,v 1.5 2019/10/26 14:57:27 jmcneill Exp $
 #
 
-file   arch/arm/arm32/arm32_boot.c
-file   arch/arm/arm32/arm32_kvminit.c
-file   arch/arm/arm32/arm32_reboot.c
-file   arch/arm/arm32/irq_dispatch.S
-
-file   arch/arm/arm32/armv7_generic_space.c
-file   arch/arm/arm/arm_generic_dma.c
-file   arch/arm/arm/bus_space_a4x.S
-
-file   arch/arm/ti/ti_platform.c
+file   arch/arm/ti/ti_platform.c       soc_ti
 
 # Interrupt controller
 device omapintc: pic, pic_splfuncs
@@ -27,8 +18,10 @@
 file   arch/arm/ti/am3_prcm.c          am3_prcm
 
 # UART
-attach com at fdt with ti_com
-file   arch/arm/ti/ti_com.c    ti_com needs-flag
+ifdef soc_ti
+attach com at fdt with ti_com: ti_prcm
+file   arch/arm/ti/ti_com.c            ti_com needs-flag
+endif
 
 # Timer
 device omaptimer
@@ -38,4 +31,8 @@
 # Ethernet
 device  cpsw: ether, ifnet, arp, mii, mii_phy
 attach  cpsw at fdt
-file    arch/arm/ti/if_cpsw.c                 cpsw
+file    arch/arm/ti/if_cpsw.c          cpsw
+
+# SOC parameters
+defflag        opt_soc.h                       SOC_TI
+defflag        opt_soc.h                       SOC_TI_AM335X: SOC_TI
diff -r bc9260dadc58 -r c1d1910b5cad sys/arch/evbarm/conf/TI
--- a/sys/arch/evbarm/conf/TI   Sat Oct 26 11:34:48 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-#      $NetBSD: TI,v 1.6 2018/11/21 08:37:06 skrll Exp $
-#
-
-include "arch/evbarm/conf/std.ti"
-include "arch/evbarm/conf/GENERIC.common"
-
-options VERBOSE_INIT_ARM
-options        CONSADDR=0x44e09000
-
-makeoptions     DTS="
-       am335x-bone.dts
-       am335x-boneblack.dts
-       am335x-boneblack-wireless.dts
-       am335x-bonegreen.dts
-       am335x-bonegreen-wireless.dts
-"
-
-makeoptions    DEBUG="-g"      # compile full symbol table
-makeoptions    COPY_SYMTAB=1
-
-#options       DIAGNOSTIC
-#options       DEBUG
-options        LOCKDEBUG
-
-options        CPU_CORTEXA8
-
-options        OMAP_SYSTEM_CLOCK_FREQ="48000000UL"
-
-config         netbsd  root on ? type ?
-
-armfdt0                at root
-simplebus*     at fdt? pass 0
-
-cpus*           at fdt? pass 0
-cpu*            at fdt? pass 0
-
-am3prcm*       at fdt? pass 1
-
-com*           at fdt?
-
-omapintc*      at fdt? pass 2
-omaptimer*     at fdt?
-
-fregulator*     at fdt?
-gpioleds*       at fdt?
-
-cpsw*          at fdt?
-ukphy*         at mii?
-
-cinclude "arch/evbarm/conf/TI.local"
diff -r bc9260dadc58 -r c1d1910b5cad sys/arch/evbarm/conf/files.generic
--- a/sys/arch/evbarm/conf/files.generic        Sat Oct 26 11:34:48 2019 +0000
+++ b/sys/arch/evbarm/conf/files.generic        Sat Oct 26 14:57:27 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.generic,v 1.8 2019/09/15 21:04:41 bouyer Exp $
+#      $NetBSD: files.generic,v 1.9 2019/10/26 14:57:27 jmcneill Exp $
 #
 # A generic (aarch32) kernel configuration info
 #
@@ -23,6 +23,7 @@
 include "arch/arm/nvidia/files.tegra"
 include "arch/arm/samsung/files.exynos"
 include "arch/arm/sunxi/files.sunxi"
+include "arch/arm/ti/files.ti"
 include "arch/arm/vexpress/files.vexpress"
 include "arch/arm/virt/files.virt"
 include "arch/arm/xilinx/files.zynq"
diff -r bc9260dadc58 -r c1d1910b5cad sys/arch/evbarm/conf/files.ti
--- a/sys/arch/evbarm/conf/files.ti     Sat Oct 26 11:34:48 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-#      $NetBSD: files.ti,v 1.2 2018/11/21 08:55:05 skrll Exp $
-#
-
-include "arch/arm/pic/files.pic"
-include "arch/arm/cortex/files.cortex"
-
-include "arch/evbarm/conf/files.fdt"
-
-include "arch/arm/ti/files.ti"
diff -r bc9260dadc58 -r c1d1910b5cad sys/arch/evbarm/conf/std.ti
--- a/sys/arch/evbarm/conf/std.ti       Sat Oct 26 11:34:48 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#      $NetBSD: std.ti,v 1.5 2018/11/21 08:55:05 skrll Exp $
-#
-
-machine                evbarm arm
-include                "arch/evbarm/conf/std.evbarm"
-
-include                "arch/evbarm/conf/files.ti"
-
-options        ARM_GENERIC_TODR
-options        ARM_HAS_VBAR
-options        ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
-options        DRAM_BLOCKS=256
-options        FDT
-options        FPU_VFP
-options        TPIDRPRW_IS_CURCPU
-options        __BUS_SPACE_HAS_STREAM_METHODS
-options        __HAVE_CPU_COUNTER
-options        __HAVE_CPU_UAREA_ALLOC_IDLELWP
-options        __HAVE_FAST_SOFTINTS
-options        __HAVE_GENERIC_CPU_INITCLOCKS
-options        __HAVE_GENERIC_START
-options        __HAVE_MM_MD_DIRECT_MAPPED_PHYS
-
-options        LOADADDRESS="0x80008000"
-makeoptions    BOARDTYPE="TI"
-makeoptions    BOARDMKFRAG="${THISARM}/conf/mk.ti"
-makeoptions    CPUFLAGS="-march=armv7-a -mfpu=neon"
-makeoptions    KERNEL_BASE_PHYS="0x80008000"
-makeoptions    KERNEL_BASE_VIRT="0x80008000"
-