On Wed, Feb 9, 2022 at 5:00 PM Bruce Ashfield <bruce.ashfi...@gmail.com> wrote: > > In message: [linux-yocto] [kernel-cache][PATCH 7/8] arm-versatile-926ejs: > reorg for tiny and preempt-rt > on 08/02/2022 Jon Mason wrote: > > > Make the necessary changes to get tiny and preempt-rt working again, as > > well as a general reorg to make things simpler. > > > > Signed-off-by: Jon Mason <jdma...@kudzu.us> > > --- > > .../arm-versatile-926ejs-gfx.cfg | 16 ++- > > .../arm-versatile-926ejs-preempt-rt.cfg | 2 + > > .../arm-versatile-926ejs-preempt-rt.scc | 5 +- > > .../arm-versatile-926ejs-standard.scc | 3 - > > .../arm-versatile-926ejs-tiny.scc | 2 - > > .../arm-versatile-926ejs.cfg | 106 +++++++++--------- > > .../arm-versatile-926ejs.scc | 11 +- > > bsp/arm-versatile-926ejs/hardware.cfg | 9 -- > > 8 files changed, 77 insertions(+), 77 deletions(-) > > create mode 100644 > > bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg > > delete mode 100644 bsp/arm-versatile-926ejs/hardware.cfg > > > > diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg > > b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg > > index 5e7519e0dfe2..83c71ae6b03e 100644 > > --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg > > +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg > > @@ -1,8 +1,16 @@ > > # SPDX-License-Identifier: MIT > > +CONFIG_INPUT=y > > +CONFIG_USB_HID=y > > + > > +CONFIG_INPUT_MISC=y > > +CONFIG_INPUT_UINPUT=y > > + > > +CONFIG_DRM_PANEL=y > > +CONFIG_DRM_PANEL_ARM_VERSATILE=y > > +CONFIG_DRM_PL111=y > > + > > CONFIG_FB=y > > CONFIG_FB_ARMCLCD=y > > -CONFIG_FRAMEBUFFER_CONSOLE=y > > > > -CONFIG_INPUT_TABLET=y > > -CONFIG_HID_WACOM=y > > -CONFIG_INPUT_MISC=y > > +CONFIG_AUXDISPLAY=y > > +CONFIG_ARM_CHARLCD=y > > diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg > > b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg > > new file mode 100644 > > index 000000000000..02840f431a0c > > --- /dev/null > > +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg > > It's minor, but we were asked to put a SPDX header on all the files in > the kernel-cache, so this would need one. > > > @@ -0,0 +1,2 @@ > > +CONFIG_LEDS_TRIGGER_CPU=n > > +CONFIG_FUNCTION_GRAPH_TRACER=n > > And for clearing a value, it's old school in the yocto kernel land and > everything (for the most part), uses "# CONFIG_FOO is not set" for > these (versus =n) > > > diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc > > b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc > > index 8dbe0e8601f5..6170625eed62 100644 > > --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc > > +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc > > @@ -1,10 +1,13 @@ > > # SPDX-License-Identifier: MIT > > define KMACHINE arm-versatile-926ejs > > define KMACHINE qemuarmv5 > > -define KMACHINE qemuarm > > define KTYPE preempt-rt > > define KARCH arm > > > > # no new branch required, re-use the ktypes/preempt-rt/preempt-rt.scc > > branch > > include ktypes/preempt-rt/preempt-rt.scc > > + > > include arm-versatile-926ejs.scc > > +kconf hardware arm-versatile-926ejs-preempt-rt.cfg > > + > > +patch arm_versatile_926ejs-kick-off-PrimeCell-RTC-PL031.patch > > This will apply the patch to the common prempt-rt branch, which is > what we've avoided for the versatile patches in the past, so we can > have a 'branch' statement before the patch to be safe (see my comment > below for more context).
I was attempting to merge all the random stuff into the main branch, but if there is logic to not do so then I can undo this change. It's probably worth opening a bug to track why this isn't usptreamed, as this platform is very old. > > diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc > > b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc > > index 6edfe67bbd57..2e4f06e2c370 100644 > > --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc > > +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc > > @@ -1,13 +1,10 @@ > > # SPDX-License-Identifier: MIT > > define KMACHINE arm-versatile-926ejs > > define KMACHINE qemuarmv5 > > -define KMACHINE qemuarm > > define KTYPE standard > > define KARCH arm > > > > include ktypes/standard/standard.scc > > -branch arm-versatile-926ejs > > - > > The branch can stay here, since we still have to carry patches to the > BSP on and off, hence the branch. > > > > > include arm-versatile-926ejs.scc > > > > diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc > > b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc > > index d22969f0de5e..e82162ba6f67 100644 > > --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc > > +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc > > @@ -1,12 +1,10 @@ > > # SPDX-License-Identifier: MIT > > define KMACHINE arm-versatile-926ejs > > define KMACHINE qemuarmv5 > > -define KMACHINE qemuarm > > define KTYPE tiny > > define KARCH arm > > > > include ktypes/tiny/tiny.scc > > -branch arm-versatile-926ejs > > > > include arm-versatile-926ejs.scc > > > > diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg > > b/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg > > index 1f41220f9449..f406106731a3 100644 > > --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg > > +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg > > @@ -1,78 +1,76 @@ > > -# SPDX-License-Identifier: MIT > > -#......................................................................... > > -# WARNING > > -# > > -# This file is a kernel configuration fragment, and not a full kernel > > -# configuration file. The final kernel configuration is made up of > > -# an assembly of processed fragments, each of which is designed to > > -# capture a specific part of the final configuration (e.g. platform > > -# configuration, feature configuration, and board specific hardware > > -# configuration). For more information on kernel configuration, please > > -# consult the product documentation. > > -# > > -#......................................................................... > > The header can stay, maybe this was debug/WIP when you were > hacking on the series ? The SPDX should stay, but this WARNING should be removed. It's not in any of the other config frags (at least for the arm machines) and is a little unsightly. > I'm curious how you came up with the option tweaks ? Some may > be defaults, but I tend to be explicit in these board fragments. I did them by hand to generate the same output with a more minimal file. If you want it like it is, I can revert back and keep the mods to a minimum. > > -CONFIG_ARM=y > > -CONFIG_ARM_AMBA=y > > -CONFIG_CPU_ARM926T=y > > -CONFIG_CPU_32v5=y > > +CONFIG_MMU=y > > +CONFIG_ARCH_MULTIPLATFORM=y > > +CONFIG_ARCH_MULTI_V7=n > > +CONFIG_ARCH_MULTI_V6=n > > CONFIG_ARCH_MULTI_V5=y > > -# CONFIG_ARCH_MULTI_V7 is not set > > -CONFIG_PCI_VERSATILE=y > > -CONFIG_CPU_CACHE_VIVT=y > > -CONFIG_CPU_TLB_V4WBI=y > > -CONFIG_CPU_COPY_V4WB=y > > -CONFIG_CPU_ABRT_EV5TJ=y > > CONFIG_ARCH_VERSATILE=y > > +CONFIG_PLAT_VERSATILE=y > > +CONFIG_AEABI=y > > +CONFIG_OABI_COMPAT=y > > +CONFIG_FPE_NWFPE=y > > CONFIG_VFP=y > > - > > -# CONFIG_PHYLIB is not set > > - > > +CONFIG_CMA=y > > CONFIG_MTD=y > > CONFIG_MTD_CMDLINE_PARTS=y > > -CONFIG_MTD_BLKDEVS=y > > CONFIG_MTD_BLOCK=y > > CONFIG_MTD_CFI=y > > -CONFIG_MTD_JEDECPROBE=y > > +CONFIG_MTD_CFI_ADV_OPTIONS=y > > CONFIG_MTD_CFI_INTELEXT=y > > CONFIG_MTD_CFI_AMDSTD=y > > +CONFIG_MTD_PHYSMAP=y > > +CONFIG_MTD_PHYSMAP_OF=y > > +CONFIG_MTD_PHYSMAP_VERSATILE=y > > +CONFIG_I2C=y > > +CONFIG_I2C_CHARDEV=y > > +CONFIG_I2C_VERSATILE=y > > +CONFIG_SPI=y > > +CONFIG_GPIOLIB=y > > +CONFIG_GPIO_PL061=y > > > > CONFIG_RTC_CLASS=y > > CONFIG_RTC_DRV_PL031=y > > +CONFIG_RTC_DRV_DS1307=y > > > > -# CONFIG_SERIAL_8250 is not set > > -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y > > +CONFIG_TTY=y > > +CONFIG_NULL_TTY=y > > +CONFIG_VT=y > > +CONFIG_VT_CONSOLE=y > > +CONFIG_VT_HW_CONSOLE_BINDING=y > > +CONFIG_SERIAL_8250_CONSOLE=y > > +CONFIG_SERIAL_8250=y > > +CONFIG_SERIAL_8250_EXTENDED=y > > +CONFIG_SERIAL_8250_MANY_PORTS=y > > +CONFIG_SERIAL_8250_SHARE_IRQ=y > > +CONFIG_SERIAL_8250_RSA=y > > CONFIG_SERIAL_AMBA_PL011=y > > +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y > > > > CONFIG_MMC=y > > -CONFIG_MMC_BLOCK=y > > CONFIG_MMC_ARMMMCI=y > > +CONFIG_NEW_LEDS=y > > +CONFIG_LEDS_CLASS=y > > +CONFIG_LEDS_SYSCON=y > > +CONFIG_LEDS_TRIGGERS=y > > +CONFIG_LEDS_TRIGGER_HEARTBEAT=y > > +CONFIG_LEDS_TRIGGER_CPU=y > > +CONFIG_ARM_VIC=y > > +CONFIG_ARM_TIMER_SP804=y > > +CONFIG_ARM_MODULE_PLTS=y > > +CONFIG_CLKSRC_VERSATILE=y > > +CONFIG_POWER_RESET_VERSATILE=y > > +CONFIG_VERSATILE_FPGA_IRQ=y > > +CONFIG_VERSATILE_FPGA_IRQ_NR=4 > > > > -CONFIG_JFFS2_FS=y > > -CONFIG_CRAMFS=y > > +CONFIG_NET_VENDOR_SMSC=y > > +CONFIG_SMC91X=y > > > > CONFIG_PCI=y > > +CONFIG_PCI_VERSATILE=y > > > > -CONFIG_SCSI=y > > -CONFIG_BLK_DEV_SD=y > > -CONFIG_SCSI_SYM53C8XX_2=y > > -CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 > > -CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 > > -CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 > > -CONFIG_SCSI_SYM53C8XX_MMIO=y > > - > > +CONFIG_SOUND=y > > +CONFIG_SND=y > > +CONFIG_SND_ARM=y > > +CONFIG_SND_ARMAACI=y > > > > CONFIG_SERIO=y > > -# CONFIG_SERIO_SERPORT is not set > > CONFIG_SERIO_AMBAKMI=y > > - > > -CONFIG_USB_MON=y > > -CONFIG_USB_OHCI_HCD=y > > -CONFIG_INPUT_EVDEV=y > > - > > -CONFIG_FRAME_POINTER=y > > - > > -# CONFIG_NO_HZ is not set > > -# CONFIG_HIGH_RES_TIMERS is not set > > - > > -CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y > > -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set > > diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs.scc > > b/bsp/arm-versatile-926ejs/arm-versatile-926ejs.scc > > index 9b1ea4b43ee4..91ab17550585 100644 > > --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs.scc > > +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs.scc > > @@ -2,11 +2,14 @@ > > kconf hardware arm-versatile-926ejs.cfg > > kconf hardware arm-versatile-926ejs-gfx.cfg > > > > -include features/profiling/profiling.scc > > -include features/latencytop/latencytop.scc > > These are includes we have in quite a few boards, is there a > specific reason to drop them ? I'm only look in the context > of this patch, so if you've moved them elsewhere in another > patch, I'll find out shortly :) These seemed like something that you wouldn't want in tiny, and should be in the standard.scc. I removed them because it looked like cruft to me, but moving to standard makes more sense (assuming you agree and want to keep them). > > > - > > +# FIXME - which of these are present? Oops, I should've removed this and actually looked at the SKU to see :) > > include features/usb/ehci-hcd.scc > > -include features/usb/uhci-hcd.scc > > include features/usb/ohci-hcd.scc > > include features/usb/xhci-hcd.scc > > > > +#FIXME - move these to tiny.scc? Same here. I needed to remove this errant comment. > > +include features/net/net.scc > > +include features/pci/pci.scc > > +include cfg/virtio.scc > > + > > +#FIXME -revisit the dts for all of the things that should be there > > \ No newline at end of file > > diff --git a/bsp/arm-versatile-926ejs/hardware.cfg > > b/bsp/arm-versatile-926ejs/hardware.cfg > > deleted file mode 100644 > > index 3250d6a67643..000000000000 > > --- a/bsp/arm-versatile-926ejs/hardware.cfg > > +++ /dev/null > > @@ -1,9 +0,0 @@ > > -# SPDX-License-Identifier: MIT > > -CONFIG_CC_OPTIMIZE_FOR_SIZE > > -CONFIG_CRAMFS > > -CONFIG_HIGH_RES_TIMERS > > -CONFIG_JFFS2_FS > > -CONFIG_NO_HZ > > -CONFIG_SERIAL_8250 > > -CONFIG_SERIAL_AMBA_PL011 > > -CONFIG_SERIAL_AMBA_PL011_CONSOLE > > There's no harm in keeping this around. Some of the options > we have listed here used to be boot failures and silent boot > death if they were incorrectly specified. Having them as > hardware options allows us to warn during the audit. But these are not being enabled, there is no "=y". It looked like an error and these things were being set in other files. I can put them back, just let me know. Thanks, Jon > > Bruce > > > -- > > 2.30.2 > > > > > > > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#11100): https://lists.yoctoproject.org/g/linux-yocto/message/11100 Mute This Topic: https://lists.yoctoproject.org/mt/88998545/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
