summaryrefslogtreecommitdiffstats
path: root/conf/multiconfig
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2023-04-18 18:20:12 -0400
committerScott Murray <scott.murray@konsulko.com>2023-04-18 18:27:34 -0400
commit6e5d281b2015dfbdee5e153ffeb3e3b5358f7f1c (patch)
treebcf2321a93f29557e6294cc9bd60fb20315beb2d /conf/multiconfig
parent32774623cb239d420bc226f437e01c3eaacb1a28 (diff)
Fix building agl-kvm-demo-platform for h3ulcb-kf
Changes: - Add masking the meta-rcar-gen3-adas layer to the KVM guest multiconfig to avoid picking up the dangling bbappends in meta-agl-bsp when building the guests. - Remove the MACHINE_SUFFIX logic from the guest image copying in the agl-kvm-demo-platform recipe; it is a leftover from the original logic used in the IC EG container host images, and is unneeded here since the host and guests will be different MACHINEs (and the guest realistically cannot use the -kf machines). Bug-AGL: SPEC-4760 Change-Id: If3237ca4d9fc86fc9d289a95bda24a4afcc7a991 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'conf/multiconfig')
-rw-r--r--conf/multiconfig/agl-kvm-guest.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/multiconfig/agl-kvm-guest.conf b/conf/multiconfig/agl-kvm-guest.conf
index b13630db4..478bc5ff0 100644
--- a/conf/multiconfig/agl-kvm-guest.conf
+++ b/conf/multiconfig/agl-kvm-guest.conf
@@ -4,7 +4,7 @@ MACHINE = "virtio-aarch64"
# Avoid parse errors caused by linux-renesas, and all the other
# random bbappends in meta-rcar-gen3.
-BBMASK += "meta-rcar-gen3/ meta-agl-refhw-gen3/"
+BBMASK += "meta-rcar-gen3/ meta-rcar-gen3-adas/ meta-agl-refhw-gen3/"
DISTRO_FEATURES:append = " kvm virtualization"
ld } /* Name.Namespace */ .highlight .py { color: #336699; font-weight: bold } /* Name.Property */ .highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #336699 } /* Name.Variable */ .highlight .ow { color: #008800 } /* Operator.Word */ .highlight .w { color: #bbbbbb } /* Text.Whitespace */ .highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */ } 
/*
 * Copyright (C) 2013 Linaro, Ltd.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
 */

&twl {
       pinctrl-names = "default";
       pinctrl-0 = <&twl4030_pins &twl4030_vpins>;
};

&omap3_pmx_core {
       /*
        * On most OMAP3 platforms, the twl4030 IRQ line is connected
        * to the SYS_NIRQ line on OMAP.  Therefore, configure the
        * defaults for the SYS_NIRQ pin here.
        */
       twl4030_pins: pinmux_twl4030_pins {
               pinctrl-single,pins = <
                       OMAP3_CORE1_IOPAD(0x21e0, PIN_INPUT_PULLUP | PIN_OFF_WAKEUPENABLE | MUX_MODE0) /* sys_nirq.sys_nirq */
               >;
       };
};

/*
 * If your board is not using the I2C4 pins with twl4030, then don't include
 * this file. For proper idle mode signaling with sys_clkreq and sys_off_mode
 * pins we need to configure I2C4, or else use the legacy sys_nvmode1 and
 * sys_nvmode2 signaling.
 */
&omap3_pmx_wkup {
       twl4030_vpins: pinmux_twl4030_vpins {
               pinctrl-single,pins = <
                       OMAP3_WKUP_IOPAD(0x2a00, PIN_INPUT | MUX_MODE0)         /* i2c4_scl.i2c4_scl */
                       OMAP3_WKUP_IOPAD(0x2a02, PIN_INPUT | MUX_MODE0)         /* i2c4_sda.i2c4_sda */
                       OMAP3_WKUP_IOPAD(0x2a06, PIN_OUTPUT | MUX_MODE0)        /* sys_clkreq.sys_clkreq */
                       OMAP3_WKUP_IOPAD(0x2a18, PIN_OUTPUT | MUX_MODE0)        /* sys_off_mode.sys_off_mode */
               >;
       };
};