Skip to content

Commit 88a20e7

Browse files
committed
fix: address review comments
- Rename board config to .csc (no maintainer) - Remove duplicate board name from comment - Change verbosity from 7 to 1 (default) - Remove ATF patch, use ATF_SKIP_LDFLAGS_WL instead - Move CONFIG_RD_* to kernel config (fix artifact caching) - Fix networking comment (chrony -> NetworkManager) - Replace -j12 with -j8 - Add fdt addr/resize after DTB reload on overlay error
1 parent 002b17f commit 88a20e7

File tree

6 files changed

+17
-55
lines changed

6 files changed

+17
-55
lines changed
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
# Nuvoton MA35D16F90 dual-core Cortex-A35 + Cortex-M4, 512MB DDR
1+
# Dual-core Cortex-A35 + Cortex-M4, 512MB DDR
22
BOARD_NAME="NuMaker IoT MA35D16F90"
33
BOARD_VENDOR="nuvoton"
44
BOARDFAMILY="nuvoton-ma35d1"
5-
BOARD_MAINTAINER=""
65
# SD card boot (sdcard1 = SD1 slot on NuMaker IoT board)
76
BOOTCONFIG="ma35d1_sdcard1_defconfig"
87
KERNEL_TARGET="vendor"

config/bootenv/nuvoton-ma35d1.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
verbosity=7
21
bootlogo=false
32
console=serial
43
fdtfile=nuvoton/ma35d1-iot-512m.dtb

config/bootscripts/boot-nuvoton-ma35d1.cmd

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
setenv overlay_error "false"
88
# default values
99
setenv rootdev "LABEL=armbi_root"
10-
setenv verbosity "7"
10+
setenv verbosity "1"
1111
setenv console "serial"
1212
setenv bootlogo "false"
1313
setenv rootfstype "ext4"
@@ -138,6 +138,8 @@ done
138138
if test "${overlay_error}" = "true"; then
139139
echo "Error applying DT overlays, restoring original DT"
140140
load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
141+
fdt addr ${fdt_addr_r}
142+
fdt resize 65536
141143
fi
142144

143145
# Resize FDT to actual size

config/kernel/linux-nuvoton-ma35d1-vendor.config

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Armbian defconfig generated with 5.10
22
# CONFIG_LOCALVERSION_AUTO is not set
3+
4+
# Initrd compression formats (required for Armbian boot)
5+
CONFIG_RD_GZIP=y
6+
CONFIG_RD_BZIP2=y
7+
CONFIG_RD_LZMA=y
8+
CONFIG_RD_XZ=y
9+
CONFIG_RD_LZO=y
10+
CONFIG_RD_LZ4=y
11+
CONFIG_RD_ZSTD=y
312
CONFIG_DEFAULT_HOSTNAME="localhost"
413
CONFIG_SYSVIPC=y
514
CONFIG_POSIX_MQUEUE=y

config/sources/families/nuvoton-ma35d1.conf

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ declare -g LOCALVERSION=""
1818
# Disable BTF - 5.10.y kernel has issues with newer pahole/toolchain
1919
declare -g KERNEL_BTF="no"
2020

21-
# Use chrony instead of systemd-timesyncd (timesyncd fails in chroot)
21+
# Use NetworkManager for network configuration
2222
declare -g NETWORKING_STACK="network-manager"
2323
ATF_PLAT="ma35d1"
2424
BOOTDELAY=1
@@ -39,6 +39,8 @@ declare -g ATFSOURCE="https://github.com/OpenNuvoton/MA35D1_arm-trusted-firmware
3939
declare -g ATFDIR="arm-trusted-firmware-ma35d1"
4040
declare -g ATFBRANCH="branch:master"
4141
declare -g ATFPATCHDIR="atf-nuvoton-ma35d1"
42+
# Fix RWX segment warning with binutils 2.39+ (skip -Wl, prefix for LD flags)
43+
declare -g ATF_SKIP_LDFLAGS_WL="yes"
4244

4345
# OP-TEE source from Nuvoton
4446
declare -g OPTEE_SOURCE="https://github.com/OpenNuvoton/MA35D1_optee_os-v3.9.0.git"
@@ -115,23 +117,6 @@ armbian_kernel_config__use_nuvoton_defconfig() {
115117
fi
116118
}
117119

118-
# Force critical kernel options after defconfig is loaded
119-
write_kernel_config__force_ma35d1_options() {
120-
if [[ ! -f .config ]]; then
121-
return
122-
fi
123-
124-
display_alert "Forcing MA35D1 critical kernel options" "MA35D1" "info"
125-
126-
# Enable all initrd compression formats (Nuvoton defconfig disables some)
127-
run_host_command_logged ./scripts/config --enable CONFIG_RD_GZIP
128-
run_host_command_logged ./scripts/config --enable CONFIG_RD_BZIP2
129-
run_host_command_logged ./scripts/config --enable CONFIG_RD_LZMA
130-
run_host_command_logged ./scripts/config --enable CONFIG_RD_XZ
131-
run_host_command_logged ./scripts/config --enable CONFIG_RD_LZO
132-
run_host_command_logged ./scripts/config --enable CONFIG_RD_LZ4
133-
run_host_command_logged ./scripts/config --enable CONFIG_RD_ZSTD
134-
}
135120

136121
# Custom ATF build for MA35D1 - we need BL2 with DTB embedded
137122
# NOTE: atf_custom_postprocess runs BEFORE atftempdir is created!
@@ -229,7 +214,7 @@ compile_optee_ma35d1() {
229214
LDFLAGS="--no-warn-rwx-segments" \
230215
NOWERROR=1 \
231216
V=1 \
232-
-j12
217+
-j$(nproc)
233218

234219
# Verify output files
235220
if [[ ! -f "${optee_out_dir}/tee-header_v2.bin" ]]; then

patch/atf/atf-nuvoton-ma35d1/fix-rwx-segment-warning.patch

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)