Skip to content

Commit 90dd976

Browse files
committed
Drop forced systemd networking as this is now anyway in minimal by default
1 parent 432f13b commit 90dd976

3 files changed

Lines changed: 3 additions & 17 deletions

File tree

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# Marvell Armada 37x 512MB-2GB RAM SoC 1xmPCIe 1xSATA 3xGBE USB3.0 eMMC SPI
22
BOARD_NAME="Espressobin"
33
BOARDFAMILY="mvebu64"
4-
BOARD_MAINTAINER=""
4+
BOARD_MAINTAINER="igorpecovnik"
55
BOOTCONFIG="mvebu_espressobin-88f3720_defconfig"
66
HAS_VIDEO_OUTPUT="no"
77
KERNEL_TARGET="current,edge"
8+
KERNEL_TEST_TARGET="current"

config/sources/families/mvebu64.conf

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,6 @@ CPUMIN=200000
7474
CPUMAX=1300000
7575
GOVERNOR=ondemand
7676

77-
function pre_install_kernel_debs__network_manager_ignore_devices() {
78-
display_alert "Board: ${BOARD}: Disabling Network-Manager for all devices" "interface-name:eth*,interface-name:wan*,interface-name:lan*,interface-name:br*" "info"
79-
80-
mkdir -p "${SDCARD}"/etc/NetworkManager/conf.d/
81-
cat <<- EOF > "${SDCARD}"/etc/NetworkManager/conf.d/99-ignore-interfaces.conf
82-
[keyfile]
83-
unmanaged-devices="interface-name:eth*,interface-name:wan*,interface-name:lan*,interface-name:br*"
84-
EOF
85-
}
86-
8777
write_uboot_platform() {
8878
if [[ $BOARD = macchiatobin-doubleshot ]]; then
8979
dd if=$1/flash-image.bin of=$2 bs=512 seek=1 status=noxfer > /dev/null 2>&1
@@ -94,8 +84,6 @@ write_uboot_platform() {
9484
}
9585

9686
family_tweaks() {
97-
[[ -f $SDCARD/etc/netplan/armbian-default.yaml ]] && sed -i "s/^ renderer.*/ renderer: networkd/" $SDCARD/etc/netplan/armbian-default.yaml
98-
cp $SRC/packages/bsp/mvebu64/networkd/10* $SDCARD/etc/systemd/network/
9987
if [[ $BOARD = "espressobin" ]]; then
10088
echo "#Marvell Espressobin Console" >> $SDCARD/etc/securetty
10189
echo "ttyMV0" >> $SDCARD/etc/securetty

lib/functions/compilation/atf.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,8 @@ compile_atf() {
7373
if linux-version compare "${binutils_version}" gt "2.39" && linux-version compare "${binutils_version}" lt "2.42"; then
7474
display_alert "Binutils version for ATF" ">= 2.39 and < 2.42, adding -Wl,--no-warn-rwx-segment" "info"
7575
binutils_flags_atf="--no-warn-rwx-segment"
76-
# elif linux-version compare "${binutils_version}" ge "2.42"; then
77-
# display_alert "Binutils version for ATF" ">= 2.42, adding -Wl,--no-warn-rwx-segments" "info"
78-
# binutils_flags_atf="--no-warn-rwx-segments"
7976
fi
80-
77+
8178
# - ENABLE_BACKTRACE="0" has been added to workaround a regression in ATF. Check: https://github.com/armbian/build/issues/1157
8279

8380
run_host_command_logged "CROSS_COMPILE='ccache ${ATF_COMPILER}'" CCACHE_BASEDIR="$(pwd)" "CC='ccache ${ATF_COMPILER}gcc'" PATH="${toolchain}:${toolchain2}:${PATH}" \

0 commit comments

Comments
 (0)