[Bug 297793] arm: vestigial TI/AM335x lines remain in armv7 GENERIC on stable/14; two cleanups need MFC from main

[email protected]
Newsgroups gmane.os.freebsd.devel.arm
Message-ID <[email protected]/bugzilla/>
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=297793

            Bug ID: 297793
           Summary: arm: vestigial TI/AM335x lines remain in armv7 GENERIC
                    on stable/14; two cleanups need MFC from main
           Product: Base System
           Version: 14.5-STABLE
          Hardware: Any
                OS: Any
            Status: New
          Severity: Affects Some People
          Priority: ---
         Component: arm
          Assignee: [email protected]
          Reporter: [email protected]

DESCRIPTION

3416e102c4e9 "arm: Remove TI code from GENERIC" (D39843) removed the TI file
lists and device entries from the armv7 GENERIC config.  Two follow-up
cleanups in main removed the lines that change left behind.  Neither was
merged to stable/14, so stable/14 still carries them:

    sys/arm/conf/GENERIC:60    options       SOC_TI_AM335X
    sys/arm/conf/GENERIC:273   makeoptions   MODULES_EXTRA+="dtb/am335x"

plus the equivalent OMAP4 lines.

Both are dead.  SOC_TI_AM335X gates entries in sys/arm/ti/files.ti, and that
file list is no longer included by GENERIC on stable/14 -- verified, there is
no files.ti reference in the config at all -- so the option selects nothing.
The dtb/am335x module builds device tree blobs for a SoC whose drivers are not
in the kernel.  SOC_OMAP4 is dead on stable/14 for the same reason.


WHY THIS IS WORTH FIXING

The lines make the config look like AM335x is supported when it is not.
Grepping sys/arm/conf/GENERIC for SOC_TI_AM335X on stable/14 returns a match,
which reads as "AM335x is enabled".  I made exactly that mistake while
investigating BeagleBone Black support and concluded 14.x still supported the
SoC.  It does not: a GENERIC kernel built from stable/14 contains no AM335x
code at all.

Verified by building GENERIC for TARGET=arm TARGET_ARCH=armv7 from
releng/14.4: the kernel links (12318748 bytes), contains zero occurrences of
ti_sysc or am335x in its strings, and no ti_sysc.o is produced.


THE TWO COMMITS

    7ad2e83d5e1e  arm/GENERIC: Remove TI DTBs
                  Emmanuel Vadot <[email protected]>, 2024-03-20
                  Sponsored by: Beckhoff Automation GmbH & Co. KG
                  removes:  makeoptions MODULES_EXTRA+="dtb/am335x"
                            makeoptions MODULES_EXTRA+="dtb/omap4"

    ad7c98797bcc  Remove TI reference from arm/GENERIC
                  Oskar Holmlund <[email protected]>, 2024-09-19
                  https://reviews.freebsd.org/D46702
                  Approved by: imp, manu (mentor)
                  removes:  options SOC_TI_AM335X
                            options SOC_OMAP4
                            a stale comment about the BeagleBone watchdog

Its own commit message makes the intent explicit: "We've removed TI support in
3416e102c4e9 ... so no need to build the DTBs now."


BRANCH STATE

Verified 2026-08-23:

    main         both cleanups present, lines gone
    stable/15    lines gone
    stable/14    lines PRESENT
    releng/14.5  lines PRESENT
    releng/14.4  lines PRESENT

Neither commit subject appears in the stable/14 log, and git cherry reports
both as not upstream.


REQUESTED ACTION

MFC 7ad2e83d5e1e and ad7c98797bcc to stable/14.

Only stable/14 is being requested; main and stable/15 already have both.
releng/14.5 and releng/14.4 carry the lines but are frozen release branches
and would pick this up through a future release cut from stable/14.

No new code is proposed in this PR.  Both commits are pure deletions from a
kernel config.


EFFECT ON BUILDS

The resulting GENERIC kernel is unchanged, because neither line had any
effect.  The only difference is that the dtb/am335x and dtb/omap4 modules stop
being built.


NOTE ON THE ALTERNATIVE

If the project would rather AM335x work out of the box on stable/14, the
opposite change is possible -- restore files "../ti/files.ti" and the device
entries.  That is not proposed here.  A separate AM335X kernel config, as in
D46703, looks like the better mechanism and keeps GENERIC unchanged.  This
request only removes lines that currently do nothing.

-- 
You are receiving this mail because:
You are the assignee for the bug.
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.