Module Name: src
Committed By: jmcneill
Date: Sat Oct 26 14:57:27 UTC 2019
Modified Files:
src/sys/arch/arm/ti: files.ti
src/sys/arch/evbarm/conf: files.generic
Removed Files:
src/sys/arch/evbarm/conf: TI files.ti std.ti
Log Message:
Adapt ti fdt glue to support GENERIC kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/ti/files.ti
cvs rdiff -u -r1.6 -r0 src/sys/arch/evbarm/conf/TI
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/files.generic
cvs rdiff -u -r1.2 -r0 src/sys/arch/evbarm/conf/files.ti
cvs rdiff -u -r1.5 -r0 src/sys/arch/evbarm/conf/std.ti
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/ti/files.ti
diff -u src/sys/arch/arm/ti/files.ti:1.4 src/sys/arch/arm/ti/files.ti:1.5
--- src/sys/arch/arm/ti/files.ti:1.4 Wed Nov 21 08:55:05 2018
+++ src/sys/arch/arm/ti/files.ti Sat Oct 26 14:57:27 2019
@@ -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 @@ attach am3prcm at fdt with am3_prcm
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 @@ file arch/arm/ti/ti_omaptimer.c omaptime
# 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
Index: src/sys/arch/evbarm/conf/files.generic
diff -u src/sys/arch/evbarm/conf/files.generic:1.8 src/sys/arch/evbarm/conf/files.generic:1.9
--- src/sys/arch/evbarm/conf/files.generic:1.8 Sun Sep 15 21:04:41 2019
+++ src/sys/arch/evbarm/conf/files.generic Sat Oct 26 14:57:27 2019
@@ -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/broadcom/files.bcm2835
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"
