Fix bitbake issues with machine variables and underscores

3 files changed, 120 insertions, 82 deletions

diff --git a/recipes-kernel/linux/crypto.inc b/recipes-kernel/linux/crypto.inc
index be6af3a..a557ded 100644
--- a/recipes-kernel/linux/crypto.inc
+++ b/recipes-kernel/linux/crypto.inc
@@ -1,4 +1,17 @@
 # modules to load for Crypto on boot
-KERNEL_MODULE_AUTOLOAD += " \
+KERNEL_MODULE_AUTOLOAD_mtcdt += " \
+	sha512_generic \
+"
+
+KERNEL_MODULE_AUTOLOAD_mtrv1 += " \
+	sha512_generic \
+"
+
+
+KERNEL_MODULE_AUTOLOAD_mtr += " \
+	sha512_generic \
+"
+
+KERNEL_MODULE_AUTOLOAD_mtcap += " \
 	sha512_generic \
 "
diff --git a/recipes-kernel/linux/driver.inc b/recipes-kernel/linux/driver.inc
index 279156a..76ed3fa 100644
--- a/recipes-kernel/linux/driver.inc
+++ b/recipes-kernel/linux/driver.inc
@@ -1,11 +1,21 @@
 # Hardware drivers to load on boot.
-
 # Gadget serial is for MTCDT only
+
+DRIVER_LOAD_ALL_MACHINES =  " \
+	atmel_usba_udc \
+	ledtrig-default-on \
+	ledtrig-heartbeat \
+"
+
 KERNEL_MODULE_AUTOLOAD_mtcdt += " \
+	${DRIVER_LOAD_ALL_MACHINES} \
 	g_serial \
 "
 
-# Is this driver needed for mtcap?
-KERNEL_MODULE_AUTOLOAD += " \
-	atmel_usba_udc \
-"
+
+# Is atmel_usba_udc needed for mtcap?
+KERNEL_MODULE_AUTOLOAD_mtcap += "${DRIVER_LOAD_ALL_MACHINES}"
+
+KERNEL_MODULE_AUTOLOAD_mtrv1 += "${DRIVER_LOAD_ALL_MACHINES}"
+
+KERNEL_MODULE_AUTOLOAD_mtr += "${DRIVER_LOAD_ALL_MACHINES}"
diff --git a/recipes-kernel/linux/net.inc b/recipes-kernel/linux/net.inc
index ea89748..c76310f 100644
--- a/recipes-kernel/linux/net.inc
+++ b/recipes-kernel/linux/net.inc
@@ -1,92 +1,107 @@
 # List of net modules to be included on boot
 # If there are dependencies, the dependent items can be
 # omitted.
-KERNEL_MODULE_AUTOLOAD += " \
-	tun \
-	iptable_netfilter \
-	l2tp_ppp \
+NET_LOAD_ALL_MACHINES += " \
 	8021q \
-	ip_tables \
+	bnep \
+	br_netfilter \
+	dns_resolver \
+	garp \
+	ip6_gre \
+	ip6table_filter \
+	ip6table_mangle \
+	ip6table_nat \
+	ip6table_raw \
+	ip6t_ah \
+	ip6t_eui64 \
+	ip6t_frag \
+	ip6t_hbh \
+	ip6t_ipv6header \
+	ip6t_MASQUERADE \
+	ip6t_mh \
+	ip6t_NPT \
+	ip6t_REJECT \
+	ip6t_rpfilter \
+	ip6t_rt \
+	ip6t_SYNPROXY \
+	ip6_vti \
+	ipip \
+	iptable_mangle \
 	iptable_nat \
+	iptable_netfilter \
+	iptable_raw \
+	ip_tables \
+	ipt_ah \
+	ip_vs \
+	l2tp_ppp \
+	mac80211 \
+	mrp \
 	nf_conntrack_ipv4 \
+	nf_conntrack_ipv6 \
+	nf_conntrack_netbios_ns \
+	nf_conntrack_netlink \
+	nf_log_ipv4 \
+	nf_log_ipv6 \
+	nf_nat_ftp \
 	nf_nat_h323 \
-	iptable_mangle \
-	iptable_raw \
-	nf_nat_snmp_basic \
 	nf_nat_pptp \
-	nf_log_ipv4 \
-	ipt_ah \
-	ipip \
-	xt_policy \
-	xt_LOG \
-	xt_tcpudp \
-	xt_set \
+	nf_nat_sip \
+	nf_nat_snmp_basic \
+	nfnetlink_cttimeout \
+	nf_tables_inet \
+	nf_tables_netdev \
+	nft_exthdr \
 	nft_meta \
-	xt_time \
-	xt_state \
+	p8022 \
+	psnap \
+	rfcomm \
+	rfkill-gpio \
+	rfkill-regulator \
+	sit \
+	tun \
+	xfrm6_mode_tunnel \
+	xt_CLASSIFY \
 	xt_connmark \
-	xt_iprange \
-	xt_REDIRECT \
 	xt_conntrack \
-	nf_tables_netdev \
-	xt_TPROXY \
-	nf_tables_inet \
-	nft_exthdr \
-	ip_vs \
-	xt_HL \
-	nf_nat_ftp \
-	xt_nat \
-	xt_NFQUEUE \
-	xt_NETMAP \
+	xt_CT \
 	xt_ecn \
-	xt_mac \
-	xt_CLASSIFY \
-	xt_TEE \
-	xt_recent \
-	xt_limit \
-	nf_nat_sip \
-	xt_l2tp \
 	xt_esp \
-	nf_conntrack_netlink \
-	xt_NFLOG \
-	xt_mark \
-	xt_CT \
-	nf_conntrack_netbios_ns \
-	xt_hl \
-	nfnetlink_cttimeout \
 	xt_hashlimit \
+	xt_hl \
+	xt_HL \
+	xt_iprange \
+	xt_l2tp \
+	xt_LED \
+	xt_limit \
+	xt_LOG \
+	xt_mac \
+	xt_mark \
 	xt_multiport \
-	psnap \
-	mrp \
-	p8022 \
-	garp \
-	bnep \
-	rfcomm \
-	mac80211 \
-	rfkill_regulator \
-	rfkill_gpio \
-	dns_resolver \
-	ip6_gre \
-	ip6_vti \
-	xfrm6_mode_tunnel \
-	ip6t_NPT \
-	ip6t_ah \
-	ip6t_rpfilter \
-	ip6t_REJECT \
-	nf_log_ipv6 \
-	ip6table_nat \
-	ip6t_hbh \
-	ip6t_eui64 \
-	ip6table_mangle \
-	ip6t_ipv6header \
-	ip6t_rt \
-	ip6t_mh \
-	ip6table_raw \
-	ip6t_MASQUERADE \
-	ip6t_frag \
-	ip6t_SYNPROXY \
-	ip6table_filter \
-	nf_conntrack_ipv6 \
-	sit \
-	br_netfilter \
+	xt_nat \
+	xt_NETMAP \
+	xt_NFLOG \
+	xt_NFQUEUE \
+	xt_policy \
+	xt_recent \
+	xt_REDIRECT \
+	xt_set \
+	xt_state \
+	xt_tcpudp \
+	xt_TEE \
+	xt_time \
+	xt_TPROXY \
+"
+
+KERNEL_MODULE_AUTOLOAD_mtcdt += " \
+	${NET_LOAD_ALL_MACHINES} \
+"
+KERNEL_MODULE_AUTOLOAD_mtrv1 += " \
+	${NET_LOAD_ALL_MACHINES} \
+"
+KERNEL_MODULE_AUTOLOAD_mtr += " \
+	${NET_LOAD_ALL_MACHINES} \
+"
+KERNEL_MODULE_AUTOLOAD_mtcap += " \
+	${NET_LOAD_ALL_MACHINES} \
 "
+